Remove autoconf dependency by adding a configure patch.

3 files changed, 283 insertions, 6 deletions

diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile
index 8b0d4a281ec..bfaf16dbf97 100644
--- a/devel/bonobo-conf/Makefile
+++ b/devel/bonobo-conf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/09/21 10:42:00 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2002/10/02 23:46:08 wiz Exp $
 
 DISTNAME=		bonobo-conf-0.14
 PKGREVISION=		2
@@ -9,7 +9,6 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Bonobo configuration system
 
-BUILD_DEPENDS+=		autoconf-[0-9]*:../../devel/autoconf
 BUILD_USES_MSGFMT=	YES
 
 USE_BUILDLINK2=		YES
@@ -20,9 +19,6 @@ GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-pre-configure:
-	cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf
-
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bonobo-conf
 .for doc in bonobo-conf.pdf bonobo-conf.sgml
diff --git a/devel/bonobo-conf/distinfo b/devel/bonobo-conf/distinfo
index a24602a37e0..ca97866fda8 100644
--- a/devel/bonobo-conf/distinfo
+++ b/devel/bonobo-conf/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2002/10/02 21:21:46 wiz Exp $
+$NetBSD: distinfo,v 1.7 2002/10/02 23:46:08 wiz Exp $
 
 SHA1 (bonobo-conf-0.14.tar.gz) = 9e33ec9eb7553cca90e4e1f9e018e2a7f2740d7a
 Size (bonobo-conf-0.14.tar.gz) = 438259 bytes
 SHA1 (patch-aa) = fa5da87fed8b39b0969ea82695fae5bba1420ed9
 SHA1 (patch-ab) = e95a62dfeb787187275cc5e75bf7316bb1745704
+SHA1 (patch-ac) = 82d91fd7e7edc6fe90d5c7e2edb871b8c0f59ee0
diff --git a/devel/bonobo-conf/patches/patch-ac b/devel/bonobo-conf/patches/patch-ac
new file mode 100644
index 00000000000..069c5cfbfed
--- /dev/null
+++ b/devel/bonobo-conf/patches/patch-ac
@@ -0,0 +1,280 @@
+$NetBSD: patch-ac,v 1.1 2002/10/02 23:46:08 wiz Exp $
+
+--- configure.orig	Thu Nov  1 12:25:50 2001
++++ configure
+@@ -209,6 +209,12 @@ ac_help="$ac_help
+ ac_help="$ac_help
+   --disable-gtktest       Do not try to compile and run a test GTK program"
+ ac_help="$ac_help
++  --with-gdk-pixbuf-prefix=PFX   Prefix where GDK_PIXBUF is installed (optional)"
++ac_help="$ac_help
++  --with-gdk-pixbuf-exec-prefix=PFX Exec prefix where GDK_PIXBUF is installed (optional)"
++ac_help="$ac_help
++  --disable-gdk_pixbuftest       Do not try to compile and run a test GDK_PIXBUF program"
++ac_help="$ac_help
+   --with-html-dir=PATH path to installed docs "
+ ac_help="$ac_help
+   --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib"
+@@ -6534,6 +6540,241 @@ rm -f conftest*
+   
+   rm -f conf.gtktest
+ 
++# Check whether --with-gdk-pixbuf-prefix or --without-gdk-pixbuf-prefix was given.
++if test "${with_gdk_pixbuf_prefix+set}" = set; then
++  withval="$with_gdk_pixbuf_prefix"
++  gdk_pixbuf_prefix="$withval"
++else
++  gdk_pixbuf_prefix=""
++fi
++
++# Check whether --with-gdk-pixbuf-exec-prefix or --without-gdk-pixbuf-exec-prefix was given.
++if test "${with_gdk_pixbuf_exec_prefix+set}" = set; then
++  withval="$with_gdk_pixbuf_exec_prefix"
++  gdk_pixbuf_exec_prefix="$withval"
++else
++  gdk_pixbuf_exec_prefix=""
++fi
++
++# Check whether --enable-gdk_pixbuftest or --disable-gdk_pixbuftest was given.
++if test "${enable_gdk_pixbuftest+set}" = set; then
++  enableval="$enable_gdk_pixbuftest"
++  :
++else
++  enable_gdk_pixbuftest=yes
++fi
++
++
++  if test x$gdk_pixbuf_exec_prefix != x ; then
++     gdk_pixbuf_args="$gdk_pixbuf_args --exec-prefix=$gdk_pixbuf_exec_prefix"
++     if test x${GDK_PIXBUF_CONFIG+set} = xset ; then
++        GDK_PIXBUF_CONFIG=$gdk_pixbuf_exec_prefix/gdk-pixbuf-config
++     fi
++  fi
++  if test x$gdk_pixbuf_prefix != x ; then
++     gdk_pixbuf_args="$gdk_pixbuf_args --prefix=$gdk_pixbuf_prefix"
++     if test x${GDK_PIXBUF_CONFIG+set} = xset ; then
++        GDK_PIXBUF_CONFIG=$gdk_pixbuf_prefix/bin/gdk-pixbuf-config
++     fi
++  fi
++
++  # Extract the first word of "gdk-pixbuf-config", so it can be a program name with args.
++set dummy gdk-pixbuf-config; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:6585: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_path_GDK_PIXBUF_CONFIG'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  case "$GDK_PIXBUF_CONFIG" in
++  /*)
++  ac_cv_path_GDK_PIXBUF_CONFIG="$GDK_PIXBUF_CONFIG" # Let the user override the test with a path.
++  ;;
++  ?:/*)			 
++  ac_cv_path_GDK_PIXBUF_CONFIG="$GDK_PIXBUF_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_GDK_PIXBUF_CONFIG="$ac_dir/$ac_word"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++  test -z "$ac_cv_path_GDK_PIXBUF_CONFIG" && ac_cv_path_GDK_PIXBUF_CONFIG="no"
++  ;;
++esac
++fi
++GDK_PIXBUF_CONFIG="$ac_cv_path_GDK_PIXBUF_CONFIG"
++if test -n "$GDK_PIXBUF_CONFIG"; then
++  echo "$ac_t""$GDK_PIXBUF_CONFIG" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++  min_gdk_pixbuf_version=0.17.0
++  echo $ac_n "checking for GDK_PIXBUF - version >= $min_gdk_pixbuf_version""... $ac_c" 1>&6
++echo "configure:6620: checking for GDK_PIXBUF - version >= $min_gdk_pixbuf_version" >&5
++  no_gdk_pixbuf=""
++  if test "$GDK_PIXBUF_CONFIG" = "no" ; then
++    no_gdk_pixbuf=yes
++  else
++    GDK_PIXBUF_CFLAGS=`$GDK_PIXBUF_CONFIG $gdk_pixbufconf_args --cflags`
++    GDK_PIXBUF_LIBS=`$GDK_PIXBUF_CONFIG $gdk_pixbufconf_args --libs`
++
++    gdk_pixbuf_major_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_args --version | \
++           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
++    gdk_pixbuf_minor_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_args --version | \
++           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
++    gdk_pixbuf_micro_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_config_args --version | \
++           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
++    if test "x$enable_gdk_pixbuftest" = "xyes" ; then
++      ac_save_CFLAGS="$CFLAGS"
++      ac_save_LIBS="$LIBS"
++      CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS"
++      LIBS="$LIBS $GDK_PIXBUF_LIBS"
++      rm -f conf.gdk_pixbuftest
++      if test "$cross_compiling" = yes; then
++  echo $ac_n "cross compiling; assumed OK... $ac_c"
++else
++  cat > conftest.$ac_ext <<EOF
++#line 6644 "configure"
++#include "confdefs.h"
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <gdk-pixbuf/gdk-pixbuf.h>
++
++char*
++my_strdup (char *str)
++{
++  char *new_str;
++  
++  if (str)
++    {
++      new_str = malloc ((strlen (str) + 1) * sizeof(char));
++      strcpy (new_str, str);
++    }
++  else
++    new_str = NULL;
++  
++  return new_str;
++}
++
++int main ()
++{
++  int major, minor, micro;
++  char *tmp_version;
++
++  system ("touch conf.gdk_pixbuftest");
++
++  /* HP/UX 9 (%@#!) writes to sscanf strings */
++  tmp_version = my_strdup("$min_gdk_pixbuf_version");
++  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
++     printf("%s, bad version string\n", "$min_gdk_pixbuf_version");
++     exit(1);
++   }
++
++   if (($gdk_pixbuf_major_version > major) ||
++      (($gdk_pixbuf_major_version == major) && ($gdk_pixbuf_minor_version > minor)) ||
++      (($gdk_pixbuf_major_version == major) && ($gdk_pixbuf_minor_version == minor) && ($gdk_pixbuf_micro_version >= micro)))
++    {
++      return 0;
++    }
++  else
++    {
++      printf("\n*** 'gdk-pixbuf-config --version' returned %d.%d.%d, but the minimum version\n", $gdk_pixbuf_major_version, $gdk_pixbuf_minor_version, $gdk_pixbuf_micro_version);
++      printf("*** of GDK_PIXBUF required is %d.%d.%d. If gdk-pixbuf-config is correct, then it is\n", major, minor, micro);
++      printf("*** best to upgrade to the required version.\n");
++      printf("*** If gdk-pixbuf-config was wrong, set the environment variable GDK_PIXBUF_CONFIG\n");
++      printf("*** to point to the correct copy of gdk-pixbuf-config, and remove the file\n");
++      printf("*** config.cache before re-running configure\n");
++      return 1;
++    }
++}
++
++
++EOF
++if { (eval echo configure:6702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++then
++  :
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -fr conftest*
++  no_gdk_pixbuf=yes
++fi
++rm -fr conftest*
++fi
++
++       CFLAGS="$ac_save_CFLAGS"
++       LIBS="$ac_save_LIBS"
++     fi
++  fi
++  if test "x$no_gdk_pixbuf" = x ; then
++     echo "$ac_t""yes" 1>&6
++     :     
++  else
++     echo "$ac_t""no" 1>&6
++     if test "$GDK_PIXBUF_CONFIG" = "no" ; then
++       echo "*** The gdk-pixbuf-config script installed by GDK_PIXBUF could not be found"
++       echo "*** If GDK_PIXBUF was installed in PREFIX, make sure PREFIX/bin is in"
++       echo "*** your path, or set the GDK_PIXBUF_CONFIG environment variable to the"
++       echo "*** full path to gdk-pixbuf-config."
++     else
++       if test -f conf.gdk_pixbuftest ; then
++        :
++       else
++          echo "*** Could not run GDK_PIXBUF test program, checking why..."
++          CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS"
++          LIBS="$LIBS $GDK_PIXBUF_LIBS"
++          cat > conftest.$ac_ext <<EOF
++#line 6736 "configure"
++#include "confdefs.h"
++
++#include <stdio.h>
++#include <gdk-pixbuf/gdk-pixbuf.h>
++
++int main() {
++ return 0; 
++; return 0; }
++EOF
++if { (eval echo configure:6746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++   echo "*** The test program compiled, but did not run. This usually means"
++          echo "*** that the run-time linker is not finding GDK_PIXBUF or finding the wrong"
++          echo "*** version of GDK_PIXBUF. If it is not finding GDK_PIXBUF, you'll need to set your"
++          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
++          echo "*** is required on your system"
++	  echo "***"
++          echo "*** If you have an old version installed, it is best to remove it, although"
++          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++   echo "*** The test program failed to compile or link. See the file config.log for the"
++          echo "*** exact error that occured. This usually means GDK_PIXBUF was incorrectly installed"
++          echo "*** or that you have moved GDK_PIXBUF since it was installed. In the latter case, you"
++          echo "*** may want to edit the gdk-pixbuf-config script: $GDK_PIXBUF_CONFIG" 
++fi
++rm -f conftest*
++          CFLAGS="$ac_save_CFLAGS"
++          LIBS="$ac_save_LIBS"
++       fi
++     fi
++     GDK_PIXBUF_CFLAGS=""
++     GDK_PIXBUF_LIBS=""
++     { echo "configure: error: gdk-pixbuf not found or too old" 1>&2; exit 1; }
++  fi
++  
++  
++  rm -f conf.gdk_pixbuftest
++
+ 
+ # Check whether --with-html-dir or --without-html-dir was given.
+ if test "${with_html_dir+set}" = set; then
+@@ -6588,8 +6829,8 @@ else
+         { echo "configure: error: bonobo >= 1.0.14 not found" 1>&2; exit 1; }
+ fi
+ 
+-BONOBO_LIBS="`gnome-config --libs oaf bonobox gnome`"
+-BONOBO_CFLAGS="`gnome-config --cflags oaf bonobox gnome`"
++BONOBO_LIBS="`gnome-config --libs oaf bonobox gnome` $GDK_PIXBUF_LIBS"
++BONOBO_CFLAGS="`gnome-config --cflags oaf bonobox gnome` $GDK_PIXBUF_CFLAGS"
+ 
+ BONOBO_CONF_LIBS="-lbonobo_conf $BONOBO_LIBS"
+ BONOBO_CONF_CFLAGS="$BONOBO_CFLAGS"
+@@ -9222,6 +9463,9 @@ s%@OAF_LIBS@%$OAF_LIBS%g
+ s%@GTK_CONFIG@%$GTK_CONFIG%g
+ s%@GTK_CFLAGS@%$GTK_CFLAGS%g
+ s%@GTK_LIBS@%$GTK_LIBS%g
++s%@GDK_PIXBUF_CONFIG@%$GDK_PIXBUF_CONFIG%g
++s%@GDK_PIXBUF_CFLAGS@%$GDK_PIXBUF_CFLAGS%g
++s%@GDK_PIXBUF_LIBS@%$GDK_PIXBUF_LIBS%g
+ s%@HTML_DIR@%$HTML_DIR%g
+ s%@GCONF_LIBS@%$GCONF_LIBS%g
+ s%@GCONF_CFLAGS@%$GCONF_CFLAGS%g