svn commit: r372262 - in head: audio/gramofile comms/owfs devel/p5-Async-MergePoint devel/p5-File-FcntlLock devel/p5-autovivification dns/p5-Net-DNS editors/p5-Padre irc/epic4 multimedia/zoneminder...

Fri Nov 7 13:51:16 UTC 2014

Author: mat
Date: Fri Nov  7 13:51:10 2014
New Revision: 372262
URL: https://svnweb.freebsd.org/changeset/ports/372262
QAT: https://qat.redports.org/buildarchive/r372262/

Log:
  Replace some occurences of mach with PERL_ARCH (and a couple of other small noop fixes.)
  
  With hat:	perl@
  Sponsored by:	Absolight

Modified:
  head/audio/gramofile/Makefile
  head/comms/owfs/Makefile
  head/devel/p5-Async-MergePoint/Makefile
  head/devel/p5-File-FcntlLock/pkg-plist
  head/devel/p5-autovivification/pkg-plist
  head/dns/p5-Net-DNS/Makefile
  head/editors/p5-Padre/Makefile
  head/irc/epic4/Makefile
  head/multimedia/zoneminder/Makefile
  head/net-im/sendxmpp/Makefile
  head/net/libproxy-perl/Makefile
  head/net/libproxy-perl/pkg-plist
  head/net/spread/Makefile
  head/security/p5-Crypt-RHash/Makefile
  head/security/p5-Snort-Rule/Makefile
  head/sysutils/p5-BackupPC-XS/pkg-plist
  head/sysutils/p5-Sys-Load/pkg-plist
  head/textproc/redland-bindings/Makefile
  head/www/p5-libapreq2/Makefile
  head/x11-toolkits/p5-Tk/Makefile

Modified: head/audio/gramofile/Makefile
==============================================================================

--- head/audio/gramofile/Makefile	Fri Nov  7 13:33:38 2014	(r372261)
+++ head/audio/gramofile/Makefile	Fri Nov  7 13:51:10 2014	(r372262)
@@ -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:

Modified: head/comms/owfs/Makefile
==============================================================================
--- head/comms/owfs/Makefile	Fri Nov  7 13:33:38 2014	(r372261)
+++ head/comms/owfs/Makefile	Fri Nov  7 13:51:10 2014	(r372262)
@@ -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>

Modified: head/devel/p5-Async-MergePoint/Makefile
==============================================================================
--- head/devel/p5-Async-MergePoint/Makefile	Fri Nov  7 13:33:38 2014	(r372261)
+++ head/devel/p5-Async-MergePoint/Makefile	Fri Nov  7 13:51:10 2014	(r372262)
@@ -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>

Modified: head/devel/p5-File-FcntlLock/pkg-plist
==============================================================================
--- head/devel/p5-File-FcntlLock/pkg-plist	Fri Nov  7 13:33:38 2014	(r372261)
+++ head/devel/p5-File-FcntlLock/pkg-plist	Fri Nov  7 13:51:10 2014	(r372262)
@@ -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

Modified: head/devel/p5-autovivification/pkg-plist
==============================================================================
--- head/devel/p5-autovivification/pkg-plist	Fri Nov  7 13:33:38 2014	(r372261)
+++ head/devel/p5-autovivification/pkg-plist	Fri Nov  7 13:51:10 2014	(r372262)
@@ -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

Modified: head/dns/p5-Net-DNS/Makefile
==============================================================================
--- head/dns/p5-Net-DNS/Makefile	Fri Nov  7 13:33:38 2014	(r372261)
+++ head/dns/p5-Net-DNS/Makefile	Fri Nov  7 13:51:10 2014	(r372262)
@@ -30,6 +30,6 @@ IPV6_BUILD_DEPENDS=	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>

Modified: head/editors/p5-Padre/Makefile
==============================================================================
--- head/editors/p5-Padre/Makefile	Fri Nov  7 13:33:38 2014	(r372261)
+++ head/editors/p5-Padre/Makefile	Fri Nov  7 13:51:10 2014	(r372262)
@@ -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:

Modified: head/irc/epic4/Makefile
==============================================================================
--- head/irc/epic4/Makefile	Fri Nov  7 13:33:38 2014	(r372261)
+++ head/irc/epic4/Makefile	Fri Nov  7 13:51:10 2014	(r372262)
@@ -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

Modified: head/multimedia/zoneminder/Makefile
==============================================================================
--- head/multimedia/zoneminder/Makefile	Fri Nov  7 13:33:38 2014	(r372261)
+++ head/multimedia/zoneminder/Makefile	Fri Nov  7 13:51:10 2014	(r372262)
@@ -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}

Modified: head/net-im/sendxmpp/Makefile
==============================================================================
--- head/net-im/sendxmpp/Makefile	Fri Nov  7 13:33:38 2014	(r372261)
+++ head/net-im/sendxmpp/Makefile	Fri Nov  7 13:51:10 2014	(r372262)
@@ -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>

Modified: head/net/libproxy-perl/Makefile
==============================================================================
--- head/net/libproxy-perl/Makefile	Fri Nov  7 13:33:38 2014	(r372261)
+++ head/net/libproxy-perl/Makefile	Fri Nov  7 13:51:10 2014	(r372262)
@@ -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"

Modified: head/net/libproxy-perl/pkg-plist
==============================================================================
--- head/net/libproxy-perl/pkg-plist	Fri Nov  7 13:33:38 2014	(r372261)
+++ head/net/libproxy-perl/pkg-plist	Fri Nov  7 13:51:10 2014	(r372262)
@@ -1,5 +1,5 @@
-%%SITE_PERL%%/mach/Net/Libproxy.pm
-%%SITE_PERL%%/mach/auto/Net/Libproxy/Libproxy.so
- at dirrm %%SITE_PERL%%/mach/auto/Net/Libproxy
- at dirrmtry %%SITE_PERL%%/mach/auto/Net
- at dirrmtry %%SITE_PERL%%/mach/Net
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Libproxy.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Libproxy/Libproxy.so
+ at dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Libproxy
+ at dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+ at dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net

Modified: head/net/spread/Makefile
==============================================================================
--- head/net/spread/Makefile	Fri Nov  7 13:33:38 2014	(r372261)
+++ head/net/spread/Makefile	Fri Nov  7 13:51:10 2014	(r372262)
@@ -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>

Modified: head/security/p5-Crypt-RHash/Makefile
==============================================================================
--- head/security/p5-Crypt-RHash/Makefile	Fri Nov  7 13:33:38 2014	(r372261)
+++ head/security/p5-Crypt-RHash/Makefile	Fri Nov  7 13:51:10 2014	(r372262)
@@ -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>

Modified: head/security/p5-Snort-Rule/Makefile
==============================================================================
--- head/security/p5-Snort-Rule/Makefile	Fri Nov  7 13:33:38 2014	(r372261)
+++ head/security/p5-Snort-Rule/Makefile	Fri Nov  7 13:51:10 2014	(r372262)
@@ -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>

Modified: head/sysutils/p5-BackupPC-XS/pkg-plist
==============================================================================
--- head/sysutils/p5-BackupPC-XS/pkg-plist	Fri Nov  7 13:33:38 2014	(r372261)
+++ head/sysutils/p5-BackupPC-XS/pkg-plist	Fri Nov  7 13:51:10 2014	(r372262)
@@ -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
- at dirrm %%SITE_PERL%%/mach/auto/BackupPC/XS
- at dirrm %%SITE_PERL%%/mach/auto/BackupPC
- at 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
+ at dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/BackupPC/XS
+ at dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/BackupPC
+ at dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/BackupPC

Modified: head/sysutils/p5-Sys-Load/pkg-plist
==============================================================================
--- head/sysutils/p5-Sys-Load/pkg-plist	Fri Nov  7 13:33:38 2014	(r372261)
+++ head/sysutils/p5-Sys-Load/pkg-plist	Fri Nov  7 13:51:10 2014	(r372262)
@@ -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
- at dirrmtry %%SITE_PERL%%/mach/auto/Sys/Load
- at dirrmtry %%SITE_PERL%%/mach/auto/Sys
- at dirrmtry %%SITE_PERL%%/mach/Sys
+ at dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Load
+ at dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys
+ at dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Sys

Modified: head/textproc/redland-bindings/Makefile
==============================================================================
--- head/textproc/redland-bindings/Makefile	Fri Nov  7 13:33:38 2014	(r372261)
+++ head/textproc/redland-bindings/Makefile	Fri Nov  7 13:51:10 2014	(r372262)
@@ -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
 

Modified: head/www/p5-libapreq2/Makefile
==============================================================================
--- head/www/p5-libapreq2/Makefile	Fri Nov  7 13:33:38 2014	(r372261)
+++ head/www/p5-libapreq2/Makefile	Fri Nov  7 13:51:10 2014	(r372262)
@@ -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>

Modified: head/x11-toolkits/p5-Tk/Makefile
==============================================================================
--- head/x11-toolkits/p5-Tk/Makefile	Fri Nov  7 13:33:38 2014	(r372261)
+++ head/x11-toolkits/p5-Tk/Makefile	Fri Nov  7 13:51:10 2014	(r372262)
@@ -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>
