Patch configure instead of configure.in so we don't need autoconf as a

build dependency.  Also minimize diffs between giflib/Makefile and
libungif/Makefile.

6 files changed, 131 insertions, 15 deletions

diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index 28a1880a33e..04c9309ad2b 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2001/03/27 03:20:00 hubertf Exp $
+# $NetBSD: Makefile,v 1.29 2001/05/02 15:51:21 jlam Exp $
 #
 
 DISTNAME=		giflib-4.1.0
@@ -11,8 +11,6 @@ COMMENT=		Tools and library routines for working with GIF images
 
 CONFLICTS=		libungif-*
 
-BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
-
 USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
@@ -31,8 +29,12 @@ MAKE_ENV+=		CC="${CC} -I${LOCALBASE}/include"
 post-patch:
 	${RM} ${WRKSRC}/doc/gif2x11.html
 
-pre-configure:
-	cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf
+# We patch configure.in, so touch the Makefile.in files to prevent automake
+# from regenerating them.
+#
+pre-build:
+	${TOUCH} ${WRKSRC}/aclocal.m4
+	${FIND} ${WRKSRC} -name "Makefile.in" -exec ${TOUCH} {} \;
 
 post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
diff --git a/graphics/giflib/distinfo b/graphics/giflib/distinfo
index 8e3b8c2ffc7..837833288d6 100644
--- a/graphics/giflib/distinfo
+++ b/graphics/giflib/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:54:13 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/05/02 15:51:21 jlam Exp $
 
 SHA1 (giflib-4.1.0.tar.gz) = d282070e7fda813c87789d4b31b61ac8afeccc3c
 Size (giflib-4.1.0.tar.gz) = 301883 bytes
 SHA1 (patch-aa) = 4b65b94d2ae8838f0139a14fb8e08ff1cbc65e7f
 SHA1 (patch-ab) = 510e9c4477729b9644cfd1fba052a7f1523b7d8f
+SHA1 (patch-ac) = 1e92b84ea304ff09f0a9cbeb565d287197c823f4
diff --git a/graphics/giflib/patches/patch-ac b/graphics/giflib/patches/patch-ac
new file mode 100644
index 00000000000..7635a5a75dc
--- /dev/null
+++ b/graphics/giflib/patches/patch-ac
@@ -0,0 +1,55 @@
+$NetBSD: patch-ac,v 1.4 2001/05/02 15:51:23 jlam Exp $
+
+--- configure.orig	Wed Feb 10 01:35:28 1999
++++ configure
+@@ -2467,50 +2467,6 @@
+ fi
+ 
+ 
+-if test ${MATH_LIB}; then
+-    echo $ac_n "checking for rle_hdr_init in -lrle""... $ac_c" 1>&6
+-echo "configure:2473: checking for rle_hdr_init in -lrle" >&5
+-ac_lib_var=`echo rle'_'rle_hdr_init | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  ac_save_LIBS="$LIBS"
+-LIBS="-lrle "-lm"  $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 2481 "configure"
+-#include "confdefs.h"
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-/* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-char rle_hdr_init();
+-
+-int main() {
+-rle_hdr_init()
+-; return 0; }
+-EOF
+-if { (eval echo configure:2492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=yes"
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
+-fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+-
+-fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-  RLE_LIB="${RLE_LIBS} -lrle -lm"
+-                 COMPILABLE_EXTRAS="${COMPILABLE_EXTRAS} gif2rle rle2gif"
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-
+-fi
+-
+     echo $ac_n "checking for main in -lgl_s""... $ac_c" 1>&6
+ echo "configure:2516: checking for main in -lgl_s" >&5
+ ac_lib_var=`echo gl_s'_'main | sed 'y%./+-%__p_%'`
diff --git a/graphics/libungif/Makefile b/graphics/libungif/Makefile
index 3b543782881..d7bc6c227ef 100644
--- a/graphics/libungif/Makefile
+++ b/graphics/libungif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/03/27 03:20:01 hubertf Exp $
+# $NetBSD: Makefile,v 1.14 2001/05/02 15:51:23 jlam Exp $
 #
 
 DISTNAME=		libungif-4.1.0
@@ -11,12 +11,10 @@ COMMENT=		Tools and library routines for working with GIF images
 
 CONFLICTS=		giflib-*
 
-BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
+USE_LIBTOOL=		# defined
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-USE_LIBTOOL=		yes
-LTCONFIG_OVERRIDE=      ${WRKSRC}/ltconfig
-
-GNU_CONFIGURE=		yes
+GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS=		--without-x
 
 DOCDIR=			${PREFIX}/share/doc/libungif
@@ -31,8 +29,12 @@ MAKE_ENV+=		CC="${CC} -I${LOCALBASE}/include"
 post-patch:
 	${RM} ${WRKSRC}/doc/gif2x11.html
 
-pre-configure:
-	cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf
+# We patch configure.in, so touch the Makefile.in files to prevent automake
+# from regenerating them.
+#
+pre-build:
+	${TOUCH} ${WRKSRC}/aclocal.m4
+	${FIND} ${WRKSRC} -name "Makefile.in" -exec ${TOUCH} {} \;
 
 post-install:
 	cd ${PREFIX}; \
diff --git a/graphics/libungif/distinfo b/graphics/libungif/distinfo
index a14dce75706..f7a43482146 100644
--- a/graphics/libungif/distinfo
+++ b/graphics/libungif/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:54:19 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/05/02 15:51:23 jlam Exp $
 
 SHA1 (libungif-4.1.0.tar.gz) = 2473012977b50a6079ba029fbe7ef82283defa4f
 Size (libungif-4.1.0.tar.gz) = 301291 bytes
 SHA1 (patch-aa) = 91d70311d4aa00d4793626c964bbb7507814f7d2
 SHA1 (patch-ab) = a93e2fe0a93aacda4566e723e681fd316fe2cb2a
+SHA1 (patch-ac) = c3ae52d7ea47935b76889c54cfac727ade149d01
diff --git a/graphics/libungif/patches/patch-ac b/graphics/libungif/patches/patch-ac
new file mode 100644
index 00000000000..76bf27d4e5c
--- /dev/null
+++ b/graphics/libungif/patches/patch-ac
@@ -0,0 +1,55 @@
+$NetBSD: patch-ac,v 1.1 2001/05/02 15:51:24 jlam Exp $
+
+--- configure.orig	Tue Jan 19 23:32:09 1999
++++ configure
+@@ -2467,50 +2467,6 @@
+ fi
+ 
+ 
+-if test ${MATH_LIB}; then
+-    echo $ac_n "checking for rle_hdr_init in -lrle""... $ac_c" 1>&6
+-echo "configure:2473: checking for rle_hdr_init in -lrle" >&5
+-ac_lib_var=`echo rle'_'rle_hdr_init | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  ac_save_LIBS="$LIBS"
+-LIBS="-lrle "-lm"  $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 2481 "configure"
+-#include "confdefs.h"
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-/* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-char rle_hdr_init();
+-
+-int main() {
+-rle_hdr_init()
+-; return 0; }
+-EOF
+-if { (eval echo configure:2492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=yes"
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
+-fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+-
+-fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-  RLE_LIB="${RLE_LIBS} -lrle -lm"
+-                 COMPILABLE_EXTRAS="${COMPILABLE_EXTRAS} gif2rle rle2gif"
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-
+-fi
+-
+     echo $ac_n "checking for main in -lgl_s""... $ac_c" 1>&6
+ echo "configure:2516: checking for main in -lgl_s" >&5
+ ac_lib_var=`echo gl_s'_'main | sed 'y%./+-%__p_%'`