4 files changed, 40 insertions, 24 deletions

diff --git a/graphics/libGLU/Makefile b/graphics/libGLU/Makefile
index 0cd220e06461..4655e4d33d5d 100644
--- a/graphics/libGLU/Makefile
+++ b/graphics/libGLU/Makefile
@@ -22,4 +22,11 @@ do-install:
 	cd ${WRKSRC}/src/glu; ${GMAKE} install
 
 .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
-.include <bsd.port.mk>
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} != "amd64" || ${ARCH} != "i386"
+CONFIGURE_ARGS+=--disable-gallium-intel
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/graphics/libGLw/Makefile b/graphics/libGLw/Makefile
index c1b60842d3d1..e7d60afeeab2 100644
--- a/graphics/libGLw/Makefile
+++ b/graphics/libGLw/Makefile
@@ -20,4 +20,11 @@ do-install:
 	cd ${WRKSRC}/src/glw; ${GMAKE} install
 
 .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
-.include <bsd.port.mk>
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} != "amd64" || ${ARCH} != "i386"
+CONFIGURE_ARGS+=--disable-gallium-intel
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile
index 28e235498276..0482a79ca000 100644
--- a/graphics/libdrm/Makefile
+++ b/graphics/libdrm/Makefile
@@ -52,10 +52,12 @@ PLIST_SUB+=	OLD="" NEW="@comment "
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "amd64" || ${ARCH} == "i386" || ${ARCH} == "ia64"
-PLIST_SUB+=	X86=""
+.if ${ARCH} == "amd64" || ${ARCH} == "i386" || ${ARCH} == "ia64" || ${ARCH} == "powerpc"
+PLIST_SUB+=     INTEL_DRIVER=""
+PLIST_SUB+=     RADEON_DRIVERS=""
 .else
-PLIST_SUB+=	X86="@comment "
+PLIST_SUB+=     INTEL_DRIVER="@comment"
+PLIST_SUB+=     RADEON_DRIVERS="@comment"
 .endif
 
 pre-patch:
diff --git a/graphics/libdrm/pkg-plist b/graphics/libdrm/pkg-plist
index 0462b7fbcdbc..4cdc099404b7 100644
--- a/graphics/libdrm/pkg-plist
+++ b/graphics/libdrm/pkg-plist
@@ -11,28 +11,28 @@
 %%OLD%%include/drm/savage_drm.h
 %%OLD%%include/drm/sis_drm.h
 %%OLD%%include/drm/via_drm.h
-%%OLD%%%%X86%%include/intel_bufmgr.h
+%%OLD%%%%INTEL_DRIVER%%include/intel_bufmgr.h
 %%NEW%%include/libdrm/drm.h
 %%NEW%%include/libdrm/drm_fourcc.h
 %%NEW%%include/libdrm/drm_mode.h
 %%NEW%%include/libdrm/drm_sarea.h
 %%NEW%%include/libdrm/i915_drm.h
-%%NEW%%%%X86%%include/libdrm/intel_bufmgr.h
-%%NEW%%%%X86%%include/libdrm/intel_debug.h
+%%NEW%%%%INTEL_DRIVER%%include/libdrm/intel_bufmgr.h
+%%NEW%%%%INTEL_DRIVER%%include/libdrm/intel_debug.h
 %%NEW%%include/libdrm/mach64_drm.h
 %%NEW%%include/libdrm/mga_drm.h
 %%NEW%%include/libdrm/nouveau_drm.h
 %%NEW%%include/libdrm/nouveau_drmif.h
 %%NEW%%include/libdrm/r128_drm.h
-%%NEW%%%%X86%%include/libdrm/r600_pci_ids.h
-%%NEW%%%%X86%%include/libdrm/radeon_bo.h
-%%NEW%%%%X86%%include/libdrm/radeon_bo_gem.h
-%%NEW%%%%X86%%include/libdrm/radeon_bo_int.h
-%%NEW%%%%X86%%include/libdrm/radeon_cs.h
-%%NEW%%%%X86%%include/libdrm/radeon_cs_gem.h
-%%NEW%%%%X86%%include/libdrm/radeon_cs_int.h
+%%NEW%%%%RADEON_DRIVERS%%include/libdrm/r600_pci_ids.h
+%%NEW%%%%RADEON_DRIVERS%%include/libdrm/radeon_bo.h
+%%NEW%%%%RADEON_DRIVERS%%include/libdrm/radeon_bo_gem.h
+%%NEW%%%%RADEON_DRIVERS%%include/libdrm/radeon_bo_int.h
+%%NEW%%%%RADEON_DRIVERS%%include/libdrm/radeon_cs.h
+%%NEW%%%%RADEON_DRIVERS%%include/libdrm/radeon_cs_gem.h
+%%NEW%%%%RADEON_DRIVERS%%include/libdrm/radeon_cs_int.h
 %%NEW%%include/libdrm/radeon_drm.h
-%%NEW%%%%X86%%include/libdrm/radeon_surface.h
+%%NEW%%%%RADEON_DRIVERS%%include/libdrm/radeon_surface.h
 %%NEW%%include/libdrm/savage_drm.h
 %%NEW%%include/libdrm/sis_drm.h
 %%NEW%%include/libdrm/via_drm.h
@@ -53,22 +53,22 @@ include/xf86drmMode.h
 lib/libdrm.la
 lib/libdrm.so
 lib/libdrm.so.2
-%%X86%%lib/libdrm_intel.la
-%%X86%%lib/libdrm_intel.so
-%%X86%%lib/libdrm_intel.so.1
+%%INTEL_DRIVER%%lib/libdrm_intel.la
+%%INTEL_DRIVER%%lib/libdrm_intel.so
+%%INTEL_DRIVER%%lib/libdrm_intel.so.1
 lib/libdrm_nouveau.la
 lib/libdrm_nouveau.so
 lib/libdrm_nouveau.so.1
-%%NEW%%%%X86%%lib/libdrm_radeon.la
-%%NEW%%%%X86%%lib/libdrm_radeon.so
-%%NEW%%%%X86%%lib/libdrm_radeon.so.1
+%%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.la
+%%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.so
+%%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.so.1
 %%NEW%%%%KMS%%lib/libkms.la
 %%NEW%%%%KMS%%lib/libkms.so
 %%NEW%%%%KMS%%lib/libkms.so.1
 libdata/pkgconfig/libdrm.pc
-%%X86%%libdata/pkgconfig/libdrm_intel.pc
+%%INTEL_DRIVER%%libdata/pkgconfig/libdrm_intel.pc
 libdata/pkgconfig/libdrm_nouveau.pc
-%%NEW%%%%X86%%libdata/pkgconfig/libdrm_radeon.pc
+%%NEW%%%%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_radeon.pc
 %%NEW%%%%KMS%%libdata/pkgconfig/libkms.pc
 @dirrm include/nouveau
 %%NEW%%%%KMS%%@dirrm include/libkms