Date: Wed, 12 Jun 2013 17:45:03 +0000 (UTC) From: Andrej Zverev <az@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r320709 - in head: archivers/rpm5 databases/rrdtool databases/rrdtool10 databases/rrdtool12 devel/git devel/p5-SDL devel/p5-subversion ftp/wzdftpd graphics/ImageMagick graphics/p5-PGPLO... Message-ID: <201306121745.r5CHj3xf087553@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: az Date: Wed Jun 12 17:45:02 2013 New Revision: 320709 URL: http://svnweb.freebsd.org/changeset/ports/320709 Log: - Fix build with new site_perl Submitted by: olli hauer <ohauer@gmx.de> Modified: head/archivers/rpm5/Makefile head/databases/rrdtool/Makefile (contents, props changed) head/databases/rrdtool10/Makefile head/databases/rrdtool12/Makefile (contents, props changed) head/devel/git/Makefile head/devel/p5-SDL/Makefile (contents, props changed) head/devel/p5-subversion/Makefile (contents, props changed) head/ftp/wzdftpd/Makefile head/graphics/ImageMagick/Makefile head/graphics/p5-PGPLOT/Makefile (contents, props changed) head/graphics/p5-ming/Makefile (contents, props changed) head/mail/zmailer/Makefile head/misc/ossp-uuid/Makefile (contents, props changed) head/multimedia/zoneminder/Makefile head/net-mgmt/flowd/Makefile head/net-mgmt/net-snmp/Makefile head/net-mgmt/pandorafms_server/Makefile (contents, props changed) head/net/spread/Makefile head/security/lasso/Makefile head/security/libprelude/Makefile head/security/libpreludedb/Makefile head/textproc/redland-bindings/Makefile head/www/libapreq2/Makefile (contents, props changed) head/x11/xfce4-conf/Makefile Modified: head/archivers/rpm5/Makefile ============================================================================== --- head/archivers/rpm5/Makefile Wed Jun 12 17:34:18 2013 (r320708) +++ head/archivers/rpm5/Makefile Wed Jun 12 17:45:02 2013 (r320709) @@ -111,7 +111,7 @@ MAN8= rpm.8 rpm2cpio.8 rpmbuild.8 rpmcon MAN3= RPM.3 RPM::Constant.3 RPM::Dependencies.3 \ RPM::Files.3 RPM::Header.3 RPM::PackageIterator.3 \ RPM::Problems.3 RPM::Spec.3 RPM::Transaction.3 -MAN3PREFIX?= ${PREFIX}/lib/perl5/${PERL_VERSION} +MAN3PREFIX?= ${PREFIX}/lib/perl5/${PERL_VER} .endif .if ${PORT_OPTIONS:MDOCS} Modified: head/databases/rrdtool/Makefile ============================================================================== --- head/databases/rrdtool/Makefile Wed Jun 12 17:34:18 2013 (r320708) +++ head/databases/rrdtool/Makefile Wed Jun 12 17:45:02 2013 (r320709) @@ -102,7 +102,7 @@ MAN1= bin_dec_hex.1 cdeftutorial.1 rpnt .if ${PORT_OPTIONS:MPERL_MODULE} MAN3= RRDp.3 RRDs.3 -MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER} .endif post-extract: Modified: head/databases/rrdtool10/Makefile ============================================================================== --- head/databases/rrdtool10/Makefile Wed Jun 12 17:34:18 2013 (r320708) +++ head/databases/rrdtool10/Makefile Wed Jun 12 17:45:02 2013 (r320709) @@ -32,7 +32,7 @@ MAN1= RRDp.1 RRDs.1 bin_dec_hex.1 rrdcg cdeftutorial.1 rpntutorial.1 rrdinfo.1 rrdxport.1 rrd-beginners.1 \ rrdfirst.1 MAN3= RRDp.3 RRDs.3 -MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER} OPTIONS_DEFINE= LATIN2 LATIN2_DESC= ISO-8859-2 fonts support Modified: head/databases/rrdtool12/Makefile ============================================================================== --- head/databases/rrdtool12/Makefile Wed Jun 12 17:34:18 2013 (r320708) +++ head/databases/rrdtool12/Makefile Wed Jun 12 17:45:02 2013 (r320709) @@ -75,7 +75,7 @@ MAN1= bin_dec_hex.1 cdeftutorial.1 rpnt .if ${PORT_OPTIONS:MPERL} MAN3= RRDp.3 RRDs.3 -MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER} .endif post-extract: Modified: head/devel/git/Makefile ============================================================================== --- head/devel/git/Makefile Wed Jun 12 17:34:18 2013 (r320708) +++ head/devel/git/Makefile Wed Jun 12 17:45:02 2013 (r320709) @@ -412,7 +412,7 @@ post-install: (cd ${WRKDIR}/htmldocs/ && ${COPYTREE_SHARE} \* ${DOCSDIR}) ${LN} -s ${DOCSDIR}/git.html ${DOCSDIR}/index.html .endif - -${RM} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/mach/perllocal.pod + -${RM} -f ${PREFIX}/lib/perl5/${PERL_VER}/mach/perllocal.pod ${MKDIR} ${PREFIX}/share/emacs/site-lisp/git ${MKDIR} ${PREFIX}/lib/xemacs/site-lisp/git ${INSTALL_DATA} ${WRKSRC}/contrib/emacs/git.el \ Modified: head/devel/p5-SDL/Makefile ============================================================================== --- head/devel/p5-SDL/Makefile Wed Jun 12 17:34:18 2013 (r320708) +++ head/devel/p5-SDL/Makefile Wed Jun 12 17:45:02 2013 (r320709) @@ -56,7 +56,7 @@ USE_SDL+= ttf USE_LDCONFIG= yes -MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER} MAN3= SDL.3 \ SDL::App.3 \ Modified: head/devel/p5-subversion/Makefile ============================================================================== --- head/devel/p5-subversion/Makefile Wed Jun 12 17:34:18 2013 (r320708) +++ head/devel/p5-subversion/Makefile Wed Jun 12 17:45:02 2013 (r320709) @@ -19,7 +19,7 @@ PKGDIR= ${.CURDIR} USE_PERL5= yes -MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER} MAN3= SVN::Base.3 \ SVN::Client.3 \ SVN::Core.3 \ Modified: head/ftp/wzdftpd/Makefile ============================================================================== --- head/ftp/wzdftpd/Makefile Wed Jun 12 17:34:18 2013 (r320708) +++ head/ftp/wzdftpd/Makefile Wed Jun 12 17:45:02 2013 (r320709) @@ -71,7 +71,7 @@ CONFIGURE_ARGS+= --disable-ipv6 .if ${PORT_OPTIONS:MPERL} USE_PERL5= yes -MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER} MAN3+= wzdftpd.3 PLIST_SUB+= PERL="" .else Modified: head/graphics/ImageMagick/Makefile ============================================================================== --- head/graphics/ImageMagick/Makefile Wed Jun 12 17:34:18 2013 (r320708) +++ head/graphics/ImageMagick/Makefile Wed Jun 12 17:45:02 2013 (r320709) @@ -420,7 +420,7 @@ pre-configure: post-install: test .if ${PORT_OPTIONS:MPERL} - @${RM} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/mach/perllocal.pod + @${RM} -f ${PREFIX}/lib/perl5/${PERL_VER}/mach/perllocal.pod .endif .if ${PORT_OPTIONS:MMODULES} . if ${PORT_OPTIONS:M16BIT_PIXEL} Modified: head/graphics/p5-PGPLOT/Makefile ============================================================================== --- head/graphics/p5-PGPLOT/Makefile Wed Jun 12 17:34:18 2013 (r320708) +++ head/graphics/p5-PGPLOT/Makefile Wed Jun 12 17:45:02 2013 (r320709) @@ -21,7 +21,7 @@ USE_FORTRAN= yes USE_PERL5= yes MAN3= PGPLOT.3 -MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER} .if !defined(NOPORTEXAMPLES) post-install: Modified: head/graphics/p5-ming/Makefile ============================================================================== --- head/graphics/p5-ming/Makefile Wed Jun 12 17:34:18 2013 (r320708) +++ head/graphics/p5-ming/Makefile Wed Jun 12 17:45:02 2013 (r320709) @@ -15,7 +15,7 @@ COMMENT= Perl5 module for Ming which all CONFIGURE_ARGS= --enable-perl INSTALL_WRKSRC= ${WRKSRC}/perl_ext -MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER} PATCH_WRKSRC= ${WRKSRC}/perl_ext PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist Modified: head/mail/zmailer/Makefile ============================================================================== --- head/mail/zmailer/Makefile Wed Jun 12 17:34:18 2013 (r320708) +++ head/mail/zmailer/Makefile Wed Jun 12 17:45:02 2013 (r320709) @@ -50,7 +50,7 @@ CONFIGURE_ARGS+=--prefix=${PREFIX}/ \ MAN1= rmail.1zm vacation.1zm zmailer.1zm zmsh.1zm mboxpath.1zm mailq.1zm \ mailrm.1zm newaliases.1zm -MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER} MAN3= ZMailer::mailq.3 MAN5= aliases.5zm mailq-m.5zm zdbases.conf.5zm zmailer.conf.5zm MAN8= hold.8zm router.8zm scheduler.8zm sendmail.8zm sm.8zm smtp.8zm \ Modified: head/misc/ossp-uuid/Makefile ============================================================================== --- head/misc/ossp-uuid/Makefile Wed Jun 12 17:34:18 2013 (r320708) +++ head/misc/ossp-uuid/Makefile Wed Jun 12 17:45:02 2013 (r320709) @@ -32,7 +32,7 @@ CONFIGURE_ENV+= PERL=${PERL5} CONFIGURE_ARGS+= --with-perl PLIST_SUB+= WITH_PERL='' MAN3= OSSP::uuid.3 -MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER} .else PLIST_SUB+= WITH_PERL='@comment ' .endif Modified: head/multimedia/zoneminder/Makefile ============================================================================== --- head/multimedia/zoneminder/Makefile Wed Jun 12 17:34:18 2013 (r320708) +++ head/multimedia/zoneminder/Makefile Wed Jun 12 17:45:02 2013 (r320709) @@ -70,7 +70,7 @@ PORTDOCS= AUTHORS \ README.FreeBSD \ TODO -MAN3PREFIX?= ${PREFIX}/lib/perl5/${PERL_VERSION} +MAN3PREFIX?= ${PREFIX}/lib/perl5/${PERL_VER} MAN3= ZoneMinder::Trigger::Connection.3 \ ZoneMinder::Control::Ncs370.3 \ ZoneMinder::Trigger::Channel::Serial.3 \ Modified: head/net-mgmt/flowd/Makefile ============================================================================== --- head/net-mgmt/flowd/Makefile Wed Jun 12 17:34:18 2013 (r320708) +++ head/net-mgmt/flowd/Makefile Wed Jun 12 17:45:02 2013 (r320709) @@ -64,7 +64,7 @@ post-install: ${PERL} Makefile.PL INSTALLSITEMAN3DIR=${MAN3PREFIX}/man/man3 PREFIX=${PREFIX} && \ ${GMAKE} && \ ${GMAKE} install; - -@${RM} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/${PERL_ARCH}/perllocal.pod + -@${RM} -f ${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod .endif .if ${PORT_OPTIONS:MPYTHON} Modified: head/net-mgmt/net-snmp/Makefile ============================================================================== --- head/net-mgmt/net-snmp/Makefile Wed Jun 12 17:34:18 2013 (r320708) +++ head/net-mgmt/net-snmp/Makefile Wed Jun 12 17:45:02 2013 (r320709) @@ -230,7 +230,7 @@ MAN3PERL= NetSNMP::ASN.3 NetSNMP::OID.3 NetSNMP::agent::default_store.3 \ NetSNMP::default_store.3 \ NetSNMP::netsnmp_request_infoPtr.3 SNMP.3 -MAN3PERLPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} +MAN3PERLPREFIX= ${PREFIX}/lib/perl5/${PERL_VER} _MANPAGES+= ${MAN3PERL:S%^%${MAN3PERLPREFIX}/man/man3/%} .endif Modified: head/net-mgmt/pandorafms_server/Makefile ============================================================================== --- head/net-mgmt/pandorafms_server/Makefile Wed Jun 12 17:34:18 2013 (r320708) +++ head/net-mgmt/pandorafms_server/Makefile Wed Jun 12 17:45:02 2013 (r320709) @@ -127,7 +127,7 @@ post-install: .else @cd ${WRKSRC} && ${SH} pandora_server_installer --install --no-tentacle .endif - @${RM} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/${PERL_ARCH}/perllocal.pod + @${RM} -f ${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod .if !defined(NOPORTDOC) @${MKDIR} ${DOCSDIR} .for x in ${PORTDOCS} Modified: head/net/spread/Makefile ============================================================================== --- head/net/spread/Makefile Wed Jun 12 17:34:18 2013 (r320708) +++ head/net/spread/Makefile Wed Jun 12 17:45:02 2013 (r320709) @@ -49,7 +49,7 @@ MAN3= libsp.3 SP_connect.3 SP_disconnec PERL_CONFIGURE_ARGS= CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}" \ INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib" -_MANPAGES+= ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/Spread.3 +_MANPAGES+= ${PREFIX}/lib/perl5/${PERL_VER}/man/man3/Spread.3 post-configure: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ Modified: head/security/lasso/Makefile ============================================================================== --- head/security/lasso/Makefile Wed Jun 12 17:34:18 2013 (r320708) +++ head/security/lasso/Makefile Wed Jun 12 17:45:02 2013 (r320709) @@ -56,7 +56,7 @@ PLIST_SUB+= WITH_PYTHON="@comment " .endif post-install: - ${RM} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/${PERL_ARCH}/perllocal.pod + ${RM} -f ${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod .ifdef(NOPORTDOCS) ${RM} -rf ${DOCSDIR} .endif Modified: head/security/libprelude/Makefile ============================================================================== --- head/security/libprelude/Makefile Wed Jun 12 17:34:18 2013 (r320708) +++ head/security/libprelude/Makefile Wed Jun 12 17:45:02 2013 (r320709) @@ -74,7 +74,7 @@ post-install: .endif .endfor .if ${PORT_OPTIONS:MPERL} - -@${RM} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/${PERL_ARCH}/perllocal.pod + -@${RM} -f ${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod .endif .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} Modified: head/security/libpreludedb/Makefile ============================================================================== --- head/security/libpreludedb/Makefile Wed Jun 12 17:34:18 2013 (r320708) +++ head/security/libpreludedb/Makefile Wed Jun 12 17:45:02 2013 (r320709) @@ -95,7 +95,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/docs/api/html/* ${DOCSDIR} .endif .if ${PORT_OPTIONS:MPERL} - @${RM} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/${PERL_ARCH}/perllocal.pod + @${RM} -f ${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod .endif @${INSTALL_MAN} ${WRKSRC}/docs/manpages/*.1 ${MAN1PREFIX}/man/man1/ Modified: head/textproc/redland-bindings/Makefile ============================================================================== --- head/textproc/redland-bindings/Makefile Wed Jun 12 17:34:18 2013 (r320708) +++ head/textproc/redland-bindings/Makefile Wed Jun 12 17:45:02 2013 (r320709) @@ -23,7 +23,7 @@ OPTIONS_DEFAULT=PYTHON USE_PERL5= yes CONFIGURE_ARGS+=--with-perl PLIST_SUB+= WITH_PERL="" -MANPREFIX= ${LOCALBASE}/lib/perl5/${PERL_VERSION} +MANPREFIX= ${LOCALBASE}/lib/perl5/${PERL_VER} MAN3= RDF::Redland.3 \ RDF::Redland::BlankNode.3 \ RDF::Redland::Iterator.3 \ @@ -72,7 +72,7 @@ PLIST_SUB+= WITH_RUBY="@comment " post-install: .if ${PORT_OPTIONS:MPERL} - -${RM} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/mach/perllocal.pod + -${RM} -f ${PREFIX}/lib/perl5/${PERL_VER}/mach/perllocal.pod .endif .include <bsd.port.mk> Modified: head/www/libapreq2/Makefile ============================================================================== --- head/www/libapreq2/Makefile Wed Jun 12 17:34:18 2013 (r320708) +++ head/www/libapreq2/Makefile Wed Jun 12 17:45:02 2013 (r320709) @@ -38,7 +38,7 @@ RUN_DEPENDS+= ${P5_APREQ_DEPENDS} USE_PERL5= yes CONFIGURE_ARGS+= --enable-perl-glue --with-perl=${PERL5} -MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER} MAN3= APR::Request.3 \ APR::Request::Apache2.3 \ APR::Request::CGI.3 \ Modified: head/x11/xfce4-conf/Makefile ============================================================================== --- head/x11/xfce4-conf/Makefile Wed Jun 12 17:34:18 2013 (r320708) +++ head/x11/xfce4-conf/Makefile Wed Jun 12 17:45:02 2013 (r320709) @@ -27,7 +27,7 @@ USES= pathfix pkgconfig OPTIONS_DEFINE= DOCS PERL NLS -MAN3PREFIX?= ${PREFIX}/lib/perl5/${PERL_VERSION} +MAN3PREFIX?= ${PREFIX}/lib/perl5/${PERL_VER} .include <bsd.port.options.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306121745.r5CHj3xf087553>