From 8aaca5506b7852065b0533ea5f730ebd2990a677 Mon Sep 17 00:00:00 2001 From: Steve Price Date: Sun, 30 Aug 1998 15:49:44 +0000 Subject: [PATCH] Unbreak after the perl upgrade. --- converters/p5-Convert-UU/Makefile | 6 ++---- converters/p5-Convert-UU/pkg-plist | 6 +++--- net-mgmt/mrtg/Makefile | 8 ++++---- net-mgmt/mrtg/pkg-plist | 4 ++-- net/mrtg/Makefile | 8 ++++---- net/mrtg/pkg-plist | 4 ++-- 6 files changed, 17 insertions(+), 19 deletions(-) diff --git a/converters/p5-Convert-UU/Makefile b/converters/p5-Convert-UU/Makefile index deeaba16cf97..e02b745fc154 100644 --- a/converters/p5-Convert-UU/Makefile +++ b/converters/p5-Convert-UU/Makefile @@ -3,7 +3,7 @@ # Date created: October 20th 1996 # Whom: James FitzGibbon # -# $Id: Makefile,v 1.12 1998/02/18 18:16:01 vanilla Exp $ +# $Id: Makefile,v 1.13 1998/08/07 18:44:26 asami Exp $ # DISTNAME= Convert-UU-0.20 @@ -14,13 +14,11 @@ MASTER_SITE_SUBDIR= Convert MAINTAINER= jfitz@FreeBSD.ORG -BROKEN= perl upgrade - USE_PERL5= YES MAN1= puuencode.1 puudecode.1 MAN3= Convert::UU.3 -MAN3PREFIX= ${PREFIX}/lib/perl5 +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} do-configure: @ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL diff --git a/converters/p5-Convert-UU/pkg-plist b/converters/p5-Convert-UU/pkg-plist index f6dfd9abd6c0..fe55efca4e9d 100644 --- a/converters/p5-Convert-UU/pkg-plist +++ b/converters/p5-Convert-UU/pkg-plist @@ -1,5 +1,5 @@ bin/puudecode bin/puuencode -lib/perl5/site_perl/Convert/UU.pm -lib/perl5/site_perl/i386-freebsd/auto/Convert/UU/.packlist -@dirrm lib/perl5/site_perl/i386-freebsd/auto/Convert/UU +lib/perl5/site_perl/%%PERL_VER%%/Convert/UU.pm +lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Convert/UU/.packlist +@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Convert/UU diff --git a/net-mgmt/mrtg/Makefile b/net-mgmt/mrtg/Makefile index 51eedf4db862..47af3aa2c7c2 100644 --- a/net-mgmt/mrtg/Makefile +++ b/net-mgmt/mrtg/Makefile @@ -3,7 +3,7 @@ # Date created: April 18th 1997 # Whom: James FitzGibbon # -# $Id: Makefile,v 1.6 1997/07/05 03:19:18 jfitz Exp $ +# $Id: Makefile,v 1.7 1997/12/16 19:42:17 vanilla Exp $ # DISTNAME= mrtg-2.5.1 @@ -13,7 +13,7 @@ MASTER_SITES= http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/pub/ MAINTAINER= jfitz@FreeBSD.ORG BUILD_DEPENDS= ${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd -RUN_DEPENDS= ${PREFIX}/lib/perl5/site_perl/PV.pm:${PORTSDIR}/devel/p5-PV +RUN_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/PV.pm:${PORTSDIR}/devel/p5-PV USE_PERL5= YES @@ -21,7 +21,7 @@ ALL_TARGET= rateup substitute do-install: ${MKDIR} -p -m 755 ${PREFIX}/etc/mrtg - ${MKDIR} -p -m 755 ${PREFIX}/lib/perl5/site_perl + ${MKDIR} -p -m 755 ${PREFIX}/lib/perl5/site_perl/${PERL_VER} ${MKDIR} -p -m 755 ${PREFIX}/share/mrtg ${MKDIR} -p -m 755 ${PREFIX}/share/doc/mrtg for file in readme.html readme.txt mibhelp.txt INSTALL COPYING COPYRIGHT Changes Contributors Todo; do \ @@ -31,7 +31,7 @@ do-install: ${INSTALL_DATA} $$file ${PREFIX}/share/mrtg/; \ done for file in SNMP_Session.pm BER.pm; do \ - ${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/lib/perl5/site_perl/; \ + ${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/lib/perl5/site_perl/${PERL_VER}; \ done ${INSTALL_PROGRAM} ${WRKSRC}/rateup ${PREFIX}/bin/ for file in mrtg cfgmaker convert indexmaker; do \ diff --git a/net-mgmt/mrtg/pkg-plist b/net-mgmt/mrtg/pkg-plist index e2563b5a78a1..392b41a306d0 100644 --- a/net-mgmt/mrtg/pkg-plist +++ b/net-mgmt/mrtg/pkg-plist @@ -4,8 +4,8 @@ bin/indexmaker bin/mrtg bin/rateup etc/mrtg/mrtg.cfg-dist -lib/perl5/site_perl/BER.pm -lib/perl5/site_perl/SNMP_Session.pm +lib/perl5/site_perl/%%PERL_VER%%/BER.pm +lib/perl5/site_perl/%%PERL_VER%%/SNMP_Session.pm share/mrtg/mrtg-l.gif share/mrtg/mrtg-m.gif share/mrtg/mrtg-r.gif diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile index 51eedf4db862..47af3aa2c7c2 100644 --- a/net/mrtg/Makefile +++ b/net/mrtg/Makefile @@ -3,7 +3,7 @@ # Date created: April 18th 1997 # Whom: James FitzGibbon # -# $Id: Makefile,v 1.6 1997/07/05 03:19:18 jfitz Exp $ +# $Id: Makefile,v 1.7 1997/12/16 19:42:17 vanilla Exp $ # DISTNAME= mrtg-2.5.1 @@ -13,7 +13,7 @@ MASTER_SITES= http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/pub/ MAINTAINER= jfitz@FreeBSD.ORG BUILD_DEPENDS= ${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd -RUN_DEPENDS= ${PREFIX}/lib/perl5/site_perl/PV.pm:${PORTSDIR}/devel/p5-PV +RUN_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/PV.pm:${PORTSDIR}/devel/p5-PV USE_PERL5= YES @@ -21,7 +21,7 @@ ALL_TARGET= rateup substitute do-install: ${MKDIR} -p -m 755 ${PREFIX}/etc/mrtg - ${MKDIR} -p -m 755 ${PREFIX}/lib/perl5/site_perl + ${MKDIR} -p -m 755 ${PREFIX}/lib/perl5/site_perl/${PERL_VER} ${MKDIR} -p -m 755 ${PREFIX}/share/mrtg ${MKDIR} -p -m 755 ${PREFIX}/share/doc/mrtg for file in readme.html readme.txt mibhelp.txt INSTALL COPYING COPYRIGHT Changes Contributors Todo; do \ @@ -31,7 +31,7 @@ do-install: ${INSTALL_DATA} $$file ${PREFIX}/share/mrtg/; \ done for file in SNMP_Session.pm BER.pm; do \ - ${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/lib/perl5/site_perl/; \ + ${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/lib/perl5/site_perl/${PERL_VER}; \ done ${INSTALL_PROGRAM} ${WRKSRC}/rateup ${PREFIX}/bin/ for file in mrtg cfgmaker convert indexmaker; do \ diff --git a/net/mrtg/pkg-plist b/net/mrtg/pkg-plist index e2563b5a78a1..392b41a306d0 100644 --- a/net/mrtg/pkg-plist +++ b/net/mrtg/pkg-plist @@ -4,8 +4,8 @@ bin/indexmaker bin/mrtg bin/rateup etc/mrtg/mrtg.cfg-dist -lib/perl5/site_perl/BER.pm -lib/perl5/site_perl/SNMP_Session.pm +lib/perl5/site_perl/%%PERL_VER%%/BER.pm +lib/perl5/site_perl/%%PERL_VER%%/SNMP_Session.pm share/mrtg/mrtg-l.gif share/mrtg/mrtg-m.gif share/mrtg/mrtg-r.gif