Buildlinkify, in the sense that only the perl headers are found in

${PREFIX} -- everything else is pickup up from ${BUILDLINK_DIR}.

46 files changed, 187 insertions, 127 deletions

diff --git a/devel/p5-AppConfig/Makefile b/devel/p5-AppConfig/Makefile
index 45686e28f64..b2f9f3e24c1 100644
--- a/devel/p5-AppConfig/Makefile
+++ b/devel/p5-AppConfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:11 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:44 jlam Exp $
 
 DISTNAME=	AppConfig-1.52
 PKGNAME=	p5-${DISTNAME}
@@ -10,10 +10,11 @@ MAINTAINER=	packages@NetBSD.org
 HOMEPAGE=	http://www.kfs.org/~abw/
 COMMENT=	perl5 module for parsing config files and command line arguments
 
-USE_PERL5=	#defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/AppConfig/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/AppConfig/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-AppConfig/distinfo b/devel/p5-AppConfig/distinfo
index 68f32f0fca0..7b1e72eb122 100644
--- a/devel/p5-AppConfig/distinfo
+++ b/devel/p5-AppConfig/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 00:44:33 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/11/26 06:49:44 jlam Exp $
 
 SHA1 (AppConfig-1.52.tar.gz) = 974e41ed348b43d98ae59ba6ccd88ab0a7061a94
 Size (AppConfig-1.52.tar.gz) = 45654 bytes
 SHA1 (patch-aa) = c08deb2b0dc4dbfb9ae921f4559fd0d6ac0ec7db
+SHA1 (patch-ab) = 0a512649238d3390db06dc0c55e04cfe8f2cdf29
diff --git a/devel/p5-AppConfig/patches/patch-ab b/devel/p5-AppConfig/patches/patch-ab
new file mode 100644
index 00000000000..bcff447e589
--- /dev/null
+++ b/devel/p5-AppConfig/patches/patch-ab
@@ -0,0 +1,21 @@
+$NetBSD: patch-ab,v 1.1 2001/11/26 06:49:44 jlam Exp $
+
+--- Makefile.PL.orig	Thu Oct 29 07:06:10 1998
++++ Makefile.PL
+@@ -5,16 +5,6 @@
+     'VERSION_FROM'   => 'AppConfig.pm', # finds $VERSION
+     'PMLIBDIRS'      => [ 'AppConfig' ],
+     'PREREQ_PM'      => { 'Getopt::Long' => 2.17 },
+-    'MAN3PODS'       => { 
+-	# We must explicitly name AppConfig.pm et al as manifyable files.
+-	# MakeMaker ignores files that match  /(config|setup).*\.pm/i;
+-	'AppConfig.pm'        => '$(INST_MAN3DIR)/AppConfig.$(MAN3EXT)',
+-	'AppConfig/Args.pm'   => '$(INST_MAN3DIR)/AppConfig::Args.$(MAN3EXT)',
+-	'AppConfig/File.pm'   => '$(INST_MAN3DIR)/AppConfig::File.$(MAN3EXT)',
+-	'AppConfig/Getopt.pm' => '$(INST_MAN3DIR)/AppConfig::Getopt.$(MAN3EXT)',
+-	'AppConfig/State.pm'  => '$(INST_MAN3DIR)/AppConfig::State.$(MAN3EXT)',
+-	'AppConfig/Sys.pm'    => '$(INST_MAN3DIR)/AppConfig::Sys.$(MAN3EXT)',
+-    },
+     'dist'           => { 
+ 	'COMPRESS'   => 'gzip', 
+ 	'SUFFIX'     => 'gz',
diff --git a/devel/p5-AtExit/Makefile b/devel/p5-AtExit/Makefile
index a169488dbbe..5e92afc4b75 100644
--- a/devel/p5-AtExit/Makefile
+++ b/devel/p5-AtExit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:12 veego Exp $
+# $NetBSD: Makefile,v 1.6 2001/11/26 06:49:45 jlam Exp $
 #
 
 DISTNAME=	AtExit-2.01
@@ -10,10 +10,11 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=AtExit/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Provides an ANSI C style atexit() function to Perl programs
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_ARCHLIB}/auto/AtExit/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_ARCHLIB}/auto/AtExit/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-BSD-Resource/Makefile b/devel/p5-BSD-Resource/Makefile
index 8f96c26809c..662a2111adb 100644
--- a/devel/p5-BSD-Resource/Makefile
+++ b/devel/p5-BSD-Resource/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:12 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:45 jlam Exp $
 
 DISTNAME=		BSD-Resource-1.10
 PKGNAME=		p5-${DISTNAME}
@@ -10,10 +10,11 @@ MAINTAINER=		packages@NetBSD.org
 HOMEPAGE=		http://iki.fi/jhi/
 COMMENT=		BSD::Resource - Perl interface to BSD process resources library
 
-USE_PERL5=		# defined
+USE_BUILDLINK_ONLY=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/BSD/Resource/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Bit-Vector/Makefile b/devel/p5-Bit-Vector/Makefile
index 687038aa6be..96c7022b857 100644
--- a/devel/p5-Bit-Vector/Makefile
+++ b/devel/p5-Bit-Vector/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/10/29 01:07:03 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/11/26 06:49:45 jlam Exp $
 #
 
 DISTNAME=	Bit-Vector-6.1
@@ -11,10 +11,11 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://theory.uwinnipeg.ca/CPAN/data/Bit-Vector/Vector.html
 COMMENT=	Efficient base class implementing bit vectors
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Bit/Vector/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Bit/Vector/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Class-Loader/Makefile b/devel/p5-Class-Loader/Makefile
index 56caea969e3..e19860589f5 100644
--- a/devel/p5-Class-Loader/Makefile
+++ b/devel/p5-Class-Loader/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:13 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:45 jlam Exp $
 #
 
 DISTNAME=		Class-Loader-2.02
@@ -12,10 +12,11 @@ MAINTAINER=		mcr@netbsd.org
 #HOMEPAGE=	
 COMMENT=		perl5 module for module loading and on-demand object creation
 
-USE_PERL5=		# defined
+USE_BUILDLINK_ONLY=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Class/Loader/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Compress-Zlib/Makefile b/devel/p5-Compress-Zlib/Makefile
index 40eeab4fd68..8b8e31f0f4d 100644
--- a/devel/p5-Compress-Zlib/Makefile
+++ b/devel/p5-Compress-Zlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:13 veego Exp $
+# $NetBSD: Makefile,v 1.4 2001/11/26 06:49:46 jlam Exp $
 
 DISTNAME=		Compress-Zlib-1.14
 PKGNAME=		p5-${DISTNAME}
@@ -9,11 +9,12 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Compress/}
 MAINTAINER=		damon@brodiefamily.org
 COMMENT=		perl5 module interface to the zlib compression library
 
-USE_PERL5=		YES
+USE_BUILDLINK_ONLY=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Compress/Zlib/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 .include "../../devel/zlib/buildlink.mk"
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Config-IniFiles/Makefile b/devel/p5-Config-IniFiles/Makefile
index f2705cac87b..cf57594693a 100644
--- a/devel/p5-Config-IniFiles/Makefile
+++ b/devel/p5-Config-IniFiles/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:13 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:46 jlam Exp $
 #
 
 DISTNAME=	Config-IniFiles-2.19
@@ -11,10 +11,11 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://sourceforge.net/projects/config-inifiles/
 COMMENT=	Perl module for reading .ini-style configuration files
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Config/IniFiles/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Config/IniFiles/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Curses/Makefile b/devel/p5-Curses/Makefile
index cf13d475fe9..691241c2549 100644
--- a/devel/p5-Curses/Makefile
+++ b/devel/p5-Curses/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/10/18 15:20:13 veego Exp $
+# $NetBSD: Makefile,v 1.11 2001/11/26 06:49:46 jlam Exp $
 # FreeBSD Id: Makefile,v 1.8 1998/04/04 13:58:26 vanilla Exp
 #
 
@@ -12,10 +12,10 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://theory.uwinnipeg.ca/CPAN/data/Curses/Curses.html
 COMMENT=	perl5 module for terminal screen handling and optimization
 
-DEPENDS=	ncurses>=4.2:../../devel/ncurses
+USE_NCURSES=	# needs libpanel.so
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Curses/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Curses/.packlist
 
 MAKE_PARAMS=	PANELS
 
@@ -23,4 +23,6 @@ do-configure:
 	@${LN} -sf ${WRKSRC}/hints/c-netbsd.ncurses.h ${WRKSRC}/c-config.h
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL ${MAKE_PARAMS}
 
+.include "../../devel/ncurses/buildlink.mk"
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Curses/distinfo b/devel/p5-Curses/distinfo
index 2b2af50d19e..aa652e45e22 100644
--- a/devel/p5-Curses/distinfo
+++ b/devel/p5-Curses/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 00:44:34 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/11/26 06:49:47 jlam Exp $
 
 SHA1 (Curses-1.05.tar.gz) = b84873e5196d7495999482df38254ee89e2e5ac4
 Size (Curses-1.05.tar.gz) = 60897 bytes
-SHA1 (patch-aa) = 351002e494b6ce5001154158b036e3f8e08108de
+SHA1 (patch-aa) = 9a21c27839667ead39d3b6e0eea3e00c785dcbe4
 SHA1 (patch-ab) = 578e6b65a930fd561254d8b6f3da7014debd271c
diff --git a/devel/p5-Curses/patches/patch-aa b/devel/p5-Curses/patches/patch-aa
index cef92eb6460..c0d227ad439 100644
--- a/devel/p5-Curses/patches/patch-aa
+++ b/devel/p5-Curses/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2000/08/28 18:20:43 jlam Exp $
+$NetBSD: patch-aa,v 1.6 2001/11/26 06:49:47 jlam Exp $
 
 --- Makefile.PL.orig	Sun Jul 16 15:13:25 2000
 +++ Makefile.PL
@@ -9,7 +9,7 @@ $NetBSD: patch-aa,v 1.5 2000/08/28 18:20:43 jlam Exp $
 -  'netbsd'    => [ ''                       => '-lcurses -ltermcap'        ],
 +  'netbsd'   => {
 +    'bsd'     => [ ''                       => '-lcurses -ltermcap'        ],
-+    'ncurses' => [ "-I$ENV{'LOCALBASE'}/include" => "$ENV{'LDFLAGS'} -lncurses" ],
++    'ncurses' => [ ''                       => '-lncurses'                 ],
 +    'default' =>   'ncurses'
 +  },
    'next'      => [ ''                       => '-lcurses -ltermcap'        ],
diff --git a/devel/p5-Data-Buffer/Makefile b/devel/p5-Data-Buffer/Makefile
index 0746e67d97b..2ef9af6a707 100644
--- a/devel/p5-Data-Buffer/Makefile
+++ b/devel/p5-Data-Buffer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:13 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:47 jlam Exp $
 #
 
 DISTNAME=		Data-Buffer-0.04
@@ -12,10 +12,11 @@ MAINTAINER=		mcr@netbsd.org
 #HOMEPAGE=	
 COMMENT=		perl5 module for low-level binary buffer
 
-USE_PERL5=		# defined
+USE_BUILDLINK_ONLY=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Data/Buffer/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Data-ShowTable/Makefile b/devel/p5-Data-ShowTable/Makefile
index d1f4416a9cb..933a2b7e895 100644
--- a/devel/p5-Data-ShowTable/Makefile
+++ b/devel/p5-Data-ShowTable/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:14 veego Exp $
+# $NetBSD: Makefile,v 1.5 2001/11/26 06:49:48 jlam Exp $
 #
 
 DISTNAME=		Data-ShowTable-3.3
@@ -10,10 +10,11 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Data/}
 MAINTAINER=		bad@netbsd.org
 COMMENT=		Perl module to print arrays of data in nicely formatted listings
 
-USE_PERL5=		# defined
+USE_BUILDLINK_ONLY=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Data/ShowTable/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Date-Calc/Makefile b/devel/p5-Date-Calc/Makefile
index ebbc34ccabb..16bb202bb77 100644
--- a/devel/p5-Date-Calc/Makefile
+++ b/devel/p5-Date-Calc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:14 veego Exp $
+# $NetBSD: Makefile,v 1.6 2001/11/26 06:49:48 jlam Exp $
 #
 
 DISTNAME=     	Date-Calc-4.3
@@ -11,10 +11,11 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.engelschall.com/u/sb/download/
 COMMENT=	perl5 module for Gregorian calendar date calculations
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Date/Calc/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Date/Calc/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Date-Manip/Makefile b/devel/p5-Date-Manip/Makefile
index 6c44a0e00e6..63327850fb4 100644
--- a/devel/p5-Date-Manip/Makefile
+++ b/devel/p5-Date-Manip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/10/18 15:20:14 veego Exp $
+# $NetBSD: Makefile,v 1.7 2001/11/26 06:49:48 jlam Exp $
 #
 
 DISTNAME=     	DateManip-5.39
@@ -11,10 +11,11 @@ MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://www.cpan.org/
 COMMENT=	perl5 module for date calculations
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Date/Manip/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Date/Manip/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Devel-SmallProf/Makefile b/devel/p5-Devel-SmallProf/Makefile
index e5501476812..b9fce27ff7b 100644
--- a/devel/p5-Devel-SmallProf/Makefile
+++ b/devel/p5-Devel-SmallProf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/10/18 15:20:14 veego Exp $
+# $NetBSD: Makefile,v 1.7 2001/11/26 06:49:48 jlam Exp $
 #
 
 DISTNAME=		Devel-SmallProf-0.9
@@ -12,10 +12,11 @@ COMMENT=		perl5 module for line-by-line profiling perl programs
 
 DEPENDS=		p5-Time-HiRes>=01.20:../../devel/p5-Time-HiRes
 
-USE_PERL5=		# defined
+USE_BUILDLINK_ONLY=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Devel/SmallProf/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Devel-Symdump/Makefile b/devel/p5-Devel-Symdump/Makefile
index 3157b96f1c7..c12346bcb30 100644
--- a/devel/p5-Devel-Symdump/Makefile
+++ b/devel/p5-Devel-Symdump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:14 veego Exp $
+# $NetBSD: Makefile,v 1.6 2001/11/26 06:49:49 jlam Exp $
 #
 
 DISTNAME=	Devel-Symdump-2.01
@@ -10,10 +10,11 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Devel/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	perl5 module for inspecting perl's symtable/class hiers
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Devel/Symdump/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Devel/Symdump/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Event/Makefile b/devel/p5-Event/Makefile
index eaa54567d53..833b286acb1 100644
--- a/devel/p5-Event/Makefile
+++ b/devel/p5-Event/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:15 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:49 jlam Exp $
 
 DISTNAME=	Event-0.81
 PKGNAME=	p5-${DISTNAME}
@@ -9,10 +9,11 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/J/JP/JPRIT/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Event library for Perl
 
-USE_PERL5=	#defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Event/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Event/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Expect/Makefile b/devel/p5-Expect/Makefile
index d8769fa4a38..77c6a2906a7 100644
--- a/devel/p5-Expect/Makefile
+++ b/devel/p5-Expect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/10/18 15:20:15 veego Exp $
+# $NetBSD: Makefile,v 1.10 2001/11/26 06:49:49 jlam Exp $
 
 DISTNAME=	Expect-1.11
 PKGNAME=	p5-expect-1.11
@@ -12,10 +12,11 @@ COMMENT=	perl version of the TCL "expect" tool
 DEPENDS+=	p5-IO-stty-[0-9]*:../../devel/p5-IO-Stty
 DEPENDS+=	p5-IO-tty-[0-9]*:../../devel/p5-IO-Tty
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Expect/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Expect/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-ExtUtils-F77/Makefile b/devel/p5-ExtUtils-F77/Makefile
index 7ca202be51b..ce8f3085430 100644
--- a/devel/p5-ExtUtils-F77/Makefile
+++ b/devel/p5-ExtUtils-F77/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:15 veego Exp $
+# $NetBSD: Makefile,v 1.5 2001/11/26 06:49:49 jlam Exp $
 
 DISTNAME=	ExtUtils-F77-1.13
 PKGNAME=	p5-${DISTNAME}
@@ -9,11 +9,11 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=ExtUtils/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Perl module for determining how to link Fortran and C
 
-USE_PERL5=	#defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/ExtUtils/F77/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/ExtUtils/F77/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/p5-File-FlockDir/Makefile b/devel/p5-File-FlockDir/Makefile
index 3c1bd8a946b..227fc312469 100644
--- a/devel/p5-File-FlockDir/Makefile
+++ b/devel/p5-File-FlockDir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:15 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:50 jlam Exp $
 #
 
 DISTNAME=	File-FlockDir-1.02
@@ -10,10 +10,11 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=File/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	FlockDir - override perl flock() for network or portability purposes
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/File/FlockDir/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/File/FlockDir/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-File-PathConvert/Makefile b/devel/p5-File-PathConvert/Makefile
index 7017d5e75fc..bc80f244271 100644
--- a/devel/p5-File-PathConvert/Makefile
+++ b/devel/p5-File-PathConvert/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:15 veego Exp $
+# $NetBSD: Makefile,v 1.5 2001/11/26 06:49:50 jlam Exp $
 #
 
 DISTNAME=	File-PathConvert-0.85
@@ -11,10 +11,11 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://theory.uwinnipeg.ca/CPAN/data/File-PathConvert/
 COMMENT=	Convert paths and URLs from absolute to relative and vice versa
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/File/PathConvert/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/File/PathConvert/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-File-Temp/Makefile b/devel/p5-File-Temp/Makefile
index e32b785520f..65c1b2d5834 100644
--- a/devel/p5-File-Temp/Makefile
+++ b/devel/p5-File-Temp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:16 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:50 jlam Exp $
 #
 
 DISTNAME=	File-Temp-0.12
@@ -10,10 +10,11 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=File/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	provides functions for generating temporary files
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/File/Temp/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/File/Temp/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-FileKGlob/Makefile b/devel/p5-FileKGlob/Makefile
index 169e2ef1577..f43e1c9c5c2 100644
--- a/devel/p5-FileKGlob/Makefile
+++ b/devel/p5-FileKGlob/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:16 veego Exp $
+# $NetBSD: Makefile,v 1.5 2001/11/26 06:49:50 jlam Exp $
 #
 
 DISTNAME=	FileKGlob
@@ -11,8 +11,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=File/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Expand a Unix file glob into a list of matching file names
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/File/KGlob/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/File/KGlob/.packlist
 
 DIST_SUBDIR=	${PKGNAME}
 
@@ -22,4 +22,5 @@ pre-configure:
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-FreezeThaw/Makefile b/devel/p5-FreezeThaw/Makefile
index 205fafc4460..24f8a8cfb9e 100644
--- a/devel/p5-FreezeThaw/Makefile
+++ b/devel/p5-FreezeThaw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:16 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:51 jlam Exp $
 #
 
 DISTNAME=	FreezeThaw-0.41
@@ -10,10 +10,11 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=FreezeThaw/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	converting Perl structures to strings and back
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/FreezeThaw/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/FreezeThaw/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-IO-Stty/Makefile b/devel/p5-IO-Stty/Makefile
index 477b6691220..74953540527 100644
--- a/devel/p5-IO-Stty/Makefile
+++ b/devel/p5-IO-Stty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:16 veego Exp $
+# $NetBSD: Makefile,v 1.6 2001/11/26 06:49:51 jlam Exp $
 
 DISTNAME=	IO-Stty-.02
 PKGNAME=	p5-IO-stty-0.02
@@ -9,10 +9,11 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=IO/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Perl class for I/O on tty devices
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/IO/Stty/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/IO/Stty/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-IO-Tty/Makefile b/devel/p5-IO-Tty/Makefile
index 71111fec85b..9d41f55ef7d 100644
--- a/devel/p5-IO-Tty/Makefile
+++ b/devel/p5-IO-Tty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/10/18 15:20:16 veego Exp $
+# $NetBSD: Makefile,v 1.7 2001/11/26 06:49:51 jlam Exp $
 #
 
 DISTNAME=	IO-Tty-0.04
@@ -10,10 +10,11 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=IO/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Another Perl class for I/O on tty and pseudo-tty devices
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/IO/Tty/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/IO/Tty/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-IO-stringy/Makefile b/devel/p5-IO-stringy/Makefile
index f82d613f2d0..84dc5ad5c14 100644
--- a/devel/p5-IO-stringy/Makefile
+++ b/devel/p5-IO-stringy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/11/22 08:59:06 martti Exp $
+# $NetBSD: Makefile,v 1.11 2001/11/26 06:49:52 jlam Exp $
 #
 
 DISTNAME=	IO-stringy-2.108
@@ -11,10 +11,11 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.zeegee.com/code/perl/IO-stringy/
 COMMENT=	Perl class for I/O on in-core objects like strings and arrays
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/IO-stringy/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/IO-stringy/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Log-Dispatch/Makefile b/devel/p5-Log-Dispatch/Makefile
index 524aeef3009..a1d55ff2904 100644
--- a/devel/p5-Log-Dispatch/Makefile
+++ b/devel/p5-Log-Dispatch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:17 veego Exp $
+# $NetBSD: Makefile,v 1.4 2001/11/26 06:49:52 jlam Exp $
 
 DISTNAME=	Log-Dispatch-1.79
 PKGNAME=	p5-${DISTNAME}
@@ -9,10 +9,11 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Log/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	perl module for logging messages to multiple outputs
 
-USE_PERL5=      # defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Log/Dispatch/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Log/Dispatch/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Make/Makefile b/devel/p5-Make/Makefile
index b0c99ac8757..ac510ad05ec 100644
--- a/devel/p5-Make/Makefile
+++ b/devel/p5-Make/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:17 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:52 jlam Exp $
 
 DISTNAME=	Make-1.00
 PKGNAME=	p5-Make-1.00
@@ -10,10 +10,11 @@ MAINTAINER=	packages@netbd.org
 HOMEPAGE=	http://www.ni-s.u-net.com/
 COMMENT=	Perl5 module implementing 'make' in Perl
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Make/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Make/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Memoize/Makefile b/devel/p5-Memoize/Makefile
index dd4ae992a8b..5bcee3551b4 100644
--- a/devel/p5-Memoize/Makefile
+++ b/devel/p5-Memoize/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:17 veego Exp $
+# $NetBSD: Makefile,v 1.4 2001/11/26 06:49:52 jlam Exp $
 #
 
 DISTNAME=	Memoize-0.65
@@ -11,10 +11,11 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://perl.plover.com/
 COMMENT=	Transparently speed up functions by caching return values
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Memoize/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Memoize/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Params-Validate/Makefile b/devel/p5-Params-Validate/Makefile
index c8c2e907910..bccfbdfe9a6 100644
--- a/devel/p5-Params-Validate/Makefile
+++ b/devel/p5-Params-Validate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:18 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:53 jlam Exp $
 
 DISTNAME=	Params-Validate-0.04
 PKGNAME=	p5-${DISTNAME}
@@ -9,11 +9,11 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/D/DR/DROLSKY/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Validate method/function parameters
 
-USE_PERL5=	#defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Params/Validate/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Params/Validate/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/p5-Parse-Yapp/Makefile b/devel/p5-Parse-Yapp/Makefile
index 0b2634a3da0..45bcd10fc3d 100644
--- a/devel/p5-Parse-Yapp/Makefile
+++ b/devel/p5-Parse-Yapp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:18 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:53 jlam Exp $
 #
 
 DISTNAME=      	Parse-Yapp-1.04
@@ -10,10 +10,11 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Parse/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	perl5 LALR parser
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Parse/Yapp/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Parse/Yapp/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Safe-Hole/Makefile b/devel/p5-Safe-Hole/Makefile
index a337cce4f15..69396e87aaa 100644
--- a/devel/p5-Safe-Hole/Makefile
+++ b/devel/p5-Safe-Hole/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:18 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:53 jlam Exp $
 #
 
 DISTNAME=	Safe-Hole-0.08
@@ -11,10 +11,11 @@ MAINTAINER=	eric@cirr.com
 HOMEPAGE=	http://theoryx5.uwinnipeg.ca/CPAN/data/Safe-Hole/Hole.html
 COMMENT=	Exec subs in the original package from within a Safe object
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Safe/Hole/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Safe/Hole/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-SortVersions/Makefile b/devel/p5-SortVersions/Makefile
index 1b64c4d816e..1119debac82 100644
--- a/devel/p5-SortVersions/Makefile
+++ b/devel/p5-SortVersions/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:18 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:54 jlam Exp $
 #
 
 DISTNAME=		SortVersions-1.1
@@ -11,10 +11,11 @@ MAINTAINER=		mcr@netbsd.org
 #HOMEPAGE=	
 COMMENT=		perl5 module for sorting of revision-like numbers
 
-USE_PERL5=		# defined
+USE_BUILDLINK_ONLY=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Sort/Versions/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Storable/Makefile b/devel/p5-Storable/Makefile
index d9762873248..45eb020daf2 100644
--- a/devel/p5-Storable/Makefile
+++ b/devel/p5-Storable/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:19 veego Exp $
+# $NetBSD: Makefile,v 1.6 2001/11/26 06:49:54 jlam Exp $
 
 DISTNAME=	Storable-1.0.13
 PKGNAME=	p5-${DISTNAME}
@@ -9,11 +9,11 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Storable/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Perl extension module for persistent data storage
 
-USE_PERL5=	#defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Storable/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Storable/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/p5-Term-ReadKey/Makefile b/devel/p5-Term-ReadKey/Makefile
index 53876942e6d..9d0ddfd8c4e 100644
--- a/devel/p5-Term-ReadKey/Makefile
+++ b/devel/p5-Term-ReadKey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:19 veego Exp $
+# $NetBSD: Makefile,v 1.4 2001/11/26 06:49:54 jlam Exp $
 #
 
 DISTNAME=	TermReadKey-2.14
@@ -11,10 +11,11 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://theory.uwinnipeg.ca/CPAN/data/TermReadKey/
 COMMENT=	Change terminal modes and perform non-blocking reads
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Term/ReadKey/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Term/ReadKey/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Test-Cmd/Makefile b/devel/p5-Test-Cmd/Makefile
index e0cd555058e..0e271e3d8e5 100644
--- a/devel/p5-Test-Cmd/Makefile
+++ b/devel/p5-Test-Cmd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:19 veego Exp $
+# $NetBSD: Makefile,v 1.5 2001/11/26 06:49:54 jlam Exp $
 
 DISTNAME=	Test-Cmd-1.04
 PKGNAME=        p5-${DISTNAME}
@@ -10,11 +10,11 @@ MAINTAINER=	wulf@netbsd.org
 HOMEPAGE=	http://www.baldmt.com/Test-Cmd/
 COMMENT=	perl5 module for testing of external commands and scripts
 
-USE_PERL5=	yes
-
-PERL5_PACKLIST+=${PERL5_SITEARCH}/auto/Test/Cmd/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Test/Cmd/.packlist
 
 do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Test-Harness/Makefile b/devel/p5-Test-Harness/Makefile
index 21a73875321..7e462b1a86b 100644
--- a/devel/p5-Test-Harness/Makefile
+++ b/devel/p5-Test-Harness/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/22 09:33:09 martti Exp $
+# $NetBSD: Makefile,v 1.4 2001/11/26 06:49:55 jlam Exp $
 
 DISTNAME=		Test-Harness-1.26
 PKGNAME=		p5-${DISTNAME}
@@ -9,7 +9,7 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Test/}
 MAINTAINER=		shell@shellhung.org
 COMMENT=		perl5 module for testing
 
-USE_PERL5=		# defined
+USE_BUILDLINK_ONLY=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Test/Harness/.packlist
 
 post-patch:
@@ -18,4 +18,5 @@ post-patch:
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Test-Simple/Makefile b/devel/p5-Test-Simple/Makefile
index 6df09ee3c62..6f4420de327 100644
--- a/devel/p5-Test-Simple/Makefile
+++ b/devel/p5-Test-Simple/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/11/22 09:37:56 martti Exp $
+# $NetBSD: Makefile,v 1.5 2001/11/26 06:49:55 jlam Exp $
 
 DISTNAME=		Test-Simple-0.33
 PKGNAME=		p5-${DISTNAME}
@@ -11,10 +11,11 @@ COMMENT=		perl5 module with a simple framework for writing tests
 
 DEPENDS+=		p5-Test-Harness-[0-9]*:../../devel/p5-Test-Harness
 
-USE_PERL5=		# defined
+USE_BUILDLINK_ONLY=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Test/Simple/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Tie-IxHash/Makefile b/devel/p5-Tie-IxHash/Makefile
index 402b34668f4..b51ece88c90 100644
--- a/devel/p5-Tie-IxHash/Makefile
+++ b/devel/p5-Tie-IxHash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:20 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:55 jlam Exp $
 #
 
 DISTNAME=      	Tie-IxHash-1.21
@@ -10,10 +10,11 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Tie/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Perl module that implements ordered in-memory associative arrays
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Tie/IxHash/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Tie/IxHash/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Time-HiRes/Makefile b/devel/p5-Time-HiRes/Makefile
index c68e4bc2a2b..7e2db356078 100644
--- a/devel/p5-Time-HiRes/Makefile
+++ b/devel/p5-Time-HiRes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/10/18 15:20:20 veego Exp $
+# $NetBSD: Makefile,v 1.7 2001/11/26 06:49:55 jlam Exp $
 #
 
 DISTNAME=		Time-HiRes-01.20
@@ -10,7 +10,7 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Time/}
 MAINTAINER=		bad@netbsd.org
 COMMENT=		perl5 module for high resolution time, sleep, and alarm
 
-USE_PERL5=		# defined
+USE_BUILDLINK_ONLY=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Time/HiRes/.packlist
 
 WRKSRC=			${WRKDIR}/Time-HiRes-01.20
@@ -18,4 +18,5 @@ WRKSRC=			${WRKDIR}/Time-HiRes-01.20
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-TimeDate/Makefile b/devel/p5-TimeDate/Makefile
index 7514390cccd..e9665d4770f 100644
--- a/devel/p5-TimeDate/Makefile
+++ b/devel/p5-TimeDate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/10/18 15:20:20 veego Exp $
+# $NetBSD: Makefile,v 1.9 2001/11/26 06:49:56 jlam Exp $
 #
 
 DISTNAME=      	TimeDate-1.10
@@ -10,10 +10,11 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Date/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	perl5 TimeDate distribution
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/TimeDate/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/TimeDate/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-WeakRef/Makefile b/devel/p5-WeakRef/Makefile
index 384bb7b2a88..b6b8657dc6c 100644
--- a/devel/p5-WeakRef/Makefile
+++ b/devel/p5-WeakRef/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:20 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:56 jlam Exp $
 
 DISTNAME=	WeakRef-0.01
 PKGNAME=	p5-${DISTNAME}
@@ -9,10 +9,11 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/LUKKA/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Provide weak references in Perl
 
-USE_PERL5=	#defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/WeakRef/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/WeakRef/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-perl-headers/Makefile b/devel/p5-perl-headers/Makefile
index ab359caf818..ca459bdec3d 100644
--- a/devel/p5-perl-headers/Makefile
+++ b/devel/p5-perl-headers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/10/18 15:20:20 veego Exp $
+# $NetBSD: Makefile,v 1.10 2001/11/26 06:49:56 jlam Exp $
 
 DISTNAME=		p5-perl-headers
 PKGNAME=		${DISTNAME}-${OS_VERSION}
@@ -11,14 +11,13 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://language.perl.com/index.html
 COMMENT=		Perl header files
 
-USE_PERL5=		# defined
+USE_BUILDLINK_ONLY=	YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/.packlist.h2ph
 
 EXTRACT_ONLY=		# empty
 WRKSRC=			${WRKDIR}
 NO_CHECKSUM=		# defined
 NO_PATCH=		# defined
-NO_CONFIGURE=		# defined
 
 # Since this package will be named, for instance, p5-perl-headers-1.5.1,
 # binary packages on a FTP server (where only "1.5" is used as the directory
@@ -46,4 +45,5 @@ do-install:
 	${CAT} ${PERL5_PACKLIST} | ${XARGS} ${CHMOD} a-w
 	${CAT} ${PERL5_PACKLIST} | ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP}
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"