Until the sources for these packages catch up to the current (post-5.6.0)

Perl API, we need to pass -DPERL_POLLUTE=1 to the build process to look
like an older perl.

5 files changed, 27 insertions, 15 deletions

diff --git a/net/p5-SNMP/Makefile b/net/p5-SNMP/Makefile
index 355fe1d16e2..eb8caa75fa4 100644
--- a/net/p5-SNMP/Makefile
+++ b/net/p5-SNMP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/08/27 07:11:17 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2000/08/29 20:48:14 jlam Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/06/27 01:53:13 jfitz Exp
 #
 
@@ -14,11 +14,14 @@ DEPENDS=	ucd-snmp>=4.0.1:../../net/ucd-snmp
 USE_PERL5=	# defined
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/SNMP/.packlist
 
+# Until the source catches up to the current Perl API, we need PERL_POLLUTE
+# to look like an older perl.
+MAKE_PARAMS=	DEFINE="-DPERL_POLLUTE=1"
+
 do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL ${MAKE_PARAMS}
 
 post-install:
-	@${INSTALL_DATA} ${WRKSRC}/README \
-		${PREFIX}/lib/perl5/site_perl/README.SNMP
+	@${INSTALL_DATA} ${WRKSRC}/README ${PERL5_SITELIB}/README.SNMP
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/p5-SNMP/pkg/PLIST b/net/p5-SNMP/pkg/PLIST
index e52964024e4..4204921d87f 100644
--- a/net/p5-SNMP/pkg/PLIST
+++ b/net/p5-SNMP/pkg/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2000/08/27 07:11:18 jlam Exp $
-lib/perl5/site_perl/README.SNMP
+@comment $NetBSD: PLIST,v 1.2 2000/08/29 20:48:14 jlam Exp $
+${PERL5_SITELIB}/README.SNMP
diff --git a/net/p5-Wais/Makefile b/net/p5-Wais/Makefile
index 23209f32ef7..471b1b53d43 100644
--- a/net/p5-Wais/Makefile
+++ b/net/p5-Wais/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/08/29 01:01:25 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/29 20:48:14 jlam Exp $
 #
 
 DISTNAME=	Wais-2.311
@@ -14,6 +14,9 @@ DEPENDS+=	p5-Curses>=1.02:../../devel/p5-Curses
 USE_PERL5=	# defined
 PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Wais/.packlist
 
+post-patch:
+	${FIND} ${WRKSRC} -name "*.orig" -exec ${RM} -f {} \;
+
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
diff --git a/net/p5-Wais/files/patch-sum b/net/p5-Wais/files/patch-sum
index 83ad1c73f2f..8e0617136cb 100644
--- a/net/p5-Wais/files/patch-sum
+++ b/net/p5-Wais/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:12:26 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/08/29 20:48:15 jlam Exp $
 
-MD5 (patch-aa) = a8826c98a6fed6416d44aa00d29e7fe1
+MD5 (patch-aa) = 74cef77460839753310d1c03bc433bf9
 MD5 (patch-ab) = 57289e03152975294e8d52170286e739
 MD5 (patch-ac) = 50c66adddb02ebba7983520af991a308
diff --git a/net/p5-Wais/patches/patch-aa b/net/p5-Wais/patches/patch-aa
index fb52871eac0..fd9c38072ca 100644
--- a/net/p5-Wais/patches/patch-aa
+++ b/net/p5-Wais/patches/patch-aa
@@ -1,8 +1,11 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/05/11 14:03:13 bad Exp $
+$NetBSD: patch-aa,v 1.2 2000/08/29 20:48:15 jlam Exp $
 
---- Makefile.PL.orig	Mon Aug  3 18:59:14 1998
-+++ Makefile.PL	Tue May 11 01:07:10 1999
-@@ -32,7 +32,7 @@
+Until the sources catch up to the current Perl API, we need PERL_POLLUTE
+to look like an older perl.
+
+--- Makefile.PL.orig	Mon Aug  3 12:59:14 1998
++++ Makefile.PL
+@@ -32,17 +32,17 @@
     'PREREQ_PM'    => { Curses     => 0,
                       },
     'LIBS'         => "-L$Config{ldflags} -lwais",
@@ -10,8 +13,11 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/05/11 14:03:13 bad Exp $
 +   'INC'          => "-DWAIS_USES_STDIO $Config{cppflags}",
     'NAME'         => 'Wais',
     'VERSION_FROM' => 'lib/Wais.pm',
-    'DEFINE'       => '-DTRACE=0',
-@@ -42,7 +42,7 @@
+-   'DEFINE'       => '-DTRACE=0',
++   'DEFINE'       => '-DTRACE=0 -DPERL_POLLUTE=1',
+    'OBJECT'       => "Wais.o HTWAIS.o dictionary.o",
+    'dist'         => { SUFFIX   => 'gz',
+                        COMPRESS => 'gzip -9f',
                         PREOP    => 'pod2text lib/Wais.pm > README; pod2text install > INSTALL',
                       },
     'MAP_TARGET'   => 'waisperl',