- Fix build with new site_perl

Submitted by: olli hauer <ohauer@gmx.de>
svn path=/head/; revision=320709
2024-12-23 04:23:08 +00:00 · 2013-06-12 17:45:02 +00:00 · 2013-06-12 17:45:02 +00:00 · 124b00a56f · 2021-03-31 03:12:20 +00:00
commit 124b00a56f
parent 6c1c5b05f5
24 changed files with 25 additions and 25 deletions
--- a/archivers/rpm5/Makefile
+++ b/archivers/rpm5/Makefile
@ -111,7 +111,7 @@ MAN8=	rpm.8 rpm2cpio.8 rpmbuild.8 rpmconstant.8 \
 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}
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@ -102,7 +102,7 @@ MAN1=		bin_dec_hex.1 cdeftutorial.1 rpntutorial.1 rrd-beginners.1 \

 .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:
--- a/databases/rrdtool10/Makefile
+++ b/databases/rrdtool10/Makefile
@ -32,7 +32,7 @@ MAN1=		RRDp.1 RRDs.1 bin_dec_hex.1 rrdcgi.1 rrdcreate.1 rrddump.1 \
 		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
--- a/databases/rrdtool12/Makefile
+++ b/databases/rrdtool12/Makefile
@ -75,7 +75,7 @@ MAN1=		bin_dec_hex.1 cdeftutorial.1 rpntutorial.1 rrd-beginners.1 \

 .if ${PORT_OPTIONS:MPERL}
 MAN3=		RRDp.3 RRDs.3
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VER}
 .endif

 post-extract:
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@ -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 \
--- a/devel/p5-SDL/Makefile
+++ b/devel/p5-SDL/Makefile
@ -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	\
--- a/devel/p5-subversion/Makefile
+++ b/devel/p5-subversion/Makefile
@ -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 \
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@ -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
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@ -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}
--- a/graphics/p5-PGPLOT/Makefile
+++ b/graphics/p5-PGPLOT/Makefile
@ -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:
--- a/graphics/p5-ming/Makefile
+++ b/graphics/p5-ming/Makefile
@ -15,7 +15,7 @@ COMMENT=	Perl5 module for Ming which allows you to create Flash 4/5 movies

 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
--- a/mail/zmailer/Makefile
+++ b/mail/zmailer/Makefile
@ -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 \
--- a/misc/ossp-uuid/Makefile
+++ b/misc/ossp-uuid/Makefile
@ -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
--- a/multimedia/zoneminder/Makefile
+++ b/multimedia/zoneminder/Makefile
@ -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 \
--- a/net-mgmt/flowd/Makefile
+++ b/net-mgmt/flowd/Makefile
@ -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}
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@ -230,7 +230,7 @@ MAN3PERL=	NetSNMP::ASN.3 NetSNMP::OID.3 NetSNMP::agent.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

--- a/net-mgmt/pandorafms_server/Makefile
+++ b/net-mgmt/pandorafms_server/Makefile
@ -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}
--- a/net/spread/Makefile
+++ b/net/spread/Makefile
@ -49,7 +49,7 @@ MAN3=		libsp.3 SP_connect.3 SP_disconnect.3 SP_equal_group_ids.3 \
 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' \
--- a/security/lasso/Makefile
+++ b/security/lasso/Makefile
@ -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
--- a/security/libprelude/Makefile
+++ b/security/libprelude/Makefile
@ -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}
--- a/security/libpreludedb/Makefile
+++ b/security/libpreludedb/Makefile
@ -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/

--- a/textproc/redland-bindings/Makefile
+++ b/textproc/redland-bindings/Makefile
@ -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>
--- a/www/libapreq2/Makefile
+++ b/www/libapreq2/Makefile
@ -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 \
--- a/x11/xfce4-conf/Makefile
+++ b/x11/xfce4-conf/Makefile
@ -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>