diff options
-rw-r--r-- | audio/squeezeboxserver/Makefile | 4 | ||||
-rw-r--r-- | devel/cil/Makefile | 2 | ||||
-rw-r--r-- | devel/p5-Mknod/Makefile | 2 | ||||
-rw-r--r-- | editors/p5-Padre/Makefile | 2 | ||||
-rw-r--r-- | math/algotutor/Makefile | 2 | ||||
-rw-r--r-- | multimedia/gtk-youtube-viewer/Makefile | 4 | ||||
-rw-r--r-- | net-mgmt/netdisco/Makefile | 2 | ||||
-rw-r--r-- | net-mgmt/ocsinventory-agent/Makefile | 2 | ||||
-rw-r--r-- | security/tinyca/Makefile | 2 | ||||
-rw-r--r-- | sysutils/debhelper/Makefile | 2 | ||||
-rw-r--r-- | www/chtml/Makefile | 2 | ||||
-rw-r--r-- | www/rt40/Makefile | 2 | ||||
-rw-r--r-- | www/rt42/Makefile | 2 | ||||
-rw-r--r-- | www/wwwstat/Makefile | 2 | ||||
-rw-r--r-- | x11/p5-X11-IdleTime/Makefile | 2 |
15 files changed, 17 insertions, 17 deletions
diff --git a/audio/squeezeboxserver/Makefile b/audio/squeezeboxserver/Makefile index be8b4ce124bd..ce84aa3c2c96 100644 --- a/audio/squeezeboxserver/Makefile +++ b/audio/squeezeboxserver/Makefile @@ -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 \ diff --git a/devel/cil/Makefile b/devel/cil/Makefile index c67c30992df8..e022bbe12a38 100644 --- a/devel/cil/Makefile +++ b/devel/cil/Makefile @@ -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 \ diff --git a/devel/p5-Mknod/Makefile b/devel/p5-Mknod/Makefile index 78fb41c9ba94..bbb24dd3a65b 100644 --- a/devel/p5-Mknod/Makefile +++ b/devel/p5-Mknod/Makefile @@ -15,6 +15,6 @@ COMMENT= Perl module interface to the mknod(2) system call USES= perl5 USE_PERL5= configure -MANPREFIX= ${SITE_PERL} +MANPREFIX= ${PREFIX}/${SITE_PERL_REL} .include <bsd.port.mk> diff --git a/editors/p5-Padre/Makefile b/editors/p5-Padre/Makefile index f82f2eb17b87..4c90b6b79a3d 100644 --- a/editors/p5-Padre/Makefile +++ b/editors/p5-Padre/Makefile @@ -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;" \ "" diff --git a/math/algotutor/Makefile b/math/algotutor/Makefile index ebf7deaa3717..36bb49d2e9dd 100644 --- a/math/algotutor/Makefile +++ b/math/algotutor/Makefile @@ -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 diff --git a/multimedia/gtk-youtube-viewer/Makefile b/multimedia/gtk-youtube-viewer/Makefile index bad16bd82d15..83c0d0f161bc 100644 --- a/multimedia/gtk-youtube-viewer/Makefile +++ b/multimedia/gtk-youtube-viewer/Makefile @@ -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 diff --git a/net-mgmt/netdisco/Makefile b/net-mgmt/netdisco/Makefile index 38da7f0a66f9..af401c6aa6fe 100644 --- a/net-mgmt/netdisco/Makefile +++ b/net-mgmt/netdisco/Makefile @@ -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' \ diff --git a/net-mgmt/ocsinventory-agent/Makefile b/net-mgmt/ocsinventory-agent/Makefile index a93ffb64327c..939fbce72ce0 100644 --- a/net-mgmt/ocsinventory-agent/Makefile +++ b/net-mgmt/ocsinventory-agent/Makefile @@ -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 diff --git a/security/tinyca/Makefile b/security/tinyca/Makefile index f0f30b7bb518..286fbcd526f1 100644 --- a/security/tinyca/Makefile +++ b/security/tinyca/Makefile @@ -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 diff --git a/sysutils/debhelper/Makefile b/sysutils/debhelper/Makefile index 577d54175e07..f4b753612fb9 100644 --- a/sysutils/debhelper/Makefile +++ b/sysutils/debhelper/Makefile @@ -13,7 +13,7 @@ COMMENT= Helper programs for debian/rules 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} diff --git a/www/chtml/Makefile b/www/chtml/Makefile index 61b18a1b1ad2..73ed8bf6d62a 100644 --- a/www/chtml/Makefile +++ b/www/chtml/Makefile @@ -15,7 +15,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/csiod:${PORTSDIR}/lang/siod 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 diff --git a/www/rt40/Makefile b/www/rt40/Makefile index e7971e447d88..d622a9c31644 100644 --- a/www/rt40/Makefile +++ b/www/rt40/Makefile @@ -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 diff --git a/www/rt42/Makefile b/www/rt42/Makefile index b49be93c45df..6adf4d0704df 100644 --- a/www/rt42/Makefile +++ b/www/rt42/Makefile @@ -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 diff --git a/www/wwwstat/Makefile b/www/wwwstat/Makefile index 4d95afad2786..ce93dcd1fe7f 100644 --- a/www/wwwstat/Makefile +++ b/www/wwwstat/Makefile @@ -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 diff --git a/x11/p5-X11-IdleTime/Makefile b/x11/p5-X11-IdleTime/Makefile index e0e033f2db9b..a04b68a72e68 100644 --- a/x11/p5-X11-IdleTime/Makefile +++ b/x11/p5-X11-IdleTime/Makefile @@ -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 |