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.

10 files changed, 69 insertions, 30 deletions

diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index afb31f1d830..efd32cfb7a6 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.21 2002/05/11 11:56:58 rh Exp $
+# $NetBSD: Makefile,v 1.22 2002/08/25 18:39:03 jlam Exp $
 #
 
 PKGNAME=	${DISTNAME}
 COMMENT=	the GNOME image loading library
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=	# defined
 
 .include "Makefile.common"
 
@@ -23,5 +23,4 @@ post-install:
 		${LOCALBASE}/share/aclocal/gdk-pixbuf.m4
 	${RM} ${PREFIX}/lib/gnomecanvaspixbufConf.sh
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common
index ee04911e5c1..90450caa633 100644
--- a/graphics/gdk-pixbuf/Makefile.common
+++ b/graphics/gdk-pixbuf/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2002/05/12 21:39:20 rh Exp $
+# $NetBSD: Makefile.common,v 1.24 2002/08/25 18:39:03 jlam Exp $
 #
 
 DISTNAME=		gdk-pixbuf-0.17.0
@@ -32,7 +32,14 @@ pre-configure:
 	${LOCALBASE}/bin/automake -a --foreign -i;			\
 	${LOCALBASE}/bin/autoconf
 
+.if defined(USE_BUILDLINK2)
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/tiff/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
+.else
 .include "../../graphics/jpeg/buildlink.mk"
 .include "../../graphics/png/buildlink.mk"
 .include "../../graphics/tiff/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
+.endif
diff --git a/graphics/gdk-pixbuf/PLIST b/graphics/gdk-pixbuf/PLIST
index 1f1e90680c2..706ad6c717e 100644
--- a/graphics/gdk-pixbuf/PLIST
+++ b/graphics/gdk-pixbuf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/05/11 11:56:58 rh Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 18:39:03 jlam Exp $
 bin/gdk-pixbuf-config
 include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-features.h
 include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-loader.h
diff --git a/graphics/gdk-pixbuf/buildlink.mk b/graphics/gdk-pixbuf/buildlink.mk
index 11eb72d68e7..843a1f3fafd 100644
--- a/graphics/gdk-pixbuf/buildlink.mk
+++ b/graphics/gdk-pixbuf/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.15 2002/05/14 18:43:52 veego Exp $
+# $NetBSD: buildlink.mk,v 1.16 2002/08/25 18:39:04 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gdk-pixbuf.
 #
diff --git a/graphics/gdk-pixbuf/buildlink2.mk b/graphics/gdk-pixbuf/buildlink2.mk
new file mode 100644
index 00000000000..e47841032ef
--- /dev/null
+++ b/graphics/gdk-pixbuf/buildlink2.mk
@@ -0,0 +1,44 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:04 jlam Exp $
+
+.if !defined(GDK_PIXBUF_BUILDLINK2_MK)
+GDK_PIXBUF_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=			gdk-pixbuf
+BUILDLINK_DEPENDS.gdk-pixbuf?=		gdk-pixbuf>=0.17.0
+BUILDLINK_PKGSRCDIR.gdk-pixbuf?=	../../graphics/gdk-pixbuf
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.gdk-pixbuf=gdk-pixbuf
+BUILDLINK_PREFIX.gdk-pixbuf_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.gdk-pixbuf=	include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-features.h
+BUILDLINK_FILES.gdk-pixbuf+=	include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-loader.h
+BUILDLINK_FILES.gdk-pixbuf+=    include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-xlib.h
+BUILDLINK_FILES.gdk-pixbuf+=	include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-xlibrgb.h
+BUILDLINK_FILES.gdk-pixbuf+=	include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf.h
+BUILDLINK_FILES.gdk-pixbuf+=	lib/gdk-pixbuf/loaders/libpixbufloader-bmp.*
+BUILDLINK_FILES.gdk-pixbuf+=	lib/gdk-pixbuf/loaders/libpixbufloader-gif.*
+BUILDLINK_FILES.gdk-pixbuf+=	lib/gdk-pixbuf/loaders/libpixbufloader-ico.*
+BUILDLINK_FILES.gdk-pixbuf+=	lib/gdk-pixbuf/loaders/libpixbufloader-jpeg.*
+BUILDLINK_FILES.gdk-pixbuf+=	lib/gdk-pixbuf/loaders/libpixbufloader-png.*
+BUILDLINK_FILES.gdk-pixbuf+=	lib/gdk-pixbuf/loaders/libpixbufloader-pnm.*
+BUILDLINK_FILES.gdk-pixbuf+=	lib/gdk-pixbuf/loaders/libpixbufloader-ras.*
+BUILDLINK_FILES.gdk-pixbuf+=	lib/gdk-pixbuf/loaders/libpixbufloader-tiff.*
+BUILDLINK_FILES.gdk-pixbuf+=	lib/gdk-pixbuf/loaders/libpixbufloader-xbm.*
+BUILDLINK_FILES.gdk-pixbuf+=	lib/gdk-pixbuf/loaders/libpixbufloader-xpm.*
+BUILDLINK_FILES.gdk-pixbuf+=	lib/gdk_pixbufConf.sh
+BUILDLINK_FILES.gdk-pixbuf+=	lib/gdk_pixbuf_xlibConf.sh
+BUILDLINK_FILES.gdk-pixbuf+=	lib/libgdk_pixbuf.*
+BUILDLINK_FILES.gdk-pixbuf+=	lib/libgdk_pixbuf_xlib.*
+
+# The gdk-pixbuf headers should be found at the usual location.
+BUILDLINK_TRANSFORM.gdk-pixbuf=	-e "s|/include/gdk-pixbuf-1.0/|/include/|g"
+
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/tiff/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	gdk-pixbuf-buildlink
+
+gdk-pixbuf-buildlink: _BUILDLINK_USE
+
+.endif	# GDK_PIXBUF_BUILDLINK2_MK
diff --git a/graphics/gdk-pixbuf/distinfo b/graphics/gdk-pixbuf/distinfo
index 51dfc1d78fc..3ea78c6f34f 100644
--- a/graphics/gdk-pixbuf/distinfo
+++ b/graphics/gdk-pixbuf/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2002/07/19 04:33:29 fredb Exp $
+$NetBSD: distinfo,v 1.8 2002/08/25 18:39:05 jlam Exp $
 
 SHA1 (gdk-pixbuf-0.17.0.tar.gz) = afff9706b5ff81bb1eaf631507ed331e0a5b7313
 Size (gdk-pixbuf-0.17.0.tar.gz) = 547194 bytes
 SHA1 (patch-aa) = 7cdd7081875d670d24e97a1b77812703d129d73d
-SHA1 (patch-ac) = efeb07a327c866bee7ddddbd94a7fae214e4c4d8
+SHA1 (patch-ac) = 16fc33898fc1cb10b3e11ee26e7ea046d1f68032
 SHA1 (patch-ad) = 4a16e30eda46b55f51f87785e5f76ea33d3bd8ed
-SHA1 (patch-ae) = 8c68907ba7566b1432d5593caeb6ab4f0551f27d
+SHA1 (patch-ae) = 2edd8fdd72d5dfaecc92974c6930e5d175e3b69f
diff --git a/graphics/gdk-pixbuf/patches/patch-aa b/graphics/gdk-pixbuf/patches/patch-aa
index d7bc4c59da6..dbc8469f57d 100644
--- a/graphics/gdk-pixbuf/patches/patch-aa
+++ b/graphics/gdk-pixbuf/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2002/07/19 04:33:29 fredb Exp $
+$NetBSD: patch-aa,v 1.4 2002/08/25 18:39:05 jlam Exp $
 
 This is to work-around the following error, reported in PR pkg/17553:
 
diff --git a/graphics/gdk-pixbuf/patches/patch-ac b/graphics/gdk-pixbuf/patches/patch-ac
index 132e873088c..18425e05d97 100644
--- a/graphics/gdk-pixbuf/patches/patch-ac
+++ b/graphics/gdk-pixbuf/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2000/10/18 00:00:00 jlam Exp $
+$NetBSD: patch-ac,v 1.4 2002/08/25 18:39:05 jlam Exp $
 
---- gdk-pixbuf-config.in.orig	Mon Apr 10 21:56:56 2000
+--- gdk-pixbuf-config.in.orig	Thu Oct 25 04:00:14 2001
 +++ gdk-pixbuf-config.in
-@@ -46,7 +46,7 @@
+@@ -44,7 +44,7 @@
        ;;
      --libs)
        libdirs=-L@libdir@
diff --git a/graphics/gdk-pixbuf/patches/patch-ad b/graphics/gdk-pixbuf/patches/patch-ad
index 4272b3d2c4c..ce8954572f2 100644
--- a/graphics/gdk-pixbuf/patches/patch-ad
+++ b/graphics/gdk-pixbuf/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.3 2002/05/11 11:56:58 rh Exp $
+$NetBSD: patch-ad,v 1.4 2002/08/25 18:39:05 jlam Exp $
 
 --- gdk-pixbuf/Makefile.am.orig	Fri Jan  4 12:54:48 2002
 +++ gdk-pixbuf/Makefile.am
diff --git a/graphics/gdk-pixbuf/patches/patch-ae b/graphics/gdk-pixbuf/patches/patch-ae
index 76bf057621a..c58d7425943 100644
--- a/graphics/gdk-pixbuf/patches/patch-ae
+++ b/graphics/gdk-pixbuf/patches/patch-ae
@@ -1,19 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2002/02/27 06:41:06 jlam Exp $
+$NetBSD: patch-ae,v 1.3 2002/08/25 18:39:06 jlam Exp $
 
---- configure.in.orig	Thu Apr 26 15:46:16 2001
-+++ configure.in	Wed Feb 27 01:35:59 2002
-@@ -130,8 +130,8 @@
- 
- if $dynworks; then
-    AC_DEFINE(USE_GMODULE)
--   GMODULE_LIBS="`glib-config --libs gmodule`"
--   GMODULE_FLAGS="`glib-config --cflags gmodule`"
-+   GMODULE_LIBS="`$GLIB_CONFIG --libs gmodule`"
-+   GMODULE_FLAGS="`$GLIB_CONFIG --cflags gmodule`"
-    AC_SUBST(GMODULE_LIBS)
-    AC_SUBST(GMODULE_FLAGS)
-    AC_MSG_RESULT(yes)
-@@ -142,6 +142,7 @@
+--- configure.in.orig	Thu Apr 18 18:48:40 2002
++++ configure.in
+@@ -128,6 +128,7 @@
  dnl Check for location of rgb.txt file (works without, but better with)
  AC_MSG_CHECKING([for location of rgb.txt database])
  
@@ -21,7 +10,7 @@ $NetBSD: patch-ae,v 1.2 2002/02/27 06:41:06 jlam Exp $
  dnl default to this..
  path_rgb_txt=/usr/lib/X11/rgb.txt
  
-@@ -154,6 +155,7 @@
+@@ -140,6 +141,7 @@
        break
      fi
    done