Sync with ports. Should be safe *cough*

git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@739 058c260c-8361-11dd-a0ac-aa2bafec7d09

2 files changed, 58 insertions, 101 deletions

diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index 5c45c87..380794d 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -1,5 +1,5 @@
 # Created by: anholt@FreeBSD.org
-# $FreeBSD$
+# $FreeBSD: head/graphics/dri/Makefile 313610 2013-03-08 01:01:11Z jkim $
 
 PORTNAME=	dri
 PORTVERSION=	${MESAVERSION}
@@ -15,103 +15,60 @@ LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm \
 USE_PKGCONFIG=	build
 USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto
 
-do-install:
-	cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri
+ALL_DRI_DRIVERS=I810 I915 I965 MACH64 MGA R128 R200 R300 R600 RADEON \
+		SAVAGE SIS SWRAST TDFX UNICHROME
 
 .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
 
-.include <bsd.port.pre.mk>
-
 .if ${ARCH} == "ia64"
-BROKEN=		Does not install on ia64
-.endif
-
-.if !(${ARCH} == "amd64" || ${ARCH} == "i386")
-CONFIGURE_ARGS+=--disable-gallium-intel
-.endif
-
-.if ${ARCH} == "amd64"
-PLIST_SUB+=	I810_DRIVER="@comment "
-PLIST_SUB+=	I9X5_DRIVER=""
-PLIST_SUB+=	MACH64_DRIVER=""
-PLIST_SUB+=	MGA_DRIVER=""
-PLIST_SUB+=	NOUVEAU_DRIVER=""
-PLIST_SUB+=	RADEON_DRIVERS=""
-PLIST_SUB+=	SAVAGE_DRIVER=""
-PLIST_SUB+=	SIS_DRIVER=""
-PLIST_SUB+=	SWRAST_DRIVER=""
-PLIST_SUB+=	TDFX_DRIVER=""
-PLIST_SUB+=	UNICHROME_DRIVER=""
+BROKEN=		does not install on ia64
 .endif
 
-.if ${ARCH} == "arm"
-PLIST_SUB+=	I810_DRIVER="@comment "
-PLIST_SUB+=	I9X5_DRIVER="@comment "
-PLIST_SUB+=	MACH64_DRIVER="@comment "
-PLIST_SUB+=	MGA_DRIVER="@comment "
-PLIST_SUB+=	NOUVEAU_DRIVER="@comment "
-PLIST_SUB+=	RADEON_DRIVERS="@comment "
-PLIST_SUB+=	SAVAGE_DRIVER="@comment "
-PLIST_SUB+=	SIS_DRIVER="@comment "
-PLIST_SUB+=	SWRAST_DRIVER="@comment "
-PLIST_SUB+=	TDFX_DRIVER="@comment "
-PLIST_SUB+=	UNICHROME_DRIVER="@comment "
+.if ${ARCH} == "amd64" || ${ARCH} == "i386"
+OPTIONS_DEFINE=	${ALL_DRI_DRIVERS}
+.elif ${ARCH} == "powerpc"
+OPTIONS_DEFINE=	MACH64 RADEON SWRAST TDFX
+.elif ${ARCH} == "sparc64"
+OPTIONS_DEFINE=	MACH64 RADEON SWRAST
 .endif
-
-.if ${ARCH} == "i386"
-PLIST_SUB+=	I810_DRIVER=""
-PLIST_SUB+=	I9X5_DRIVER=""
-PLIST_SUB+=	MACH64_DRIVER=""
-PLIST_SUB+=	MGA_DRIVER=""
-PLIST_SUB+=	NOUVEAU_DRIVER=""
-PLIST_SUB+=	RADEON_DRIVERS=""
-PLIST_SUB+=	SAVAGE_DRIVER=""
-PLIST_SUB+=	SIS_DRIVER=""
-PLIST_SUB+=	SWRAST_DRIVER=""
-PLIST_SUB+=	TDFX_DRIVER=""
-PLIST_SUB+=	UNICHROME_DRIVER=""
+OPTIONS_DEFAULT=${OPTIONS_DEFINE}
+
+I810_DESC=	Include DRI support for Intel i810
+I915_DESC=	Include DRI support for Intel i915
+I965_DESC=	Include DRI support for Intel i965
+MACH64_DESC=	Include DRI support for AMD/ATI Mach64
+MGA_DESC=	Include DRI support for Matrox
+R128_DESC=	Include DRI support for AMD/ATI R128
+R200_DESC=	Include DRI support for AMD/ATI R200
+R300_DESC=	Include DRI support for AMD/ATI R300
+R600_DESC=	Include DRI support for AMD/ATI R600
+RADEON_DESC=	Include DRI support for AMD/ATI R100
+SAVAGE_DESC=	Include DRI support for S3/Via Savage
+SIS_DESC=	Include DRI support for SiS 300 and 6326
+SWRAST_DESC=	Include generic software DRI support
+TDFX_DESC=	Include DRI support for 3dfx Voodoo
+UNICHROME_DESC=	Include DRI support for S3/Via Unichrome
+
+.include <bsd.port.options.mk>
+
+DRI_DRIVERS=
+.for _d in ${ALL_DRI_DRIVERS}
+.if ${PORT_OPTIONS:M${_d}}
+DRI_DRIVERS+=	${_d}
+PLIST_SUB+=	${_d}_DRIVER=""
+.else
+PLIST_SUB+=	${_d}_DRIVER="@comment "
 .endif
+.endfor
 
-.if ${ARCH} == "mips"
-PLIST_SUB+=	I810_DRIVER="@comment "
-PLIST_SUB+=	I9X5_DRIVER="@comment "
-PLIST_SUB+=	MACH64_DRIVER="@comment "
-PLIST_SUB+=	MGA_DRIVER="@comment "
-PLIST_SUB+=	NOUVEAU_DRIVER="@comment "
-PLIST_SUB+=	RADEON_DRIVERS="@comment "
-PLIST_SUB+=	SAVAGE_DRIVER="@comment "
-PLIST_SUB+=	SIS_DRIVER="@comment "
-PLIST_SUB+=	SWRAST_DRIVER="@comment "
-PLIST_SUB+=	TDFX_DRIVER="@comment "
-PLIST_SUB+=	UNICHROME_DRIVER="@comment "
-.endif
+.include <bsd.port.pre.mk>
 
-.if ${ARCH} == "powerpc"
-PLIST_SUB+=	I810_DRIVER="@comment "
-PLIST_SUB+=	I9X5_DRIVER="@comment "
-PLIST_SUB+=	MACH64_DRIVER=""
-PLIST_SUB+=	MGA_DRIVER="@comment "
-PLIST_SUB+=	NOUVEAU_DRIVER="@comment "
-PLIST_SUB+=	RADEON_DRIVERS=""
-PLIST_SUB+=	SAVAGE_DRIVER="@comment "
-PLIST_SUB+=	SIS_DRIVER="@comment "
-PLIST_SUB+=	SWRAST_DRIVER=""
-PLIST_SUB+=	TDFX_DRIVER=""
-PLIST_SUB+=	UNICHROME_DRIVER="@comment "
+.if !(${ARCH} == "amd64" || ${ARCH} == "i386")
+CONFIGURE_ARGS+=--disable-gallium-intel
 .endif
+CONFIGURE_ARGS+=--with-dri-drivers="${DRI_DRIVERS:L}"
 
-.if ${ARCH} == "sparc64"
-PLIST_SUB+=	I810_DRIVER="@comment "
-PLIST_SUB+=	I9X5_DRIVER="@comment "
-PLIST_SUB+=	MACH64_DRIVER=""
-PLIST_SUB+=	MGA_DRIVER="@comment "
-PLIST_SUB+=	NOUVEAU_DRIVER="@comment "
-PLIST_SUB+=	RADEON_DRIVERS=""
-PLIST_SUB+=	SAVAGE_DRIVER="@comment "
-PLIST_SUB+=	SIS_DRIVER="@comment "
-PLIST_SUB+=	SWRAST_DRIVER=""
-PLIST_SUB+=	TDFX_DRIVER="@comment "
-PLIST_SUB+=	UNICHROME_DRIVER="@comment "
-.endif
+do-install:
+	cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri
 
 .include <bsd.port.post.mk>
diff --git a/graphics/dri/pkg-plist b/graphics/dri/pkg-plist
index 4273a52..9442cdb 100644
--- a/graphics/dri/pkg-plist
+++ b/graphics/dri/pkg-plist
@@ -1,19 +1,19 @@
 include/GL/internal/dri_interface.h
-%%OLD%%%%I810_DRIVER%%lib/dri/i810_dri.so
-%%I9X5_DRIVER%%lib/dri/i915_dri.so
-%%I9X5_DRIVER%%lib/dri/i965_dri.so
-%%OLD%%%%MACH64_DRIVER%%lib/dri/mach64_dri.so
-%%OLD%%%%MGA_DRIVER%%lib/dri/mga_dri.so
-%%OLD%%%%RADEON_DRIVERS%%lib/dri/r128_dri.so
-%%RADEON_DRIVERS%%lib/dri/r200_dri.so
-%%OLD%%%%RADEON_DRIVERS%%lib/dri/r300_dri.so
-%%OLD%%%%RADEON_DRIVERS%%lib/dri/r600_dri.so
-%%RADEON_DRIVERS%%lib/dri/radeon_dri.so
-%%OLD%%%%SAVAGE_DRIVER%%lib/dri/savage_dri.so
-%%OLD%%%%SIS_DRIVER%%lib/dri/sis_dri.so
+%%I810_DRIVER%%lib/dri/i810_dri.so
+%%I915_DRIVER%%lib/dri/i915_dri.so
+%%I965_DRIVER%%lib/dri/i965_dri.so
+%%MACH64_DRIVER%%lib/dri/mach64_dri.so
+%%MGA_DRIVER%%lib/dri/mga_dri.so
+%%R128_DRIVER%%lib/dri/r128_dri.so
+%%R200_DRIVER%%lib/dri/r200_dri.so
+%%R300_DRIVER%%lib/dri/r300_dri.so
+%%R600_DRIVER%%lib/dri/r600_dri.so
+%%RADEON_DRIVER%%lib/dri/radeon_dri.so
+%%SAVAGE_DRIVER%%lib/dri/savage_dri.so
+%%SIS_DRIVER%%lib/dri/sis_dri.so
 %%SWRAST_DRIVER%%lib/dri/swrast_dri.so
-%%OLD%%%%TDFX_DRIVER%%lib/dri/tdfx_dri.so
-%%OLD%%%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
+%%TDFX_DRIVER%%lib/dri/tdfx_dri.so
+%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
 libdata/pkgconfig/dri.pc
 @dirrm lib/dri
 @dirrmtry include/GL/internal