Date: Sat, 5 Jul 2014 00:50:08 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360712 - in head/www: squidpurge webfs webstone yourls zikula Message-ID: <201407050050.s650o8fx092326@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Sat Jul 5 00:50:07 2014 New Revision: 360712 URL: http://svnweb.freebsd.org/changeset/ports/360712 QAT: https://qat.redports.org/buildarchive/r360712/ Log: Stage. Modified: head/www/squidpurge/Makefile head/www/webfs/Makefile head/www/webstone/Makefile head/www/yourls/Makefile head/www/zikula/Makefile Modified: head/www/squidpurge/Makefile ============================================================================== --- head/www/squidpurge/Makefile Sat Jul 5 00:28:04 2014 (r360711) +++ head/www/squidpurge/Makefile Sat Jul 5 00:50:07 2014 (r360712) @@ -18,8 +18,9 @@ WRKSRC= ${WRKDIR}/purge PLIST_FILES= sbin/purge -NO_STAGE= yes +post-patch: + ${REINPLACE_CMD} -e 's/= g++/= ${CXX}/g' ${WRKSRC}/Makefile do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/purge ${PREFIX}/sbin + ${INSTALL_PROGRAM} ${WRKSRC}/purge ${STAGEDIR}${PREFIX}/sbin .include <bsd.port.mk> Modified: head/www/webfs/Makefile ============================================================================== --- head/www/webfs/Makefile Sat Jul 5 00:28:04 2014 (r360711) +++ head/www/webfs/Makefile Sat Jul 5 00:50:07 2014 (r360712) @@ -15,37 +15,28 @@ RUN_DEPENDS= ${LOCALBASE}/etc/mime.types WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} USES= gmake MAKEFILE= GNUmakefile -.if !defined(WITHOUT_OPENSSL) -MAKE_ENV= USE_SSL=no -.endif -MAKE_ENV+= LDLIBS="-lssl -lcrypto" USE_DIET=no -PLIST_FILES= sbin/webfsd +PLIST_FILES= sbin/webfsd man/man1/webfsd.1 + +OPTIONS_DEFINE= OPENSSL +OPENSSL_MAKE_ENV= LDLIBS="-lssl -lcrypto" USE_DIET=no +OPENSSL_MAKE_ENV_OFF= USE_SSL=no -MAN1= webfsd.1 MIMEFILE?= ${LOCALBASE}/etc/mime.types USE_RC_SUBR= webfsd -NO_STAGE= yes -pre-everything:: - @${ECHO_CMD} "" - @${ECHO_CMD} "===========================================" - @${ECHO_CMD} "This package supports the following option:" - @${ECHO_CMD} "" - @${ECHO_CMD} " -DWITHOUT_SSL - omit SSL support" - @${ECHO_CMD} "===========================================" - @${ECHO_CMD} "" +.include <bsd.port.options.mk> post-patch: @${REINPLACE_CMD} -e 's|/etc/mime.types|${MIMEFILE}|' ${WRKSRC}/GNUmakefile @${REINPLACE_CMD} -e 's|/etc/mime.types|${MIMEFILE}|' ${WRKSRC}/webfsd.man -.if defined(WITHOUT_OPENSSL) +.if empty(PORT_OPTIONS:MOPENSSL) @${REINPLACE_CMD} -e 's|USE_SSL := yes|USE_SSL := no|' ${WRKSRC}/Make.config .endif do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/webfsd ${PREFIX}/sbin - @${INSTALL_MAN} ${WRKSRC}/webfsd.man ${PREFIX}/man/man1/webfsd.1 + ${INSTALL_PROGRAM} ${WRKSRC}/webfsd ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_MAN} ${WRKSRC}/webfsd.man ${STAGEDIR}${PREFIX}/man/man1/webfsd.1 .include <bsd.port.mk> Modified: head/www/webstone/Makefile ============================================================================== --- head/www/webstone/Makefile Sat Jul 5 00:28:04 2014 (r360711) +++ head/www/webstone/Makefile Sat Jul 5 00:50:07 2014 (r360712) @@ -16,27 +16,23 @@ WRKSRC= ${WRKDIR}/WebStone2.5/src ALL_TARGET= install NO_INSTALL_MANPAGES= yes -NO_STAGE= yes do-install: @${RM} ${WRKSRC}/../bin/runs/keepme @${RMDIR} ${WRKSRC}/../bin/runs - @${MKDIR} ${PREFIX}/webstone/bin - @${MKDIR} ${PREFIX}/webstone/conf - @${MKDIR} ${PREFIX}/webstone/lgm - ${INSTALL_SCRIPT} ${WRKSRC}/../bin/* ${PREFIX}/webstone/bin - ${INSTALL_SCRIPT} ${WRKSRC}/../lgm/* ${PREFIX}/webstone/lgm - ${INSTALL_DATA} ${WRKSRC}/../conf/* ${PREFIX}/webstone/conf - ${INSTALL_SCRIPT} ${WRKSRC}/../webstone ${PREFIX}/webstone + @${MKDIR} ${STAGEDIR}${PREFIX}/webstone/bin + @${MKDIR} ${STAGEDIR}${PREFIX}/webstone/conf + @${MKDIR} ${STAGEDIR}${PREFIX}/webstone/lgm + ${INSTALL_SCRIPT} ${WRKSRC}/../bin/* ${STAGEDIR}${PREFIX}/webstone/bin + ${INSTALL_SCRIPT} ${WRKSRC}/../lgm/* ${STAGEDIR}${PREFIX}/webstone/lgm + ${INSTALL_DATA} ${WRKSRC}/../conf/* ${STAGEDIR}${PREFIX}/webstone/conf + ${INSTALL_SCRIPT} ${WRKSRC}/../webstone ${STAGEDIR}${PREFIX}/webstone @${MKDIR} ${WRKSRC}/../bin/runs @${TOUCH} ${WRKSRC}/../bin/runs/keepme .for file in webclient webmaster genrand - ${STRIP_CMD} ${PREFIX}/webstone/bin/${file} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/webstone/bin/${file} .endfor .for file in ws20_cgi ws25_cgi - ${STRIP_CMD} ${PREFIX}/webstone/lgm/${file} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/webstone/lgm/${file} .endfor -post-install: - @${CAT} ${PKGMESSAGE} - .include <bsd.port.mk> Modified: head/www/yourls/Makefile ============================================================================== --- head/www/yourls/Makefile Sat Jul 5 00:28:04 2014 (r360711) +++ head/www/yourls/Makefile Sat Jul 5 00:50:07 2014 (r360712) @@ -1,43 +1,39 @@ # Created by: Joe Horn <joehorn@gmail.com> # $FreeBSD$ -PORTNAME= yourls -DISTVERSION= 1.5.1 -CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} +PORTNAME= yourls +DISTVERSION= 1.5.1 +CATEGORIES= www +MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} MAINTAINER= ports@FreeBSD.org -COMMENT= Your Own URL Shortener +COMMENT= Your Own URL Shortener -LICENSE= GPLv3 +LICENSE= GPLv3 -WRKSRC= ${WRKDIR}/${PORTNAME} +WRKSRC= ${WRKDIR}/${PORTNAME} EXTRACT_AFTER_ARGS= -d ${WRKSRC} USES= zip:infozip -NO_BUILD= YES +NO_BUILD= YES -USE_PHP= bcmath curl json mysql pcre xml +USE_PHP= bcmath curl json mysql pcre xml -SUB_LIST+= PKGNAME=${PKGNAME} -SUB_FILES+= pkg-message +SUB_LIST+= PKGNAME=${PKGNAME} +SUB_FILES+= pkg-message -NO_STAGE= yes .include <bsd.port.pre.mk> do-install: - @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${WWWDIR} - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR} + @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR} @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \ ${WWWDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST} - @${FIND} ${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644 + @${FIND} ${STAGEDIR}${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644 @${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type f -print0 | \ ${XARGS} -0 ${CHMOD} 644' >> ${TMPPLIST} - @${FIND} ${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755 + @${FIND} ${STAGEDIR}${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755 @${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type d -print0 | \ ${XARGS} -0 ${CHMOD} 755' >> ${TMPPLIST} -post-install: - @${CAT} ${PKGMESSAGE} - .include <bsd.port.post.mk> Modified: head/www/zikula/Makefile ============================================================================== --- head/www/zikula/Makefile Sat Jul 5 00:28:04 2014 (r360711) +++ head/www/zikula/Makefile Sat Jul 5 00:50:07 2014 (r360712) @@ -22,17 +22,13 @@ IGNORE_WITH_MYSQL= 41 50 SUB_FILES= pkg-message -NO_STAGE= yes do-install: - @${MKDIR} ${WWWDIR} - @cd ${WRKSRC} && \ - ${FIND} . -type d -exec ${MKDIR} ${WWWDIR}/{} \; \ - -exec ${CHOWN} ${WWWOWN}:${WWWGRP} ${WWWDIR}/{} \; - @cd ${WRKSRC} && \ - ${FIND} . \! -type d -exec ${INSTALL_DATA} {} ${WWWDIR}/{} \; \ - -exec ${CHOWN} ${WWWOWN}:${WWWGRP} ${WWWDIR}/{} \; - -post-install: - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}${WWWDIR} + (cd ${WRKSRC} && \ + ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${WWWDIR}/{} \; \ + -exec ${CHOWN} ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}/{} \;) + (cd ${WRKSRC} && \ + ${FIND} . \! -type d -exec ${INSTALL_DATA} {} ${STAGEDIR}${WWWDIR}/{} \; \ + -exec ${CHOWN} ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}/{} \;) .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407050050.s650o8fx092326>