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, 57 insertions, 188 deletions

diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 7c2c841a54e..68521ee9b70 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2002/07/18 02:19:38 rh Exp $
+# $NetBSD: Makefile,v 1.69 2002/08/25 18:39:11 jlam Exp $
 #
 
 DISTNAME=		imlib-1.9.14
@@ -18,7 +18,7 @@ PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 USE_GMAKE=		yes
 UNLIMIT_RESOURCES=	datasize
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 
 CPPFLAGS+=		-DENABLE_NLS
 CONFIGURE_ENV+=		ac_cv_path_CONVERT_PROG="${LOCALBASE}/bin/convert"
@@ -27,7 +27,7 @@ CONFIGURE_ENV+=		X_LDFLAGS="${X_LDFLAGS}"
 # The following ensures that `imlib-config --libs' includes the correct
 # linker flags for linking the X11 libs.
 #
-X_LDFLAGS=		-Wl,-R${X11BASE}/lib -L${BUILDLINK_X11_DIR}/lib
+X_LDFLAGS=		-Wl,-R${X11BASE}/lib -L${X11BASE}/lib
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/imlib
@@ -37,12 +37,12 @@ post-install:
 	${LN} -fs ${PREFIX}/share/aclocal/imlib.m4 \
 		${LOCALBASE}/share/aclocal/imlib.m4
 
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../graphics/jpeg/buildlink.mk"
-.include "../../graphics/libungif/buildlink.mk"
-.include "../../graphics/netpbm/buildlink.mk"
-.include "../../graphics/png/buildlink.mk"
-.include "../../graphics/tiff/buildlink.mk"
-.include "../../x11/gtk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/libungif/buildlink2.mk"
+.include "../../graphics/netpbm/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/tiff/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/imlib/buildlink2.mk b/graphics/imlib/buildlink2.mk
new file mode 100644
index 00000000000..912c944c313
--- /dev/null
+++ b/graphics/imlib/buildlink2.mk
@@ -0,0 +1,32 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:11 jlam Exp $
+
+.if !defined(IMLIB_BUILDLINK2_MK)
+IMLIB_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		imlib
+BUILDLINK_DEPENDS.imlib?=	imlib>=1.9.11nb1
+BUILDLINK_PKGSRCDIR.imlib?=	../../graphics/imlib
+
+EVAL_PREFIX+=		BUILDLINK_PREFIX.imlib=imlib
+BUILDLINK_PREFIX.imlib_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.imlib=	include/gdk_imlib.h
+BUILDLINK_FILES.imlib+=	include/gdk_imlib_private.h
+BUILDLINK_FILES.imlib+=	include/gdk_imlib_types.h
+BUILDLINK_FILES.imlib+=	include/Imlib.h
+BUILDLINK_FILES.imlib+=	include/Imlib_private.h
+BUILDLINK_FILES.imlib+=	include/Imlib_types.h
+BUILDLINK_FILES.imlib+=	lib/libImlib.*
+BUILDLINK_FILES.imlib+=	lib/libgdk_imlib.*
+
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/libungif/buildlink2.mk"
+.include "../../graphics/netpbm/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/tiff/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	imlib-buildlink
+
+imlib-buildlink: _BUILDLINK_USE
+
+.endif	# IMLIB_BUILDLINK2_MK
diff --git a/graphics/imlib/distinfo b/graphics/imlib/distinfo
index 7abf58cc60f..823b99e3176 100644
--- a/graphics/imlib/distinfo
+++ b/graphics/imlib/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.10 2002/07/29 01:48:12 rh Exp $
+$NetBSD: distinfo,v 1.11 2002/08/25 18:39:11 jlam Exp $
 
 SHA1 (imlib-1.9.14.tar.gz) = 3c8c8c3aaec3cc5a9fc924060a71223862a313f6
 Size (imlib-1.9.14.tar.gz) = 748591 bytes
 SHA1 (patch-aa) = 185a5229af781d3dbc57978a3f4acd8308ca4c14
 SHA1 (patch-ab) = df9f9f7c85f0794748a4ca6f58836f8dd230c805
 SHA1 (patch-ac) = 94e90fa4e33ff2fdee013f8589f5531e717879c8
-SHA1 (patch-ad) = 0910b5574cca6c7cfbaec04c4c5396488d422ce7
-SHA1 (patch-ae) = 9701e0251592ae8df33b455457b6470f9833bbd7
-SHA1 (patch-ag) = 5e8452358e1f0625d1a1a5a990512bd51f51e6c9
+SHA1 (patch-ae) = 3ed6fff2e73f04ec83c27dc6e3f2db2fa446abbb
+SHA1 (patch-ag) = 0ed464cb26492f3eebb8812efdb49ee83ef4ae6b
diff --git a/graphics/imlib/patches/patch-ac b/graphics/imlib/patches/patch-ac
index 5255991550e..32bc68417a5 100644
--- a/graphics/imlib/patches/patch-ac
+++ b/graphics/imlib/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.10 2002/07/18 02:19:38 rh Exp $
+$NetBSD: patch-ac,v 1.11 2002/08/25 18:39:12 jlam Exp $
 
 --- imlib.pc.in.orig	Sat Sep 30 12:09:41 2000
 +++ imlib.pc.in
diff --git a/graphics/imlib/patches/patch-ad b/graphics/imlib/patches/patch-ad
deleted file mode 100644
index 879f45eb8cd..00000000000
--- a/graphics/imlib/patches/patch-ad
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-ad,v 1.7 2002/03/29 18:01:14 wiz Exp $
-
---- configure.in.orig	Fri Mar 22 15:51:24 2002
-+++ configure.in
-@@ -32,6 +32,8 @@
- 	fi
- ])
- 
-+AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
-+
- dynworks=false
- if test x$with_modules = xno; then
- 	AC_MSG_RESULT(no)
-@@ -41,8 +43,8 @@
- if test "x$GDK_IMLIB" != x; then
-   oLIBS="$LIBS"
-   oCFLAGS="$CFLAGS"
--  LIBS="$LIBS `glib-config --libs gmodule`"
--  CFLAGS="$CFLAGS `glib-config --cflags gmodule`"
-+  LIBS="$LIBS `$GLIB_CONFIG --libs gmodule`"
-+  CFLAGS="$CFLAGS `$GLIB_CONFIG --cflags gmodule`"
-   AC_TRY_RUN([
- #include <glib.h>
- #include <gmodule.h>
-@@ -74,8 +76,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)
- fi
-@@ -139,7 +141,9 @@
-   GX_LIBS="$GTK_LIBS"
- fi
- 
--CPPFLAGS="$CPPFLAGS -I$includedir -I$prefix/include"
-+if test -z "$X_LDFLAGS"; then
-+  X_LDFLAGS=
-+fi
- 
- SUPPORT_LIBS=""
- 
-@@ -309,6 +313,7 @@
- AC_SUBST(CPPFLAGS)
- AC_SUBST(X_CFLAGS)
- AC_SUBST(LDFLAGS)
-+AC_SUBST(X_LDFLAGS)
- AC_SUBST(X_PRE_LIBS)
- AC_SUBST(X_LIBS)
- AC_SUBST(X_EXTRA_LIBS)
diff --git a/graphics/imlib/patches/patch-ae b/graphics/imlib/patches/patch-ae
index 11ad2029a84..2fde8550d6e 100644
--- a/graphics/imlib/patches/patch-ae
+++ b/graphics/imlib/patches/patch-ae
@@ -1,25 +1,18 @@
-$NetBSD: patch-ae,v 1.4 2001/08/13 11:14:31 rh Exp $
+$NetBSD: patch-ae,v 1.5 2002/08/25 18:39:12 jlam Exp $
 
---- imlib-config.in.orig	Wed Mar 28 05:18:40 2001
+--- imlib-config.in.orig	Tue Mar 27 22:18:40 2001
 +++ imlib-config.in
-@@ -55,15 +55,15 @@
-       if test @includedir@ != /usr/include ; then
-         includes=-I@includedir@
-       fi
--      echo `@GTK_CONFIG@ --cflags` $includes @X_CFLAGS@
-+      echo `gtk-config --cflags` $includes @X_CFLAGS@
+@@ -58,11 +58,11 @@
+       echo `@GTK_CONFIG@ --cflags` $includes @X_CFLAGS@
        ;;
      --libs)
 -      libdirs=-L@libdir@
--      echo $libdirs -lImlib @LDFLAGS@ $gx_libs @X_LIBS@ @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@
 +      libdirs="-L@libdir@ -Wl,-R@libdir@"
-+      echo $libdirs -lImlib @X_LDFLAGS@ $gx_libs @X_LIBS@ @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@
+       echo $libdirs -lImlib @LDFLAGS@ $gx_libs @X_LIBS@ @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@
        ;;
      --libs-gdk)
 -      libdirs=-L@libdir@
--      echo $libdirs -lgdk_imlib$gdk_gx_libs `@GTK_CONFIG@ --libs` $gdk_libs
 +      libdirs="-L@libdir@ -Wl,-R@libdir@"
-+      echo $libdirs -lgdk_imlib$gdk_gx_libs `gtk-config --libs` $gdk_libs
+       echo $libdirs -lgdk_imlib$gdk_gx_libs `@GTK_CONFIG@ --libs` $gdk_libs
        ;;
      *)
-       echo "${usage}" 1>&2
diff --git a/graphics/imlib/patches/patch-ag b/graphics/imlib/patches/patch-ag
index 93805c04255..1cdc3167638 100644
--- a/graphics/imlib/patches/patch-ag
+++ b/graphics/imlib/patches/patch-ag
@@ -1,116 +1,15 @@
-$NetBSD: patch-ag,v 1.3 2002/03/29 18:01:14 wiz Exp $
+$NetBSD: patch-ag,v 1.4 2002/08/25 18:39:13 jlam Exp $
 
---- configure.orig	Mon Mar 25 17:45:33 2002
+--- configure.orig	Mon Mar 25 11:45:33 2002
 +++ configure
-@@ -5596,6 +5596,43 @@
- fi
- 
- 
-+# Extract the first word of "glib-config", so it can be a program name with args.
-+set dummy glib-config; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:5578: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  case "$GLIB_CONFIG" in
-+  /*)
-+  ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  ?:/*)			 
-+  ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with a dos path.
-+  ;;
-+  *)
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do 
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_path_GLIB_CONFIG="$ac_dir/$ac_word"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  test -z "$ac_cv_path_GLIB_CONFIG" && ac_cv_path_GLIB_CONFIG="no"
-+  ;;
-+esac
-+fi
-+GLIB_CONFIG="$ac_cv_path_GLIB_CONFIG"
-+if test -n "$GLIB_CONFIG"; then
-+  echo "$ac_t""$GLIB_CONFIG" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+
- dynworks=false
- if test x$with_modules = xno; then
- 	echo "$ac_t""no" 1>&6
-@@ -5605,8 +5642,8 @@
- if test "x$GDK_IMLIB" != x; then
-   oLIBS="$LIBS"
-   oCFLAGS="$CFLAGS"
--  LIBS="$LIBS `glib-config --libs gmodule`"
--  CFLAGS="$CFLAGS `glib-config --cflags gmodule`"
-+  LIBS="$LIBS `$GLIB_CONFIG --libs gmodule`"
-+  CFLAGS="$CFLAGS `$GLIB_CONFIG --cflags gmodule`"
-   if test "$cross_compiling" = yes; then
-     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
-@@ -5656,8 +5693,8 @@
- #define USE_GMODULE 1
- EOF
- 
--   GMODULE_LIBS="`glib-config --libs gmodule`"
--   GMODULE_FLAGS="`glib-config --cflags gmodule`"
-+   GMODULE_LIBS="`$GLIB_CONFIG --libs gmodule`"
-+   GMODULE_FLAGS="`$GLIB_CONFIG --cflags gmodule`"
-    
-    
- fi
-@@ -7365,7 +7402,9 @@
-   GX_LIBS="$GTK_LIBS"
- fi
- 
--CPPFLAGS="$CPPFLAGS -I$includedir -I$prefix/include"
-+if test -z "$X_LDFLAGS"; then
-+  X_LDFLAGS=
-+fi
- 
- SUPPORT_LIBS=""
- 
-@@ -7670,8 +7709,8 @@
+@@ -7670,8 +7670,8 @@
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    echo "$ac_t""yes" 1>&6
 -  TIFFLIBS="-ltiff"
 -    SUPPORT_LIBS="$SUPPORT_LIBS -ltiff"; cat >> confdefs.h <<\EOF
 +  TIFFLIBS="-ltiff -ljpeg -lz"
-+    SUPPORT_LIBS="$SUPPORT_LIBS -ltiff -ljpeg -lz"; cat >> confdefs.h <<\EOF
++    SUPPORT_LIBS="$SUPPORT_LIBS $TIFFLIBS"; cat >> confdefs.h <<\EOF
  #define HAVE_LIBTIFF 1
  EOF
  
-@@ -8137,6 +8176,7 @@
- 
- 
- 
-+
- trap '' 1 2 15
- cat > confcache <<\EOF
- # This file is a shell script that caches the results of configure
-@@ -8317,6 +8357,7 @@
- s%@GTK_CONFIG@%$GTK_CONFIG%g
- s%@GTK_CFLAGS@%$GTK_CFLAGS%g
- s%@GTK_LIBS@%$GTK_LIBS%g
-+s%@GLIB_CONFIG@%$GLIB_CONFIG%g
- s%@GMODULE_LIBS@%$GMODULE_LIBS%g
- s%@GMODULE_FLAGS@%$GMODULE_FLAGS%g
- s%@TIFFLIBS@%$TIFFLIBS%g
-@@ -8341,6 +8382,7 @@
- s%@HAVE_JPEG_FALSE@%$HAVE_JPEG_FALSE%g
- s%@SUPPORT_LIBS@%$SUPPORT_LIBS%g
- s%@GDK_SUPPORT_LIBS@%$GDK_SUPPORT_LIBS%g
-+s%@X_LDFLAGS@%$X_LDFLAGS%g
- 
- CEOF
- EOF