Date: Fri, 29 Nov 2013 04:19:56 +0000 (UTC) From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335144 - in head: polish/webalizer2 portuguese/webalizer-pt_BR portuguese/webalizer-pt_PT ukrainian/webalizer www/webalizer Message-ID: <201311290419.rAT4Juf3062626@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dinoex Date: Fri Nov 29 04:19:56 2013 New Revision: 335144 URL: http://svnweb.freebsd.org/changeset/ports/335144 Log: - use STAGEDIR Modified: head/polish/webalizer2/Makefile head/portuguese/webalizer-pt_BR/Makefile head/portuguese/webalizer-pt_PT/Makefile head/ukrainian/webalizer/Makefile head/www/webalizer/Makefile head/www/webalizer/pkg-plist Modified: head/polish/webalizer2/Makefile ============================================================================== --- head/polish/webalizer2/Makefile Fri Nov 29 03:54:28 2013 (r335143) +++ head/polish/webalizer2/Makefile Fri Nov 29 04:19:56 2013 (r335144) @@ -8,7 +8,6 @@ MAINTAINER= wtp@bsdguru.org MASTERDIR?= ${.CURDIR}/../../www/webalizer WEBALIZER_LANG= polish -NO_STAGE= yes .if exists(${.CURDIR}/Makefile.local) .include "${.CURDIR}/Makefile.local" .endif Modified: head/portuguese/webalizer-pt_BR/Makefile ============================================================================== --- head/portuguese/webalizer-pt_BR/Makefile Fri Nov 29 03:54:28 2013 (r335143) +++ head/portuguese/webalizer-pt_BR/Makefile Fri Nov 29 04:19:56 2013 (r335144) @@ -8,7 +8,6 @@ MAINTAINER= ports@FreeBSD.org MASTERDIR?= ${.CURDIR}/../../www/webalizer WEBALIZER_LANG= portuguese_brazil -NO_STAGE= yes .if exists(${.CURDIR}/Makefile.local) .include "${.CURDIR}/Makefile.local" .endif Modified: head/portuguese/webalizer-pt_PT/Makefile ============================================================================== --- head/portuguese/webalizer-pt_PT/Makefile Fri Nov 29 03:54:28 2013 (r335143) +++ head/portuguese/webalizer-pt_PT/Makefile Fri Nov 29 04:19:56 2013 (r335144) @@ -8,7 +8,6 @@ MAINTAINER= ports@FreeBSD.org MASTERDIR?= ${.CURDIR}/../../www/webalizer WEBALIZER_LANG= portuguese -NO_STAGE= yes .if exists(${.CURDIR}/Makefile.local) .include "${.CURDIR}/Makefile.local" .endif Modified: head/ukrainian/webalizer/Makefile ============================================================================== --- head/ukrainian/webalizer/Makefile Fri Nov 29 03:54:28 2013 (r335143) +++ head/ukrainian/webalizer/Makefile Fri Nov 29 04:19:56 2013 (r335144) @@ -10,5 +10,4 @@ LIB_DEPENDS= gd:${PORTSDIR}/ukrainian/gd WEBALIZER_LANG= ukrainian -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/www/webalizer/Makefile ============================================================================== --- head/www/webalizer/Makefile Fri Nov 29 03:54:28 2013 (r335143) +++ head/www/webalizer/Makefile Fri Nov 29 04:19:56 2013 (r335144) @@ -23,7 +23,6 @@ EXAMPLESDIR?= ${PREFIX}/share/examples/$ GD_PORT?= graphics/gd CONFLICTS= geolizer-2* -NO_STAGE= yes .if defined(BATCH) # no cosmetique spaces allowed @@ -51,11 +50,11 @@ DISTFILES+= webalizer-geodb-20130801.tgz # slave ports override with languages specific gd .if !defined(LIB_DEPENDS) -LIB_DEPENDS= gd:${PORTSDIR}/${GD_PORT} +LIB_DEPENDS= libgd.so:${PORTSDIR}/${GD_PORT} .endif .if ${PORT_OPTIONS:MGEOIP} -LIB_DEPENDS+= GeoIP:${PORTSDIR}/net/GeoIP +LIB_DEPENDS+= libGeoIP.so:${PORTSDIR}/net/GeoIP .endif .if ${PORT_OPTIONS:MGEODB} @@ -104,7 +103,7 @@ CFLAGS+= -Wall MAN1= ${PKGNAMEPREFIX}webalizer.1 ${PKGNAMEPREFIX}wcmgr.1 DOC1= CHANGES Copyright INSTALL \ README README.FIRST DNS.README country-codes.txt -DOC2= INSTALL GeoIP.README +EXAMPLES1= msfree.png sample.conf webalizer.png WRKSRC= ${WRKDIR}/${DISTNAME:S/-src$//} PLIST_SUB+= PKGNAMEPREFIX=${PKGNAMEPREFIX} SUPP_LANG= albanian arabic catalan chinese croatian czech danish dutch \ @@ -170,36 +169,32 @@ pre-configure: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/webalizer \ - ${PREFIX}/bin/${PKGNAMEPREFIX}webalizer + ${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}webalizer ${INSTALL_PROGRAM} ${WRKSRC}/wcmgr \ - ${PREFIX}/bin/${PKGNAMEPREFIX}wcmgr + ${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}wcmgr ${LN} -sf ${PKGNAMEPREFIX}webalizer \ - ${PREFIX}/bin/${PKGNAMEPREFIX}webazolver + ${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}webazolver ${INSTALL_DATA} ${WRKSRC}/sample.conf \ - ${PREFIX}/etc/${PKGNAMEPREFIX}webalizer.conf-dist ; + ${STAGEDIR}${PREFIX}/etc/${PKGNAMEPREFIX}webalizer.conf-dist ; post-install: .for i in ${MAN1} - ${INSTALL_MAN} ${WRKSRC}/${i:S/^${PKGNAMEPREFIX}//} ${PREFIX}/man/man1/${i} + ${INSTALL_MAN} ${WRKSRC}/${i:S/^${PKGNAMEPREFIX}//} ${STAGEDIR}${PREFIX}/man/man1/${i} .endfor .if ${PORT_OPTIONS:MGEODB} || ${PORT_OPTIONS:MGEOIP} - ${MKDIR} ${PREFIX}/share/geolizer - @${INSTALL_DATA} ${WRKDIR}/flags/* ${PREFIX}/share/geolizer/ + ${MKDIR} ${STAGEDIR}${PREFIX}/share/geolizer + ${INSTALL_DATA} ${WRKDIR}/flags/* ${STAGEDIR}${PREFIX}/share/geolizer/ .endif .if ${PORT_OPTIONS:MGEODB} - @${INSTALL_DATA} ${WRKDIR}/GeoDB.dat ${PREFIX}/share/geolizer/ + ${INSTALL_DATA} ${WRKDIR}/GeoDB.dat ${STAGEDIR}${PREFIX}/share/geolizer/ .endif -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -.for i in ${DOC1} - @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/${i} -.endfor -.endif -.if !defined(NOPORTEXAMPLES) - ${MKDIR} ${EXAMPLESDIR} -.for i in msfree.png sample.conf webalizer.png - @${INSTALL_DATA} ${WRKSRC}/${i} ${EXAMPLESDIR}/${i} -.endfor +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${DOC1:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ +.endif +.if ${PORT_OPTIONS:MEXAMPLES} + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${EXAMPLES1:S,^,${WRKSRC}/,} ${STAGEDIR}${EXAMPLESDIR}/ .endif .include <bsd.port.mk> Modified: head/www/webalizer/pkg-plist ============================================================================== --- head/www/webalizer/pkg-plist Fri Nov 29 03:54:28 2013 (r335143) +++ head/www/webalizer/pkg-plist Fri Nov 29 04:19:56 2013 (r335144) @@ -1,8 +1,9 @@ bin/%%PKGNAMEPREFIX%%webalizer +bin/%%PKGNAMEPREFIX%%webazolver bin/%%PKGNAMEPREFIX%%wcmgr -@exec ln -f %B/%%PKGNAMEPREFIX%%webalizer %B/%%PKGNAMEPREFIX%%webazolver -@unexec rm -f %B/%%PKGNAMEPREFIX%%webazolver etc/%%PKGNAMEPREFIX%%webalizer.conf-dist +man/man1/%%PKGNAMEPREFIX%%webalizer.1.gz +man/man1/%%PKGNAMEPREFIX%%wcmgr.1.gz %%WITH_GEODB%%share/geolizer/GeoDB.dat %%WITH_GEOIP%%share/geolizer/README %%WITH_GEOIP%%share/geolizer/a1.png
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311290419.rAT4Juf3062626>