Remove build dependency on automake by providing patches.

Requested and tested by Nick Hudson.

6 files changed, 131 insertions, 15 deletions

diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index 2b13cbd94ba..965e6274d71 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2002/06/25 06:54:43 tron Exp $
+# $NetBSD: Makefile,v 1.35 2002/07/13 16:17:33 wiz Exp $
 #
 
 DISTNAME=	SDL-1.2.3
@@ -9,7 +9,6 @@ MAINTAINER=	wiz@netbsd.org
 HOMEPAGE=	http://www.libsdl.org/
 COMMENT=	Simple DirectMedia Layer, a cross-platform multimedia library
 
-BUILD_DEPENDS+=		automake>=1.4:../../devel/automake
 BUILD_DEPENDS+=		nasm>=0.98:../../devel/nasm
 
 USE_BUILDLINK_ONLY=	YES
@@ -49,9 +48,6 @@ CONFIGURE_ENV+=		SYSTEM_LIBS="${LDFLAGS}"
 pre-patch:
 	cd ${WRKSRC} && ${MKDIR} src/audio/netbsd
 
-pre-configure:
-	cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf --force --foreign
-
 post-configure:
 	cd ${WRKSRC}/src/audio && ${CP} *.[ch] netbsd/
 
diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo
index 7173979fd9e..6c4e93c7cd9 100644
--- a/devel/SDL/distinfo
+++ b/devel/SDL/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2002/02/14 00:39:45 wiz Exp $
+$NetBSD: distinfo,v 1.11 2002/07/13 16:17:33 wiz Exp $
 
 SHA1 (SDL-1.2.3.tar.gz) = f74f5bf47a472083da8700d2354cb90062e2a845
 Size (SDL-1.2.3.tar.gz) = 1568671 bytes
@@ -10,9 +10,12 @@ SHA1 (patch-af) = f5e824addf308f9c467de02e3b262afbc0ef77c0
 SHA1 (patch-ag) = 989c3464686a3158c538034ad7ea012a4e4b4b9e
 SHA1 (patch-ah) = f509c0c146002cf2525bd9b7c7532fbca7aa4fb6
 SHA1 (patch-ai) = 0edabed555e3fc4b0a92aff9240359fc6637f022
-SHA1 (patch-aj) = 193253f2d1e10efda167ef90fdc8fc6c426b3c42
+SHA1 (patch-aj) = 450364c3f779e923f3cfc59edaf3e1d5ffdc70c9
 SHA1 (patch-ak) = 657947be674831c98850f044315e4681fe58ea29
 SHA1 (patch-al) = 0fe579ae0358d59f87a78fe4b5b006ef991d44f0
+SHA1 (patch-am) = 39de95c727fbd5276729b8591554a7b9664166e3
 SHA1 (patch-an) = b875bc9e173d69cb5fcc1b4ea3e7039b7633d187
+SHA1 (patch-ap) = ca979b24a57a8f115f5e1bdf6b1e5672a60d20a9
 SHA1 (patch-aq) = 45f63636a9caa338274db68596c8cf8c1d3cd0f0
 SHA1 (patch-ar) = 1a78f0bcb6a8f65f71af23accb2a9780331f275b
+SHA1 (patch-as) = a53286d5e0a2cab7e0a1d80baf3b76681f996b7a
diff --git a/devel/SDL/patches/patch-aj b/devel/SDL/patches/patch-aj
index 4f6413014dd..4f200e3c4a6 100644
--- a/devel/SDL/patches/patch-aj
+++ b/devel/SDL/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.9 2002/02/14 00:39:46 wiz Exp $
+$NetBSD: patch-aj,v 1.10 2002/07/13 16:17:33 wiz Exp $
 
---- configure.in.orig	Mon Jul 23 15:54:03 2001
+--- configure.in.orig	Thu Nov  8 08:28:00 2001
 +++ configure.in
-@@ -366,10 +366,7 @@
+@@ -374,10 +374,7 @@
                    , enable_nas=yes)
      if test x$enable_audio = xyes -a x$enable_nas = xyes; then
          AC_MSG_CHECKING(for NAS audio support)
@@ -14,7 +14,7 @@ $NetBSD: patch-aj,v 1.9 2002/02/14 00:39:46 wiz Exp $
          AC_MSG_RESULT($have_nas)
          if test x$have_nas = xyes; then
              CFLAGS="$CFLAGS -DNAS_SUPPORT"
-@@ -420,7 +417,7 @@
+@@ -429,7 +426,7 @@
                    NASMFLAGS="-f win32"
                    ;;
                *)
@@ -23,7 +23,7 @@ $NetBSD: patch-aj,v 1.9 2002/02/14 00:39:46 wiz Exp $
                    ;;
              esac
              AC_SUBST(NASMFLAGS)
-@@ -930,8 +927,8 @@
+@@ -999,8 +996,8 @@
              pthread_lib="-pthread"
              ;;
          *-*-netbsd*)
@@ -34,7 +34,7 @@ $NetBSD: patch-aj,v 1.9 2002/02/14 00:39:46 wiz Exp $
              ;;
          *-*-openbsd*)
              pthread_cflags="-D_REENTRANT"
-@@ -1348,11 +1345,13 @@
+@@ -1465,11 +1462,13 @@
          CheckDummyVideo
          CheckDiskAudio
          CheckNASM
@@ -48,7 +48,7 @@ $NetBSD: patch-aj,v 1.9 2002/02/14 00:39:46 wiz Exp $
          CheckAAlib
          CheckOpenGL
          CheckPTHREAD
-@@ -1642,7 +1641,11 @@
+@@ -1770,7 +1769,11 @@
              COPY_ARCH_SRC(src/thread, linux, SDL_systhread_c.h)
              COPY_ARCH_SRC(src/thread, linux, SDL_sysmutex.c)
              COPY_ARCH_SRC(src/thread, linux, SDL_sysmutex_c.h)
@@ -61,7 +61,7 @@ $NetBSD: patch-aj,v 1.9 2002/02/14 00:39:46 wiz Exp $
              COPY_ARCH_SRC(src/thread, generic, SDL_syssem_c.h)
              COPY_ARCH_SRC(src/thread, linux, SDL_syscond.c)
              COPY_ARCH_SRC(src/thread, generic, SDL_syscond_c.h)
-@@ -2021,6 +2024,10 @@
+@@ -2157,6 +2160,10 @@
  
  if test $ARCH = solaris; then
    SDL_RLD_FLAGS="-R\${exec_prefix}/lib"
diff --git a/devel/SDL/patches/patch-am b/devel/SDL/patches/patch-am
new file mode 100644
index 00000000000..9a715c5e3e2
--- /dev/null
+++ b/devel/SDL/patches/patch-am
@@ -0,0 +1,91 @@
+$NetBSD: patch-am,v 1.3 2002/07/13 16:17:33 wiz Exp $
+
+--- configure.orig	Thu Nov  8 08:28:08 2001
++++ configure
+@@ -3588,10 +3588,7 @@
+     if test x$enable_audio = xyes -a x$enable_nas = xyes; then
+         echo $ac_n "checking for NAS audio support""... $ac_c" 1>&6
+ echo "configure:3591: checking for NAS audio support" >&5
+-        have_nas=no
+-        if test -r /usr/X11R6/include/audio/audiolib.h; then
+-            have_nas=yes
+-        fi
++        have_nas=yes
+         echo "$ac_t""$have_nas" 1>&6
+         if test x$have_nas = xyes; then
+             CFLAGS="$CFLAGS -DNAS_SUPPORT"
+@@ -3683,7 +3680,7 @@
+                   NASMFLAGS="-f win32"
+                   ;;
+               *)
+-                  NASMFLAGS="-f elf"
++                  test -n "$NASMFLAGS" || NASMFLAGS="-f elf"
+                   ;;
+             esac
+             
+@@ -5582,8 +5579,8 @@
+             pthread_lib="-pthread"
+             ;;
+         *-*-netbsd*)
+-            pthread_cflags="-I/usr/pkg/include -D_REENTRANT"
+-            pthread_lib="-L/usr/pkg/lib -lpthread -lsem"
++            pthread_cflags="-D_REENTRANT"
++            pthread_lib="-lpthread"
+             ;;
+         *-*-openbsd*)
+             pthread_cflags="-D_REENTRANT"
+@@ -6588,11 +6585,13 @@
+         CheckDummyVideo
+         CheckDiskAudio
+         CheckNASM
++        CheckOPENBSDAUDIO
+         CheckOSS
+         CheckARTSC
+         CheckESD
+         CheckNAS
+         CheckX11
++        CheckDGA
+         CheckAAlib
+         CheckOpenGL
+         CheckPTHREAD
+@@ -7553,7 +7552,20 @@
+ __EOF__
+   cat >>$new <$old
+ 
+-            
++	    if test x$use_pthreads = xyes -a x$enable_pthread_sem != xyes; then
++		
++  echo "Copying src/thread/generic/SDL_syssem.c -> src/thread/SDL_syssem.c"
++  old="$srcdir/src/thread/generic/SDL_syssem.c"
++  new="$srcdir/src/thread/SDL_syssem.c"
++  cat >$new <<__EOF__
++/* WARNING:  This file was automatically generated!
++ * Original: $old
++ */
++__EOF__
++  cat >>$new <$old
++
++	    else
++		
+   echo "Copying src/thread/linux/SDL_syssem.c -> src/thread/SDL_syssem.c"
+   old="$srcdir/src/thread/linux/SDL_syssem.c"
+   new="$srcdir/src/thread/SDL_syssem.c"
+@@ -7564,6 +7576,7 @@
+ __EOF__
+   cat >>$new <$old
+ 
++	    fi
+             
+   echo "Copying src/thread/generic/SDL_syssem_c.h -> src/thread/SDL_syssem_c.h"
+   old="$srcdir/src/thread/generic/SDL_syssem_c.h"
+@@ -8842,6 +8855,10 @@
+ 
+ if test $ARCH = solaris; then
+   SDL_RLD_FLAGS="-R\${exec_prefix}/lib"
++fi
++
++if test $ARCH = netbsd; then
++  SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib -Wl,-rpath,${X11BASE}/lib"
+ fi
+ 
+ if test $ARCH = openbsd; then
diff --git a/devel/SDL/patches/patch-ap b/devel/SDL/patches/patch-ap
new file mode 100644
index 00000000000..adf2b569cc0
--- /dev/null
+++ b/devel/SDL/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.4 2002/07/13 16:17:33 wiz Exp $
+
+--- src/hermes/Makefile.in.orig	Thu Nov  8 08:28:07 2001
++++ src/hermes/Makefile.in
+@@ -345,7 +345,7 @@
+ 
+ 
+ .asm.lo:
+-	$(LIBTOOL) --mode=compile $(STRIP_FPIC) $(NASM) @NASMFLAGS@ $<
++	$(LIBTOOL) --tag=CC --mode=compile $(STRIP_FPIC) $(NASM) @NASMFLAGS@ $<
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/devel/SDL/patches/patch-as b/devel/SDL/patches/patch-as
new file mode 100644
index 00000000000..a37f7a4ccfe
--- /dev/null
+++ b/devel/SDL/patches/patch-as
@@ -0,0 +1,13 @@
+$NetBSD: patch-as,v 1.1 2002/07/13 16:17:33 wiz Exp $
+
+--- src/Makefile.in.orig	Thu Nov  8 08:28:02 2001
++++ src/Makefile.in
+@@ -128,7 +128,7 @@
+ lib_LTLIBRARIES = libSDL.la
+ 
+ libSDL_la_SOURCES = $(GENERAL_SRCS)
+-libSDL_la_LDFLAGS =          -release $(LT_RELEASE)		-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
++libSDL_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ 
+ libSDL_la_LIBADD =  	main/libarch.la			@SDL_EXTRALIBS@			@SYSTEM_LIBS@
+