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.

6 files changed, 51 insertions, 17 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 845d326cf41..9fa4051ca86 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2002/07/30 22:30:05 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2002/08/25 18:39:18 jlam Exp $
 
 DISTNAME=	netpbm-9.25
 CATEGORIES=	graphics
@@ -9,14 +9,14 @@ MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://netpbm.sourceforge.net/
 COMMENT=	toolkit for conversion of images between different formats
 
-USE_BUILDLINK_ONLY=	yes
-USE_GMAKE=		yes
-USE_PERL5=		yes
+USE_BUILDLINK2=	yes
+USE_GMAKE=	yes
+USE_PERL5=	yes
 
-REPLACE_PERL=		pnm/pnmquant ppm/ppmfade ppm/ppmrainbow ppm/ppmshadow
+REPLACE_PERL=	pnm/pnmquant ppm/ppmfade ppm/ppmrainbow ppm/ppmshadow
 
 INSTALL_TARGET=	install-dev install
-MAKE_ENV+=	CC="${CC}" INSTALL="${INSTALL}" STRIPFLAG="${_STRIPFLAG_INSTALL}"
+MAKE_ENV+=	INSTALL="${INSTALL}" STRIPFLAG="${_STRIPFLAG_INSTALL}"
 MAKEFILE=	GNUmakefile
 
 .include "../../mk/bsd.prefs.mk"
@@ -38,6 +38,7 @@ post-patch:
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/shhopt/shhopt.h ${PREFIX}/include
 
-.include "../../graphics/png/buildlink.mk"
-.include "../../graphics/tiff/buildlink.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/tiff/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/netpbm/buildlink2.mk b/graphics/netpbm/buildlink2.mk
new file mode 100644
index 00000000000..9cc47d8f8de
--- /dev/null
+++ b/graphics/netpbm/buildlink2.mk
@@ -0,0 +1,33 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:18 jlam Exp $
+
+.if !defined(NETPBM_BUILDLINK2_MK)
+NETPBM_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		netpbm
+BUILDLINK_DEPENDS.netpbm?=	netpbm>=9.24
+BUILDLINK_PKGSRCDIR.netpbm?=	../../graphics/netpbm
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.netpbm=netpbm
+BUILDLINK_PREFIX.netpbm_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.netpbm=		include/bitio.h
+BUILDLINK_FILES.netpbm+=	include/pam.h
+BUILDLINK_FILES.netpbm+=	include/pammap.h
+BUILDLINK_FILES.netpbm+=	include/pbm.h
+BUILDLINK_FILES.netpbm+=	include/pgm.h
+BUILDLINK_FILES.netpbm+=	include/pm.h
+BUILDLINK_FILES.netpbm+=	include/pm_config.h
+BUILDLINK_FILES.netpbm+=	include/pnm.h
+BUILDLINK_FILES.netpbm+=	include/ppm.h
+BUILDLINK_FILES.netpbm+=	include/ppmcmap.h
+BUILDLINK_FILES.netpbm+=	include/ppmfloyd.h
+BUILDLINK_FILES.netpbm+=	include/shhopt.h
+BUILDLINK_FILES.netpbm+=	lib/libpbm.*
+BUILDLINK_FILES.netpbm+=	lib/libpgm.*
+BUILDLINK_FILES.netpbm+=	lib/libpnm.*
+BUILDLINK_FILES.netpbm+=	lib/libppm.*
+
+BUILDLINK_TARGETSS=	netpbm-buildlink
+
+netpbm-buildlink: _BUILDLINK_USE
+
+.endif	# NETPBM_BUILDLINK2_MK
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index 69017aecb3b..354184a5525 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2002/07/02 01:47:52 kristerw Exp $
+$NetBSD: distinfo,v 1.11 2002/08/25 18:39:19 jlam Exp $
 
 SHA1 (netpbm-9.25.tgz) = 9c7f6a98348a5f3d6e908b514f33498b2a9c359a
 Size (netpbm-9.25.tgz) = 2052922 bytes
-SHA1 (patch-aa) = 1e3eb961f34dedb81ac1be823e25f0ae052905b6
+SHA1 (patch-aa) = 0d505e205eb200653735a6bbc13cabac88c87df2
 SHA1 (patch-ab) = b6932fd52dff9a6acd01e42136ff7a70561c7434
 SHA1 (patch-ac) = 42a6dbfe24447132c6dd654512607c0c9c4a5699
 SHA1 (patch-ad) = 354059e1fe894b3776afe3d565fdaefb90941690
diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa
index b0dbb607dfb..b32096a4b50 100644
--- a/graphics/netpbm/patches/patch-aa
+++ b/graphics/netpbm/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.19 2002/05/14 18:03:18 tron Exp $
+$NetBSD: patch-aa,v 1.20 2002/08/25 18:39:19 jlam Exp $
 
 --- Makefile.config.in.orig	Thu Mar 14 16:25:54 2002
 +++ Makefile.config.in	Tue May 14 19:52:32 2002
@@ -117,8 +117,8 @@ $NetBSD: patch-aa,v 1.19 2002/05/14 18:03:18 tron Exp $
  # Netbsd:
 -#JPEGLIB_DIR = ${LOCALBASE}/lib
 -#JPEGHDR_DIR = ${LOCALBASE}/include
-+JPEGLIB_DIR = ${BUILDLINK_DIR}/lib
-+JPEGHDR_DIR = ${BUILDLINK_DIR}/include
++JPEGLIB_DIR = ${LOCALBASE}/lib
++JPEGHDR_DIR = ${LOCALBASE}/include
  # OSF, Tru64:
  #JPEGLIB_DIR = /usr/local1/DEC/lib
  #JPEGHDR_DIR = /usr/local1/DEC/include
@@ -133,8 +133,8 @@ $NetBSD: patch-aa,v 1.19 2002/05/14 18:03:18 tron Exp $
  # NetBSD:
 -#PNGLIB_DIR = $(LOCALBASE)/lib
 -#PNGHDR_DIR = $(LOCALBASE)/include
-+PNGLIB_DIR = $(BUILDLINK_DIR)/lib
-+PNGHDR_DIR = $(BUILDLINK_DIR)/include
++PNGLIB_DIR = $(LOCALBASE)/lib
++PNGHDR_DIR = $(LOCALBASE)/include
  # OSF/Tru64:
  #PNGLIB_DIR = /usr/local1/DEC/lib
  #PNGHDR_DIR = /usr/local1/DEC/include
diff --git a/graphics/netpbm/patches/patch-ac b/graphics/netpbm/patches/patch-ac
index 98ef65c13c3..3f140d98452 100644
--- a/graphics/netpbm/patches/patch-ac
+++ b/graphics/netpbm/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.11 2002/05/14 18:03:18 tron Exp $
+$NetBSD: patch-ac,v 1.12 2002/08/25 18:39:19 jlam Exp $
 
 --- ppm/ppmtompeg/param.c-orig	Fri Aug 31 16:49:01 2001
 +++ ppm/ppmtompeg/param.c	Sat Mar 23 19:20:02 2002
diff --git a/graphics/netpbm/patches/patch-ad b/graphics/netpbm/patches/patch-ad
index 06db159d07e..431d5fe946d 100644
--- a/graphics/netpbm/patches/patch-ad
+++ b/graphics/netpbm/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.10 2002/07/02 01:47:53 kristerw Exp $
+$NetBSD: patch-ad,v 1.11 2002/08/25 18:39:20 jlam Exp $
 --- Makefile.common.orig	Tue Jul  2 02:28:12 2002
 +++ Makefile.common	Tue Jul  2 02:28:33 2002
 @@ -199,7 +199,7 @@