Make p5-GnuPG-Interface and pgpenvelope work again by switching to the

Class::MethodMaker v1 compatibility interface in Class::MakeMethods.
Bump PKGREVISION.

6 files changed, 49 insertions, 9 deletions

diff --git a/security/p5-GnuPG-Interface/Makefile b/security/p5-GnuPG-Interface/Makefile
index fcd59f4126f..20b8309924e 100644
--- a/security/p5-GnuPG-Interface/Makefile
+++ b/security/p5-GnuPG-Interface/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/01/10 18:22:22 tv Exp $
+# $NetBSD: Makefile,v 1.2 2005/03/04 20:57:50 tv Exp $
 #
 
 DISTNAME=		GnuPG-Interface-0.34
 PKGNAME=		p5-${DISTNAME}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		security perl5
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gnupg-interface/}
 
@@ -11,11 +11,17 @@ MAINTAINER=		tv@duh.org
 HOMEPAGE=		http://gnupg-interface.sourceforge.net/
 COMMENT=		Perl interface to GnuPG
 
-DEPENDS+=		p5-Class-MethodMaker>=1.00:../../devel/p5-Class-MethodMaker
+DEPENDS+=		p5-Class-MakeMethods>=1.010:../../devel/p5-Class-MakeMethods
 DEPENDS+=		gnupg>=1.2.3:../../security/gnupg
 
 USE_BUILDLINK3=		yes
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/GnuPG/Interface/.packlist
 
+pre-configure:
+	cd ${WRKSRC}/lib/GnuPG && for f in *.pm; do \
+		${SED} -e 's/use Class::MethodMaker/use Class::MakeMethods::Emulator::MethodMaker/' $$f > $$f.new && \
+		${MV} -f $$f.new $$f; \
+	done
+
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/p5-GnuPG-Interface/distinfo b/security/p5-GnuPG-Interface/distinfo
index 3179e3e0093..75d139e7990 100644
--- a/security/p5-GnuPG-Interface/distinfo
+++ b/security/p5-GnuPG-Interface/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 13:10:11 agc Exp $
+$NetBSD: distinfo,v 1.3 2005/03/04 20:57:50 tv Exp $
 
 SHA1 (GnuPG-Interface-0.34.tar.gz) = 992c521db3ac7d1ca7b727d40c944a02c41bc818
 RMD160 (GnuPG-Interface-0.34.tar.gz) = 7ed30ef60ca0bfff2ee948782ed8b753903c47e2
 Size (GnuPG-Interface-0.34.tar.gz) = 38730 bytes
 SHA1 (patch-aa) = 3e050bfd306758e72170c0f353a602cd59345536
+SHA1 (patch-ab) = de27289735f964962a94e938ca11e9376e838d1d
diff --git a/security/p5-GnuPG-Interface/patches/patch-ab b/security/p5-GnuPG-Interface/patches/patch-ab
new file mode 100644
index 00000000000..ba91f75d756
--- /dev/null
+++ b/security/p5-GnuPG-Interface/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2005/03/04 20:57:50 tv Exp $
+
+--- Makefile.PL.orig	2005-03-04 15:44:26.000000000 -0500
++++ Makefile.PL
+@@ -40,7 +40,7 @@ WriteMakefile
+     VERSION_FROM => File::Spec->catfile( $gnupg_base, 'Interface.pm' ),
+     
+     PREREQ_PM    => {
+-		     'Class::MethodMaker' => 1.00,
++		     'Class::MakeMethods' => 1.010,
+ 		    },
+     
+     PM           => { %pm_install_hash },
diff --git a/security/pgpenvelope/Makefile b/security/pgpenvelope/Makefile
index c8f3ead3095..c5323208f08 100644
--- a/security/pgpenvelope/Makefile
+++ b/security/pgpenvelope/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2005/01/10 18:27:37 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/03/04 20:57:50 tv Exp $
 #
 
 DISTNAME=		pgpenvelope-2.10.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		security mail
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=pgpenvelope/}
 
@@ -11,8 +11,8 @@ HOMEPAGE=		http://pgpenvelope.sourceforge.net/
 COMMENT=		GnuPG and Pine/Procmail integration tool
 
 DEPENDS+=		p5-AppConfig>=1.52:../../devel/p5-AppConfig
-DEPENDS+=		p5-Class-MethodMaker>=0.96:../../devel/p5-Class-MethodMaker
-DEPENDS+=		p5-GnuPG-Interface>=0.34nb1:../../security/p5-GnuPG-Interface
+DEPENDS+=		p5-Class-MakeMethods>=1.010:../../devel/p5-Class-MakeMethods
+DEPENDS+=		p5-GnuPG-Interface>=0.34nb2:../../security/p5-GnuPG-Interface
 DEPENDS+=		p5-String-Approx>=3.13:../../textproc/p5-String-Approx
 DEPENDS+=		p5-Term-ReadKey>=2.14:../../devel/p5-Term-ReadKey
 DEPENDS+=		p5-Term-ReadLine>=1.01:../../devel/p5-Term-ReadLine
@@ -20,5 +20,11 @@ DEPENDS+=		p5-Term-ReadLine>=1.01:../../devel/p5-Term-ReadLine
 USE_BUILDLINK3=		yes
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/pgpenvelope/.packlist
 
+pre-configure:
+	cd ${WRKSRC}/lib/PGPEnvelope && for f in *.pm; do \
+		${SED} -e 's/use Class::MethodMaker/use Class::MakeMethods::Emulator::MethodMaker/' $$f > $$f.new && \
+		${MV} -f $$f.new $$f; \
+	done
+
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/pgpenvelope/distinfo b/security/pgpenvelope/distinfo
index f02a408d2ee..12bf93c21c0 100644
--- a/security/pgpenvelope/distinfo
+++ b/security/pgpenvelope/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 13:10:11 agc Exp $
+$NetBSD: distinfo,v 1.3 2005/03/04 20:57:50 tv Exp $
 
 SHA1 (pgpenvelope-2.10.2.tar.gz) = 1266a9d2184e5f4ccc0c43a6f32008e4c4218536
 RMD160 (pgpenvelope-2.10.2.tar.gz) = 465c420969001d5de477d58706b9358a913b5f27
 Size (pgpenvelope-2.10.2.tar.gz) = 282070 bytes
 SHA1 (patch-aa) = 8a1a79f6276d24d6dbf8e5dacaeca227a139ae34
+SHA1 (patch-ab) = 26295a1de6d2ea2fbd2e58a70f2634924b5f64ac
diff --git a/security/pgpenvelope/patches/patch-ab b/security/pgpenvelope/patches/patch-ab
new file mode 100644
index 00000000000..f6b9d0680ad
--- /dev/null
+++ b/security/pgpenvelope/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2005/03/04 20:57:50 tv Exp $
+
+--- Makefile.PL.orig	2005-03-04 15:53:29.000000000 -0500
++++ Makefile.PL
+@@ -13,7 +13,7 @@ my $prereq_modules = { 'AppConfig'      
+ 		       'Term::ReadKey'       => 2.14,
+ 		       'Term::ReadLine::Gnu' => 1.01,
+ 		       'GnuPG::Interface'    => 0.30,
+-		       'Class::MethodMaker'  => 0.96,
++		       'Class::MakeMethods'  => 1.010,
+ 		       'String::Approx'      => 3.13,
+ 		      };
+