svn commit: r375302 - in head: audio/squeezeboxserver devel/cil devel/p5-Mknod editors/p5-Padre math/algotutor multimedia/gtk-youtube-viewer net-mgmt/netdisco net-mgmt/ocsinventory-agent security/t...

Mathieu Arnold mat at FreeBSD.org
Tue Dec 23 02:22:25 UTC 2014 

Author: mat
Date: Tue Dec 23 02:22:19 2014
New Revision: 375302
URL: https://svnweb.freebsd.org/changeset/ports/375302
QAT: https://qat.redports.org/buildarchive/r375302/

Log:
  Catch up abusive uses of ${SITE_PERL}.
  
  Sponsored by:	Absolight

Modified:
  head/audio/squeezeboxserver/Makefile
  head/devel/cil/Makefile
  head/devel/p5-Mknod/Makefile
  head/editors/p5-Padre/Makefile
  head/math/algotutor/Makefile
  head/multimedia/gtk-youtube-viewer/Makefile
  head/net-mgmt/netdisco/Makefile
  head/net-mgmt/ocsinventory-agent/Makefile
  head/security/tinyca/Makefile
  head/sysutils/debhelper/Makefile
  head/www/chtml/Makefile
  head/www/rt40/Makefile
  head/www/rt42/Makefile
  head/www/wwwstat/Makefile
  head/x11/p5-X11-IdleTime/Makefile

Modified: head/audio/squeezeboxserver/Makefile
==============================================================================
--- head/audio/squeezeboxserver/Makefile	Tue Dec 23 01:42:10 2014	(r375301)
+++ head/audio/squeezeboxserver/Makefile	Tue Dec 23 02:22:19 2014	(r375302)
@@ -134,7 +134,7 @@ SUB_FILES=	Custom.pm \
 		custom-convert.conf
 SUB_LIST=	PERL=${PERL} \
 		PORTNAME=${PORTNAME} \
-		SITE_PERL=${SITE_PERL} \
+		SITE_PERL=${PREFIX}/${SITE_PERL_REL} \
 		SLIMDIR=${SLIMDIR} \
 		SLIMDBDIR=${SLIMDBDIR} \
 		SLIMUSER=${SLIMUSER} \
@@ -159,7 +159,7 @@ post-patch:
 	    -e 's|%%DISTDIR%%|${_DISTDIR}|g' \
 	    -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 	    -e 's|%%PREFIX%%|${PREFIX}|g' \
-	    -e 's|%%SITE_PERL%%|${SITE_PERL}|g' \
+	    -e 's|%%SITE_PERL%%|${PREFIX}/${SITE_PERL_REL}|g' \
 	    -e 's|%%SLIMDBDIR%%|${SLIMDBDIR}|g' \
 	    -e 's|%%TMP_SLIMDIR%%|${TMP_SLIMDIR}|g' \
 		${WRKSRC}/scanner.pl \

Modified: head/devel/cil/Makefile
==============================================================================
--- head/devel/cil/Makefile	Tue Dec 23 01:42:10 2014	(r375301)
+++ head/devel/cil/Makefile	Tue Dec 23 02:22:19 2014	(r375302)
@@ -42,7 +42,7 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		'35 s|make|gmake|g' ${WRKSRC}/myocamlbuild.ml
 	@${REINPLACE_CMD} -e \
-		's|@CILHOME@/lib|${SITE_PERL}/CIL|g ; \
+		's|@CILHOME@/lib|${PREFIX}/${SITE_PERL_REL}/CIL|g ; \
 		s|\@CILHOME\@|${PREFIX}|g' \
 		${WRKSRC}/lib/App/Cilly/CilConfig.pm.in
 	@${REINPLACE_CMD} -e \

Modified: head/devel/p5-Mknod/Makefile
==============================================================================
--- head/devel/p5-Mknod/Makefile	Tue Dec 23 01:42:10 2014	(r375301)
+++ head/devel/p5-Mknod/Makefile	Tue Dec 23 02:22:19 2014	(r375302)
@@ -15,6 +15,6 @@ COMMENT=	Perl module interface to the mk
 USES=		perl5
 USE_PERL5=	configure
 
-MANPREFIX=	${SITE_PERL}
+MANPREFIX=	${PREFIX}/${SITE_PERL_REL}
 
 .include <bsd.port.mk>

Modified: head/editors/p5-Padre/Makefile
==============================================================================
--- head/editors/p5-Padre/Makefile	Tue Dec 23 01:42:10 2014	(r375301)
+++ head/editors/p5-Padre/Makefile	Tue Dec 23 02:22:19 2014	(r375302)
@@ -76,7 +76,7 @@ MAKE_JOBS_UNSAFE=	yes
 
 DESKTOP_ENTRIES="Padre" \
 		"The Perl IDE" \
-		"${SITE_PERL}/auto/share/dist/Padre/icons/padre/64x64/logo.png" \
+		"${PREFIX}/${SITE_PERL_REL}/auto/share/dist/Padre/icons/padre/64x64/logo.png" \
 		"padre" \
 		"Development;Perl;IDE;" \
 		""

Modified: head/math/algotutor/Makefile
==============================================================================
--- head/math/algotutor/Makefile	Tue Dec 23 01:42:10 2014	(r375301)
+++ head/math/algotutor/Makefile	Tue Dec 23 02:22:19 2014	(r375302)
@@ -26,7 +26,7 @@ USES=		shebangfix perl5 tar:tgz
 SHEBANG_FILES=	algotutor gen_at_graph
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,!!SITE_PERL!!,${SITE_PERL},' \
+	@${REINPLACE_CMD} -e 's,!!SITE_PERL!!,${PREFIX}/${SITE_PERL_REL},' \
 		-e 's|!!PREFIX!!|${PREFIX}|g' \
 			${WRKSRC}/algotutor
 

Modified: head/multimedia/gtk-youtube-viewer/Makefile
==============================================================================
--- head/multimedia/gtk-youtube-viewer/Makefile	Tue Dec 23 01:42:10 2014	(r375301)
+++ head/multimedia/gtk-youtube-viewer/Makefile	Tue Dec 23 02:22:19 2014	(r375302)
@@ -64,10 +64,10 @@ GTK2_CONFIGURE_ON=	--gtk-youtube-viewer
 post-install:
 .if ${PORT_OPTIONS:MGTK2}
 	${LN} -sf \
-	${SITE_PERL}/auto/share/dist/WWW-YoutubeViewer/gtk-youtube-viewer.desktop \
+	${PREFIX}/${SITE_PERL_REL}/auto/share/dist/WWW-YoutubeViewer/gtk-youtube-viewer.desktop \
 		${STAGEDIR}${DESKTOPDIR}
 	${LN} -sf \
-	${SITE_PERL}/auto/share/dist/WWW-YoutubeViewer/icons/gtk-youtube-viewer.png \
+	${PREFIX}/${SITE_PERL_REL}/auto/share/dist/WWW-YoutubeViewer/icons/gtk-youtube-viewer.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps
 .endif
 

Modified: head/net-mgmt/netdisco/Makefile
==============================================================================
--- head/net-mgmt/netdisco/Makefile	Tue Dec 23 01:42:10 2014	(r375301)
+++ head/net-mgmt/netdisco/Makefile	Tue Dec 23 02:22:19 2014	(r375302)
@@ -92,7 +92,7 @@ post-patch:
 		-e 's#%%NETDISCO_GROUP%%#${GROUPS}#g'		\
 		-e 's#%%NETDISCO_DBDIR%%#${NETDISCO_DBDIR}#g'	\
 		-e 's#%%ETCDIR%%#${ETCDIR}#g'		\
-		-e 's#%%SITE_PERL%%#${SITE_PERL}#g'	\
+		-e 's#%%SITE_PERL%%#${PREFIX}/${SITE_PERL_REL}#g'	\
 		-e 's#%%APACHEMODDIR%%#${APACHEMODDIR}#g'	\
 		-e 's#%%APACHEETCDIR%%#${APACHEETCDIR}#g'	\
 		-e 's#%%MIBINCLUDES%%#${MIBINCLUDES}#g'	\

Modified: head/net-mgmt/ocsinventory-agent/Makefile
==============================================================================
--- head/net-mgmt/ocsinventory-agent/Makefile	Tue Dec 23 01:42:10 2014	(r375301)
+++ head/net-mgmt/ocsinventory-agent/Makefile	Tue Dec 23 02:22:19 2014	(r375302)
@@ -26,7 +26,7 @@ USE_PERL5=	configure
 CONFIGURE_ENV=	PERL_AUTOINSTALL=1
 WRKSRC=		${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 SUB_FILES=	pkg-message
-SUB_LIST=	SITE_PERL=${SITE_PERL}
+SUB_LIST=	SITE_PERL=${PREFIX}/${SITE_PERL_REL}
 
 # define options
 OPTIONS_DEFINE=	DAEMON IPMI SSL PRINTER SNMP

Modified: head/security/tinyca/Makefile
==============================================================================
--- head/security/tinyca/Makefile	Tue Dec 23 01:42:10 2014	(r375301)
+++ head/security/tinyca/Makefile	Tue Dec 23 02:22:19 2014	(r375302)
@@ -33,7 +33,7 @@ do-install:
 	${INSTALL_DATA} ${LIB2_FILES:S|^|${WRKSRC}/lib/GUI/|} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PORTNAME}/GUI
 	${INSTALL_DATA} ${WRKSRC}/templates/openssl.cnf ${STAGEDIR}${PREFIX}/etc/tinyca.cnf.sample
 	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g" \
-		-e "s:%%SITE_PERL%%:${SITE_PERL}:g" \
+		-e "s:%%SITE_PERL%%:${PREFIX}/${SITE_PERL_REL}:g" \
 		-e "s:%%OPENSSLBASE%%:${OPENSSLBASE}:g" \
 		${WRKSRC}/tinyca2 >${WRKSRC}/tinyca.new
 	${INSTALL_SCRIPT} ${WRKSRC}/tinyca.new ${STAGEDIR}${PREFIX}/bin/tinyca

Modified: head/sysutils/debhelper/Makefile
==============================================================================
--- head/sysutils/debhelper/Makefile	Tue Dec 23 01:42:10 2014	(r375301)
+++ head/sysutils/debhelper/Makefile	Tue Dec 23 02:22:19 2014	(r375302)
@@ -13,7 +13,7 @@ COMMENT=	Helper programs for debian/rule
 
 LICENSE=	GPLv2
 
-MAKE_ARGS=	PREFIX=${PREFIX} SITE_PERL=${SITE_PERL}
+MAKE_ARGS=	PREFIX=${PREFIX} SITE_PERL=${PREFIX}/${SITE_PERL_REL}
 NO_BUILD=	yes
 USES=		gmake perl5 shebangfix
 WRKSRC=		${WRKDIR}/${PORTNAME}

Modified: head/www/chtml/Makefile
==============================================================================
--- head/www/chtml/Makefile	Tue Dec 23 01:42:10 2014	(r375301)
+++ head/www/chtml/Makefile	Tue Dec 23 02:22:19 2014	(r375302)
@@ -15,7 +15,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/csiod:${
 
 USES=		perl5 tar:tgz
 USE_PERL5=	run
-MAKE_ENV=	SITE_PERL=${SITE_PERL}
+MAKE_ENV=	SITE_PERL=${PREFIX}/${SITE_PERL_REL}
 NO_WRKSUBDIR=	yes
 MAKEFILE=	makefile
 MAKE_JOBS_UNSAFE=	yes

Modified: head/www/rt40/Makefile
==============================================================================
--- head/www/rt40/Makefile	Tue Dec 23 01:42:10 2014	(r375301)
+++ head/www/rt40/Makefile	Tue Dec 23 02:22:19 2014	(r375302)
@@ -193,7 +193,7 @@ pre-fetch:
 post-patch:
 	@${RM} -f ${WRKSRC}/lib/RT.pm.in.orig
 	@${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!g' ${WRKSRC}/config.layout
-	@${REINPLACE_CMD} -e 's!%%SITE_PERL%%!${SITE_PERL}!g' ${WRKSRC}/config.layout
+	@${REINPLACE_CMD} -e 's!%%SITE_PERL%%!${PREFIX}/${SITE_PERL_REL}!g' ${WRKSRC}/config.layout
 	@${REINPLACE_CMD} -e 's!/path/to/your/etc!${RT_ETC_PATH}!g' ${WRKSRC}/etc/RT_SiteConfig.pm
 	@${REINPLACE_CMD} -e 's!/bin:/usr/bin!/bin:/usr/bin:${LOCALBASE}/bin!' ${WRKSRC}/lib/RT/Interface/CLI.pm && \
 	    ${RM} ${WRKSRC}/lib/RT/Interface/CLI.pm.bak

Modified: head/www/rt42/Makefile
==============================================================================
--- head/www/rt42/Makefile	Tue Dec 23 01:42:10 2014	(r375301)
+++ head/www/rt42/Makefile	Tue Dec 23 02:22:19 2014	(r375302)
@@ -189,7 +189,7 @@ pre-fetch:
 post-patch:
 	@${RM} -f ${WRKSRC}/lib/RT.pm.in.orig
 	@${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!g' ${WRKSRC}/config.layout
-	@${REINPLACE_CMD} -e 's!%%SITE_PERL%%!${SITE_PERL}!g' ${WRKSRC}/config.layout
+	@${REINPLACE_CMD} -e 's!%%SITE_PERL%%!${PREFIX}/${SITE_PERL_REL}!g' ${WRKSRC}/config.layout
 	@${REINPLACE_CMD} -e 's!/path/to/your/etc!${RT_ETC_PATH}!g' ${WRKSRC}/etc/RT_SiteConfig.pm
 	@${REINPLACE_CMD} -e 's!/bin:/usr/bin!/bin:/usr/bin:${LOCALBASE}/bin!' ${WRKSRC}/lib/RT/Interface/CLI.pm && \
 	    ${RM} ${WRKSRC}/lib/RT/Interface/CLI.pm.bak

Modified: head/www/wwwstat/Makefile
==============================================================================
--- head/www/wwwstat/Makefile	Tue Dec 23 01:42:10 2014	(r375301)
+++ head/www/wwwstat/Makefile	Tue Dec 23 02:22:19 2014	(r375302)
@@ -20,7 +20,7 @@ USE_APACHE_RUN=	22+
 USES=		perl5
 MAKE_ENV+=	PERL=${PERL}
 SUB_FILES=	pkg-message
-SUB_LIST=	SITE_PERL=${PREFIX}/${SITE_PERL}
+SUB_LIST=	SITE_PERL=${PREFIX}/${SITE_PERL_REL}
 
 BIN_FILES=	monthly oldlog2new splitlog wwwerrs wwwstat
 SPERL_FILES=	domains.pl splitlog.rc wwwstat.rc

Modified: head/x11/p5-X11-IdleTime/Makefile
==============================================================================
--- head/x11/p5-X11-IdleTime/Makefile	Tue Dec 23 01:42:10 2014	(r375301)
+++ head/x11/p5-X11-IdleTime/Makefile	Tue Dec 23 02:22:19 2014	(r375302)
@@ -21,7 +21,7 @@ USE_XORG=	x11 xscrnsaver
 USES=		perl5
 USE_PERL5=	configure patch
 
-MANPREFIX=	${SITE_PERL}
+MANPREFIX=	${PREFIX}/${SITE_PERL_REL}
 
 post-patch:
 .for i in IdleTime.pm

More information about the svn-ports-head mailing list