- Respect X11BASE

Reported by:	pointyhat

3 files changed, 29 insertions, 9 deletions

diff --git a/graphics/glide3/files/patch-h3-src-makefile b/graphics/glide3/files/patch-h3-src-makefile
index 64ea6835edc0..be64c681301d 100644
--- a/graphics/glide3/files/patch-h3-src-makefile
+++ b/graphics/glide3/files/patch-h3-src-makefile
@@ -1,5 +1,5 @@
---- h3/glide3/src/makefile.autoconf.am.orig	Fri Oct 27 04:20:00 2000
-+++ h3/glide3/src/makefile.autoconf.am	Fri May 10 19:53:18 2002
+--- 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
  
@@ -68,3 +68,12 @@
  	$(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 \
+              $(top_builddir)/@FX_GLIDE_HW@/minihwc/libminihwc.la
+-LINK_LIBS  = -L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm
++LINK_LIBS  = -L$(X11BASE)/lib -lX11 -lXext -lXxf86dga -lXxf86vm
+ 
+ CLEANFILES = fxinline.h fxgasm.h
+ 
diff --git a/graphics/glide3/files/patch-h5-src-makefile b/graphics/glide3/files/patch-h5-src-makefile
index 07a35c8bbd20..c6ea0725e156 100644
--- a/graphics/glide3/files/patch-h5-src-makefile
+++ b/graphics/glide3/files/patch-h5-src-makefile
@@ -1,5 +1,5 @@
---- h5/glide3/src/makefile.autoconf.am.orig	Sat Nov 18 08:00:26 2000
-+++ h5/glide3/src/makefile.autoconf.am	Fri May 10 20:10:23 2002
+--- 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.
@@ -65,3 +65,12 @@
  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 \
+              $(top_builddir)/@FX_GLIDE_HW@/minihwc/libminihwc.la
+-LINK_LIBS  = -L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm -lm
++LINK_LIBS  = -L$(X11BASE)/lib -lX11 -lXext -lXxf86dga -lXxf86vm -lm
+ 
+ CLEANFILES = fxinline.h fxgasm.h
+ 
diff --git a/graphics/glide3/files/patch-make-3dfx_mak b/graphics/glide3/files/patch-make-3dfx_mak
index 9f1758498f15..272aabf0b999 100644
--- a/graphics/glide3/files/patch-make-3dfx_mak
+++ b/graphics/glide3/files/patch-make-3dfx_mak
@@ -1,9 +1,11 @@
-diff -ru ../Glide3.orig/swlibs/include/make/3dfx.mak ./swlibs/include/make/3dfx.mak
---- ../Glide3.orig/swlibs/include/make/3dfx.mak	Sat Nov 18 08:00:37 2000
-+++ ./swlibs/include/make/3dfx.mak	Sun Jan 13 16:13:53 2002
-@@ -133,15 +133,11 @@
+--- swlibs/include/make/3dfx.mak.orig	Sun Nov 19 00:00:37 2000
++++ swlibs/include/make/3dfx.mak	Tue Dec  5 05:44:13 2006
+@@ -131,17 +131,13 @@
+ endif
+ 
  ifeq "$(OS)" "FreeBSD"
- GCINCS	       = -I. -I$(BUILD_ROOT_SWLIBS)/include -I$(BUILD_ROOT_HW)/include -I/usr/X11R6/include
+-GCINCS	       = -I. -I$(BUILD_ROOT_SWLIBS)/include -I$(BUILD_ROOT_HW)/include -I/usr/X11R6/include
++GCINCS	       = -I. -I$(BUILD_ROOT_SWLIBS)/include -I$(BUILD_ROOT_HW)/include -I$(X11BASE)/include
  GCOPTS	       = -Wall
 -# 
 -# BIG_OPT Indicates O3(?) or better is being used. It changes the