ports/60454: [MAINTAINER-UPDATE] graphics/linux_mesa3: modify broken port

[TAKEMURA Masahiro]

>Number:         60454
>Category:       ports
>Synopsis:       [MAINTAINER-UPDATE] graphics/linux_mesa3: modify broken port
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 21 02:40:17 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     TAKEMURA Masahiro
>Release:        FreeBSD 5.2-BETA i386
>Organization:
University of Tokyo
>Environment:
System: FreeBSD taro 5.2-BETA FreeBSD 5.2-BETA #0: Tue Dec 2 21:12:01 JST 2003 mastake at taro.msel.t.u-tokyo.ac.jp:/usr/obj/usr/src/sys/GENERIC i386

>Description:
	the port graphics/linux_mesa is marked as `BROKEN'.
	So I modify it to be able to make.
	And changing MAINTAINER as ports at freebsd.org, because 
	I can't maintain it any more.
>How-To-Repeat:
	the variable BROKEN is drfined.
>Fix:
	patch is as follows

-----BEGIN
--- ports/graphics/linux_mesa3/Makefile.orig	Mon Nov  3 12:56:36 2003
+++ ports/graphics/linux_mesa3/Makefile	Sun Dec 21 11:20:45 2003
@@ -7,7 +7,7 @@
 
 PORTNAME=		mesa
 PORTVERSION=		3.4.2
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		graphics linux
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE} \
 			ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/
@@ -16,14 +16,9 @@
 DISTFILES=		MesaLib-${PORTVERSION}${EXTRACT_SUFX} \
 			MesaDemos-${PORTVERSION}${EXTRACT_SUFX}
 
-MAINTAINER=		mastake at msel.t.u-tokyo.ac.jp
+MAINTAINER=		ports at freebsd.org
 COMMENT=	A graphics library similar to SGI's OpenGL, used from Linux programs
 
-BROKEN=		"Inconsistent dependencies (installs both linux_base-6.x and 7.x, which conflict), will be removed after Feb 2"
-
-BUILD_DEPENDS=	${LINUXBASE}/lib/ld-linux.so.2:${PORTSDIR}/emulators/linux_base \
-		${LINUXBASE}/usr/bin/gcc:${PORTSDIR}/devel/linux_devtools-6
-
 USE_BZIP2=		yes
 ONLY_FOR_ARCHS=		i386
 USE_LINUX_PREFIX=	yes
@@ -59,6 +54,19 @@
 			GLUT_MINOR_VER=${GLUT_MINOR_VER} \
 			LIBMESA_MAJOR_VER=${LIBMESA_MAJOR_VER}
 
+.include <bsd.port.pre.mk>
+
+.if exists(${LINUXBASE}/lib/ld-2.1.3.so)
+BUILD_DEPENDS+=	${LINUXBASE}/lib/ld-linux.so.2:${PORTSDIR}/emulators/linux_base-6 \
+		${LINUXBASE}/usr/bin/gcc:${PORTSDIR}/devel/linux_devtools-6
+.elifdef(WITH_LINUX6)
+BUILD_DEPENDS+=	${LINUXBASE}/lib/ld-linux.so.2:${PORTSDIR}/emulators/linux_base-6 \
+		${LINUXBASE}/usr/bin/gcc:${PORTSDIR}/devel/linux_devtools-6
+.else
+BUILD_DEPENDS+=	${LINUXBASE}/lib/ld-linux.so.2:${PORTSDIR}/emulators/linux_base \
+		${LINUXBASE}/usr/bin/gcc:${PORTSDIR}/devel/linux_devtools-7
+.endif
+
 post-install:
 	${STRIP_CMD} ${PREFIX}/usr/X11R6/lib/libglut.so.${GLUT_MAJOR_VER}.${GLUT_MINOR_VER}.0
 	@for R in GL GLU; do \
@@ -68,4 +76,4 @@
 	done
 	${LINUXBASE}/sbin/ldconfig
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
-----END
>Release-Note:
>Audit-Trail:
>Unformatted: