Provide configure and Makefile.in patches so that we can remove need for

a BUILD_DEPENDS on auto{make,conf}.

4 files changed, 133 insertions, 8 deletions

diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 4e3526e1d90..9095e4a5803 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2002/01/27 17:16:44 tron Exp $
+# $NetBSD: Makefile,v 1.63 2002/03/11 08:03:04 skrll Exp $
 #
 
 DISTNAME=		imlib-1.9.11
@@ -9,8 +9,6 @@ MAINTAINER=		tron@netbsd.org
 HOMEPAGE=		http://www.nl.rasterman.com/imlib.html
 COMMENT=		image manipulation library for X11
 
-BUILD_DEPENDS+=		automake>=1.4:../../devel/automake
-
 USE_X11BASE=		yes
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
@@ -30,10 +28,6 @@ CONFIGURE_ENV+=		X_LDFLAGS="${X_LDFLAGS}"
 #
 X_LDFLAGS=		-Wl,-R${X11BASE}/lib -L${BUILDLINK_X11_DIR}/lib
 
-pre-configure:
-	${TOUCH} ${WRKSRC}/ltconfig
-	cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf --include-deps --force
-
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/imlib
 	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.gif *.html \
diff --git a/graphics/imlib/distinfo b/graphics/imlib/distinfo
index 2118e7f449d..69d8a7e1755 100644
--- a/graphics/imlib/distinfo
+++ b/graphics/imlib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2001/08/23 04:47:54 jlam Exp $
+$NetBSD: distinfo,v 1.6 2002/03/11 08:03:04 skrll Exp $
 
 SHA1 (imlib-1.9.11.tar.gz) = 30b48d9f3745547d2186750ecbd3a391d3f805ed
 Size (imlib-1.9.11.tar.gz) = 758757 bytes
@@ -7,3 +7,5 @@ SHA1 (patch-ab) = 9af11e0041b07670a3bab37cd4234e4e00bc7d78
 SHA1 (patch-ac) = d92c08ede60358d192c32d08482b536ff13a7fb8
 SHA1 (patch-ad) = 6c673375d669b7e3e57b558c4f7fbd320162eaf4
 SHA1 (patch-ae) = 9701e0251592ae8df33b455457b6470f9833bbd7
+SHA1 (patch-af) = 693144285a5d2729925bc9256e951dd34e71c249
+SHA1 (patch-ag) = 5ee9f5c78b4991d1d916d83e0ca46b5ce9e6729c
diff --git a/graphics/imlib/patches/patch-af b/graphics/imlib/patches/patch-af
new file mode 100644
index 00000000000..1c7ca935fc4
--- /dev/null
+++ b/graphics/imlib/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2002/03/11 08:03:05 skrll Exp $
+
+--- gdk_imlib/Makefile.in.orig	Sun Mar 10 03:14:31 2002
++++ gdk_imlib/Makefile.in
+@@ -176,7 +176,7 @@
+ 
+ 
+ libgdk_imlib_la_LDFLAGS = -version-info 10:11:9
+-libgdk_imlib_la_LIBADD = $(GMODULE_LIBS)
++libgdk_imlib_la_LIBADD = $(GMODULE_LIBS) $(SUPPORT_LIBS)
+ 
+ include_HEADERS = gdk_imlib.h gdk_imlib_private.h gdk_imlib_types.h
+ 
diff --git a/graphics/imlib/patches/patch-ag b/graphics/imlib/patches/patch-ag
new file mode 100644
index 00000000000..f5367064506
--- /dev/null
+++ b/graphics/imlib/patches/patch-ag
@@ -0,0 +1,116 @@
+$NetBSD: patch-ag,v 1.1 2002/03/11 08:03:05 skrll Exp $
+
+--- configure.orig	Tue Jul 31 16:34:51 2001
++++ configure
+@@ -5571,6 +5571,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
+@@ -5580,8 +5617,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
+@@ -5631,8 +5668,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
+@@ -7490,7 +7527,9 @@
+   GX_LIBS="$GTK_LIBS"
+ fi
+ 
+-CPPFLAGS="$CPPFLAGS -I$includedir -I$prefix/include"
++if test -z "$X_LDFLAGS"; then
++  X_LDFLAGS=
++fi
+ 
+ SUPPORT_LIBS=""
+ 
+@@ -7795,8 +7834,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
+ #define HAVE_LIBTIFF 1
+ EOF
+ 
+@@ -8272,6 +8311,7 @@
+ 
+ 
+ 
++
+ trap '' 1 2 15
+ cat > confcache <<\EOF
+ # This file is a shell script that caches the results of configure
+@@ -8463,6 +8503,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
+@@ -8493,6 +8534,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