get rid of automake build dependency by patching configure

3 files changed, 107 insertions, 7 deletions

diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile
index 30be878d0df..28cdb5631b8 100644
--- a/lang/squeak/Makefile
+++ b/lang/squeak/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/11/29 19:46:12 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2002/10/02 22:00:09 dillo Exp $
 #
 
 DISTNAME=	Squeak-3.0
@@ -14,7 +14,6 @@ MAINTAINER=	fredb@netbsd.org
 HOMEPAGE=	http://www.squeak.org/
 COMMENT=	Full Smalltalk 80 with portability to UN*X, Mac, and Windows
 
-BUILD_DEPENDS+=	automake>=1.4:../../devel/automake
 BUILD_DEPENDS+=	unzip-[0-9]*:../../archivers/unzip
 
 GNU_CONFIGURE=	yes
@@ -37,10 +36,6 @@ post-extract:
 	    ${LOCALBASE}/bin/unzip ${DISTDIR}/${DIST_SUBDIR}/Squeak3.0-3552.zip
 	${MKDIR} ${WRKSRC}
 
-pre-configure:
-	cd ${WRKSRC}/../src/unix; \
-	    ${LOCALBASE}/bin/aclocal && ${LOCALBASE}/bin/autoconf
-
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/squeak/3.0
 .for f in ReadMe.txt SqueakV3.sources
diff --git a/lang/squeak/distinfo b/lang/squeak/distinfo
index 1fc00866c10..6f3cbb4c7b7 100644
--- a/lang/squeak/distinfo
+++ b/lang/squeak/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2001/08/24 14:46:28 mjl Exp $
+$NetBSD: distinfo,v 1.8 2002/10/02 22:00:09 dillo Exp $
 
 SHA1 (squeak/ReadMe.txt.gz) = e632f908e576d8ccbf8386a1b94689e261a2aec7
 Size (squeak/ReadMe.txt.gz) = 6513 bytes
@@ -14,4 +14,5 @@ SHA1 (patch-ac) = 035cb8f3d00619de7b2c638168834ac6da2aaad8
 SHA1 (patch-ad) = b9b9b99da74429a4a42e7ff5ecc632c0dfe61648
 SHA1 (patch-ae) = c1714d9dbeeb7a86cfda350c567d29431616e281
 SHA1 (patch-af) = 8fc7494c1182ff9a55ae26aaa389e94e52c9f6c7
+SHA1 (patch-ag) = 42fc9206783c74b948915ddcee93aa5eed929323
 SHA1 (patch-ba) = eae0e8c40b14e3e04b278b1b841c4c89ddebea7b
diff --git a/lang/squeak/patches/patch-ag b/lang/squeak/patches/patch-ag
new file mode 100644
index 00000000000..e1ddaacb3eb
--- /dev/null
+++ b/lang/squeak/patches/patch-ag
@@ -0,0 +1,104 @@
+$NetBSD: patch-ag,v 1.1 2002/10/02 22:00:10 dillo Exp $
+
+--- ../src/unix/configure.orig	Wed Oct  2 23:48:40 2002
++++ ../src/unix/configure
+@@ -3737,7 +4463,22 @@ int main() {
+ OPEN_SOUND_SYSTEM;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3741: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  rm -rf conftest*
++  ac_cv_oss="yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  cat > conftest.$ac_ext <<EOF
++#line 4475 "configure"
++#include "confdefs.h"
++#include <soundcard.h>
++int main() {
++SOUND_VERSION;
++; return 0; }
++EOF
++if { (eval echo configure:4482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_oss="yes"
+ else
+@@ -3748,6 +4489,8 @@ else
+ fi
+ rm -f conftest*
+ fi
++rm -f conftest*
++fi
+ 
+ echo "$ac_t""$ac_cv_oss" 1>&6
+ if $test "$ac_cv_oss" = "yes" -a -e /dev/dsp; then
+@@ -3759,9 +4502,65 @@ EOF
+ #define OSS_DEVICE "/dev/dsp"
+ EOF
+ 
++elif $test "$ac_cv_oss" = "yes" -a -e /dev/audio; then
++  cat >> confdefs.h <<\EOF
++#define HAVE_OSS 1
++EOF
++
++  cat >> confdefs.h <<\EOF
++#define OSS_DEVICE "/dev/audio"
++EOF
++
++  echo $ac_n "checking for _oss_ioctl in -lossaudio""... $ac_c" 1>&6
++echo "configure:4516: checking for _oss_ioctl in -lossaudio" >&5
++ac_lib_var=`echo ossaudio'_'_oss_ioctl | 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="-lossaudio  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 4524 "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 _oss_ioctl();
++
++int main() {
++_oss_ioctl()
++; return 0; }
++EOF
++if { (eval echo configure:4535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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
++    ac_tr_lib=HAVE_LIB`echo ossaudio | sed -e 's/[^a-zA-Z0-9_]/_/g' \
++    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_lib 1
++EOF
++
++  LIBS="-lossaudio $LIBS"
++
++else
++  echo "$ac_t""no" 1>&6
++fi
++
+ fi
+ echo $ac_n "checking for prefix to use for loadable modules""... $ac_c" 1>&6
+-echo "configure:3765: checking for prefix to use for loadable modules" >&5
++echo "configure:4564: checking for prefix to use for loadable modules" >&5
+ if eval "test \"`echo '$''{'ac_cv_module_prefix'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else