[Midnightbsd-cvs] mports: mports/x11: We had two versions of this in ports! The other was

[laffer1 at midnightbsd.org]

Log Message:
-----------
We had two versions of this in ports!  The other was in graphics!

This is the older of the two and appears to have no depends.

Modified Files:
--------------
    mports/x11:
        Makefile (r1.50 -> r1.51)

Removed Files:
-------------
    mports/x11/libGL:
        Makefile
        distinfo
        pkg-descr
        pkg-plist
    mports/x11/libGL/files:
        patch-GL-GL-Imakefile
        patch-GL-Imakefile
    mports/x11/libGL/scripts:
        configure

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11/Makefile,v
retrieving revision 1.50
retrieving revision 1.51
diff -L x11/Makefile -L x11/Makefile -u -r1.50 -r1.51
--- x11/Makefile
+++ x11/Makefile
@@ -42,7 +42,6 @@
     SUBDIR += kde3
     SUBDIR += kdebase3
     SUBDIR += kdelibs3
-    SUBDIR += libGL
     SUBDIR += libICE
     SUBDIR += libSM
     SUBDIR += libX11
--- x11/libGL/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-This package contains the OpenGL library, which can perform rendering over GLX
-or using the Direct Rendering Infrastructure.
-
-WWW: http://www.freedesktop.org/Software/xorg
-
-- Eric Anholt
-anholt at FreeBSD.org
--- x11/libGL/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-include/GL/gl.h
-include/GL/glext.h
-include/GL/glx.h
-include/GL/glxext.h
-include/GL/glxint.h
-include/GL/glxmd.h
-include/GL/glxproto.h
-include/GL/glxtokens.h
-lib/libGL.a
-lib/libGL.so
-lib/libGL.so.1
- at dirrm include/GL
--- x11/libGL/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# New ports collection makefile for:    xorg-server
-# Date created:		7 May 2004
-# Whom:			anholt at FreeBSD.org
-#
-# $MidnightBSD: mports/x11/libGL/Makefile,v 1.2 2008/04/04 01:28:58 laffer1 Exp $
-# $FreeBSD: ports/x11/libGL/Makefile,v 1.6 2005/03/17 23:22:08 lesi Exp $
-#
-
-PORTNAME=	libGL
-PORTVERSION=	1.0
-PORTREVISION=	1
-CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R6.8.1/tars
-DISTFILES=	X11R6.8.1-src1.tar.gz \
-		X11R6.8.1-src3.tar.gz
-EXTRACT_ONLY=	X11R6.8.1-src1.tar.gz
-
-MAINTAINER=	x11 at FreeBSD.org
-COMMENT=	OpenGL library that renders using GLX or DRI
-
-LIB_DEPENDS=	Xxf86vm.1:${PORTSDIR}/x11/libXxf86
-
-CONFLICTS=	XFree86-libraries-* xorg-libraries-*
-
-EXTRA_PATCHES=	${CF_PATCHES}
-
-PREFIX?=	${X11BASE}
-XBUILD_DIRS=	lib/GL
-GLHEADERS=	gl.h glext.h glx.h glxext.h glxint.h glxmd.h glxproto.h \
-		glxtokens.h
-USE_LDCONFIG=	yes
-USE_GNOME=	pkgconfig
-
-.include <bsd.port.pre.mk>
-
-post-extract:
-	(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
-		${DISTDIR}/${DIST_SUBDIR}/X11R6.8.1-src3.tar.gz | \
-		${TAR} -xf - xc/programs/Xserver/hw/xfree86/os-support \
-		xc/programs/Xserver/GL)
-
-post-install:
-	${MKDIR} ${PREFIX}/include/GL
-.for i in ${GLHEADERS}
-	${INSTALL_DATA} ${WRKSRC}/include/GL/${i} ${PREFIX}/include/GL
-.endfor
-
-.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
-.include <bsd.port.post.mk>
--- x11/libGL/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b
-SHA256 (xorg/X11R6.8.1-src1.tar.gz) = cba581759249a292996ae552e98c7803ef1692ce81c1b06bed472f3b3d465b70
-SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401
-MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3
-SHA256 (xorg/X11R6.8.1-src3.tar.gz) = 179d798f46dcd2cbe7f25baf2091996b3b9a12588ed37f8146c39617126a94f9
-SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808
--- x11/libGL/files/patch-GL-Imakefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- lib/GL/Imakefile.orig	Thu Mar  4 09:46:25 2004
-+++ lib/GL/Imakefile	Sun May  9 11:26:47 2004
-@@ -107,11 +107,7 @@
-  * built-in to libGL.  In the former case, libGL needs to be built before
-  * the drivers, and in the latter case, it needs to be built after the driver.
-  */
--#if BuildXF86DRI && GlxUseBuiltInDRIDriver
--SUBDIRS = $(MESADIRS) $(DRIDIRS) $(DRIVERDIRS) $(GLXDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS)
--#else
--SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS) $(DRIVERDIRS)
--#endif
-+SUBDIRS = $(GLXDIRS) $(DRIDIRS) $(LIBGLBUILDDIR)
- 
- MakeSubdirs($(SUBDIRS))
- 
--- x11/libGL/files/patch-GL-GL-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/GL/GL/Imakefile.orig	Sun May  9 16:07:28 2004
-+++ lib/GL/GL/Imakefile	Sun May  9 16:08:51 2004
-@@ -204,7 +204,7 @@
- #endif
- 
- #if BuildXF86DRI && BuildXF86VidModeExt
--VMODEREQUIREDLIBS = $(LDPRELIBS) $(XXF86VMLIB)
-+VMODEREQUIREDLIBS = $(LDPRELIBS) -L$(USRLIBDIR) $(XXF86VMLIB)
- #endif
- 
- /*
--- x11/libGL/scripts/configure
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-LOCALDEF=$WRKDIR/.config
-
-rm -f $LOCALDEF
-echo "#define UseInstalledPrograms YES"			>> $LOCALDEF
-echo "#define StandardIncludes -I${PREFIX}/include"	>> $LOCALDEF
-
-sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen