Date: Sun, 19 Jan 2014 11:00:29 +0000 (UTC) From: Martin Matuska <mm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340261 - in head/www: lighttpd lighttpd-mod_geoip lighttpd-mod_h264_streaming Message-ID: <201401191100.s0JB0TUZ062181@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mm Date: Sun Jan 19 11:00:28 2014 New Revision: 340261 URL: http://svnweb.freebsd.org/changeset/ports/340261 QAT: https://qat.redports.org/buildarchive/r340261/ Log: Add STAGE support Modified: head/www/lighttpd-mod_geoip/Makefile head/www/lighttpd-mod_h264_streaming/Makefile head/www/lighttpd/Makefile Modified: head/www/lighttpd-mod_geoip/Makefile ============================================================================== --- head/www/lighttpd-mod_geoip/Makefile Sun Jan 19 10:59:03 2014 (r340260) +++ head/www/lighttpd-mod_geoip/Makefile Sun Jan 19 11:00:28 2014 (r340261) @@ -27,21 +27,22 @@ ALL_TARGET= ${PORTNAME}.la _BUILDING_LIGHTTPD_MODULE= yes -NO_STAGE= yes do-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/lighttpd @${INSTALL_KLD} ${WRKSRC}/src/.libs/${PORTNAME}.so \ - ${LOCALBASE}/lib/lighttpd + ${STAGEDIR}${PREFIX}/lib/lighttpd @${INSTALL_KLD} ${WRKSRC}/src/.libs/${PORTNAME}.la \ - ${LOCALBASE}/lib/lighttpd + ${STAGEDIR}${PREFIX}/lib/lighttpd @${INSTALL_DATA} ${WRKSRC}/src/.libs/${PORTNAME}.a \ - ${LOCALBASE}/lib/lighttpd + ${STAGEDIR}${PREFIX}/lib/lighttpd post-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/lighttpd/conf.d @${INSTALL_DATA} ${WRKSRC}/doc/config/conf.d/geoip.conf \ - ${PREFIX}/etc/lighttpd/conf.d/geoip.conf.sample -.if !exists(${PREFIX}/etc/lighttpd/conf.d/geoip.conf) + ${STAGEDIR}${PREFIX}/etc/lighttpd/conf.d/geoip.conf.sample +.if !exists(${STAGEDIR}${PREFIX}/etc/lighttpd/conf.d/geoip.conf) @${INSTALL_DATA} ${WRKSRC}/doc/config/conf.d/geoip.conf \ - ${PREFIX}/etc/lighttpd/conf.d/geoip.conf.sample + ${STAGEDIR}${PREFIX}/etc/lighttpd/conf.d/geoip.conf.sample .endif .include "${MASTERDIR}/Makefile" Modified: head/www/lighttpd-mod_h264_streaming/Makefile ============================================================================== --- head/www/lighttpd-mod_h264_streaming/Makefile Sun Jan 19 10:59:03 2014 (r340260) +++ head/www/lighttpd-mod_h264_streaming/Makefile Sun Jan 19 11:00:28 2014 (r340261) @@ -35,21 +35,22 @@ ALL_TARGET= ${PORTNAME}.la _BUILDING_LIGHTTPD_MODULE= yes -NO_STAGE= yes do-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/lighttpd @${INSTALL_KLD} ${WRKSRC}/src/.libs/${PORTNAME}.so \ - ${LOCALBASE}/lib/lighttpd + ${STAGEDIR}${PREFIX}/lib/lighttpd @${INSTALL_KLD} ${WRKSRC}/src/.libs/${PORTNAME}.la \ - ${LOCALBASE}/lib/lighttpd + ${STAGEDIR}${PREFIX}/lib/lighttpd @${INSTALL_DATA} ${WRKSRC}/src/.libs/${PORTNAME}.a \ - ${LOCALBASE}/lib/lighttpd + ${STAGEDIR}${PREFIX}/lib/lighttpd post-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/lighttpd/conf.d @${INSTALL_DATA} ${FILESDIR}/h264_streaming.conf \ - ${PREFIX}/etc/lighttpd/conf.d/h264_streaming.conf.sample -.if !exists(${PREFIX}/etc/lighttpd/conf.d/h264_streaming.conf) + ${STAGEDIR}${PREFIX}/etc/lighttpd/conf.d/h264_streaming.conf.sample +.if !exists(${STAGEDIR}${PREFIX}/etc/lighttpd/conf.d/h264_streaming.conf) @${INSTALL_DATA} ${FILESDIR}/h264_streaming.conf \ - ${PREFIX}/etc/lighttpd/conf.d/h264_streaming.conf + ${STAGEDIR}${PREFIX}/etc/lighttpd/conf.d/h264_streaming.conf .endif .include "${MASTERDIR}/Makefile" Modified: head/www/lighttpd/Makefile ============================================================================== --- head/www/lighttpd/Makefile Sun Jan 19 10:59:03 2014 (r340260) +++ head/www/lighttpd/Makefile Sun Jan 19 11:00:28 2014 (r340261) @@ -83,7 +83,6 @@ PLIST_SUB+= LOGROOT="${LIGHTTPD_LOGROOT .endif # !defined(_BUILDING_LIGHTTPD_MODULE) -NO_STAGE= yes .include <bsd.port.pre.mk> .if !defined(_BUILDING_LIGHTTPD_MODULE) @@ -201,37 +200,37 @@ post-patch: ${WRKSRC}/doc/config/lighttpd.conf post-install: - @${MKDIR} ${PREFIX}/etc/lighttpd/conf.d ${PREFIX}/etc/lighttpd/vhosts.d + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/lighttpd/conf.d ${STAGEDIR}${PREFIX}/etc/lighttpd/vhosts.d .for FILE in ${LIGHTTPD_CONF_FILES} @${INSTALL_DATA} ${WRKSRC}/doc/config/${FILE} \ - ${PREFIX}/etc/lighttpd/${FILE}.sample -.if !exists(${PREFIX}/etc/lighttpd/${FILE}) + ${STAGEDIR}${PREFIX}/etc/lighttpd/${FILE}.sample +.if !exists(${STAGEDIR}${PREFIX}/etc/lighttpd/${FILE}) @${INSTALL_DATA} ${WRKSRC}/doc/config/${FILE} \ - ${PREFIX}/etc/lighttpd/${FILE} + ${STAGEDIR}${PREFIX}/etc/lighttpd/${FILE} .endif .endfor .for FILE in ${LIGHTTPD_CONF_D_FILES} @${INSTALL_DATA} ${WRKSRC}/doc/config/conf.d/${FILE} \ - ${PREFIX}/etc/lighttpd/conf.d/${FILE}.sample -.if !exists(${PREFIX}/etc/lighttpd/conf.d/${FILE}) + ${STAGEDIR}${PREFIX}/etc/lighttpd/conf.d/${FILE}.sample +.if !exists(${STAGEDIR}${PREFIX}/etc/lighttpd/conf.d/${FILE}) @${INSTALL_DATA} ${WRKSRC}/doc/config/conf.d/${FILE} \ - ${PREFIX}/etc/lighttpd/conf.d/${FILE} + ${STAGEDIR}${PREFIX}/etc/lighttpd/conf.d/${FILE} .endif .endfor @${INSTALL_DATA} ${WRKSRC}/doc/config/vhosts.d/vhosts.template \ - ${PREFIX}/etc/lighttpd/vhosts.d/vhosts.template - @${MKDIR} -m 0700 ${LIGHTTPD_LOGROOT} - @${CHOWN} ${LIGHTTPD_USER}:${LIGHTTPD_GROUP} ${LIGHTTPD_LOGROOT} + ${STAGEDIR}${PREFIX}/etc/lighttpd/vhosts.d/vhosts.template + @${MKDIR} -m 0700 ${STAGEDIR}${LIGHTTPD_LOGROOT} + @${CHOWN} ${LIGHTTPD_USER}:${LIGHTTPD_GROUP} ${STAGEDIR}${LIGHTTPD_LOGROOT} .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} . for FILE in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}/${FILE} + @${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}/${FILE} . endfor .endif .if ${PORT_OPTIONS:MMYSQLAUTH} . for FILE in README.mysqlauth mysql_auth.sql - @${INSTALL_DATA} ${FILESDIR}/${FILE} ${DOCSDIR}/${FILE} + @${INSTALL_DATA} ${FILESDIR}/${FILE} ${STAGEDIR}${DOCSDIR}/${FILE} . endfor .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401191100.s0JB0TUZ062181>