Upgrade to the latest CVS snapshot and remove CVS hack.

The driver is now in the pre-release stage, with first stable release scheduled
within the one month or even less, so please test it hard and report bugs into
utah's mailing list (see pkg/MESSAGE for details). Happy rendering!

4 files changed, 108 insertions, 0 deletions

diff --git a/graphics/utah-glx/files/patch-ab b/graphics/utah-glx/files/patch-ab
new file mode 100644
index 000000000000..053b3c568792
--- /dev/null
+++ b/graphics/utah-glx/files/patch-ab
@@ -0,0 +1,39 @@
+--- libGLU/Makefile.in.orig	Thu Dec 16 05:30:13 1999
++++ libGLU/Makefile.in	Fri Dec 31 04:19:58 1999
+@@ -13,10 +13,10 @@
+ # These define the name/version of the shared library we're building
+ # ------------------------------------------------------------------
+ LIBNAME = GLU
+-GLUREV_major = 1
+-GLUREV_minor = 2
+-GLUREV_micro = 0
+-SOGLUREV = ${GLUREV_major}.${GLUREV_minor}.${GLUREV_micro}
++GLUREV_major = ${GLVER}
++GLUREV_minor = 
++GLUREV_micro = 
++SOGLUREV = ${GLUREV_major}
+ GLULIB = lib${LIBNAME}.so.${SOGLUREV}
+ 
+ # FIXME: different library version for Mesa 3.2?
+@@ -104,8 +104,8 @@
+ 	@if [ -d ${INSTALL_libdir} ]; then set +x; \
+ 	else (set -x; ${MKDIR} ${INSTALL_libdir}); fi
+ 	${INSTALL} ${INSTALLFLAGS} ${INSTBINFLAGS} ${GLULIB} ${INSTALL_libdir}
+-	${RM} ${INSTALL_libdir}/lib${LIBNAME}.so.${GLUREV_major} ;\
+-	${LN} ${GLULIB} ${INSTALL_libdir}/lib${LIBNAME}.so.${GLUREV_major}
++#	${RM} ${INSTALL_libdir}/lib${LIBNAME}.so.${GLUREV_major} ;\
++#	${LN} ${GLULIB} ${INSTALL_libdir}/lib${LIBNAME}.so.${GLUREV_major}
+ 	${RM} ${INSTALL_libdir}/lib${LIBNAME}.so ;\
+ 	${LN} ${GLULIB} ${INSTALL_libdir}/lib${LIBNAME}.so
+ else
+@@ -128,8 +128,8 @@
+ 	${CC} -o ./$@~ ${SHARED_LDFLAGS} -Wl,-soname,lib${LIBNAME}.so.${GLUREV_major} ${OBJS} ${MATHLIBS}
+ 	${RM} $@
+ 	${MV} $@~ $@
+-	${RM} lib${LIBNAME}.so.${GLUREV_major}
+-	${LN} $@ lib${LIBNAME}.so.${GLUREV_major}
++#	${RM} lib${LIBNAME}.so.${GLUREV_major}
++#	${LN} $@ lib${LIBNAME}.so.${GLUREV_major}
+ 	${RM} lib${LIBNAME}.so
+ 	${LN} $@ lib${LIBNAME}.so
+ 
diff --git a/graphics/utah-glx/files/patch-ac b/graphics/utah-glx/files/patch-ac
new file mode 100644
index 000000000000..167b606cea59
--- /dev/null
+++ b/graphics/utah-glx/files/patch-ac
@@ -0,0 +1,37 @@
+--- libglut/Makefile.in.orig	Thu Dec 16 05:30:14 1999
++++ libglut/Makefile.in	Fri Dec 31 04:34:53 1999
+@@ -13,9 +13,9 @@
+ # These define the name/version of the shared library we're building
+ # ------------------------------------------------------------------
+ LIBNAME = glut
+-GLUTREV_major = 3
+-GLUTREV_minor = 7
+-SOGLUTREV = ${GLUTREV_major}.${GLUTREV_minor}
++GLUTREV_major = ${GLUTVER}
++GLUTREV_minor = 
++SOGLUTREV = ${GLUTREV_major}${GLUTREV_minor}
+ GLUTLIB = lib${LIBNAME}.so.${SOGLUTREV}
+ 
+ # Source and Object definitions
+@@ -113,8 +113,8 @@
+ 	@if [ -d ${INSTALL_libdir} ]; then set +x; \
+ 	else (set -x; ${MKDIR} ${INSTALL_libdir}); fi
+ 	${INSTALL} ${INSTALLFLAGS} ${INSTBINFLAGS} ${GLUTLIB} ${INSTALL_libdir}
+-	${RM} ${INSTALL_libdir}/lib${LIBNAME}.so.${GLUTREV_major} ;\
+-	${LN} ${GLUTLIB} ${INSTALL_libdir}/lib${LIBNAME}.so.${GLUTREV_major}
++#	${RM} ${INSTALL_libdir}/lib${LIBNAME}.so.${GLUTREV_major} ;\
++#	${LN} ${GLUTLIB} ${INSTALL_libdir}/lib${LIBNAME}.so.${GLUTREV_major}
+ 	${RM} ${INSTALL_libdir}/lib${LIBNAME}.so ;\
+ 	${LN} ${GLUTLIB} ${INSTALL_libdir}/lib${LIBNAME}.so
+ else
+@@ -139,8 +139,8 @@
+ 	${CC} -o ./$@~ ${SHARED_LDFLAGS} -Wl,-soname,lib${LIBNAME}.so.${GLUTREV_major} ${OBJS} ${MATHLIBS}
+ 	${RM} $@
+ 	${MV} $@~ $@
+-	${RM} lib${LIBNAME}.so.${GLUTREV_major}
+-	${LN} $@ lib${LIBNAME}.so.${GLUTREV_major}
++#	${RM} lib${LIBNAME}.so.${GLUTREV_major}
++#	${LN} $@ lib${LIBNAME}.so.${GLUTREV_major}
+ 	${RM} lib${LIBNAME}.so
+ 	${LN} $@ lib${LIBNAME}.so
+ 
diff --git a/graphics/utah-glx/files/patch-ad b/graphics/utah-glx/files/patch-ad
new file mode 100644
index 000000000000..ad3787fbb2e2
--- /dev/null
+++ b/graphics/utah-glx/files/patch-ad
@@ -0,0 +1,12 @@
+--- Makefile.in.orig	Wed Mar 22 22:25:54 2000
++++ Makefile.in	Fri Apr 28 03:51:47 2000
+@@ -40,7 +40,8 @@
+ 		( cd $$i && ${MAKE} $@ ) || exit 1; \
+ 	done
+ 	test -s ${sysconfdir}/glx.conf || \
+-		${INSTALL} -m 644 glx.conf ${sysconfdir}/glx.conf
++		${INSTALL} -c -m 644 glx.conf ${sysconfdir}/glx.conf
++	${INSTALL} -c -m 644 glx.conf ${sysconfdir}/glx.conf.default
+ 
+ real-clean:
+ 	${RM} config.status
diff --git a/graphics/utah-glx/files/patch-ae b/graphics/utah-glx/files/patch-ae
new file mode 100644
index 000000000000..cc4603b35a43
--- /dev/null
+++ b/graphics/utah-glx/files/patch-ae
@@ -0,0 +1,20 @@
+--- libGL/Makefile.in.orig	Mon Feb 28 20:57:28 2000
++++ libGL/Makefile.in	Mon Feb 28 21:09:30 2000
+@@ -14,7 +14,7 @@
+ # These define the name/version of the shared library we're building
+ # ------------------------------------------------------------------
+ LIBNAME = GL
+-SOGLREV = 1.0
++SOGLREV = ${GLVER}
+ 
+ # Source and Object files
+ # -----------------------
+@@ -111,7 +111,7 @@
+ 
+ lib${LIBNAME}.so.${SOGLREV} : render.c ${OBJS}
+ 	${RM} $@~
+-	@SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \
++	@SONAME=`echo $@`; set -x; \
+ 	if [ `uname` = "SunOS" ] ; then \
+ 		${CC} -o ./$@~ ${SHARED_LDFLAGS} -Wl,-h,$$SONAME ${OBJS} \
+ 		${XLIBDIR} ${XLIBS} ${LIBS} ${MATHLIBS}; \