* We use automake, so we must patch configure.in, not configure.

* Fix the path to the rgb.txt file, which wasn't being set properly due
  to x11-links.

3 files changed, 32 insertions, 15 deletions

diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common
index 71234f092f4..2761d4e496e 100644
--- a/graphics/gdk-pixbuf/Makefile.common
+++ b/graphics/gdk-pixbuf/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2001/11/29 19:46:12 jlam Exp $
+# $NetBSD: Makefile.common,v 1.18 2002/02/27 06:41:05 jlam Exp $
 #
 
 DISTNAME=		gdk-pixbuf-0.11.0
@@ -16,6 +16,7 @@ USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 GNU_CONFIGURE=		# defined
+CONFIGURE_ENV+=		path_rgb_txt="${X11BASE}/lib/X11/rgb.txt"
 
 M4=			${LOCALBASE}/bin/gm4
 PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
@@ -24,9 +25,9 @@ DISTINFO_FILE=		${.CURDIR}/../gdk-pixbuf/distinfo
 PATCHDIR=		${.CURDIR}/../gdk-pixbuf/patches
 
 pre-configure:
-	cd ${WRKSRC} && \
-	${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/autoconf && \
-	${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/automake
+	cd ${WRKSRC};							\
+	${LOCALBASE}/bin/automake;					\
+	${LOCALBASE}/bin/autoconf
 
 .include "../../graphics/jpeg/buildlink.mk"
 .include "../../graphics/png/buildlink.mk"
diff --git a/graphics/gdk-pixbuf/distinfo b/graphics/gdk-pixbuf/distinfo
index eba8a91ab85..3736be289d6 100644
--- a/graphics/gdk-pixbuf/distinfo
+++ b/graphics/gdk-pixbuf/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2001/09/30 21:17:58 rh Exp $
+$NetBSD: distinfo,v 1.5 2002/02/27 06:41:05 jlam Exp $
 
 SHA1 (gdk-pixbuf-0.11.0.tar.gz) = cddc0cccc246c910312b53e9e7f8dc1f63a2ef1f
 Size (gdk-pixbuf-0.11.0.tar.gz) = 459728 bytes
 SHA1 (patch-ac) = efeb07a327c866bee7ddddbd94a7fae214e4c4d8
 SHA1 (patch-ad) = 8841c915841c2ec71082a8894b12038b97bb2088
-SHA1 (patch-ae) = 60b558c5d4894bab57520b8e2713d061083408cf
+SHA1 (patch-ae) = 8c68907ba7566b1432d5593caeb6ab4f0551f27d
diff --git a/graphics/gdk-pixbuf/patches/patch-ae b/graphics/gdk-pixbuf/patches/patch-ae
index 7944366f2a9..76bf057621a 100644
--- a/graphics/gdk-pixbuf/patches/patch-ae
+++ b/graphics/gdk-pixbuf/patches/patch-ae
@@ -1,15 +1,31 @@
-$NetBSD: patch-ae,v 1.1 2001/08/12 18:15:38 jlam Exp $
+$NetBSD: patch-ae,v 1.2 2002/02/27 06:41:06 jlam Exp $
 
---- configure.orig	Wed Jul 18 11:04:43 2001
-+++ configure
-@@ -3573,8 +3573,8 @@
- #define USE_GMODULE 1
- EOF
+--- 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`"
-    
-    
-    echo "$ac_t""yes" 1>&6
+    AC_SUBST(GMODULE_LIBS)
+    AC_SUBST(GMODULE_FLAGS)
+    AC_MSG_RESULT(yes)
+@@ -142,6 +142,7 @@
+ dnl Check for location of rgb.txt file (works without, but better with)
+ AC_MSG_CHECKING([for location of rgb.txt database])
+ 
++if test -z "$path_rgb_txt"; then
+ dnl default to this..
+ path_rgb_txt=/usr/lib/X11/rgb.txt
+ 
+@@ -154,6 +155,7 @@
+       break
+     fi
+   done
++fi
+ fi
+ AC_MSG_RESULT([$path_rgb_txt])
+ AC_DEFINE_UNQUOTED(PATH_RGB_TXT,"$path_rgb_txt")