diff options
-rw-r--r-- | audio/gramofile/Makefile | 2 | ||||
-rw-r--r-- | comms/owfs/Makefile | 2 | ||||
-rw-r--r-- | devel/p5-Async-MergePoint/Makefile | 6 | ||||
-rw-r--r-- | devel/p5-File-FcntlLock/pkg-plist | 18 | ||||
-rw-r--r-- | devel/p5-autovivification/pkg-plist | 6 | ||||
-rw-r--r-- | dns/p5-Net-DNS/Makefile | 2 | ||||
-rw-r--r-- | editors/p5-Padre/Makefile | 2 | ||||
-rw-r--r-- | irc/epic4/Makefile | 2 | ||||
-rw-r--r-- | multimedia/zoneminder/Makefile | 2 | ||||
-rw-r--r-- | net-im/sendxmpp/Makefile | 4 | ||||
-rw-r--r-- | net/libproxy-perl/Makefile | 6 | ||||
-rw-r--r-- | net/libproxy-perl/pkg-plist | 10 | ||||
-rw-r--r-- | net/spread/Makefile | 2 | ||||
-rw-r--r-- | security/p5-Crypt-RHash/Makefile | 2 | ||||
-rw-r--r-- | security/p5-Snort-Rule/Makefile | 6 | ||||
-rw-r--r-- | sysutils/p5-BackupPC-XS/pkg-plist | 12 | ||||
-rw-r--r-- | sysutils/p5-Sys-Load/pkg-plist | 12 | ||||
-rw-r--r-- | textproc/redland-bindings/Makefile | 2 | ||||
-rw-r--r-- | www/p5-libapreq2/Makefile | 4 | ||||
-rw-r--r-- | x11-toolkits/p5-Tk/Makefile | 4 |
20 files changed, 53 insertions, 53 deletions
diff --git a/audio/gramofile/Makefile b/audio/gramofile/Makefile index fc6b456dff1f..085432fb752c 100644 --- a/audio/gramofile/Makefile +++ b/audio/gramofile/Makefile @@ -23,7 +23,7 @@ USE_CSTD= gnu89 MAKE_ARGS+= CC="${CC}" MAKE_ARGS+= CXX="${CXX}" -PERLCOREDIR= ${LOCALBASE}/lib/perl5/${PERL_VER}/mach/CORE +PERLCOREDIR= ${LOCALBASE}/lib/perl5/${PERL_VER}/${PERL_ARCH}/CORE MAKE_ARGS+= PERLCOREDIR=${PERLCOREDIR} post-patch: diff --git a/comms/owfs/Makefile b/comms/owfs/Makefile index ef7e0e9a8f51..72bf8bbc1679 100644 --- a/comms/owfs/Makefile +++ b/comms/owfs/Makefile @@ -137,7 +137,7 @@ post-install: .endif .if ${PORT_OPTIONS:MOWPERL} @${RM} -f ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod* - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/perl5/site_perl/5.16/mach/auto/OW/OW.so + ${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/OW/OW.so .endif .include <bsd.port.mk> diff --git a/devel/p5-Async-MergePoint/Makefile b/devel/p5-Async-MergePoint/Makefile index 6e2f8f587833..ea344d72ffe8 100644 --- a/devel/p5-Async-MergePoint/Makefile +++ b/devel/p5-Async-MergePoint/Makefile @@ -17,11 +17,11 @@ USES= perl5 USE_PERL5= configure PLIST_FILES= %%SITE_PERL%%/Async/MergePoint.pm \ - %%SITE_PERL%%/mach/auto/Async/MergePoint/.packlist \ + %%SITE_PERL%%/%%PERL_ARCH%%/auto/Async/MergePoint/.packlist \ %%PERL5_MAN3%%/Async::MergePoint.3.gz -PLIST_DIRS= %%SITE_PERL%%/mach/auto/Async/MergePoint \ - %%SITE_PERL%%/mach/auto/Async \ +PLIST_DIRS= %%SITE_PERL%%/%%PERL_ARCH%%/auto/Async/MergePoint \ + %%SITE_PERL%%/%%PERL_ARCH%%/auto/Async \ %%SITE_PERL%%/Async .include <bsd.port.mk> diff --git a/devel/p5-File-FcntlLock/pkg-plist b/devel/p5-File-FcntlLock/pkg-plist index 2fb51313d820..aecbdf02e691 100644 --- a/devel/p5-File-FcntlLock/pkg-plist +++ b/devel/p5-File-FcntlLock/pkg-plist @@ -1,15 +1,15 @@ %%SITE_PERL%%/%%PERL_ARCH%%/File/FcntlLock.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/FcntlLock/.packlist %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/FcntlLock/FcntlLock.so -%%SITE_PERL%%/mach/File/FcntlLock.pod -%%SITE_PERL%%/mach/File/FcntlLock/Core.pm -%%SITE_PERL%%/mach/File/FcntlLock/Errors.pm -%%SITE_PERL%%/mach/File/FcntlLock/Inline.pm -%%SITE_PERL%%/mach/File/FcntlLock/Inline.pod -%%SITE_PERL%%/mach/File/FcntlLock/Pure.pm -%%SITE_PERL%%/mach/File/FcntlLock/Pure.pod -%%SITE_PERL%%/mach/File/FcntlLock/XS.pm -%%SITE_PERL%%/mach/File/FcntlLock/XS.pod +%%SITE_PERL%%/%%PERL_ARCH%%/File/FcntlLock.pod +%%SITE_PERL%%/%%PERL_ARCH%%/File/FcntlLock/Core.pm +%%SITE_PERL%%/%%PERL_ARCH%%/File/FcntlLock/Errors.pm +%%SITE_PERL%%/%%PERL_ARCH%%/File/FcntlLock/Inline.pm +%%SITE_PERL%%/%%PERL_ARCH%%/File/FcntlLock/Inline.pod +%%SITE_PERL%%/%%PERL_ARCH%%/File/FcntlLock/Pure.pm +%%SITE_PERL%%/%%PERL_ARCH%%/File/FcntlLock/Pure.pod +%%SITE_PERL%%/%%PERL_ARCH%%/File/FcntlLock/XS.pm +%%SITE_PERL%%/%%PERL_ARCH%%/File/FcntlLock/XS.pod %%PERL5_MAN3%%/File::FcntlLock.3.gz %%PERL5_MAN3%%/File::FcntlLock::Inline.3.gz %%PERL5_MAN3%%/File::FcntlLock::Pure.3.gz diff --git a/devel/p5-autovivification/pkg-plist b/devel/p5-autovivification/pkg-plist index 99ecc0bb4963..29faee55eecc 100644 --- a/devel/p5-autovivification/pkg-plist +++ b/devel/p5-autovivification/pkg-plist @@ -1,4 +1,4 @@ %%PERL5_MAN3%%/autovivification.3.gz -%%SITE_PERL%%/mach/autovivification.pm -%%SITE_PERL%%/mach/auto/autovivification/.packlist -%%SITE_PERL%%/mach/auto/autovivification/autovivification.so +%%SITE_PERL%%/%%PERL_ARCH%%/autovivification.pm +%%SITE_PERL%%/%%PERL_ARCH%%/auto/autovivification/.packlist +%%SITE_PERL%%/%%PERL_ARCH%%/auto/autovivification/autovivification.so diff --git a/dns/p5-Net-DNS/Makefile b/dns/p5-Net-DNS/Makefile index 52770ade955b..87a887cb1531 100644 --- a/dns/p5-Net-DNS/Makefile +++ b/dns/p5-Net-DNS/Makefile @@ -30,6 +30,6 @@ IPV6_BUILD_DEPENDS= p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 IPV6_RUN_DEPENDS= p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 post-stage: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/mach/auto/Net/DNS/DNS.so + ${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Net/DNS/DNS.so .include <bsd.port.mk> diff --git a/editors/p5-Padre/Makefile b/editors/p5-Padre/Makefile index 8b60c699ce7a..c68d90144364 100644 --- a/editors/p5-Padre/Makefile +++ b/editors/p5-Padre/Makefile @@ -110,7 +110,7 @@ post-patch: s|-lgtk-x11-2.0.*-lpangoft2-1.0|-lm| ; \ /-lgobject-2.0/d ; \ /-lglib-2.0/d ; \ - s|\\$$ORIGIN|${SITE_PERL}/mach/auto/Wx/Scintilla|' \ + s|\\$$ORIGIN|${SITE_PERL}/${PERL_ARCH}/auto/Wx/Scintilla|' \ ${WRKDIR}/${WXSC_DISTNAME}/inc/Module/Build/Scintilla/GTK.pm pre-configure: diff --git a/irc/epic4/Makefile b/irc/epic4/Makefile index 54d747772abc..2f09aa79075b 100644 --- a/irc/epic4/Makefile +++ b/irc/epic4/Makefile @@ -51,7 +51,7 @@ CONFIGURE_ARGS+= --without-tcl # .if ${PORT_OPTIONS:MPERL} USES+= perl5 -CONFIGURE_ARGS+= --with-perl=${SITE_PERL}/../../${PERL_VERSION}/mach/CORE +CONFIGURE_ARGS+= --with-perl=${SITE_PERL}/../../${PERL_VERSION}/${PERL_ARCH}/CORE .else CONFIGURE_ARGS+= --without-perl .endif diff --git a/multimedia/zoneminder/Makefile b/multimedia/zoneminder/Makefile index 6e2a5c802c1b..acc8c704dae6 100644 --- a/multimedia/zoneminder/Makefile +++ b/multimedia/zoneminder/Makefile @@ -140,7 +140,7 @@ post-install: .for i in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/$i ${STAGEDIR}${DOCSDIR} .endfor - -${RM} -f ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/mach/perllocal.pod + -${RM} -f ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod ${MKDIR} -m 0700 -p ${STAGEDIR}${M_TMPDIR} ${CHOWN} ${WWWOWN}:${WWWGRP} ${STAGEDIR}${M_TMPDIR} ${MKDIR} -m 0755 -p ${STAGEDIR}${M_RUNDIR} diff --git a/net-im/sendxmpp/Makefile b/net-im/sendxmpp/Makefile index a987ba0560e1..a3046d7f5905 100644 --- a/net-im/sendxmpp/Makefile +++ b/net-im/sendxmpp/Makefile @@ -17,8 +17,8 @@ USES= perl5 USE_PERL5= configure PLIST_FILES= bin/sendxmpp \ - %%SITE_PERL%%/mach/auto/sendxmpp/.packlist \ + %%SITE_PERL%%/%%PERL_ARCH%%/auto/sendxmpp/.packlist \ man/man1/sendxmpp.1.gz -PLIST_DIRS= %%SITE_PERL%%/mach/auto/sendxmpp +PLIST_DIRS= %%SITE_PERL%%/%%PERL_ARCH%%/auto/sendxmpp .include <bsd.port.mk> diff --git a/net/libproxy-perl/Makefile b/net/libproxy-perl/Makefile index b355d9bb5d29..d5f4e9a74623 100644 --- a/net/libproxy-perl/Makefile +++ b/net/libproxy-perl/Makefile @@ -19,10 +19,10 @@ USES= perl5 LIBPROXY_SLAVE= perl do-install: - ${MKDIR} ${STAGEDIR}${SITE_PERL}/mach/auto/Net/Libproxy ${STAGEDIR}${SITE_PERL}/mach/Net + ${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Net/Libproxy ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/Net ${INSTALL_LIB} ${WRKSRC}/perl/blib/arch/auto/Net/Libproxy.so \ - ${STAGEDIR}${SITE_PERL}/mach/auto/Net/Libproxy/ + ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Net/Libproxy/ ${INSTALL_DATA} ${WRKSRC}/perl/blib/lib/Libproxy.pm \ - ${STAGEDIR}${SITE_PERL}/mach/Net/ + ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/Net/ .include "${MASTERDIR}/Makefile" diff --git a/net/libproxy-perl/pkg-plist b/net/libproxy-perl/pkg-plist index 51235dcfaf93..f6fe0295e541 100644 --- a/net/libproxy-perl/pkg-plist +++ b/net/libproxy-perl/pkg-plist @@ -1,5 +1,5 @@ -%%SITE_PERL%%/mach/Net/Libproxy.pm -%%SITE_PERL%%/mach/auto/Net/Libproxy/Libproxy.so -@dirrm %%SITE_PERL%%/mach/auto/Net/Libproxy -@dirrmtry %%SITE_PERL%%/mach/auto/Net -@dirrmtry %%SITE_PERL%%/mach/Net +%%SITE_PERL%%/%%PERL_ARCH%%/Net/Libproxy.pm +%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Libproxy/Libproxy.so +@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Libproxy +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net diff --git a/net/spread/Makefile b/net/spread/Makefile index b094c7957d93..00275543a0ff 100644 --- a/net/spread/Makefile +++ b/net/spread/Makefile @@ -74,6 +74,6 @@ post-install: ${INSTALL} -m 750 -d ${STAGEDIR}${RUNDIR} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libspread.so.1 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtspread.so.1 - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/mach/auto/Spread/Spread.so + ${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Spread/Spread.so .include <bsd.port.post.mk> diff --git a/security/p5-Crypt-RHash/Makefile b/security/p5-Crypt-RHash/Makefile index 0c0e12ba3a66..a712dd19d327 100644 --- a/security/p5-Crypt-RHash/Makefile +++ b/security/p5-Crypt-RHash/Makefile @@ -16,6 +16,6 @@ USES= perl5 USE_PERL5= configure fixpacklist post-install: - @${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/mach/auto/Crypt/Rhash/Rhash.so + @${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Crypt/Rhash/Rhash.so .include <bsd.port.mk> diff --git a/security/p5-Snort-Rule/Makefile b/security/p5-Snort-Rule/Makefile index 559336f3a7af..b82bc753166f 100644 --- a/security/p5-Snort-Rule/Makefile +++ b/security/p5-Snort-Rule/Makefile @@ -15,10 +15,10 @@ USES= perl5 USE_PERL5= configure PLIST_FILES= %%SITE_PERL%%/Snort/Rule.pm \ - %%SITE_PERL%%/mach/auto/Snort/Rule/.packlist \ + %%SITE_PERL%%/%%PERL_ARCH%%/auto/Snort/Rule/.packlist \ %%PERL5_MAN3%%/Snort::Rule.3.gz -PLIST_DIRS= %%SITE_PERL%%/mach/auto/Snort/Rule \ - %%SITE_PERL%%/mach/auto/Snort \ +PLIST_DIRS= %%SITE_PERL%%/%%PERL_ARCH%%/auto/Snort/Rule \ + %%SITE_PERL%%/%%PERL_ARCH%%/auto/Snort \ %%SITE_PERL%%/Snort .include <bsd.port.mk> diff --git a/sysutils/p5-BackupPC-XS/pkg-plist b/sysutils/p5-BackupPC-XS/pkg-plist index a35f781f6dbf..aca3f3e7ada8 100644 --- a/sysutils/p5-BackupPC-XS/pkg-plist +++ b/sysutils/p5-BackupPC-XS/pkg-plist @@ -1,7 +1,7 @@ %%PERL5_MAN3%%/BackupPC::XS.3.gz -%%SITE_PERL%%/mach/BackupPC/XS.pm -%%SITE_PERL%%/mach/auto/BackupPC/XS/.packlist -%%SITE_PERL%%/mach/auto/BackupPC/XS/XS.so -@dirrm %%SITE_PERL%%/mach/auto/BackupPC/XS -@dirrm %%SITE_PERL%%/mach/auto/BackupPC -@dirrmtry %%SITE_PERL%%/mach/BackupPC +%%SITE_PERL%%/%%PERL_ARCH%%/BackupPC/XS.pm +%%SITE_PERL%%/%%PERL_ARCH%%/auto/BackupPC/XS/.packlist +%%SITE_PERL%%/%%PERL_ARCH%%/auto/BackupPC/XS/XS.so +@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/BackupPC/XS +@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/BackupPC +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/BackupPC diff --git a/sysutils/p5-Sys-Load/pkg-plist b/sysutils/p5-Sys-Load/pkg-plist index ace63b65a7e5..20415dc35c45 100644 --- a/sysutils/p5-Sys-Load/pkg-plist +++ b/sysutils/p5-Sys-Load/pkg-plist @@ -1,7 +1,7 @@ -%%SITE_PERL%%/mach/auto/Sys/Load/.packlist -%%SITE_PERL%%/mach/auto/Sys/Load/Load.so -%%SITE_PERL%%/mach/Sys/Load.pm +%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Load/.packlist +%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Load/Load.so +%%SITE_PERL%%/%%PERL_ARCH%%/Sys/Load.pm %%PERL5_MAN3%%/Sys::Load.3.gz -@dirrmtry %%SITE_PERL%%/mach/auto/Sys/Load -@dirrmtry %%SITE_PERL%%/mach/auto/Sys -@dirrmtry %%SITE_PERL%%/mach/Sys +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Load +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Sys diff --git a/textproc/redland-bindings/Makefile b/textproc/redland-bindings/Makefile index 8669727ecbd3..a4bbdb1691aa 100644 --- a/textproc/redland-bindings/Makefile +++ b/textproc/redland-bindings/Makefile @@ -36,7 +36,7 @@ RUBY_USE= RUBY=yes post-install: .if ${PORT_OPTIONS:MPERL} - ${RM} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/mach/perllocal.pod + ${RM} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod ${SED} -i '' -e 's,^${STAGEDIR},,g' ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/RDF/Redland/CORE/.packlist .endif diff --git a/www/p5-libapreq2/Makefile b/www/p5-libapreq2/Makefile index 3ee2ec4a9227..86ce141dc5c4 100644 --- a/www/p5-libapreq2/Makefile +++ b/www/p5-libapreq2/Makefile @@ -45,10 +45,10 @@ post-stage: ${RM} ${STAGEDIR}${PREFIX}/lib/libapreq2* ${RM} ${STAGEDIR}${PREFIX}/libexec/apache22/mod_apreq2* ${FIND} ${STAGEDIR} -name '*.bs' -type f -size 0c -exec ${RM} {} \; - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/mach/auto/APR/Request/Request.so + ${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/APR/Request/Request.so .for i in Apache2 CGI Cookie Error Hook Param Parser ${STRIP_CMD} \ - ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/mach/auto/APR/Request/${i}/${i}.so + ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/APR/Request/${i}/${i}.so .endfor .include <bsd.port.mk> diff --git a/x11-toolkits/p5-Tk/Makefile b/x11-toolkits/p5-Tk/Makefile index dda506fde324..6b4832a43051 100644 --- a/x11-toolkits/p5-Tk/Makefile +++ b/x11-toolkits/p5-Tk/Makefile @@ -49,10 +49,10 @@ post-configure: post-stage: ${FIND} ${STAGEDIR} -name '*.bs' -size 0c -exec ${RM} {} \; - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/mach/auto/Tk/Tk.so + ${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Tk/Tk.so .for i in Canvas Compound Entry Event HList IO InputO JPEG Listbox Menubutton Mwm NBFrame PNG Pixmap Scale Scrollbar TList Text TixGrid WinPhoto X Xlib ${STRIP_CMD} \ - ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/mach/auto/Tk/${i}/${i}.so + ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Tk/${i}/${i}.so .endfor .include <bsd.port.mk> |