7 files changed, 34 insertions, 25 deletions
diff --git a/graphics/p5-GD/Makefile b/graphics/p5-GD/Makefile
index 7db96b12757..ff8da0066db 100644
--- a/graphics/p5-GD/Makefile
+++ b/graphics/p5-GD/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/10/18 15:20:21 veego Exp $
+# $NetBSD: Makefile,v 1.10 2001/11/26 06:49:57 jlam Exp $
 #
 
 DISTNAME=	GD-1.32
@@ -11,12 +11,13 @@ MAINTAINER=	damon@brodiefamily.org
 HOMEPAGE=	http://theory.uwinnipeg.ca/CPAN/data/GD/GD.html
 COMMENT=	Perl5 interface to gd graphics library
 
-DEPENDS+=	gd>=1.8.3:../../graphics/gd
-
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/GD/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/GD/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../graphics/gd/buildlink.mk"
+.include "../../lang/perl5/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/p5-GD/distinfo b/graphics/p5-GD/distinfo
index ce071ac1eed..ab34278dca5 100644
--- a/graphics/p5-GD/distinfo
+++ b/graphics/p5-GD/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:54:21 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/11/26 06:49:57 jlam Exp $
 
 SHA1 (GD-1.32.tar.gz) = 4b23951edf4b907adfc8c57108d924e9b7c85fda
 Size (GD-1.32.tar.gz) = 249769 bytes
-SHA1 (patch-aa) = 7274b5a108879348cc737b9bc56baf598284a5e6
+SHA1 (patch-aa) = d302b053d0e5f11f04d1af66e74d56b739eedd0d
diff --git a/graphics/p5-GD/patches/patch-aa b/graphics/p5-GD/patches/patch-aa
index 4f752249f56..e9aad9c76a8 100644
--- a/graphics/p5-GD/patches/patch-aa
+++ b/graphics/p5-GD/patches/patch-aa
@@ -1,12 +1,16 @@
-$NetBSD: patch-aa,v 1.2 2000/07/14 08:53:14 rh Exp $
+$NetBSD: patch-aa,v 1.3 2001/11/26 06:49:57 jlam Exp $
 
---- Makefile.PL.orig	Mon Jul 10 22:07:22 2000
-+++ Makefile.PL	Mon Jul 10 22:12:09 2000
-@@ -5,14 +5,17 @@
+--- Makefile.PL.orig	Fri Aug  4 16:59:22 2000
++++ Makefile.PL
+@@ -3,16 +3,19 @@
+ warn "NOTICE: This module requires libgd 1.8.3 or higher (shared library version 4.X).\n";
+ 
  # =====> PATHS: CHECK AND ADJUST <=====
- my @INC     = qw(-I/usr/local/include -I/usr/local/include/gd); 
- my @LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/local/lib );
+-my @INC     = qw(-I/usr/local/include -I/usr/local/include/gd); 
+-my @LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/local/lib );
 -my @LIBS    = qw(-lgd -lpng -lz);
++my @INC     = qw(); 
++my @LIBPATH = qw();
 +my @LIBS    = qw(-lgd -lpng -lz -lintl);
  
  # FEATURE FLAGS
diff --git a/graphics/p5-GDGraph/Makefile b/graphics/p5-GDGraph/Makefile
index 9a471674ab6..5a292025c4d 100644
--- a/graphics/p5-GDGraph/Makefile
+++ b/graphics/p5-GDGraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:21 veego Exp $
+# $NetBSD: Makefile,v 1.6 2001/11/26 06:49:58 jlam Exp $
 #
 
 DISTNAME=	GDGraph-1.33
@@ -13,10 +13,11 @@ COMMENT=	GDGraph is a package to generate charts, using Lincoln Stein's GD.pm
 
 DEPENDS+=       p5-GDTextUtil>=0.75:../../graphics/p5-GDTextUtil
 
-USE_PERL5=      # defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/GD/Graph/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/GD/Graph/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/p5-GDGraph3d/Makefile b/graphics/p5-GDGraph3d/Makefile
index 29c5aca7dc8..a287e9f60a4 100644
--- a/graphics/p5-GDGraph3d/Makefile
+++ b/graphics/p5-GDGraph3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:21 veego Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:59 jlam Exp $
 
 DISTNAME=	GDGraph3d-0.55
 PKGNAME=	p5-${DISTNAME}
@@ -11,10 +11,11 @@ COMMENT=	GDGraph3d is a pkg to generate charts, using Lincoln Stein's GD.pm
 
 DEPENDS+=       p5-GDGraph>=1.30:../../graphics/p5-GDGraph
 
-USE_PERL5=      # defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/GD/Graph3d/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/GD/Graph3d/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/p5-GDTextUtil/Makefile b/graphics/p5-GDTextUtil/Makefile
index 82c59f030f2..6e57047e23d 100644
--- a/graphics/p5-GDTextUtil/Makefile
+++ b/graphics/p5-GDTextUtil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:21 veego Exp $
+# $NetBSD: Makefile,v 1.6 2001/11/26 06:49:59 jlam Exp $
 #
 
 DISTNAME=	GDTextUtil-0.80
@@ -13,10 +13,11 @@ COMMENT=	Perl 5 text utilities for use with the GD drawing package
 
 DEPENDS+=	p5-GD>=1.30:../../graphics/p5-GD
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/GD/Text/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/GD/Text/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/p5-Image-Size/Makefile b/graphics/p5-Image-Size/Makefile
index 18678d468f3..0e1fd25c5db 100644
--- a/graphics/p5-Image-Size/Makefile
+++ b/graphics/p5-Image-Size/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/10/29 01:16:44 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/11/26 06:49:59 jlam Exp $
 #
 
 DISTNAME=	Image-Size-2.94
@@ -11,10 +11,11 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://theory.uwinnipeg.ca/CPAN/data/Image-Size/
 COMMENT=	Read the dimensions of an image in several popular formats
 
-USE_PERL5=	# defined
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Image/Size/.packlist
+USE_BUILDLINK_ONLY=	YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Image/Size/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"