Make sure to disable gallium when not set WITH_GALLIUM.

Replace version in plist with a PLIST_SUB one.


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

2 files changed, 8 insertions, 5 deletions

diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index 40d85c1..763f621 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -32,6 +32,8 @@ ALL_DRI_DRIVERS+=I810 MACH64 MGA R128 R300 R600 SAVAGE SIS TDFX UNICHROME
 
 .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
 
+PLIST_SUB+=	VERSION=${MESADISTVERSION}
+
 .if ${ARCH} == "amd64" || ${ARCH} == "i386"
 DRI_DRIVERS=	${ALL_DRI_DRIVERS}
 .endif
@@ -52,6 +54,7 @@ CONFIGURE_ARGS+=--with-gallium-drivers=r300,r600,radeonsi,svga,swrast
 #                          [default=r300,r600,svga,swrast
 PLIST_SUB+=	GALLIUM=""
 . else
+CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers
 PLIST_SUB+=	GALLIUM="@comment "
 . endif
 . if ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
diff --git a/graphics/dri/pkg-plist b/graphics/dri/pkg-plist
index 6ccf91b..b613bc6 100644
--- a/graphics/dri/pkg-plist
+++ b/graphics/dri/pkg-plist
@@ -28,10 +28,10 @@ include/GL/internal/dri_interface.h
 %%OLD%%%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
 %%NEW%%%%GALLIUM%%lib/dri/vmwgfx_dri.la
 %%NEW%%%%GALLIUM%%lib/dri/vmwgfx_dri.so
-%%NEW%%lib/libdricore9.1.6.la
-%%NEW%%lib/libdricore9.1.6.so
-%%NEW%%lib/libdricore9.1.6.so.1
-%%NEW%%%%GALLIUM%%lib/libllvmradeon9.1.6.la
-%%NEW%%%%GALLIUM%%lib/libllvmradeon9.1.6.so
+%%NEW%%lib/libdricore%%VERSION%%.la
+%%NEW%%lib/libdricore%%VERSION%%.so
+%%NEW%%lib/libdricore%%VERSION%%.so.1
+%%NEW%%%%GALLIUM%%lib/libllvmradeon%%VERSION%%.la
+%%NEW%%%%GALLIUM%%lib/libllvmradeon%%VERSION%%.so
 libdata/pkgconfig/dri.pc
 @dirrm lib/dri