Upgrade to version 3.4.2.

PR:	ports/31679
Submitted by:	Maintainer

6 files changed, 68 insertions, 75 deletions

diff --git a/graphics/linux_mesa3/Makefile b/graphics/linux_mesa3/Makefile
index ba17ff6d14dc..39b23bc482db 100644
--- a/graphics/linux_mesa3/Makefile
+++ b/graphics/linux_mesa3/Makefile
@@ -6,80 +6,50 @@
 #
 
 PORTNAME=		mesa
-PORTVERSION=		3.2.2
+PORTVERSION=		3.4.2
 CATEGORIES=		graphics linux
-MASTER_SITES=		${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
+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
 PKGNAMEPREFIX=		linux_
-DISTFILES=		Mesa-${PORTVERSION:S/./-/g:S/-/./}.${MACHINE_ARCH}.rpm
-EXTRACT_ONLY=
-
-PATCH_SITES=		${RPM_MIRRORS:S/__DIR__/${UPDDIR}/g}
-PATCHFILES=
+DISTFILES=		MesaLib-${PORTVERSION}${EXTRACT_SUFX} \
+			MesaDemos-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=		mastake@msel.t.u-tokyo.ac.jp
 
-BUILD_DEPENDS=		rpm2cpio:${PORTSDIR}/archivers/rpm
-RUN_DEPENDS=		\
-	/compat/linux/lib/ld-linux.so.2:${PORTSDIR}/emulators/linux_base
+BUILD_DEPENDS=	${PREFIX}/lib/ld-linux.so.2:${PORTSDIR}/emulators/linux_base \
+		${PREFIX}/usr/bin/gcc:${PORTSDIR}/devel/linux_devtools
+RUN_DEPENDS=	${PREFIX}/lib/ld-linux.so.2:${PORTSDIR}/emulators/linux_base
 
+USE_BZIP2=		yes
 ONLY_FOR_ARCHS=		i386
-DIST_SUBDIR=		rpm
 PREFIX=			/compat/linux
-NO_BUILD=		yes
+WRKSRC=			${WRKDIR}/Mesa-${PORTVERSION}
 NO_FILTER_SHLIBS=	yes
 NO_MTREE=		yes
 
-RPM_MIRRORS=		\
-	ftp://ftp.redhat.com/pub/redhat/__DIR__/ \
-	ftp://ftp.infomagic.com/pub/mirrors/linux/redhat/__DIR__/ \
-	ftp://ftp.crc.ca/pub/systems/linux/redhat/ftp.redhat.com/__DIR__/ \
-	ftp://ftp.nluug.nl/site/ftp.redhat.com/redhat/__DIR__/ \
-	ftp://ftp.is.co.za/linux/distributions/redhat/__DIR__/ \
-	ftp://mirror.aarnet.edu.au/pub/linux/redhat/__DIR__/ \
-	ftp://ftp.kddlabs.co.jp/Linux/packages/RedHat/redhat/__DIR__/ \
-	ftp://download.sourceforge.net/pub/mirrors/redhat/redhat/__DIR__/
+INSTALL=		${PREFIX}/usr/bin/install
 
-STDDIR=			linux/6.2/en/os/${MACHINE_ARCH}/RedHat/RPMS
-UPDDIR=			linux/updates/6.2/en/os/${MACHINE_ARCH}
+GNU_CONFIGURE=		yes
+CONFIGURE_TARGET=	#
+CONFIGURE_ARGS=		--libdir="${PREFIX}/usr/X11R6/lib" \
+			--includedir="${PREFIX}/usr/X11R6/include"
+CONFIGURE_ENV=		PATH="/compat/linux/bin:/compat/linux/usr/bin:${PATH}"\
+			GL_MAJOR_VER="${GL_MAJOR_VER}" \
+			GL_MINOR_VER="${GL_MINOR_VER}" \
+			GLUT_MAJOR_VER="${GLUT_MAJOR_VER}" \
+			GLUT_MINOR_VER="${GLUT_MINOR_VER}"
+GL_MAJOR_VER=		1
+GL_MINOR_VER=		3
+GLUT_MAJOR_VER=		3
+GLUT_MINOR_VER=		8
 
-.include <bsd.port.pre.mk>
+MAKE_ENV=		PATH=${PREFIX}/usr/bin:${PATH}
 
-RPMDIR=			${DISTDIR}/${DIST_SUBDIR}
+.include <bsd.port.pre.mk>
 
-do-install:
-	@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
-#
+post-install:
 	${PREFIX}/sbin/ldconfig
 
 .include <bsd.port.post.mk>
diff --git a/graphics/linux_mesa3/distinfo b/graphics/linux_mesa3/distinfo
index 67b2a643cfc0..355c390a4f71 100644
--- a/graphics/linux_mesa3/distinfo
+++ b/graphics/linux_mesa3/distinfo
@@ -1 +1,2 @@
-MD5 (rpm/Mesa-3.2-2.i386.rpm) = 593aa72451380019b466edad1120b02e
+MD5 (MesaLib-3.4.2.tar.bz2) = 5bad47f1f86a87b2a35e8c8c33d97e4a
+MD5 (MesaDemos-3.4.2.tar.bz2) = b3a7b01dae8b1f09f951f9257c242b08
diff --git a/graphics/linux_mesa3/files/patch-aa b/graphics/linux_mesa3/files/patch-aa
new file mode 100644
index 000000000000..18adc1a85c27
--- /dev/null
+++ b/graphics/linux_mesa3/files/patch-aa
@@ -0,0 +1,12 @@
+--- 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=${GL_MAJOR_VER}:${GL_MINOR_VER}
++LIBGLU_VERSION=${GL_MAJOR_VER}:${GL_MINOR_VER}
++LIBGLUT_VERSION=${GLUT_MAJOR_VER}:${GLUT_MINOR_VER}
diff --git a/graphics/linux_mesa3/pkg-comment b/graphics/linux_mesa3/pkg-comment
index ce10da53f544..e9995ab6a1c3 100644
--- a/graphics/linux_mesa3/pkg-comment
+++ b/graphics/linux_mesa3/pkg-comment
@@ -1 +1 @@
-RedHat shared library package of Mesa3
+A graphics library similar to SGI's OpenGL, used from Linux programs
diff --git a/graphics/linux_mesa3/pkg-descr b/graphics/linux_mesa3/pkg-descr
index 6bf510205aed..cad8524a2b23 100644
--- a/graphics/linux_mesa3/pkg-descr
+++ b/graphics/linux_mesa3/pkg-descr
@@ -1,5 +1,4 @@
-This port installs a Linux shared library of Mesa from RedHat Package,
-to be used by Linux programs.
+This port installs a Linux shared library of Mesa, used from 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 3035d31618d8..06692159ce9c 100644
--- a/graphics/linux_mesa3/pkg-plist
+++ b/graphics/linux_mesa3/pkg-plist
@@ -1,15 +1,26 @@
-etc/mesa.conf
-usr/X11R6/lib/libGL.la
-usr/X11R6/lib/libGL.so
+usr/X11R6/lib/libGL.so.1.3.0
 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/libGL.so
+usr/X11R6/lib/libGL.la
+usr/X11R6/lib/libGLU.so.1.3.0
 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/libGLU.so
+usr/X11R6/lib/libGLU.la
+usr/X11R6/lib/libglut.so.3.8.0
 usr/X11R6/lib/libglut.so.3
-usr/X11R6/lib/libglut.so.3.7.0
-usr/X11R6/lib/libMesaGL.so
-usr/X11R6/lib/libMesaGLU.so
+usr/X11R6/lib/libglut.so
+usr/X11R6/lib/libglut.la
+etc/mesa.conf
+usr/X11R6/include/GL/gl.h
+usr/X11R6/include/GL/glext.h
+usr/X11R6/include/GL/gl_mangle.h
+usr/X11R6/include/GL/glu.h
+usr/X11R6/include/GL/glu_mangle.h
+usr/X11R6/include/GL/osmesa.h
+usr/X11R6/include/GL/glx.h
+usr/X11R6/include/GL/glx_mangle.h
+usr/X11R6/include/GL/xmesa.h
+usr/X11R6/include/GL/xmesa_x.h
+usr/X11R6/include/GL/xmesa_xf86.h
+usr/X11R6/include/GL/glut.h
+@dirrm usr/X11R6/include/GL