Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.  This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.

7 files changed, 31 insertions, 9 deletions

diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 9b60d4c2602..255edc69a49 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2002/07/19 14:33:08 fredb Exp $
+# $NetBSD: Makefile,v 1.43 2002/08/25 18:39:20 jlam Exp $
 
 # On update, don't forget to increase shared library major/minor's in
 # accordance with changes (patch-aa).
@@ -16,8 +16,8 @@ MAINTAINER=	fredb@netbsd.org
 HOMEPAGE=	http://www.libpng.org/pub/png/
 COMMENT=	Library for manipulating PNG images
 
-USE_BUILDLINK_ONLY=	yes
-USE_LIBTOOL=		yes
+USE_BUILDLINK2=	yes
+USE_LIBTOOL=	yes
 
 LIBPNG_SO_MAJOR=	3
 LIBPNG_SO_MINOR=	1
@@ -37,5 +37,5 @@ post-install:
 test: build
 	@cd ${WRKSRC} && ${MAKE} -f ${MAKEFILE} test
 
-.include "../../devel/zlib/buildlink.mk"
+.include "../../devel/zlib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/png/PLIST b/graphics/png/PLIST
index 1c149201a2c..2bf1c7c2f2c 100644
--- a/graphics/png/PLIST
+++ b/graphics/png/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/07/19 14:33:08 fredb Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 18:39:20 jlam Exp $
 include/png.h
 include/pngconf.h
 lib/libpng.a
diff --git a/graphics/png/buildlink.mk b/graphics/png/buildlink.mk
index 5dc634dfb1f..2d65697e7b7 100644
--- a/graphics/png/buildlink.mk
+++ b/graphics/png/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.11 2002/07/19 14:33:08 fredb Exp $
+# $NetBSD: buildlink.mk,v 1.12 2002/08/25 18:39:21 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libpng.
 #
diff --git a/graphics/png/buildlink2.mk b/graphics/png/buildlink2.mk
new file mode 100644
index 00000000000..06bebd52e86
--- /dev/null
+++ b/graphics/png/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:21 jlam Exp $
+
+.if !defined(PNG_BUILDLINK2_MK)
+PNG_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		png
+BUILDLINK_DEPENDS.png?=		png>=1.2.4
+BUILDLINK_PKGSRCDIR.png?=	../../graphics/png
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.png=png
+BUILDLINK_PREFIX.png_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.png=	include/png.h
+BUILDLINK_FILES.png+=	include/pngconf.h
+BUILDLINK_FILES.png+=	lib/libpng.*
+
+.include "../../devel/zlib/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	png-buildlink
+
+png-buildlink: _BUILDLINK_USE
+
+.endif	# PNG_BUILDLINK2_MK
diff --git a/graphics/png/distinfo b/graphics/png/distinfo
index 3c65c54d8bb..639a740655b 100644
--- a/graphics/png/distinfo
+++ b/graphics/png/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2002/07/19 14:33:08 fredb Exp $
+$NetBSD: distinfo,v 1.10 2002/08/25 18:39:22 jlam Exp $
 
 SHA1 (libpng-1.2.4.tar.bz2) = c9aec320e4fdb178d6d918ba30258a0480cbe074
 Size (libpng-1.2.4.tar.bz2) = 390161 bytes
diff --git a/graphics/png/patches/patch-aa b/graphics/png/patches/patch-aa
index bcabffdfe05..17e68e412a5 100644
--- a/graphics/png/patches/patch-aa
+++ b/graphics/png/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.19 2002/07/19 14:33:09 fredb Exp $
+$NetBSD: patch-aa,v 1.20 2002/08/25 18:39:22 jlam Exp $
 
 --- scripts/makefile.std.orig	Thu May 23 08:29:59 2002
 +++ scripts/makefile.std
diff --git a/graphics/png/patches/patch-ab b/graphics/png/patches/patch-ab
index 4338679c8db..8a938890726 100644
--- a/graphics/png/patches/patch-ab
+++ b/graphics/png/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2002/07/19 03:22:17 mycroft Exp $
+$NetBSD: patch-ab,v 1.4 2002/08/25 18:39:22 jlam Exp $
 
 --- pngtest.c.orig	Wed Dec 12 23:37:22 2001
 +++ pngtest.c	Fri Jul 19 03:18:50 2002