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.

4 files changed, 10 insertions, 21 deletions

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