- Refactor MesaLib ports.

- Update graphics/libGLw to 7.0.1.

2 files changed, 93 insertions, 58 deletions

diff --git a/graphics/libGL/Makefile b/graphics/libGL/Makefile
index 76bbfe558c30..78b5f0208d4a 100644
--- a/graphics/libGL/Makefile
+++ b/graphics/libGL/Makefile
@@ -5,71 +5,21 @@
 # $FreeBSD$
 #
 
-PORTNAME?=	libGL
-PORTVERSION?=	7.0.1
+PORTNAME=	libGL
+PORTVERSION=	${MESAVERSION}
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/
-MASTER_SITE_SUBDIR=	mesa3d
-DISTFILES=	MesaLib-${PORTVERSION}${EXTRACT_SUFX}
 
-MAINTAINER=	x11@FreeBSD.org
-COMMENT?=	OpenGL library that renders using GLX or DRI
+COMMENT=	OpenGL library that renders using GLX or DRI
 
 BUILD_DEPENDS+=	makedepend:${PORTSDIR}/devel/makedepend
 LIB_DEPENDS+=	drm:${PORTSDIR}/graphics/libdrm
 
-CONFLICTS=	XFree86-libraries-* xorg-libraries-6.*
-
 USE_XORG=	glproto xxf86vm xext xfixes xdamage
-USE_GMAKE=	yes
-USE_LDCONFIG=	yes
 CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/drm
-GLHEADERS=	gl.h glext.h glx.h glxext.h
-MAKE_ARGS=	SHELL=${SH}
-
-WRKSRC=		${WRKDIR}/Mesa-${PORTVERSION}
-PREFIX?=	${X11BASE}
-USE_BZIP2=	yes
-
-pre-patch:
-	@${REINPLACE_CMD} \
-		-e 's|/usr/X11R6|${X11BASE}|g' \
-		-e 's|/usr/local|${LOCALBASE}|g' \
-		-e 's|gcc|${CC}|g' \
-		-e 's|g++|${CXX}|g' \
-		-e 's|CFLAGS = |CFLAGS = ${CFLAGS} |g' \
-		-e 's|OPT_FLAGS = .*|OPT_FLAGS = ${CFLAGS}|g' \
-		-e 's|-lpthread|${PTHREAD_LIBS}|g' \
-		-e 's|SRC_DIRS = .*|SRC_DIRS = glx/x11|g' \
-		${WRKSRC}/configs/freebsd-dri
-	@${REINPLACE_CMD} \
-		-e 's|^\(MKDEP_OPTIONS.*\)|\1 --|' \
-		-e 's|^DRI_DRIVER_INSTALL_DIR.*|DRI_DRIVER_INSTALL_DIR = ${X11BASE}/lib/dri|' \
-		${WRKSRC}/configs/default
-
-do-install:
-	${MKDIR} ${PREFIX}/include/GL
-.for i in ${GLHEADERS}
-	${INSTALL_DATA} ${WRKSRC}/include/GL/${i} ${PREFIX}/include/GL
-.endfor
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/libGL.so.1 ${PREFIX}/lib
-	${LN} -sf libGL.so.1 ${PREFIX}/lib/libGL.so
-
-.include <bsd.port.pre.mk>
 
-.if ${ARCH} == i386
-PLIST_SUB+=	I386=""
-PLIST_SUB+=	I386_AMD64=""
-ALL_TARGET=	freebsd-dri-x86
-.elif ${ARCH} == amd64
-PLIST_SUB+=	I386="@comment "
-PLIST_SUB+=	I386_AMD64=""
-ALL_TARGET=	freebsd-dri-amd64
-.else
-PLIST_SUB+=	I386="@comment "
-PLIST_SUB+=	I386_AMD64="@comment "
-ALL_TARGET=	freebsd-dri
-.endif
+SRCDIR=		glx/x11
+HEADERS=	gl.h glext.h glx.h glxext.h
+HEADERSDIR=	include/GL
 
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
+.include <bsd.port.mk>
diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk
new file mode 100644
index 000000000000..39350c1d2962
--- /dev/null
+++ b/graphics/libGL/bsd.mesalib.mk
@@ -0,0 +1,85 @@
+#-*- mode: Fundamental; tab-width: 4; -*-
+# ex:ts=4
+#
+# bsd.mesa.mk - an attempt to refactor MesaLib ports.
+#
+# Created by: Florent Thoumie <flz@FreeBSD.org>
+#
+# !!! Here be dragons !!! (they seem to be everywhere these days)
+#
+# Remember to upgrade the following ports everytime you bump MESAVERSION:
+#
+#    - graphics/libGL
+#    - graphics/libGLU
+#    - graphics/libGLw
+#    - graphics/dri
+#
+# $FreeBSD$
+#
+
+MESAVERSION=	7.0.1
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/
+MASTER_SITE_SUBDIR=	mesa3d
+DISTFILES=	MesaLib-${PORTVERSION}${EXTRACT_SUFX}
+MAINTAINER=	x11@FreeBSD.org
+CONFLICTS?=	XFree86-libraries-* xorg-libraries-6.*
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_LDCONFIG=	yes
+
+MAKE_ARGS=	SHELL=${SH}
+CFLAGS+=	-DUSE_XSHM -DHZ=100
+
+PREFIX=		${X11BASE}
+FILESDIR=	${.CURDIR}/../../graphics/libGL/files
+WRKSRC=		${WRKDIR}/Mesa-${PORTVERSION}
+CONFDIR=	${WRKSRC}/configs
+
+SHVER?=		1
+
+.if !defined(ARCH)
+ARCH!=		uname -p
+.endif
+
+.if ${ARCH} == i386
+PLIST_SUB+=	I386=""
+PLIST_SUB+=	I386_AMD64=""
+ALL_TARGET=	freebsd-dri-x86
+.elif ${ARCH} == amd64
+PLIST_SUB+=	I386="@comment "
+PLIST_SUB+=	I386_AMD64=""
+ALL_TARGET=	freebsd-dri-amd64
+.else
+PLIST_SUB+=	I386="@comment "
+PLIST_SUB+=	I386_AMD64="@comment "
+ALL_TARGET=	freebsd-dri
+.endif
+
+pre-patch:
+	@${REINPLACE_CMD} \
+		-e '/^CC =/d' -e '/^CXX =/d' \
+		-e 's|/usr/X11R6|${X11BASE}|g' \
+		-e 's|/usr/local|${LOCALBASE}|g' \
+		-e 's|-lpthread|${PTHREAD_LIBS}|g' \
+		-e 's|CFLAGS = |CFLAGS = ${CFLAGS} |g' \
+		-e 's|OPT_FLAGS = .*|OPT_FLAGS = ${CFLAGS}|g' \
+		-e "s|SRC_DIRS = .*|SRC_DIRS = ${SRCDIR}|g" \
+		-e 's|-DHAVE_POSIX_MEMALIGN||' \
+		${CONFDIR}/freebsd-dri
+	@${REINPLACE_CMD} \
+		-e 's|^\(MKDEP_OPTIONS.*\)|\1 -- -I${X11BASE}/include|' \
+		-e 's|^\(MKLIB_OPTIONS.*\)|\1 -L${X11BASE}/lib|' \
+		-e 's|^DRI_DRIVER_INSTALL_DIR.*|DRI_DRIVER_INSTALL_DIR = ${X11BASE}/lib/dri|' \
+		${CONFDIR}/default
+
+.if !target(do-install)
+do-install:
+	${MKDIR} ${PREFIX}/include/GL/
+.for i in ${HEADERS}
+	${INSTALL_DATA} ${WRKSRC}/${HEADERSDIR}/${i} ${PREFIX}/include/GL/
+.endfor
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/${PORTNAME}.so.${SHVER} ${PREFIX}/lib
+	${LN} -sf ${PORTNAME}.so.${SHVER} ${PREFIX}/lib/${PORTNAME}.so
+.endif