9 files changed, 1 insertions, 166 deletions

diff --git a/MOVED b/MOVED
index c05a34376955..2f3042402397 100644
--- a/MOVED
+++ b/MOVED
@@ -653,3 +653,4 @@ misc/solfege|audio/solfege|2003-11-05|better category
 print/pktrace|print/mftrace|2003-11-05|program renamed
 databases/mysql-jdbc-mm|databases/mysql-connector-java|2003-11-05|renamed
 sysutils/prune|sysutils/fileprune|2003-11-06|renamed because of conflict with graphviz
+graphics/Mesa3|graphics/libglut|2003-11-06|split into graphics/mesagl and graphics/libglut
diff --git a/graphics/Makefile b/graphics/Makefile
index df1081d7cae2..c6287caac7c3 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -9,7 +9,6 @@
     SUBDIR += Hermes
     SUBDIR += IPA
     SUBDIR += ImageMagick
-    SUBDIR += Mesa3
     SUBDIR += OpenEXR
     SUBDIR += aalib
     SUBDIR += acidwarp
diff --git a/graphics/Mesa3/Makefile b/graphics/Mesa3/Makefile
deleted file mode 100644
index 0f767c625b7d..000000000000
--- a/graphics/Mesa3/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-# New ports collection makefile for:    Mesa
-# Date created:         Tue Feb  7 12:02:49  1995
-# Whom:                 hsu
-#
-# $FreeBSD$
-#
-
-PORTNAME=	Mesa
-PORTVERSION=	3.4.2
-PORTREVISION=	2
-CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		ftp://iris.ssec.wisc.edu/pub/Mesa/ \
-		ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/
-MASTER_SITE_SUBDIR=	mesa3d
-DISTFILES=	MesaLib-${PORTVERSION}${EXTRACT_SUFX} \
-		MesaDemos-${PORTVERSION}${EXTRACT_SUFX}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A graphics library similar to SGI's OpenGL
-
-USE_BZIP2=	yes
-USE_REINPLACE=	yes
-INSTALLS_SHLIB=	yes
-
-.if defined(WANT_GGI)
-LIB_DEPENDS=	ggi.2:${PORTSDIR}/graphics/libggi
-CONFIGURE_ARGS+=--with-ggi=${LOCALBASE}
-.endif
-
-GLUTVER=	3
-USE_X_PREFIX=	yes
-USE_LIBTOOL=	yes
-USE_GMAKE=	yes
-CONFIGURE_ENV+=	GLVER="${GLVER}" GLUTVER="${GLUTVER}" \
-		LIBS="-lm"
-PLIST_SUB=	GLVER="${GLVER}" GLUTVER="${GLUTVER}"
-
-.include <bsd.port.pre.mk>
-
-.if ${XFREE86_VERSION} == 3
-SUB_GL=		src src-glu
-INCLUDE_GL=	include
-GLVER=		14
-PLIST_SUB+=	XFREE3:=""
-.else
-SUB_GL=
-INCLUDE_GL=
-GLVER=		1
-PLIST_SUB+=	XFREE3:="@comment "
-MAKE_ENV=	INCLUDES="-I${X11BASE}/include -I${WRKSRC}/include -DGLCALLBACKPCAST=\*"
-MAKE_ARGS=	-e
-.endif
-
-MAKE_ENV+=	SUB_GL="${SUB_GL}"		\
-		INCLUDE_GL=${INCLUDE_GL}
-
-.ifdef USE_MESA
-.error You have `USE_MESA' variable defined either in environment or in make(1) arguments. Please undefine and try again.
-.endif
-
-pre-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
-
-post-configure:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/src/config.c
-
-post-install:
-.for lib in GL GLU
-	@${LN} -sf ${PREFIX}/lib/lib${lib}.so ${PREFIX}/lib/libMesa${lib}.so
-.endfor
-.if ${XFREE86_VERSION} > 3
-	${MKDIR} ${PREFIX}/include/GL
-	${INSTALL_DATA} ${WRKSRC}/include/GL/glut.h ${PREFIX}/include/GL
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/graphics/Mesa3/distinfo b/graphics/Mesa3/distinfo
deleted file mode 100644
index 355c390a4f71..000000000000
--- a/graphics/Mesa3/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (MesaLib-3.4.2.tar.bz2) = 5bad47f1f86a87b2a35e8c8c33d97e4a
-MD5 (MesaDemos-3.4.2.tar.bz2) = b3a7b01dae8b1f09f951f9257c242b08
diff --git a/graphics/Mesa3/files/patch-aa b/graphics/Mesa3/files/patch-aa
deleted file mode 100644
index 80847a17c8d3..000000000000
--- a/graphics/Mesa3/files/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-
-$FreeBSD$
-
---- configure.orig	Fri May 18 10:51:10 2001
-+++ configure	Fri May 18 10:52:30 2001
-@@ -823,9 +823,9 @@
- MESA_MAJOR=3
- MESA_MINOR=4
- MESA_TINY=2
--LIBGL_VERSION=1:2:0${MESA_MAJOR}0${MESA_MINOR}0${MESA_TINY}
--LIBGLU_VERSION=1:1:0${MESA_MAJOR}0${MESA_MINOR}0${MESA_TINY}
--LIBGLUT_VERSION=3:7:0
-+LIBGL_VERSION=${GLVER}:0
-+LIBGLU_VERSION=${GLVER}:0
-+LIBGLUT_VERSION=${GLUTVER}:0
- 
- 
- 
diff --git a/graphics/Mesa3/files/patch-ad b/graphics/Mesa3/files/patch-ad
deleted file mode 100644
index 147ed95df496..000000000000
--- a/graphics/Mesa3/files/patch-ad
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in.orig	Thu May 17 01:28:53 2001
-+++ Makefile.in	Tue Jun  5 17:34:13 2001
-@@ -95,7 +95,7 @@
- 
- @NEED_GLUT_TRUE@SUB_GLUT = src-glut
- 
--SUBDIRS = include src src-glu $(SUB_GLUT) $(DEMO_DIRS) util
-+SUBDIRS = $(INCLUDE_GL) $(SUB_GL) $(SUB_GLUT) $(DEMO_DIRS) util
- 
- EXTRA_DIST = docs/INSTALL docs/INSTALL.GNU docs/CONFIG docs/IAFA-PACKAGE 	docs/RELNOTES docs/VERSIONS docs/CONFORM  docs/COPYING 	docs/COPYRIGHT docs/README docs/README.3DFX docs/README.BEOS 	docs/README.GGI docs/README.MINGW32 docs/README.MITS 	docs/README.QUAKE docs/README.THREADS docs/README.X11 	images/girl.rgb images/reflect.rgb images/tile.rgb
- 
-@@ -113,7 +113,7 @@
- 
- TAR = gtar
- GZIP_ENV = --best
--DIST_SUBDIRS =  include src src-glu src-glut book demos samples xdemos \
-+DIST_SUBDIRS =  $(INCLUDE_GL) $(SUB_GL) src-glut book demos samples xdemos \
- util
- all: all-redirect
- .SUFFIXES:
diff --git a/graphics/Mesa3/files/patch-ae b/graphics/Mesa3/files/patch-ae
deleted file mode 100644
index 295ebbb601f6..000000000000
--- a/graphics/Mesa3/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/config.c	2000/09/11 12:25:04	1.1
-+++ src/config.c	2000/09/11 12:25:27
-@@ -406,7 +406,7 @@
- #if defined(__WIN32__) || defined(__MSDOS__)
-    const char *filename = "mesa.cnf";
- #else
--   const char *filename = "/etc/mesa.conf"; 
-+   const char *filename = "%%PREFIX%%/etc/mesa.conf"; 
- #endif   
-    FILE *file;
-    struct cnode *list;
diff --git a/graphics/Mesa3/pkg-descr b/graphics/Mesa3/pkg-descr
deleted file mode 100644
index 6c688e072076..000000000000
--- a/graphics/Mesa3/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Mesa is a 3-D graphics library with an API which is very similar to that
-of OpenGL*.  To the extent that Mesa utilizes the OpenGL command syntax
-or state machine, it is being used with authorization from Silicon Graphics,
-Inc.  However, the author makes no claim that Mesa is in any way a
-compatible replacement for OpenGL or associated with Silicon Graphics, Inc.
-Those who want a licensed implementation of OpenGL should contact a licensed
-vendor.  This software is distributed under the terms of the GNU Library
-General Public License, see the LICENSE file for details.
-
-paulo@isr.uc.pt
-
-WWW: http://www.mesa3d.org/
diff --git a/graphics/Mesa3/pkg-plist b/graphics/Mesa3/pkg-plist
deleted file mode 100644
index f0a4a99604de..000000000000
--- a/graphics/Mesa3/pkg-plist
+++ /dev/null
@@ -1,22 +0,0 @@
-%%XFREE3:%%etc/mesa.conf
-%%XFREE3:%%include/GL/gl.h
-%%XFREE3:%%include/GL/gl_mangle.h
-%%XFREE3:%%include/GL/glu.h
-%%XFREE3:%%include/GL/glu_mangle.h
-include/GL/glut.h
-%%XFREE3:%%include/GL/glx.h
-%%XFREE3:%%include/GL/glx_mangle.h
-%%XFREE3:%%include/GL/glext.h
-%%XFREE3:%%include/GL/osmesa.h
-%%XFREE3:%%include/GL/xmesa.h
-%%XFREE3:%%include/GL/xmesa_x.h
-%%XFREE3:%%include/GL/xmesa_xf86.h
-%%XFREE3:%%lib/libGL.so
-%%XFREE3:%%lib/libGL.so.%%GLVER%%
-%%XFREE3:%%lib/libGLU.so
-%%XFREE3:%%lib/libGLU.so.%%GLVER%%
-lib/libMesaGL.so
-lib/libMesaGLU.so
-lib/libglut.so
-lib/libglut.so.%%GLUTVER%%
-%%XFREE3:%%@dirrm include/GL