5 files changed, 92 insertions, 60 deletions

diff --git a/graphics/linux_mesa3/Makefile b/graphics/linux_mesa3/Makefile
index 4f091038bcb4..e04c9ef3a6a7 100644
--- a/graphics/linux_mesa3/Makefile
+++ b/graphics/linux_mesa3/Makefile
@@ -1,44 +1,85 @@
-# New ports collection makefile for:    Mesa for Linux compat
-# Date created:         Oct, 8 1998
-# Whom:                 cracauer
+# New ports collection makefile for:	Mesa3 for Linux compat
+# Date created:		May 18 2000
+# Whom:			Masahiro TAKEMURA
 #
 # $FreeBSD$
 #
 
-PORTNAME=	mesa
-PORTVERSION=	2.6
-CATEGORIES=	graphics linux
-MASTER_SITES= 	ftp://iris.ssec.wisc.edu/pub/Mesa/old-versions/
-PKGNAMEPREFIX=	linux_
-DISTNAME=       MesaLib-${PORTVERSION}
+PORTNAME=		mesa
+PORTVERSION=		3.2.2
+CATEGORIES=		graphics linux
+MASTER_SITES=		${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
+PKGNAMEPREFIX=		linux_
+DISTFILES=		Mesa-${PORTVERSION:S/./-/g:S/-/./}.${MACHINE_ARCH}.rpm
+EXTRACT_ONLY=
 
-MAINTAINER=	cracauer@cons.org
+PATCH_SITES=		${RPM_MIRRORS:S/__DIR__/${UPDDIR}/g}
+PATCHFILES=
 
-BUILD_DEPENDS=	/compat/linux/usr/lib/libglide2x.so:${PORTSDIR}/graphics/linux_glide \
-		/compat/linux/usr/bin/gcc:${PORTSDIR}/devel/linux_devtools
+MAINTAINER=		mastake@msel.t.u-tokyo.ac.jp
 
-BROKEN=		linux crosscompilation needs to be fixed first
-ONLY_FOR_ARCHS=	i386
+BUILD_DEPENDS=		rpm2cpio:${PORTSDIR}/misc/rpm
+RUN_DEPENDS=		\
+	/compat/linux/lib/ld-linux.so.2:${PORTSDIR}/emulators/linux_base
 
-ALL_TARGET=	linux-glide
-MAKE_ENV=	PATH=${PREFIX}/usr/bin:$$PATH
-NO_FILTER_SHLIBS=yes
+ONLY_FOR_ARCHS=		i386
+DIST_SUBDIR=		rpm
+PREFIX=			/compat/linux
+NO_BUILD=		yes
+NO_FILTER_SHLIBS=	yes
+NO_MTREE=		yes
 
-PREFIX=		/compat/linux
-WRKSRC=		${WRKDIR}/Mesa-2.6/src
+RPM_MIRRORS=		\
+	ftp://ftp.freesoftware.com/pub/linux/redhat/__DIR__/ \
+	ftp://ftp.redhat.com/redhat/__DIR__/ \
+	ftp://ftp.infomagic.com/pub/mirrors/linux/RedHat/__DIR__/ \
+	ftp://ftp.crc.ca/mirrors/by-site/ftp.redhat.com/redhat/__DIR__/ \
+	ftp://ftp.nluug.nl/site/ftp.redhat.com/redhat/__DIR__/ \
+	ftp://mirror.nucba.ac.jp/mirror/redhat/__DIR__/ \
+	ftp://ftp.is.co.za/linux/distributions/redhat/__DIR__/ \
+	ftp://mirror.aarnet.edu.au/pub/linux/redhat/__DIR__/
 
-post-extract:
-	-${MKDIR} ${WRKSRC}/../lib/
+STDDIR=			redhat-6.2/${MACHINE_ARCH}/RedHat/RPMS
+UPDDIR=			updates/6.2/${MACHINE_ARCH}
+
+.include <bsd.port.pre.mk>
+
+RPMDIR=			${DISTDIR}/${DIST_SUBDIR}
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/../lib/libMesaGL.so.2.6 ${PREFIX}/usr/lib/.
-	${LN} -fs libMesaGL.so.2.6 ${PREFIX}/usr/lib/libMesaGL.so.2
-	${LN} -fs libMesaGL.so.2.6 ${PREFIX}/usr/lib/libMesaGL.so
-	${LN} -fs libMesaGL.so.2.6 ${PREFIX}/usr/lib/libGL.so
-	@${MKDIR} ${PREFIX}/usr/include/GL
-	${INSTALL_DATA} ${WRKSRC}/../include/GL/* ${PREFIX}/usr/include/GL/.
-	${INSTALL_DATA} ${WRKSRC}/../include/glaux.h ${PREFIX}/usr/include/.
-	${INSTALL_DATA} ${WRKSRC}/../include/gltk.h ${PREFIX}/usr/include/.
-	-/compat/linux/sbin/ldconfig
-
-.include <bsd.port.mk>
+	@if [ -z "`kldstat -v | ${GREP} -E 'linux(aout|elf)'`" ]; then \
+		${ECHO} 'Linux mode is not enabled.\
+			Loading linux kernel module...' | fmt; \
+		linux || { \
+		${ECHO} 'The linux kernel module could not be loaded.\
+			Please manually load the module and retry.\
+			See "man linux" for details.' | fmt; \
+		${FALSE}; \
+		};\
+	fi
+#
+# Install all packages.
+#
+	@for R in ${DISTFILES}; do \
+		${ECHO} $$R; \
+		cd ${PREFIX} && rpm2cpio ${RPMDIR}/$$R | cpio -di; \
+	done
+#
+# Install updates
+#
+	@for R in ${PATCHFILES}; do \
+		${ECHO} $$R; \
+		cd ${PREFIX} && rpm2cpio ${RPMDIR}/$$R | cpio -di; \
+	done
+#
+# Create Symbolic link
+#
+	@for R in GL GLU; do \
+		cd ${PREFIX}/usr/X11R6/lib && ${LN} -s lib$$R.so libMesa$$R.so; \
+	done
+#
+# Finish
+#
+	${PREFIX}/sbin/ldconfig
+
+.include <bsd.port.post.mk>
diff --git a/graphics/linux_mesa3/distinfo b/graphics/linux_mesa3/distinfo
index 23a3ccd09714..67b2a643cfc0 100644
--- a/graphics/linux_mesa3/distinfo
+++ b/graphics/linux_mesa3/distinfo
@@ -1 +1 @@
-MD5 (MesaLib-2.6.tar.gz) = ee27bf2548dbc2031974c33ee6226c0c
+MD5 (rpm/Mesa-3.2-2.i386.rpm) = 593aa72451380019b466edad1120b02e
diff --git a/graphics/linux_mesa3/pkg-comment b/graphics/linux_mesa3/pkg-comment
index 13bd5bda8aac..ce10da53f544 100644
--- a/graphics/linux_mesa3/pkg-comment
+++ b/graphics/linux_mesa3/pkg-comment
@@ -1 +1 @@
-Installs Linux shared library of Mesa to access glide/3dfx cards
+RedHat shared library package of Mesa3
diff --git a/graphics/linux_mesa3/pkg-descr b/graphics/linux_mesa3/pkg-descr
index e49c588d6624..6bf510205aed 100644
--- a/graphics/linux_mesa3/pkg-descr
+++ b/graphics/linux_mesa3/pkg-descr
@@ -1,5 +1,5 @@
-This port installs a Linux shared library of Mesa with access to
-glide/3dfx cards, to be used by Linux programs.
+This port installs a Linux shared library of Mesa from RedHat Package,
+to be used by Linux programs.
 
 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
diff --git a/graphics/linux_mesa3/pkg-plist b/graphics/linux_mesa3/pkg-plist
index 52f53bae5f26..3035d31618d8 100644
--- a/graphics/linux_mesa3/pkg-plist
+++ b/graphics/linux_mesa3/pkg-plist
@@ -1,24 +1,15 @@
-usr/lib/libMesaGL.so.2.6
-usr/lib/libMesaGL.so.2
-usr/lib/libMesaGL.so
-usr/lib/libGL.so
-usr/include/GL/FooMesa.h
-usr/include/GL/dosmesa.h
-usr/include/GL/fxmesa.h
-usr/include/GL/gl.h
-usr/include/GL/gl_mangle.h
-usr/include/GL/glu.h
-usr/include/GL/glu_mangle.h
-usr/include/GL/glut.h
-usr/include/GL/glx.h
-usr/include/GL/glx_mangle.h
-usr/include/GL/gmesa.h
-usr/include/GL/mglmesa.h
-usr/include/GL/osmesa.h
-usr/include/GL/svgamesa.h
-usr/include/GL/wmesa.h
-usr/include/GL/xmesa.h
-usr/include/glaux.h
-usr/include/gltk.h
-@exec /compat/linux/sbin/ldconfig ; true
-@dirrm usr/include/GL
+etc/mesa.conf
+usr/X11R6/lib/libGL.la
+usr/X11R6/lib/libGL.so
+usr/X11R6/lib/libGL.so.1
+usr/X11R6/lib/libGL.so.1.2.0
+usr/X11R6/lib/libGLU.la
+usr/X11R6/lib/libGLU.so
+usr/X11R6/lib/libGLU.so.1
+usr/X11R6/lib/libGLU.so.1.2.0
+usr/X11R6/lib/libglut.la
+usr/X11R6/lib/libglut.so
+usr/X11R6/lib/libglut.so.3
+usr/X11R6/lib/libglut.so.3.7.0
+usr/X11R6/lib/libMesaGL.so
+usr/X11R6/lib/libMesaGLU.so