Remove ports which are replaced by graphics/linux-f10-dri :

graphics/linux_dri
graphics/linux-dri74

Discussed on:	emulation@

10 files changed, 2 insertions, 201 deletions

diff --git a/MOVED b/MOVED
index bcd224610e52..4f9435496b28 100644
--- a/MOVED
+++ b/MOVED
@@ -4415,3 +4415,5 @@ comms/libticables|comms/libticables2|2013-07-01|Has expired: Superseded by comms
 devel/libticalcs|comms/libticalcs2|2013-07-01|Has expired: Superseded by comms/libticalcs2
 emulators/tiemu2|emulators/tiemu3|2013-07-01|Has expired: Superseded by emulators/tiemu3
 net/rubygem-bunny060||2013-07-02|Removed
+graphics/linux_dri||2013-07-03|Removed
+graphics/linux-dri74||2013-07-03|Removed
diff --git a/graphics/Makefile b/graphics/Makefile
index c0297375ce1b..c2c67cc68aba 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -579,7 +579,6 @@
     SUBDIR += linplasma
     SUBDIR += linux-XnViewMP
     SUBDIR += linux-adobesvg
-    SUBDIR += linux-dri74
     SUBDIR += linux-f10-cairo
     SUBDIR += linux-f10-dri
     SUBDIR += linux-f10-gdk-pixbuf
@@ -595,7 +594,6 @@
     SUBDIR += linux-f10-ungif
     SUBDIR += linux-panorama-tools
     SUBDIR += linux-sdl_ttf
-    SUBDIR += linux_dri
     SUBDIR += linux_glide
     SUBDIR += lprof-devel
     SUBDIR += lua-gd
diff --git a/graphics/linux-dri74/Makefile b/graphics/linux-dri74/Makefile
deleted file mode 100644
index 8aed4db33e94..000000000000
--- a/graphics/linux-dri74/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# New ports collection makefile for:	graphics/linux-dri74
-# Date created:				2009-05-06
-# Whom:					bsam
-#
-# $FreeBSD$
-#
-
-PORTNAME=	dri
-PORTVERSION=	7.4
-PORTREVISION=	1
-CATEGORIES=	graphics linux
-MASTER_SITES=	ftp://ftp.ipt.ru/pub/download/ \
-		http://people.freebsd.org/~bsam/download/
-PKGNAMEPREFIX=	linux-
-DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
-
-MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	Mesa-based DRI libraries, drivers, and binaries (Linux Ubuntu 9.0.4)
-
-CONFLICTS=	linux_dri-6.5.2006* linux-libGLU-[0-9]* linux_dri-[0-9]* linux-f8-dri-[0-9]* linux-f10-dri-[0-9]* \
-		linux-f10-libGLU-[0-9]*
-
-ONLY_FOR_ARCHS=	i386 amd64
-NO_BUILD=	yes
-USE_BZIP2=	yes
-USE_LINUX_PREFIX=yes
-USE_LDCONFIG=	yes
-
-do-install:
-	@cd ${WRKSRC} && ${SH} -c '(${FIND} -d . | ${CPIO} -dumpl ${PREFIX}) > /dev/null 2>&1'
-
-.include <bsd.port.pre.mk>
-
-pre-fetch:
-.if ${OSVERSION} < 702000
-IGNORE=		you need FreeBSD>=7.2 RELEASE with Linux emulation 2.6.x
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/graphics/linux-dri74/distinfo b/graphics/linux-dri74/distinfo
deleted file mode 100644
index 6dc47f3eb237..000000000000
--- a/graphics/linux-dri74/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (linux-dri-7.4.tar.bz2) = 9880c28efd741035f344fd3074cbd5da2ac1bf97d9ef5eac1eb288aeac167be8
-SIZE (linux-dri-7.4.tar.bz2) = 13625644
diff --git a/graphics/linux-dri74/pkg-descr b/graphics/linux-dri74/pkg-descr
deleted file mode 100644
index 470a1a6cd5da..000000000000
--- a/graphics/linux-dri74/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Mesa-based runtime libraries, drivers and binaries from Ubuntu-9.0.4
-which are needed to run X-based applications within linuxulator.
-
-WWW: http://www.mesa3d.org/
diff --git a/graphics/linux-dri74/pkg-plist b/graphics/linux-dri74/pkg-plist
deleted file mode 100644
index 1a5b188e4e2f..000000000000
--- a/graphics/linux-dri74/pkg-plist
+++ /dev/null
@@ -1,29 +0,0 @@
-@comment file listing
-usr/bin/glxgears
-usr/bin/glxinfo
-usr/lib/dri/i810_dri.so
-usr/lib/dri/i915_dri.so
-usr/lib/dri/i965_dri.so
-usr/lib/dri/mach64_dri.so
-usr/lib/dri/mga_dri.so
-usr/lib/dri/r128_dri.so
-usr/lib/dri/r200_dri.so
-usr/lib/dri/r300_dri.so
-usr/lib/dri/radeon_dri.so
-usr/lib/dri/s3v_dri.so
-usr/lib/dri/savage_dri.so
-usr/lib/dri/sis_dri.so
-usr/lib/dri/swrast_dri.so
-usr/lib/dri/tdfx_dri.so
-usr/lib/dri/trident_dri.so
-usr/lib/dri/unichrome_dri.so
-usr/lib/libGL.so.1
-usr/lib/libGL.so.1.2
-usr/lib/libGLU.so.1
-usr/lib/libGLU.so.1.3.070300
-usr/lib/libdrm.so.2
-usr/lib/libdrm.so.2.4.0
-usr/lib/libdrm_intel.so.1
-usr/lib/libdrm_intel.so.1.0.0
-@comment non-empty directory listing in revers order
-@dirrm usr/lib/dri
diff --git a/graphics/linux_dri/Makefile b/graphics/linux_dri/Makefile
deleted file mode 100644
index 37a965afc8ac..000000000000
--- a/graphics/linux_dri/Makefile
+++ /dev/null
@@ -1,81 +0,0 @@
-# Ports collection makefile for:	linux_dri
-# Date created:				Thu Oct 25 18:51:06 PDT 2001
-# Whom:					Eric Anholt <eta@lclark.edu>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	linux_dri
-PORTVERSION=	7.0
-PORTREVISION=	2
-CATEGORIES=	graphics linux
-MASTER_SITES=	http://people.freebsd.org/~anholt/dri/files/
-DISTFILES=	Mesa-linux-bin-${PORTVERSION}.tar.bz2 \
-		linux-libglide.tar.gz \
-		linux-dri-tools.tar.gz
-
-MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	Binary Linux DRI libraries for 3D hardware acceleration of Linux apps
-
-CONFLICTS=	linux_dri-6.5.2006* linux-libGLU-[0-9]* linux-f8-dri-[0-9]* \
-		linux-f8-libGLU-[0-9]* linux-f10-dri-[0-9]* linux-dri-[0-9]* \
-		linux-f10-libGLU-[0-9]*
-
-WRKSRC=		${WRKDIR}
-NO_BUILD=	yes
-USE_LINUX=	yes
-USE_LINUX_PREFIX=	yes
-USE_LINUX_APPS=	xorglibs
-
-# don't package this for amd64 until we come up with 32-bit ioctl wrappers for
-# the drm.
-ONLY_FOR_ARCHS=	i386 amd64
-
-MODULELIST=	i810_dri.so \
-		i915_dri.so \
-		i965_dri.so \
-		mach64_dri.so \
-		mga_dri.so \
-		r128_dri.so \
-		r200_dri.so \
-		r300_dri.so \
-		radeon_dri.so \
-		savage_dri.so \
-		sis_dri.so \
-		tdfx_dri.so \
-		unichrome_dri.so
-LDCONFIG_LINUX=	${LINUXBASE}/sbin/ldconfig
-
-.include <bsd.port.pre.mk>
-
-do-install:
-	${MKDIR} ${PREFIX}/usr/X11R6/lib/modules/dri
-	${INSTALL_PROGRAM} ${WRKSRC}/linux_dri/libGL.so.1.2 \
-		${PREFIX}/usr/X11R6/lib
-#	${BRANDELF} -t Linux ${PREFIX}/usr/X11R6/lib/libGL.so.1.2
-	${INSTALL_PROGRAM} ${WRKSRC}/linux_dri/libGLU.so.1.3.070100 \
-		${PREFIX}/usr/X11R6/lib
-	${INSTALL_PROGRAM} ${WRKSRC}/linux_dri/libdrm.so.2.3.0 \
-		${PREFIX}/usr/lib
-	${INSTALL_PROGRAM} ${WRKSRC}/linux_dri/libexpat.so.1 \
-		${PREFIX}/usr/lib
-#	${BRANDELF} -t Linux ${PREFIX}/usr/X11R6/lib/libGLU.so.1.3.070100
-.for i in ${MODULELIST}
-	${INSTALL_PROGRAM} ${WRKSRC}/linux_dri/${i} \
-		${PREFIX}/usr/X11R6/lib/modules/dri
-.endfor
-#	The libglide3 distributed with linux_base is broken and is symlinked poorly, supply our own.
-	${INSTALL_PROGRAM} ${WRKDIR}/linux-libglide/libglide3-v3.so.0 ${PREFIX}/usr/X11R6/lib
-	${INSTALL_PROGRAM} ${WRKDIR}/linux-libglide/libglide3-v5.so.0 ${PREFIX}/usr/X11R6/lib
-	${LN} -sf libglide3-v3.so.0 ${PREFIX}/usr/X11R6/lib/libglide3-v3.so
-	${LN} -sf libglide3-v5.so.0 ${PREFIX}/usr/X11R6/lib/libglide3-v5.so
-	${INSTALL_PROGRAM} ${WRKDIR}/linux-dri-tools/libglut.so.3.7.0 ${PREFIX}/usr/X11R6/lib
-	${INSTALL_PROGRAM} ${WRKDIR}/linux-dri-tools/gears ${PREFIX}/usr/X11R6/bin
-	${BRANDELF} -t Linux ${PREFIX}/usr/X11R6/bin/gears
-	${INSTALL_PROGRAM} ${WRKDIR}/linux-dri-tools/glxinfo ${PREFIX}/usr/X11R6/bin
-	${BRANDELF} -t Linux ${PREFIX}/usr/X11R6/bin/glxinfo
-
-post-install:
-	@${LDCONFIG_LINUX} ${PREFIX}/usr/X11R6/lib
-
-.include <bsd.port.post.mk>
diff --git a/graphics/linux_dri/distinfo b/graphics/linux_dri/distinfo
deleted file mode 100644
index ec3ceee50fe2..000000000000
--- a/graphics/linux_dri/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-SHA256 (Mesa-linux-bin-7.0.tar.bz2) = 9133f5dffe6b7fe1d590df2e6a865e677b87cd45edb4c45ec75ee47471a06ad4
-SIZE (Mesa-linux-bin-7.0.tar.bz2) = 10137014
-SHA256 (linux-libglide.tar.gz) = 0fc6d3d3e99bb9ad7a6b314e1b883a6a9421d4f6fd3bf0ee541d055f4ffca237
-SIZE (linux-libglide.tar.gz) = 286591
-SHA256 (linux-dri-tools.tar.gz) = 7c6262959c8f08d4a47f0cb9a77d2761e5ac24fe9dca8949b9fe07b963962a83
-SIZE (linux-dri-tools.tar.gz) = 124318
diff --git a/graphics/linux_dri/pkg-descr b/graphics/linux_dri/pkg-descr
deleted file mode 100644
index f1c6ee9bb517..000000000000
--- a/graphics/linux_dri/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-linux_dri installs binary linux DRI modules, libraries and basic programs to 
-support and test 3d hardware acceleration of linux binaries with the DRI.
-
-Compiled by anholt@FreeBSD.org on a debian unstable system, patched to
-disable the new Damage protocol call for rotated rendering due to it being
-unavailable in our linux base ports.
diff --git a/graphics/linux_dri/pkg-plist b/graphics/linux_dri/pkg-plist
deleted file mode 100644
index 8d3ff149c3ce..000000000000
--- a/graphics/linux_dri/pkg-plist
+++ /dev/null
@@ -1,32 +0,0 @@
-usr/X11R6/bin/gears
-usr/X11R6/bin/glxinfo
-usr/X11R6/lib/libGL.so.1
-usr/X11R6/lib/libGL.so.1.2
-usr/X11R6/lib/libGLU.so.1
-usr/X11R6/lib/libGLU.so.1.3.070100
-usr/lib/libdrm.so.2
-usr/lib/libdrm.so.2.3.0
-usr/lib/libexpat.so.1
-usr/X11R6/lib/libglide3.so.3
-usr/X11R6/lib/libglide3-v3.so
-usr/X11R6/lib/libglide3-v3.so.0
-usr/X11R6/lib/libglide3-v5.so
-usr/X11R6/lib/libglide3-v5.so.0
-usr/X11R6/lib/libglut.so.3.7.0
-usr/X11R6/lib/libglut.so.3
-usr/X11R6/lib/modules/dri/i810_dri.so
-usr/X11R6/lib/modules/dri/i915_dri.so
-usr/X11R6/lib/modules/dri/i965_dri.so
-usr/X11R6/lib/modules/dri/mach64_dri.so
-usr/X11R6/lib/modules/dri/mga_dri.so
-usr/X11R6/lib/modules/dri/r128_dri.so
-usr/X11R6/lib/modules/dri/r200_dri.so
-usr/X11R6/lib/modules/dri/r300_dri.so
-usr/X11R6/lib/modules/dri/radeon_dri.so
-usr/X11R6/lib/modules/dri/savage_dri.so
-usr/X11R6/lib/modules/dri/sis_dri.so
-usr/X11R6/lib/modules/dri/tdfx_dri.so
-usr/X11R6/lib/modules/dri/unichrome_dri.so
-@exec %D/sbin/ldconfig %D/usr/X11R6/lib
-@dirrm usr/X11R6/lib/modules/dri
-@dirrm usr/X11R6/lib/modules