Use buildlink2. Use perl5/module.mk.

4 files changed, 22 insertions, 30 deletions

diff --git a/net/p5-Net-SNMP/Makefile b/net/p5-Net-SNMP/Makefile
index b35657fa1eb..254a16f2179 100644
--- a/net/p5-Net-SNMP/Makefile
+++ b/net/p5-Net-SNMP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/01/18 22:50:16 mjl Exp $
+# $NetBSD: Makefile,v 1.9 2002/10/27 20:48:58 seb Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/06/27 18:38:15 jfitz Exp
 #
 
@@ -17,11 +17,8 @@ DEPENDS+=	p5-Digest-MD5>=2.11:../../security/p5-Digest-MD5
 DEPENDS+=	p5-Digest-SHA1>=1.02:../../security/p5-Digest-SHA1
 DEPENDS+=	p5-Digest-HMAC>=1.00:../../security/p5-Digest-HMAC
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Net/SNMP/.packlist
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/p5-SNMP/Makefile b/net/p5-SNMP/Makefile
index 21267b53a62..6a73fc130e8 100644
--- a/net/p5-SNMP/Makefile
+++ b/net/p5-SNMP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/04/20 18:46:07 fredb Exp $
+# $NetBSD: Makefile,v 1.13 2002/10/27 20:48:58 seb Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/06/27 01:53:13 jfitz Exp
 #
 
@@ -12,9 +12,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=SNMP/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Perl5 module for interfacing to the UCD SNMP library
 
-DEPENDS=	ucd-snmp-4.2.4*:../../net/ucd-snmp
-
-USE_PERL5=	# defined
+USE_BUILDLINK2=	YES
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/SNMP/.packlist
 
 # Until the source catches up to the current Perl API, we need PERL_POLLUTE
@@ -24,9 +22,6 @@ PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/SNMP/.packlist
 PLFILES=	async1.pl async2.pl ipforward.pl mibtree.pl mibwalk.pl
 PLFILES+=	pingmib.pl tablewalk.pl testleak.pl
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL ${MAKE_PARAMS}
-
 post-build:
 	@for i in ${PLFILES} ; do ${ECHO} "#! ${PREFIX}/bin/perl" | ${CAT} - ${WRKSRC}/examples/$$i > ${WRKDIR}/$$i ; done
 
@@ -38,4 +33,6 @@ post-install:
 test:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} test
 
+.include "../../lang/perl5/module.mk"
+.include "../../net/ucd-snmp/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/p5-Wais/Makefile b/net/p5-Wais/Makefile
index 196c2543ee3..a0c2d6e9bd1 100644
--- a/net/p5-Wais/Makefile
+++ b/net/p5-Wais/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/10/18 15:20:33 veego Exp $
+# $NetBSD: Makefile,v 1.8 2002/10/27 20:48:58 seb Exp $
 #
 
 DISTNAME=	Wais-2.311
@@ -10,16 +10,14 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Wais/}
 MAINTAINER=	bad@netbsd.org
 COMMENT=	perl5 module for accessing WAIS servers
 
-DEPENDS+=	freewais-sf-2.2.12:../../net/freewais-sf
 DEPENDS+=	p5-Curses>=1.02:../../devel/p5-Curses
 
-USE_PERL5=	# defined
+USE_BUILDLINK2=	YES
 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
-
+.include "../../lang/perl5/module.mk"
+.include "../../net/freewais-sf/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/p5-ispman/Makefile b/net/p5-ispman/Makefile
index 2e7ec5a2e33..d079c930f4d 100644
--- a/net/p5-ispman/Makefile
+++ b/net/p5-ispman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/11/26 06:50:13 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/27 20:48:59 seb Exp $
 #
 
 DISTNAME=		ispman-0.5
@@ -19,33 +19,33 @@ DEPENDS+=		p5-IMAP-Admin>=1.2.5:../../mail/p5-IMAP-Admin
 DEPENDS+=		p5-Convert-ASN1>=0.07:../../textproc/p5-Convert-ASN1
 DEPENDS+=		p5-IO-stringy>=1.213:../../devel/p5-IO-stringy
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/ISPMan/.packlist
 PLIST_SRC=		${WRKDIR}/PLIST
+PERL5_CONFIGURE_DIRS=	${WRKSRC} ${WRKSRC}/../IO-stringy-1.212_patched
+BUILD_DIRS=		${PERL5_CONFIGURE_DIRS}
+INSTALL_DIRS=		${WRKSRC}
 
 MAKE_PARAMS+=		--noprompt
 
-do-configure:
+pre-configure:
 	${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
 	cd ${WRKSRC} &&							\
 	for i in `${FIND} * -type f -print` ; do			\
 		${CP} $$i $$i.old &&					\
 		${SED} < $$i.old > $$i -e 's:/etc:${PREFIX}/etc:g' &&	\
 		${RM} $$i.old ;						\
-	done &&								\
-	${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL ${MAKE_PARAMS}
-	cd ${WRKSRC}/../IO-stringy-1.212_patched &&			\
-	${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL ${MAKE_PARAMS}
+	done
 
 post-build:
-	cd ${WRKSRC}/../IO-stringy-1.212_patched &&			\
-	${SETENV} ${MAKE_ENV} ${MAKE} ${ALL_TARGET} && 			\
 	${ECHO} >> ${PLIST_SRC}						\
-	"`${GREP} ^INSTALLSITELIB Makefile | ${CUT} -d/ -f2-`/IO/ScalarPatched.pm"
+	"`${GREP} ^INSTALLSITELIB					\
+	   ${WRKSRC}/../IO-stringy-1.212_patched/Makefile		\
+	   | ${CUT} -d/ -f2-`/IO/ScalarPatched.pm"
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/../IO-stringy-1.212_patched/lib/IO/Scalar.pm \
 		${PREFIX}/`${TAIL} -n 1 ${PLIST_SRC}`
 
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"