Import of glx.

OpenGL hardware acceleration for RIVA and Matrox G200 based cards.

PR:		12661
Submitted by:	Marc van Woerkom  <3d@freebsd.org>

7 files changed, 751 insertions, 0 deletions

diff --git a/graphics/glx/Makefile b/graphics/glx/Makefile
new file mode 100644
index 000000000000..ed6942d7f286
--- /dev/null
+++ b/graphics/glx/Makefile
@@ -0,0 +1,333 @@
+# New ports collection makefile for:	GLX
+# Version required:     CVS
+# Date created:         13 September 1999
+# Whom:                 Marc E E van Woerkom  <van.woerkom@netcologne.de>
+#
+# $Id:$
+#
+#
+# Notes:
+#
+#  . You need at least XFree86 3.3.4 (or the glx patched 3.3.3.1)!
+#    This port is set up for 3.3.5
+#
+#  . Mesa-3.0 has to be uninstalled before this port builds!
+#    Why? Because we need to create a glx aware version.
+#
+#  . This stuff has been tested with
+#    - a Diamond Viper 330 (RIVA 128),
+#    - a Diamond Viper 550 (RIVA TNT),
+#    - and was reported to work with a Matrox G200 card
+#
+#  . Glx on n-vidia's site is outdated (we have XFree86-3.3.5 now
+#    so I rolled my own snapshot of the open project glx code.
+#    It is slightly outdated but will be updated soon.
+#
+#  . The current Mesa3 port for FreeBSD does not stop at the 'patch'
+#    target, but will instead try to build X11 immediatley if XFree86
+#    is not present.
+#    For this version (XFree86 3.3.5 needs no patches for glx yet) we
+#    ignore this wrong behaviour.
+#
+#  . We need tclsh for building - the choice for tclsh 8.0 is due to
+#    lack of time to include a proper selection scheme
+#
+#  . You can set CHIPSET_3D appropriately in /etc/make.conf if the
+#    question bugs you
+#
+
+DISTNAME=	glx-990802
+CATEGORIES=	graphics
+MASTER_SITES=	http://www.freebsd.org/~3d/distfiles/glx/XF3.3.5/
+DISTFILES=	${DISTNAME}.tar.bz2 \
+	 	riva-x-glx.faq.bz2 \
+		Mesa-3_0.diff.bz2
+
+MAINTAINER=	3d@freebsd.org
+
+# search for tclsh, if not present build it
+BUILD_DEPENDS=	tclsh8.0:${PORTSDIR}/lang/tcl80
+
+# These settings are here to make future updates to this port easier
+#PATCH_XFREE=	yes
+PATCH_MESA=	yes
+
+.if defined(PATCH_XFREE)
+BUILD_DEPENDS= 	/nonexistent:${PORTSDIR}/x11/XFree86:patch
+.endif
+.if defined(PATCH_MESA)
+BUILD_DEPENDS= 	/nonexistent:${PORTSDIR}/graphics/Mesa3:patch
+.endif
+
+USE_BZIP2=	yes
+
+EXTRACT_ONLY=	${DISTNAME}.tar.bz2
+
+DIST_SUBDIR=	glx
+
+WRKSRC=		${WRKDIR}/${DISTNAME}
+
+# I don't want to build XFree86 too soon, so don't use USE_X_PREFIX
+#USE_X_PREFIX=	yes
+PREFIX=		${X11BASE}
+
+XFCONFIG=	/etc/XF86Config
+
+XFREEVER=	3.3.5
+XFREEDIR=	${PORTSDIR}/x11/XFree86/work/xc
+
+MESAVER=	3.0
+MESADIR=	${PORTSDIR}/graphics/Mesa3/work/Mesa-3.0
+
+# As we ask for CHIPSET_3D if not set
+IS_INTERACTIVE=	YES
+
+# comment out the following line,
+# if you want to build with Imake (Linux/alpha favours that)
+USE_AUTOCONF=	yes
+GNU_CONFIGURE=	yes
+
+# we support nvidia RIVA 128, TNT.. and Matrox G200/400 cards
+.if defined(CHIPSET_3D)
+.if ${CHIPSET_3D} == RIVA
+WITH_CHIPSET=	--with-chipset=tnt
+.endif
+.if ${CHIPSET_3D} == MGA
+WITH_CHIPSET=	--with-chipset=mga
+.endif
+.endif
+
+CONFIGURE_ARGS= --with-mesa=${MESADIR} \
+		--with-mesa-version=mesa30 \
+		${WITH_CHIPSET}  # --with-mmx-asm --with-3dnow-asm
+
+USE_GMAKE=	yes
+
+.if !defined(GNU_CONFIGURE)
+USE_IMAKE= 	yes
+.endif
+
+.include <bsd.port.pre.mk>
+
+#
+#  before 'patch'
+#
+#  . apply some patches to the Mesa 3.0 distribution
+#
+pre-patch:
+.if defined(PATCH_XFREE)
+	@${ECHO} "=> Patching XFree86-${XFREEVER} for GLX .."
+	cd ${XFREEDIR}; \
+	${PATCH} -s -f <${FILESDIR}/XFree86-3_3_5.diff
+.endif
+.if defined(PATCH_MESA)
+	@${ECHO} "=> Checking Mesa-${MESAVER} installation .."
+	@if \
+	  pkg_info -e "Mesa-${MESAVER}"; \
+	then \
+	  ${ECHO} "Found Mesa-${MESAVER} - please deinstall"; \
+	  ${ECHO} "Aborting.."; \
+	  ${FALSE} ; \
+	fi
+.if exists(${MESADIR}/../.glxpatch_done)
+	@${ECHO} "=> Mesa-${MESAVER} seems already patched for GLX .."
+.else
+	@${ECHO} "=> Patching Mesa-${MESAVER} for GLX acceleration .."
+	@${ECHO} "(ignore the rejections, as they should happen in comments only)"
+	-cd ${MESADIR}; \
+	bzcat ${DISTDIR}/${DIST_SUBDIR}/Mesa-3_0.diff.bz2 | ${PATCH} -s -f
+	${TOUCH} ${MESADIR}/../.glxpatch_done
+.endif
+.endif
+
+#
+#  before 'configure'
+#
+#  . patch glx configure.in, libGL/Makefile.in,
+#    serverglx/Makefile.in (yes, this is an ugly hack)
+#
+pre-configure:
+.if !defined(CHIPSET_3D) || ${CHIPSET_3D} != RIVA && ${CHIPSET_3D} != MGA
+	@${ECHO}
+	@${ECHO} You must set the variable CHIPSET_3D to 'RIVA' if you use
+	@${ECHO} a nvidia RIVA 128, 128ZX, TNT, TNT2 .. based graphics card,
+	@${ECHO} or to 'MGA' if you use a Matrox G200/G400 graphics adapter
+	@${FALSE}
+.endif
+.if defined(GNU_CONFIGURE)
+	@${ECHO} "=> Adjusting ${WRKSRC}/configure.in .."
+	@cd ${WRKSRC}; \
+	${SED} -e 's;tclsh;tclsh8\.0;g' \
+	<configure.in >configure.in.new; \
+	${MV} configure.in.new configure.in
+	@${ECHO} "=> Adjusting ${WRKSRC}/libGL/Makefile.in .."
+	@cd ${WRKSRC}/libGL; \
+	${SED} -e 's;SOGLREV = 1\.0;SOGLREV = 1;' \
+	<Makefile.in >Makefile.in.new; \
+	${MV} Makefile.in.new Makefile.in
+	@${ECHO} "=> Adjusting ${WRKSRC}/servGL/serverglx/Makefile.in .."
+	@cd ${WRKSRC}/servGL/serverglx; \
+	${SED} -e 's;tclsh;tclsh8\.0;g' \
+	<Makefile.in >Makefile.in.new; \
+	${MV} Makefile.in.new Makefile.in
+.endif
+
+#
+#  after 'configure'
+#
+#  . only for the old IMAKE style configuration
+#
+post-configure:
+.if !defined(GNU_CONFIGURE)
+	@${ECHO} "Using IMAKE"
+	@${ECHO} "=> Adjusting ${WRKSRC}/Config .."
+	@cd ${WRKSRC}; \
+	${SED} -e 's;XSERVTOP = .*;XSERVTOP = ${XFREEDIR};' \
+	       -e 's;MESATOP = .*;MESATOP = ${MESADIR};' \
+	<Config.in >Config;
+	@${ECHO} "=> Adjusting ${WRKSRC}/libGL/Imakefile .."
+	@cd ${WRKSRC}/libGL; \
+	${SED} -e 's;tclsh;tclsh8\.0;' <Imakefile >Imakefile.new; \
+	${MV} Imakefile.new Imakefile
+	@${ECHO} "=> Adjusting ${WRKSRC}/servGL/serverglx/Imakefile .."
+	@cd ${WRKSRC}/servGL/serverglx; \
+	${SED} -e 's;tclsh;tclsh8\.0;' <Imakefile >Imakefile.new; \
+	${MV} Imakefile.new Imakefile
+.endif
+
+#
+#  before 'build':
+#
+#  . build a glx aware Mesa lib
+#  . create makefiles (old IMAKE style configuration)
+#
+pre-build:
+.if defined(PATCH_XFREE)
+	@${ECHO} "=> Building and installing XFree86-${XFREEVER} with GLX support .."
+	cd ${XFREEDIR}/../..; \
+	${MAKE} all install
+.endif
+.if defined(PATCH_MESA)
+	@${ECHO} "=> Building and installing Mesa-${MESAVER} with GLX support .."
+	cd ${MESADIR}/../..; \
+	${MAKE} all install
+.endif
+.if !defined(GNU_CONFIGURE)
+	@${ECHO} "=> Creating makefiles .."
+	cd ${WRKSRC}; \
+	${XMKMF}; \
+	${MAKE} Makefile; \
+	${MAKE} Makefiles
+.endif
+
+#
+#  before 'install':
+#
+#  . check for proper installed XFree86 version (3.3.4 or higher)
+#  . check for glx installation (please deinstall)
+#  . check for Mesa 3.0 installtion (please deinstall)
+#
+pre-install:
+	@${ECHO} "=> Checking XFree86 installation .."
+	@if \
+	  pkg_info -e "XFree86-3.3.4"; \
+	then \
+	  ${ECHO} "Found XFree86 3.3.4 - this port should still work"; \
+	elif \
+	  pkg_info -e "XFree86-3.3.5"; \
+	then \
+	  ${ECHO} "OK, found XFree86 3.3.5 - this port should work"; \
+	elif \
+	  pkg_info -e "XFree86-3.3.6"; \
+	then \
+	  ${ECHO} "Found XFree86 3.3.6 - this port should work"; \
+	elif \
+	  pkg_info -e "XFree86-3.3.3.1"; \
+	then \
+	  ${ECHO} ""; \
+	  ${ECHO} "This port will work only if your XFree86 3.3.3.1 version"; \
+	  ${ECHO} "has been patched for use with glx!"; \
+	  ${ECHO} ""; \
+	  ${ECHO} "Visit 'http://www.freebsd.org/~3d' for more information"; \
+	  ${ECHO} ""; \
+	  ${ECHO} "(We continue with fingers crossed)"; \
+	  ${ECHO} ""; \
+	else \
+	  ${ECHO} ""; \
+	  ${ECHO} "This port depends on having a proper version of XFree86"; \
+	  ${ECHO} "installed - preferably ${XFREEVER}!"; \
+	  ${ECHO} ""; \
+	  ${ECHO} "Visit 'http://www.freebsd.org/~3d' for more information"; \
+	  ${ECHO} ""; \
+	  ${ECHO} "Aborting.."; \
+	  ${FALSE} ; \
+	fi
+
+#
+#  after 'install':
+#
+#  . install some docs
+#  . move old Mesa lib away (old IMAKE style configuration)
+#  . check XFree86 configuration file for colordepth (RIVA only)
+#  . check XFree86 configuration file for glx module
+#  . give some hints
+#
+post-install:
+.if !defined(NOPORTDOCS)
+	@${ECHO} "=> Installing documentation .."
+	${MKDIR} ${PREFIX}/share/doc/riva-glx
+	${INSTALL_MAN} ${DISTDIR}/${DIST_SUBDIR}/riva-x-glx.faq.bz2 ${PREFIX}/share/doc/riva-glx
+	${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/riva-glx
+	${INSTALL_MAN} ${WRKSRC}/tested.html ${PREFIX}/share/doc/riva-glx
+
+.endif
+.if !defined(GNU_CONFIGURE)
+	@${ECHO} "=> Adjusting links .."
+	-${MV} ${X11BASE}/lib/libMesaGL.a ${X11BASE}/lib/libMesaGL.a.old
+	-${MV} ${X11BASE}/lib/libMesaGL.so.14 ${X11BASE}/lib/libMesaGL.so.14.old
+	-${LN} -s ${X11BASE}/lib/libGL.a ${X11BASE}/lib/libMesaGL.a
+	-${LN} -s ${X11BASE}/lib/libGL.so.1 ${X11BASE}/lib/libMesaGL.so.14
+.endif
+.if !defined(CHIPSET_3D) || ${CHIPSET_3D} == RIVA
+	@${ECHO} "=> Checking for \"DefaultColorDepth\" in ${XFCONFIG} .."
+	@${ECHO} ""
+	@if \
+	  ${GREP} '^ *DefaultColorDepth *1[56] *$$' ${XFCONFIG}; \
+	then \
+	  ${ECHO} ""; \
+	  ${ECHO} "Found something."; \
+	else \
+	  ${ECHO} "Nope, nothing found - please use"; \
+	  ${ECHO} ""; \
+	  ${ECHO} "    DefaultColorDepth 16"; \
+	  ${ECHO} ""; \
+	  ${ECHO} "or"; \
+	  ${ECHO} ""; \
+	  ${ECHO} "    DefaultColorDepth 15"; \
+	  ${ECHO} ""; \
+	  ${ECHO} "in your ${XFCONFIG} file with your RIVA card!"; \
+	fi
+.endif
+	@${ECHO} "=> Checking for Section \"Module\" in ${XFCONFIG} .."
+	@${ECHO} ""
+	@if \
+	  ${GREP} -A2 '^ *Section *"Module" *$$' ${XFCONFIG} | \
+	  ${GREP} -B1 -A1 '^ *Load *"glx\.so" *$$' | \
+	  ${GREP} -B2 '^ *EndSection *$$' | \
+	  ${GREP} -A2 '^ *Section *"Module" *$$'; \
+	then \
+	  ${ECHO} ""; \
+	  ${ECHO} "Looks OK to me."; \
+	else \
+	  ${ECHO} "Nope, not found - please add"; \
+	  ${ECHO} ""; \
+	  ${ECHO} "  Section \"Module\""; \
+	  ${ECHO} "  Load \"glx.so\""; \
+	  ${ECHO} "  EndSection"; \
+	  ${ECHO} ""; \
+	  ${ECHO} "to the end of your ${XFCONFIG} file!"; \
+	fi
+	@${ECHO} "=> Giving last advice .."
+	@${CAT} ${PKGDIR}/MESSAGE
+
+.include <bsd.port.post.mk>
diff --git a/graphics/utah-glx/Makefile b/graphics/utah-glx/Makefile
new file mode 100644
index 000000000000..ed6942d7f286
--- /dev/null
+++ b/graphics/utah-glx/Makefile
@@ -0,0 +1,333 @@
+# New ports collection makefile for:	GLX
+# Version required:     CVS
+# Date created:         13 September 1999
+# Whom:                 Marc E E van Woerkom  <van.woerkom@netcologne.de>
+#
+# $Id:$
+#
+#
+# Notes:
+#
+#  . You need at least XFree86 3.3.4 (or the glx patched 3.3.3.1)!
+#    This port is set up for 3.3.5
+#
+#  . Mesa-3.0 has to be uninstalled before this port builds!
+#    Why? Because we need to create a glx aware version.
+#
+#  . This stuff has been tested with
+#    - a Diamond Viper 330 (RIVA 128),
+#    - a Diamond Viper 550 (RIVA TNT),
+#    - and was reported to work with a Matrox G200 card
+#
+#  . Glx on n-vidia's site is outdated (we have XFree86-3.3.5 now
+#    so I rolled my own snapshot of the open project glx code.
+#    It is slightly outdated but will be updated soon.
+#
+#  . The current Mesa3 port for FreeBSD does not stop at the 'patch'
+#    target, but will instead try to build X11 immediatley if XFree86
+#    is not present.
+#    For this version (XFree86 3.3.5 needs no patches for glx yet) we
+#    ignore this wrong behaviour.
+#
+#  . We need tclsh for building - the choice for tclsh 8.0 is due to
+#    lack of time to include a proper selection scheme
+#
+#  . You can set CHIPSET_3D appropriately in /etc/make.conf if the
+#    question bugs you
+#
+
+DISTNAME=	glx-990802
+CATEGORIES=	graphics
+MASTER_SITES=	http://www.freebsd.org/~3d/distfiles/glx/XF3.3.5/
+DISTFILES=	${DISTNAME}.tar.bz2 \
+	 	riva-x-glx.faq.bz2 \
+		Mesa-3_0.diff.bz2
+
+MAINTAINER=	3d@freebsd.org
+
+# search for tclsh, if not present build it
+BUILD_DEPENDS=	tclsh8.0:${PORTSDIR}/lang/tcl80
+
+# These settings are here to make future updates to this port easier
+#PATCH_XFREE=	yes
+PATCH_MESA=	yes
+
+.if defined(PATCH_XFREE)
+BUILD_DEPENDS= 	/nonexistent:${PORTSDIR}/x11/XFree86:patch
+.endif
+.if defined(PATCH_MESA)
+BUILD_DEPENDS= 	/nonexistent:${PORTSDIR}/graphics/Mesa3:patch
+.endif
+
+USE_BZIP2=	yes
+
+EXTRACT_ONLY=	${DISTNAME}.tar.bz2
+
+DIST_SUBDIR=	glx
+
+WRKSRC=		${WRKDIR}/${DISTNAME}
+
+# I don't want to build XFree86 too soon, so don't use USE_X_PREFIX
+#USE_X_PREFIX=	yes
+PREFIX=		${X11BASE}
+
+XFCONFIG=	/etc/XF86Config
+
+XFREEVER=	3.3.5
+XFREEDIR=	${PORTSDIR}/x11/XFree86/work/xc
+
+MESAVER=	3.0
+MESADIR=	${PORTSDIR}/graphics/Mesa3/work/Mesa-3.0
+
+# As we ask for CHIPSET_3D if not set
+IS_INTERACTIVE=	YES
+
+# comment out the following line,
+# if you want to build with Imake (Linux/alpha favours that)
+USE_AUTOCONF=	yes
+GNU_CONFIGURE=	yes
+
+# we support nvidia RIVA 128, TNT.. and Matrox G200/400 cards
+.if defined(CHIPSET_3D)
+.if ${CHIPSET_3D} == RIVA
+WITH_CHIPSET=	--with-chipset=tnt
+.endif
+.if ${CHIPSET_3D} == MGA
+WITH_CHIPSET=	--with-chipset=mga
+.endif
+.endif
+
+CONFIGURE_ARGS= --with-mesa=${MESADIR} \
+		--with-mesa-version=mesa30 \
+		${WITH_CHIPSET}  # --with-mmx-asm --with-3dnow-asm
+
+USE_GMAKE=	yes
+
+.if !defined(GNU_CONFIGURE)
+USE_IMAKE= 	yes
+.endif
+
+.include <bsd.port.pre.mk>
+
+#
+#  before 'patch'
+#
+#  . apply some patches to the Mesa 3.0 distribution
+#
+pre-patch:
+.if defined(PATCH_XFREE)
+	@${ECHO} "=> Patching XFree86-${XFREEVER} for GLX .."
+	cd ${XFREEDIR}; \
+	${PATCH} -s -f <${FILESDIR}/XFree86-3_3_5.diff
+.endif
+.if defined(PATCH_MESA)
+	@${ECHO} "=> Checking Mesa-${MESAVER} installation .."
+	@if \
+	  pkg_info -e "Mesa-${MESAVER}"; \
+	then \
+	  ${ECHO} "Found Mesa-${MESAVER} - please deinstall"; \
+	  ${ECHO} "Aborting.."; \
+	  ${FALSE} ; \
+	fi
+.if exists(${MESADIR}/../.glxpatch_done)
+	@${ECHO} "=> Mesa-${MESAVER} seems already patched for GLX .."
+.else
+	@${ECHO} "=> Patching Mesa-${MESAVER} for GLX acceleration .."
+	@${ECHO} "(ignore the rejections, as they should happen in comments only)"
+	-cd ${MESADIR}; \
+	bzcat ${DISTDIR}/${DIST_SUBDIR}/Mesa-3_0.diff.bz2 | ${PATCH} -s -f
+	${TOUCH} ${MESADIR}/../.glxpatch_done
+.endif
+.endif
+
+#
+#  before 'configure'
+#
+#  . patch glx configure.in, libGL/Makefile.in,
+#    serverglx/Makefile.in (yes, this is an ugly hack)
+#
+pre-configure:
+.if !defined(CHIPSET_3D) || ${CHIPSET_3D} != RIVA && ${CHIPSET_3D} != MGA
+	@${ECHO}
+	@${ECHO} You must set the variable CHIPSET_3D to 'RIVA' if you use
+	@${ECHO} a nvidia RIVA 128, 128ZX, TNT, TNT2 .. based graphics card,
+	@${ECHO} or to 'MGA' if you use a Matrox G200/G400 graphics adapter
+	@${FALSE}
+.endif
+.if defined(GNU_CONFIGURE)
+	@${ECHO} "=> Adjusting ${WRKSRC}/configure.in .."
+	@cd ${WRKSRC}; \
+	${SED} -e 's;tclsh;tclsh8\.0;g' \
+	<configure.in >configure.in.new; \
+	${MV} configure.in.new configure.in
+	@${ECHO} "=> Adjusting ${WRKSRC}/libGL/Makefile.in .."
+	@cd ${WRKSRC}/libGL; \
+	${SED} -e 's;SOGLREV = 1\.0;SOGLREV = 1;' \
+	<Makefile.in >Makefile.in.new; \
+	${MV} Makefile.in.new Makefile.in
+	@${ECHO} "=> Adjusting ${WRKSRC}/servGL/serverglx/Makefile.in .."
+	@cd ${WRKSRC}/servGL/serverglx; \
+	${SED} -e 's;tclsh;tclsh8\.0;g' \
+	<Makefile.in >Makefile.in.new; \
+	${MV} Makefile.in.new Makefile.in
+.endif
+
+#
+#  after 'configure'
+#
+#  . only for the old IMAKE style configuration
+#
+post-configure:
+.if !defined(GNU_CONFIGURE)
+	@${ECHO} "Using IMAKE"
+	@${ECHO} "=> Adjusting ${WRKSRC}/Config .."
+	@cd ${WRKSRC}; \
+	${SED} -e 's;XSERVTOP = .*;XSERVTOP = ${XFREEDIR};' \
+	       -e 's;MESATOP = .*;MESATOP = ${MESADIR};' \
+	<Config.in >Config;
+	@${ECHO} "=> Adjusting ${WRKSRC}/libGL/Imakefile .."
+	@cd ${WRKSRC}/libGL; \
+	${SED} -e 's;tclsh;tclsh8\.0;' <Imakefile >Imakefile.new; \
+	${MV} Imakefile.new Imakefile
+	@${ECHO} "=> Adjusting ${WRKSRC}/servGL/serverglx/Imakefile .."
+	@cd ${WRKSRC}/servGL/serverglx; \
+	${SED} -e 's;tclsh;tclsh8\.0;' <Imakefile >Imakefile.new; \
+	${MV} Imakefile.new Imakefile
+.endif
+
+#
+#  before 'build':
+#
+#  . build a glx aware Mesa lib
+#  . create makefiles (old IMAKE style configuration)
+#
+pre-build:
+.if defined(PATCH_XFREE)
+	@${ECHO} "=> Building and installing XFree86-${XFREEVER} with GLX support .."
+	cd ${XFREEDIR}/../..; \
+	${MAKE} all install
+.endif
+.if defined(PATCH_MESA)
+	@${ECHO} "=> Building and installing Mesa-${MESAVER} with GLX support .."
+	cd ${MESADIR}/../..; \
+	${MAKE} all install
+.endif
+.if !defined(GNU_CONFIGURE)
+	@${ECHO} "=> Creating makefiles .."
+	cd ${WRKSRC}; \
+	${XMKMF}; \
+	${MAKE} Makefile; \
+	${MAKE} Makefiles
+.endif
+
+#
+#  before 'install':
+#
+#  . check for proper installed XFree86 version (3.3.4 or higher)
+#  . check for glx installation (please deinstall)
+#  . check for Mesa 3.0 installtion (please deinstall)
+#
+pre-install:
+	@${ECHO} "=> Checking XFree86 installation .."
+	@if \
+	  pkg_info -e "XFree86-3.3.4"; \
+	then \
+	  ${ECHO} "Found XFree86 3.3.4 - this port should still work"; \
+	elif \
+	  pkg_info -e "XFree86-3.3.5"; \
+	then \
+	  ${ECHO} "OK, found XFree86 3.3.5 - this port should work"; \
+	elif \
+	  pkg_info -e "XFree86-3.3.6"; \
+	then \
+	  ${ECHO} "Found XFree86 3.3.6 - this port should work"; \
+	elif \
+	  pkg_info -e "XFree86-3.3.3.1"; \
+	then \
+	  ${ECHO} ""; \
+	  ${ECHO} "This port will work only if your XFree86 3.3.3.1 version"; \
+	  ${ECHO} "has been patched for use with glx!"; \
+	  ${ECHO} ""; \
+	  ${ECHO} "Visit 'http://www.freebsd.org/~3d' for more information"; \
+	  ${ECHO} ""; \
+	  ${ECHO} "(We continue with fingers crossed)"; \
+	  ${ECHO} ""; \
+	else \
+	  ${ECHO} ""; \
+	  ${ECHO} "This port depends on having a proper version of XFree86"; \
+	  ${ECHO} "installed - preferably ${XFREEVER}!"; \
+	  ${ECHO} ""; \
+	  ${ECHO} "Visit 'http://www.freebsd.org/~3d' for more information"; \
+	  ${ECHO} ""; \
+	  ${ECHO} "Aborting.."; \
+	  ${FALSE} ; \
+	fi
+
+#
+#  after 'install':
+#
+#  . install some docs
+#  . move old Mesa lib away (old IMAKE style configuration)
+#  . check XFree86 configuration file for colordepth (RIVA only)
+#  . check XFree86 configuration file for glx module
+#  . give some hints
+#
+post-install:
+.if !defined(NOPORTDOCS)
+	@${ECHO} "=> Installing documentation .."
+	${MKDIR} ${PREFIX}/share/doc/riva-glx
+	${INSTALL_MAN} ${DISTDIR}/${DIST_SUBDIR}/riva-x-glx.faq.bz2 ${PREFIX}/share/doc/riva-glx
+	${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/riva-glx
+	${INSTALL_MAN} ${WRKSRC}/tested.html ${PREFIX}/share/doc/riva-glx
+
+.endif
+.if !defined(GNU_CONFIGURE)
+	@${ECHO} "=> Adjusting links .."
+	-${MV} ${X11BASE}/lib/libMesaGL.a ${X11BASE}/lib/libMesaGL.a.old
+	-${MV} ${X11BASE}/lib/libMesaGL.so.14 ${X11BASE}/lib/libMesaGL.so.14.old
+	-${LN} -s ${X11BASE}/lib/libGL.a ${X11BASE}/lib/libMesaGL.a
+	-${LN} -s ${X11BASE}/lib/libGL.so.1 ${X11BASE}/lib/libMesaGL.so.14
+.endif
+.if !defined(CHIPSET_3D) || ${CHIPSET_3D} == RIVA
+	@${ECHO} "=> Checking for \"DefaultColorDepth\" in ${XFCONFIG} .."
+	@${ECHO} ""
+	@if \
+	  ${GREP} '^ *DefaultColorDepth *1[56] *$$' ${XFCONFIG}; \
+	then \
+	  ${ECHO} ""; \
+	  ${ECHO} "Found something."; \
+	else \
+	  ${ECHO} "Nope, nothing found - please use"; \
+	  ${ECHO} ""; \
+	  ${ECHO} "    DefaultColorDepth 16"; \
+	  ${ECHO} ""; \
+	  ${ECHO} "or"; \
+	  ${ECHO} ""; \
+	  ${ECHO} "    DefaultColorDepth 15"; \
+	  ${ECHO} ""; \
+	  ${ECHO} "in your ${XFCONFIG} file with your RIVA card!"; \
+	fi
+.endif
+	@${ECHO} "=> Checking for Section \"Module\" in ${XFCONFIG} .."
+	@${ECHO} ""
+	@if \
+	  ${GREP} -A2 '^ *Section *"Module" *$$' ${XFCONFIG} | \
+	  ${GREP} -B1 -A1 '^ *Load *"glx\.so" *$$' | \
+	  ${GREP} -B2 '^ *EndSection *$$' | \
+	  ${GREP} -A2 '^ *Section *"Module" *$$'; \
+	then \
+	  ${ECHO} ""; \
+	  ${ECHO} "Looks OK to me."; \
+	else \
+	  ${ECHO} "Nope, not found - please add"; \
+	  ${ECHO} ""; \
+	  ${ECHO} "  Section \"Module\""; \
+	  ${ECHO} "  Load \"glx.so\""; \
+	  ${ECHO} "  EndSection"; \
+	  ${ECHO} ""; \
+	  ${ECHO} "to the end of your ${XFCONFIG} file!"; \
+	fi
+	@${ECHO} "=> Giving last advice .."
+	@${CAT} ${PKGDIR}/MESSAGE
+
+.include <bsd.port.post.mk>
diff --git a/graphics/utah-glx/distinfo b/graphics/utah-glx/distinfo
new file mode 100644
index 000000000000..05f85047abac
--- /dev/null
+++ b/graphics/utah-glx/distinfo
@@ -0,0 +1,3 @@
+MD5 (glx/glx-990802.tar.bz2) = 5b04e03339dfffca73b6a11ce64cd59e
+MD5 (glx/riva-x-glx.faq.bz2) = 6c5b499db143f071c6f69ba6c43db4c4
+MD5 (glx/Mesa-3_0.diff.bz2) = 5631bc2d7a54c366e072a72e45fca6c7
diff --git a/graphics/utah-glx/pkg-comment b/graphics/utah-glx/pkg-comment
new file mode 100644
index 000000000000..2183297aafc6
--- /dev/null
+++ b/graphics/utah-glx/pkg-comment
@@ -0,0 +1 @@
+Hardware accelerated OpenGL 3d graphics (RIVA & G200/G400)
diff --git a/graphics/utah-glx/pkg-descr b/graphics/utah-glx/pkg-descr
new file mode 100644
index 000000000000..a03f74f97bad
--- /dev/null
+++ b/graphics/utah-glx/pkg-descr
@@ -0,0 +1,21 @@
+OpenGL hardware acceleration for RIVA based cards and Matrox G200.
+
+To bridge the time until the XFree86-4 release, this port will build a  
+Mesa 3.0 Graphics Library that makes use of the 3d hardware acceleration
+features of nvidia's RIVA 128/128ZX and RIVA TNT/TNT2/VANTAGE based 
+graphics cards and the Matrox G200/G400.
+
+WARNING:
+
+Please note that this build might need a considerable amount of time.
+(AMD K6/300MHz/196MB/SCSI: XFree86 3 hours, Mesa 1/2 hour, glx 10 min)
+
+See Jordan K Hubbard's article in the July '99 issue of
+
+    http://www.freebsdzine.org 
+
+for more information or visit
+
+WWW: http://www.freebsd.org/~3d
+
+Marc E E van Woerkom  <3d@freebsd.org>
diff --git a/graphics/utah-glx/pkg-message b/graphics/utah-glx/pkg-message
new file mode 100644
index 000000000000..2054bcf326f7
--- /dev/null
+++ b/graphics/utah-glx/pkg-message
@@ -0,0 +1,29 @@
+
+Additional Notes:
+-----------------
+
+If you built an SVGA server with 3d hardware acceleration for a nvidia card 
+(RIVA 128, TNT, TNT2, TNT2 Ultra ..) please check that
+
+- you changed the default colour depth to 16 or 15 in your /etc/XF86Config 
+  file (keyword: DefaultColorDepth) plus 
+
+and (this holds for Matrox G200/G400 too) check if
+
+- you added to /etc/XF86Config (outside of any other section) the
+  following 3 lines:
+
+      Section "Module"
+      Load "glx.so"
+      EndSection
+
+- you enabled System V shared memory support in your kernel
+
+
+Things you might want to do:
+
+. Try out ports/x11/xscreensaver (e.g. superquadrics) as an sample OpenGL 
+  application,
+. read the article or 
+. have a look at the docs in X11/share/doc/riva-glx, esp the FAQ or
+. visit http://www.freebsd.org/~3d
diff --git a/graphics/utah-glx/pkg-plist b/graphics/utah-glx/pkg-plist
new file mode 100644
index 000000000000..4ac032ed9a38
--- /dev/null
+++ b/graphics/utah-glx/pkg-plist
@@ -0,0 +1,31 @@
+include/GL/GLXproto.h
+include/GL/dosmesa.h
+include/GL/foomesa.h
+include/GL/fxmesa.h
+include/GL/ggimesa.h
+include/GL/gl.h
+include/GL/gl_mangle.h
+include/GL/glu.h
+include/GL/glu_mangle.h
+include/GL/glut.h
+include/GL/glx.h
+include/GL/glx_mangle.h
+include/GL/mglmesa.h
+include/GL/osmesa.h
+include/GL/osmesa3.h
+include/GL/svgamesa.h
+include/GL/wmesa.h
+include/GL/xmesa.h
+lib/libGL.a
+lib/libGL.so.1 
+lib/libMesaGL.a
+lib/libMesaGL.so.14
+lib/libMesaGLU.a
+lib/libMesaGLU.so.14
+lib/libglut.a
+lib/libglut.so.3
+lib/modules/glx.so
+share/doc/riva-glx/README
+share/doc/riva-glx/riva-x-glx.faq.bz2
+share/doc/riva-glx/tested.html
+@dirrm share/doc/riva-glx