Fix for new autotools.

4 files changed, 34 insertions, 63 deletions

diff --git a/graphics/glide3/Makefile b/graphics/glide3/Makefile
index 8329aa5dda74..a1918b12544d 100644
--- a/graphics/glide3/Makefile
+++ b/graphics/glide3/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_XORG=	x11 xxf86dga xxf86vm
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	automake14 autoconf libtool
+USE_AUTOTOOLS=	automake autoconf libtool
 AUTOMAKE_ARGS=	-a
 
 MAKEFILE=	makefile.autoconf
diff --git a/graphics/glide3/files/patch-configure_in b/graphics/glide3/files/patch-configure_in
index 3145e4a05d10..128ce8b2b007 100644
--- a/graphics/glide3/files/patch-configure_in
+++ b/graphics/glide3/files/patch-configure_in
@@ -1,19 +1,13 @@
---- configure.in.orig	Thu May 31 12:05:51 2001
-+++ configure.in	Fri May 10 19:45:32 2002
-@@ -25,6 +25,10 @@
- AM_INIT_AUTOMAKE(glide, 3.0)
- AM_CONFIG_HEADER(swlibs/include/config.h)
+--- configure.in.orig	2001-05-31 14:05:51.000000000 -0500
++++ configure.in	2011-03-06 14:40:30.000000000 -0600
+@@ -27,2 +27,6 @@
  AC_PREFIX_DEFAULT([/usr])
 +
 +AC_PATH_X
 +AC_SUBST(x_includes)
 +
  includedir='${prefix}/include/glide3'
- #
- # Variables local to the build.
-@@ -168,6 +172,11 @@
-                    ;;
-                esac],[FX_GLIDE_BUILD_ARCHITECTURE=`uname -m`])
+@@ -170,2 +174,7 @@
  AC_SUBST(FX_GLIDE_BUILD_ARCHITECTURE)
 +
 +# Appease automake1.5 about assembly targets
@@ -21,5 +15,9 @@
 +AC_SUBST(ASFLAGS)
 +
  #
- # Various tests needed at points in the build
- # First, we set defaults.
+@@ -250,3 +259,4 @@
+ AC_PROG_CPP
+-AC_CHECK_TOOL(AS, as, false)
++AM_PROG_AS
++AM_PROG_CC_C_O
+ AC_CHECK_TOOL(OBJDUMP, objdump, false)
diff --git a/graphics/glide3/files/patch-h3-src-makefile b/graphics/glide3/files/patch-h3-src-makefile
index 6a1e96ef8549..8b81435dd08e 100644
--- a/graphics/glide3/files/patch-h3-src-makefile
+++ b/graphics/glide3/files/patch-h3-src-makefile
@@ -1,17 +1,11 @@
---- h3/glide3/src/makefile.autoconf.am.orig	Fri Oct 27 19:20:00 2000
-+++ h3/glide3/src/makefile.autoconf.am	Tue Dec  5 05:45:11 2006
-@@ -101,7 +101,7 @@
- endif
- 
+--- h3/glide3/src/makefile.autoconf.am.orig	2000-10-27 06:20:00.000000000 -0500
++++ h3/glide3/src/makefile.autoconf.am	2011-03-06 14:46:41.000000000 -0600
+@@ -103,3 +103,3 @@
  if GL_AMD3D
 -GL_AMD3D_SRC = xtexdl_3dnow.S xdraw2_3dnow.S xdraw3_3dnow.S
 +GL_AMD3D_SRC = xtexdl_3dnow.S xdraw2_3dnow.S xdraw3_3dnow.S xdraw2_def.S xdraw3_def.S
  endif
- 
- VDEFS = $(FX_CHRIS_DENIS_ANTHONY_HACK_VDEFS) \
-@@ -138,41 +138,40 @@
- #
- # Special rules for assembly files.
+@@ -140,8 +140,8 @@
  #
 -PREPROCESSOR=/lib/cpp -$$ -I.
 -xdraw2.o : xdraw2.S xdraw2.inc.S fxgasm.h
@@ -25,9 +19,7 @@
 +xdraw3.lo : xdraw3.S fxgasm.h
 +	libtool --mode=compile $(CC) $(AFLAGS) -c -o $@ xdraw3.S
  
- # 3DNow!(tm) dependencies
- # XXX_def.obj targets are the default targets
- 
+@@ -151,17 +151,16 @@
  if GL_AMD3D
 -else
 -xdraw2_def.o: xdraw2.S xdraw2.inc.S fxgasm.h
@@ -55,10 +47,7 @@
 +xtexdl_3dnow.lo: xtexdl.S fxgasm.h 
 +	libtool --mode=compile $(CC) $(AFLAGS) -DGL_AMD3D -DUSE_PACKET_FIFO=1 -c -o $@ xtexdl.S
  
- endif
- 
- if FX_GLIDE_C_CPU_DETECT
- CPUSOURCES = cpudtect.c
+@@ -172,5 +171,5 @@
  else
 -CPUSOURCES = cpudtect.S
 +CPUSOURCES = cpudtect_asm.S
@@ -66,14 +55,12 @@
 -cpudtect.o cpudtect.lo: cpudtect.S
 +cpudtect_asm.o cpudtect_asm.lo: cpudtect.S
  	$(PREPROCESSOR) -DUSE_PACKET_FIFO=1 $< > $*.tmp.s
- 	$(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
- 	$(CP) $*.o $*.lo
-@@ -212,7 +211,7 @@
- WHOLE_LIBS = $(top_builddir)/swlibs/fxmisc/libfxmisc.la \
-              $(top_builddir)/swlibs/newpci/pcilib/libfxpci.la \
+@@ -214,3 +213,3 @@
               $(top_builddir)/@FX_GLIDE_HW@/minihwc/libminihwc.la
 -LINK_LIBS  = -L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm
 +LINK_LIBS  = -L$(LOCALBASE)/lib -lX11 -lXext -lXxf86dga -lXxf86vm
  
- CLEANFILES = fxinline.h fxgasm.h
+@@ -224,2 +223,3 @@
+ fxgasm_SOURCES         = fxgasm.c gthread.c
++fxgasm_CFLAGS          = $(AM_CFLAGS)
  
diff --git a/graphics/glide3/files/patch-h5-src-makefile b/graphics/glide3/files/patch-h5-src-makefile
index 42f094b48241..48771391f7ee 100644
--- a/graphics/glide3/files/patch-h5-src-makefile
+++ b/graphics/glide3/files/patch-h5-src-makefile
@@ -1,8 +1,6 @@
---- h5/glide3/src/makefile.autoconf.am.orig	Sun Nov 19 00:00:26 2000
-+++ h5/glide3/src/makefile.autoconf.am	Tue Dec  5 05:44:58 2006
-@@ -152,46 +152,40 @@
- #
- # Special rules for assembly files.
+--- h5/glide3/src/makefile.autoconf.am.orig	2000-11-18 10:00:26.000000000 -0600
++++ h5/glide3/src/makefile.autoconf.am	2011-03-06 14:49:35.000000000 -0600
+@@ -154,7 +154,6 @@
  #
 -PREPROCESSOR=/lib/cpp -$$ -I.
 +PREPROCESSOR=$(CPP) -$$ -I.
@@ -12,37 +10,31 @@
 -	$(CP) $*.o $*.lo
 +	libtool --mode=compile $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
  	$(RM) -f $*.tmp.s
- 
- xdraw2_3dnow.o xdraw2_3dnow.lo: xdraw2.s xdraw2.inc.s fxgasm.h
+@@ -163,4 +162,3 @@
  	$(PREPROCESSOR) -DGL_AMD3D -DUSE_PACKET_FIFO=1 $< > $*.tmp.s
 -	$(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
 -	$(CP) $*.o $*.lo
 +	libtool --mode=compile $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
  	$(RM) -f $*.tmp.s
- 
- xdraw3_def.o xdraw3_def.lo: xdraw3.s fxgasm.h
+@@ -169,4 +167,3 @@
  	$(PREPROCESSOR) $< > $*.tmp.s
 -	$(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
 -	$(CP) $*.o $*.lo
 +	libtool --mode=compile $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
  	$(RM) -f $*.tmp.s
- 
- xdraw3_3dnow.o xdraw3_3dnow.lo: xdraw3.s fxgasm.h
+@@ -175,4 +172,3 @@
  	$(PREPROCESSOR) -DGL_AMD3D -DUSE_PACKET_FIFO=1 $< > $*.tmp.s
 -	$(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
 -	$(CP) $*.o $*.lo
 +	libtool --mode=compile $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
  	$(RM) -f $*.tmp.s
- 
- xtexdl_3dnow.o xtexdl_3dnow.lo: xtexdl.s fxgasm.h 
+@@ -181,4 +177,3 @@
  	$(PREPROCESSOR) -DGL_AMD3D -DUSE_PACKET_FIFO=1 $< > $*.tmp.s
 -	$(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
 -	$(CP) $*.o $*.lo
 +	libtool --mode=compile $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
  	$(RM) -f $*.tmp.s
- 
- if FX_GLIDE_C_CPU_DETECT
- CPUSOURCES = cpudtect.c
+@@ -188,8 +183,7 @@
  else
 -CPUSOURCES = cpudtect.s 
 +CPUSOURCES = cpudtect_asm.s 
@@ -54,23 +46,17 @@
 -	$(CP) $*.o $*.lo
 +	libtool --mode=compile $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
  	$(RM) -f $*.tmp.s
- endif
- 
-@@ -202,7 +196,7 @@
- FX_GLIDE_CTRISETUP_SRC = gxdraw.c
- else
+@@ -204,3 +198,3 @@
  if GL_AMD3D
 -FX_GLIDE_CTRISETUP_SRC = xdraw2_3dnow.s xdraw3_3dnow.s
 +FX_GLIDE_CTRISETUP_SRC = xdraw2_3dnow.s xdraw3_3dnow.s xtexdl_3dnow.s xdraw2_def.s xdraw3_def.s
  else
- FX_GLIDE_CTRISETUP_SRC = xdraw2_def.s xdraw3_def.s
- endif
-@@ -214,7 +208,7 @@
-              $(top_builddir)/swlibs/newpci/pcilib/libfxpci.la \
- 			 $(top_builddir)/swlibs/$(TEXTURE_UTILITIES_DIR)/lib/libtexus.la \
+@@ -216,3 +210,3 @@
               $(top_builddir)/@FX_GLIDE_HW@/minihwc/libminihwc.la
 -LINK_LIBS  = -L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm -lm
 +LINK_LIBS  = -L$(LOCALBASE)/lib -lX11 -lXext -lXxf86dga -lXxf86vm -lm
  
- CLEANFILES = fxinline.h fxgasm.h
+@@ -231,2 +225,3 @@
+ fxgasm_DEPENDENCIES    = gthread.lo
++fxgasm_CFLAGS          = $(AM_CFLAGS)