- Refactor MesaLib ports.

- Update graphics/libGLw to 7.0.1.

1 files changed, 14 insertions, 39 deletions

diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index fa4858248830..7046f14d2d7c 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -6,14 +6,10 @@
 #
 
 PORTNAME=	dri
-PORTVERSION=	7.0.1
+PORTVERSION=	${MESAVERSION}
 PORTEPOCH=	2
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=mesa3d
-DISTNAME=	MesaLib-${PORTVERSION}
 
-MAINTAINER=	anholt@FreeBSD.org
 COMMENT=	OpenGL hardware acceleration drivers for the DRI
 
 LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm \
@@ -22,22 +18,18 @@ BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
 
 CONFLICTS=	xfree86-dri-* dri-6.2.2005* dri-6.5.2006*
 
-WRKSRC=		${WRKDIR}/Mesa-${PORTVERSION}
-USE_X_PREFIX=	yes
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-MAKE_ARGS=	SHELL=${SH}
 MAKE_ENV+=	FBSDCC="${CC}" FBSDCXX="${CXX}" \
 		FBSDCFLAGS="${CFLAGS}" FBSDCXXFLAGS="${CXXFLAGS}" \
 		PTHREAD_LIBS=${PTHREAD_LIBS}
 USE_GCC=	3.4+
 
-DRIMODDIR=	${PREFIX}/lib/dri
+USE_XORG=	x11
 
-.include <bsd.port.pre.mk>
+DRIMODDIR=	${PREFIX}/lib/dri
+SRCDIR=		mesa
 
-.if ${X_WINDOW_SYSTEM:L} != xorg
-IGNORE=	requires libGL from X.Org
+.if !defined(ARCH)
+ARCH!=	uname -p
 .endif
 
 do-install:
@@ -60,6 +52,14 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/savage_dri.so ${DRIMODDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/sis_dri.so ${DRIMODDIR}
 
+.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
+
+.include <bsd.port.pre.mk>
+
+.if ${X_WINDOW_SYSTEM:L} != xorg
+IGNORE=	requires libGL from X.Org
+.endif
+
 .if ${OSVERSION} < 500000
 pre-patch:
 	@${REINPLACE_CMD} -e 's|stdint.h|sys/types.h|g' \
@@ -67,29 +67,4 @@ pre-patch:
 		${WRKSRC}/src/mesa/drivers/dri/mga/mgacontext.h
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e '/^CC =/d' -e '/^CXX =/d' \
-		-e 's|/usr/local|$$(LOCALBASE)|g' \
-		-e 's|/usr/X11R6|$$(X11BASE)|g' \
-		-e 's|-lpthread|$$(PTHREAD_LIBS)|g' \
-		-e 's|^\(SRC_DIRS =\).*|\1 mesa|' \
-			${WRKSRC}/configs/freebsd-dri
-.if ${OSVERSION} < 700013
-	@${REINPLACE_CMD} -e 's|-DHAVE_POSIX_MEMALIGN||' \
-			${WRKSRC}/configs/freebsd-dri
-.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
 .include <bsd.port.post.mk>