9 files changed, 1 insertions, 309 deletions
diff --git a/graphics/Makefile b/graphics/Makefile
index effd5d62215..247f14d4d4f 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.170 2002/01/10 13:07:35 jlam Exp $
+# $NetBSD: Makefile,v 1.171 2002/01/24 16:15:19 tron Exp $
 #
 
 COMMENT=	Graphics tools and libraries
@@ -8,7 +8,6 @@ SUBDIR+=	GMT
 SUBDIR+=	GUIlib
 SUBDIR+=	ImageMagick
 SUBDIR+=	Mesa
-SUBDIR+=	Mesa-glx
 SUBDIR+=	MesaLib
 SUBDIR+=	Ngraph
 SUBDIR+=	SDL-image
diff --git a/graphics/Mesa-glx/DESCR b/graphics/Mesa-glx/DESCR
deleted file mode 100644
index 649555c8b8b..00000000000
--- a/graphics/Mesa-glx/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-This project is building a hardware accelerated glx module for free unix
-operating systems. Currently, we have support for 3D acceleration on the
-Matrox MGA-G200, MGA-G400, and nvidia's RIVA series for XFree86 3.3. We
-also support software rendering. 
-
-The GLX protocol is a way to send 3D graphics commands over an
-X client-server connection. It was created by Silicon Graphics and
-recently released as open source. We're currently based on a separate
-implementation, however. 
diff --git a/graphics/Mesa-glx/MESSAGE b/graphics/Mesa-glx/MESSAGE
deleted file mode 100644
index ea464d9a34c..00000000000
--- a/graphics/Mesa-glx/MESSAGE
+++ /dev/null
@@ -1,11 +0,0 @@
-======================================================================
-$NetBSD: MESSAGE,v 1.1 2001/10/31 23:50:10 zuntum Exp $
-
-To enable GLX hardware acceleration you have to add a configuration
-section like this one to "/etc/XF86Config":
-
-Section "Module"
-  Load "glx.so"
-EndSection
-
-======================================================================
diff --git a/graphics/Mesa-glx/Makefile b/graphics/Mesa-glx/Makefile
deleted file mode 100644
index 3f893bdbf00..00000000000
--- a/graphics/Mesa-glx/Makefile
+++ /dev/null
@@ -1,80 +0,0 @@
-# $NetBSD: Makefile,v 1.23 2001/09/27 23:18:09 jlam Exp $
-
-DISTNAME=	glx-20000813
-PKGNAME=	Mesa-${DISTNAME}
-CATEGORIES=	graphics
-MASTER_SITES=	http://snow.ashlu.bc.ca/glx/snapshots/
-EXTRACT_SUFX=	.tar.bz2
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		MesaLib-${MESA_VERSION}${EXTRACT_SUFX} \
-		MesaDemos-${MESA_VERSION}${EXTRACT_SUFX}
-
-MAINTAINER=	tron@netbsd.org
-HOMEPAGE=	http://utah-glx.sourceforge.net/
-COMMENT=	OpenGL like graphics library with GLX hardware acceleration
-
-BUILD_DEPENDS+=	perl>=${PERL5_REQD}:../../lang/perl5
-BUILD_DEPENDS+=	autoconf>=2.13:../../devel/autoconf
-BUILD_DEPENDS+=	tcl>=8.3.2nb1:../../lang/tcl
-
-BROKEN=		Package is outdated and has security problems.
-
-CONFLICTS+=		Mesa-[0-9]*
-CONFLICTS+=		MesaLib-[0-9]*
-CONFLICTS+=		glu-[0-9]*
-CONFLICTS+=		glut-[0-9]*
-ONLY_FOR_PLATFORM=	NetBSD-*-i386
-
-GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
-USE_LIBTOOL=		yes
-USE_X11BASE=		yes
-CHECK_MESA=		yes
-CONFIGURE_ARGS+=	--enable-static --with-mesa=${MESA_WRKSRC}
-CONFIGURE_ARGS+=	--with-moduledir=${PREFIX}/lib/modules
-CONFIGURE_ENV+=		TCLSH=${TCLSH}
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${HAVE_BUILTIN_MESA} != "NO"
-IGNORE=			"Mesa-glx has already been installed as part of XFree86-4.x"
-.endif
-
-AUTOCONF=	${LOCALBASE}/bin/autoconf
-WRKSRCDIRS=	${MESA_WRKSRC} ${WRKSRC} ${WRKSRC}/docs
-MAKE_ENV+=	PERL=${PERL5}
-MESA_VERSION=	3.1
-MESA_WRKSRC=	${WRKDIR}/Mesa-${MESA_VERSION}
-TCLSH=		${LOCALBASE}/bin/tclsh
-
-pre-configure:
-	@cd ${WRKSRC} && ${AUTOCONF} && cd docs && ${AUTOCONF}
-
-do-configure:
-	@for DIR in ${WRKSRCDIRS}; do \
-	  cd $$DIR && \
-	  ${SETENV} CC="${CC}" ac_cv_path_CC="${CC}" \
-	    CFLAGS="${CFLAGS}" \
-	    INSTALL="`${TYPE} ${INSTALL} | ${AWK} '{ print $$NF }'` -c -o ${BINOWN} -g ${BINGRP}" \
-	    INSTALL_DATA="${INSTALL_DATA}" \
-	    INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-	    INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-	    ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; \
-	done
-
-do-build:
-	@for DIR in ${WRKSRCDIRS}; do \
-	  cd $$DIR && \
-	  ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} \
-	    ${ALL_TARGET}; \
-	done
-
-do-install:
-	@for DIR in ${WRKSRCDIRS}; do \
-	  cd $$DIR && \
-	  ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} \
-	    ${INSTALL_TARGET}; \
-	done
-	${INSTALL_DATA} ${WRKSRC}/glx.conf ${PREFIX}/etc/glx.conf.default
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/Mesa-glx/PLIST b/graphics/Mesa-glx/PLIST
deleted file mode 100644
index 078f26f78a1..00000000000
--- a/graphics/Mesa-glx/PLIST
+++ /dev/null
@@ -1,33 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:50:10 zuntum Exp $
-etc/glx.conf.default
-@exec test -f %D/etc/glx.conf || cp %D/etc/glx.conf.default %D/etc/glx.conf
-etc/mesa.conf
-include/GL/gl.h
-include/GL/gl_mangle.h
-include/GL/glu.h
-include/GL/glu_mangle.h
-include/GL/glut.h
-include/GL/glutf90.h
-include/GL/glx.h
-include/GL/glx_mangle.h
-include/GL/osmesa.h
-include/GL/xmesa.h
-include/GL/xmesa_x.h
-include/GL/xmesa_xf86.h
-lib/libGL.so
-lib/libGL.so.3
-lib/libGL.so.3.0
-lib/libGL.a
-lib/libGL.la
-lib/libGLU.so
-lib/libGLU.so.3
-lib/libGLU.so.3.0
-lib/libGLU.a
-lib/libGLU.la
-lib/libglut.so
-lib/libglut.so.10
-lib/libglut.so.10.0
-lib/libglut.a
-lib/libglut.la
-lib/modules/glx.so
-@dirrm include/GL
diff --git a/graphics/Mesa-glx/distinfo b/graphics/Mesa-glx/distinfo
deleted file mode 100644
index 62faf673cfd..00000000000
--- a/graphics/Mesa-glx/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:54:07 wiz Exp $
-
-SHA1 (glx-20000813.tar.bz2) = 410580763d3a0ff3aad005801f690158e8cc5311
-Size (glx-20000813.tar.bz2) = 549361 bytes
-SHA1 (MesaLib-3.1.tar.bz2) = 256acbb4489294db01cdbae48f3a633767ec8d73
-Size (MesaLib-3.1.tar.bz2) = 1231238 bytes
-SHA1 (MesaDemos-3.1.tar.bz2) = 3b1f289f6feea4e57f81786a7cc072cfdd2c0209
-Size (MesaDemos-3.1.tar.bz2) = 883081 bytes
-SHA1 (patch-aa) = 2a12d022f7bcf5c1ef66f8a52ba292490ff71912
-SHA1 (patch-ab) = fea041643709d61ce0f81d440d7304e8b23436fe
-SHA1 (patch-ac) = 088c9193246fe63bb7faa407f8262e04ddf3a0c1
diff --git a/graphics/Mesa-glx/patches/patch-aa b/graphics/Mesa-glx/patches/patch-aa
deleted file mode 100644
index 4e8faf3daa2..00000000000
--- a/graphics/Mesa-glx/patches/patch-aa
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2000/04/11 22:36:05 tron Exp $
-
---- configure.in.orig	Fri Mar 31 06:26:15 2000
-+++ configure.in	Wed Apr 12 00:05:05 2000
-@@ -933,39 +933,6 @@
-   xserver_flags="$xserver_flags -D_XSERVER64"
- fi
- 
--dnl try to save some labor on the location of glx.conf
--dnl we want it to be in the same place as XF86Config,
--dnl so look in some common locations and hope for the best.
--
--which_sysconf=`echo $sysconfdir | grep "\$.prefix."`
--if test -z "$which_sysconf"
-- then
--  echo "sysconfdir not set"
-- else
--  AC_MSG_CHECKING([XF86Config location])
--  if test -f /etc/XF86Config
--   then
--    sysconfdir="/etc"
--    AC_MSG_RESULT([$sysconfdir])
--  elif test -f /etc/X11/XF86Config
--   then
--    sysconfdir="/etc/X11"
--    AC_MSG_RESULT([$sysconfdir])
--  elif test -f ${x_libraries}/X11/XF86Config
--   then
--    sysconfdir=${x_libraries}/X11/XF86Config
--    AC_MSG_RESULT([${sysconfdir}])
--  elif test -f /usr/X11R6/lib/X11/XF86Config
--   then
--    sysconfdir="/usr/X11R6/lib/X11/XF86Config"
--    AC_MSG_RESULT([${sysconfdir}])
--   else
--    AC_MSG_RESULT([can't find it!])
--    AC_MSG_WARN([defaulting to ${sysconfdir} for glx.conf])
--  fi
--fi
--
--
- dnl
- dnl Checks for library functions.
- dnl
diff --git a/graphics/Mesa-glx/patches/patch-ab b/graphics/Mesa-glx/patches/patch-ab
deleted file mode 100644
index a09eea80e8f..00000000000
--- a/graphics/Mesa-glx/patches/patch-ab
+++ /dev/null
@@ -1,95 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2000/12/28 17:29:45 wiz Exp $
-
---- libGL/Makefile.in.orig	Sat Jun  3 10:16:36 2000
-+++ libGL/Makefile.in
-@@ -14,7 +14,7 @@
- # These define the name/version of the shared library we're building
- # ------------------------------------------------------------------
- LIBNAME = GL
--SOGLREV = 1.0
-+SOGLREV = 3:0
- 
- # Source and Object files
- # -----------------------
-@@ -23,7 +23,6 @@
- 	map_points.c pointers.c glx_varray.c direct_protocol.c 
- 
- OBJS = ${SRCS:.c=.o}
--UNSHARED_OBJS = unshared/*.o
- 
- 
- # Additional compiler rules
-@@ -50,22 +49,12 @@
- 	${CC} ${ALL_CFLAGS} -E $*.c > $@
- 
- .c.o:
--ifeq "${USE_DYNAMIC_MODULE}" "yes"
--	${RM} $@
--	${CC} ${ALL_CFLAGS} ${SHARED_CFLAGS} -c $<
--else
--	${RM} unshared/$@
--	${CC} ${ALL_CFLAGS} -c $< -o unshared/$@
--endif
-+	${LIBTOOL} ${CC} ${ALL_CFLAGS} -c $< 
- 
- # Main targets
- # ------------
- 
--ifeq "${USE_DYNAMIC_MODULE}" "yes"
--all : lib${LIBNAME}.so.${SOGLREV}
--else
--all : unshared-subdir lib${LIBNAME}.a
--endif
-+all : lib${LIBNAME}.la
- 
- 
- clean :
-@@ -79,20 +68,8 @@
- 	${DEPEND} -f .deps -- ${ALL_CFLAGS} -- ${SRCS}
- 
- 
--ifeq "${USE_DYNAMIC_MODULE}" "yes"
--install: lib${LIBNAME}.so.${SOGLREV}
--	@if [ -d ${DESTDIR}${INSTALL_libdir} ]; then set +x; \
--	else (set -x; ${MKDIR} ${DESTDIR}${INSTALL_libdir}); fi
--	${INSTALL} ${INSTALLFLAGS} ${INSTBINFLAGS} lib${LIBNAME}.so.${SOGLREV} ${DESTDIR}${INSTALL_libdir}
--	@T=`echo ${DESTDIR}${INSTALL_libdir}/lib${LIBNAME}.so.${SOGLREV} | sed 's/\.[^\.]*$$//'`; set -x; ${RM} $$T && ${LN} lib${LIBNAME}.so.${SOGLREV} $$T
--	${RM} ${DESTDIR}${INSTALL_libdir}/lib${LIBNAME}.so
--	${LN} lib${LIBNAME}.so.${SOGLREV} ${DESTDIR}${INSTALL_libdir}/lib${LIBNAME}.so
--else
--install: lib${LIBNAME}.a
--	@if [ -d ${DESTDIR}${INSTALL_libdir} ]; then set +x; \
--	else (set -x; ${MKDIR} ${DESTDIR}${INSTALL_libdir}); fi
--	${INSTALL} ${INSTALLFLAGS} ${INSTBINFLAGS} lib${LIBNAME}.a ${DESTDIR}${INSTALL_libdir}
--endif
-+install: lib${LIBNAME}.la
-+	${LIBTOOL} ${BSD_INSTALL_DATA} $< ${DESTDIR}${INSTALL_libdir}
- 
- tags :
- 	${TAGS} -w *.[ch]
-@@ -110,21 +87,10 @@
- render.c: genlib.tcl genGL.tcl
- 	${TCLSH} genlib.tcl
- 
--lib${LIBNAME}.so.${SOGLREV} : render.c ${OBJS}
--	${RM} $@~
--	@SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \
--	if [ `uname` = "SunOS" ] ; then \
--		${CC} -o ./$@~ ${SHARED_LDFLAGS} -Wl,-h,$$SONAME ${OBJS} \
--		${XLIBDIR} ${XLIBS} ${LIBS} ${MATHLIBS}; \
--	else \
--		${CC} -o ./$@~ ${SHARED_LDFLAGS} -Wl,-soname,$$SONAME ${OBJS} \
--		${XLIBDIR} ${XLIBS} ${LIBS} ${MATHLIBS}; \
--	fi; \
--	${RM} $$SONAME; ${LN} $@ $$SONAME; \
--	${RM} $@
--	${MV} $@~ $@
--	${RM} lib${LIBNAME}.so
--	${LN} $@ lib${LIBNAME}.so
-+lib${LIBNAME}.la : render.c ${OBJS}
-+	${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${INSTALL_libdir} \
-+	  -version-info ${SOGLREV} -Wl,-R${X11BASE}/lib ${XLIBDIR} ${XLIBS} \
-+	  ${LIBS} ${MATHLIBS} -o $@ ${OBJS:.o=.lo}
- 
- lib${LIBNAME}.a : render.c ${UNSHARED_OBJS}
- 	${RM} $@~
diff --git a/graphics/Mesa-glx/patches/patch-ac b/graphics/Mesa-glx/patches/patch-ac
deleted file mode 100644
index d2ee283aee1..00000000000
--- a/graphics/Mesa-glx/patches/patch-ac
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2000/04/11 22:49:26 tron Exp $
-
---- ../Mesa-3.1/src/X86/assyntax.h.orig	Tue Nov 16 00:22:22 1999
-+++ ../Mesa-3.1/src/X86/assyntax.h	Mon Apr  3 00:11:38 2000
-@@ -237,7 +237,8 @@
- 
- #if defined(Lynx) || (defined(SYSV) || defined(SVR4)) && !defined(ACK_ASSEMBLER) \
-  || (defined(linux) || defined(__OS2ELF__)) && defined(__ELF__) \
-- || defined(__FreeBSD__) && __FreeBSD__ >= 3
-+ || defined(__FreeBSD__) && __FreeBSD__ >= 3 \
-+ || defined(__NetBSD__) && defined(__ELF__)
- #define GLNAME(a)       a
- #else
- #define GLNAME(a)       CONCAT(_,a)
-@@ -932,7 +933,8 @@
- 
- #if defined(Lynx) || (defined(SYSV) || defined(SVR4)) \
-  || (defined(linux) || defined(__OS2ELF__)) && defined(__ELF__) \
-- || defined(__FreeBSD__) && __FreeBSD__ >= 3
-+ || defined(__FreeBSD__) && __FreeBSD__ >= 3 \
-+ || defined(__NetBSD__) && defined(__ELF__)
- #define GLNAME(a) a
- #else
- #define GLNAME(a) _ ## a