Add LLVM runtime and depend on expat and libelf.

5 files changed, 22 insertions, 4 deletions

diff --git a/graphics/linux-c6-dri/Makefile b/graphics/linux-c6-dri/Makefile
index 8e2588cd4e96..355c8d813145 100644
--- a/graphics/linux-c6-dri/Makefile
+++ b/graphics/linux-c6-dri/Makefile
@@ -3,14 +3,16 @@
 
 PORTNAME=	dri
 PORTVERSION=	11.0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics linux
 LIB_DISTFILES=	mesa-libGL-${PORTVERSION}-4.el6${EXTRACT_SUFX} \
 		mesa-libGLU-${PORTVERSION}-4.el6${EXTRACT_SUFX} \
 		mesa-dri-drivers-${PORTVERSION}-4.el6${EXTRACT_SUFX} \
+		mesa-private-llvm-3.6.2-1.el6${EXTRACT_SUFX} \
 		libdrm-2.4.65-2.el6${EXTRACT_SUFX} \
 		freeglut-2.6.0-1.el6${EXTRACT_SUFX}
 SRC_DISTFILES=	mesa-${PORTVERSION}-4.el6.src.rpm:SOURCE \
+		mesa-private-llvm-3.6.2-1.el6.src.rpm:SOURCE \
 		libdrm-2.4.65-2.el6.src.rpm:SOURCE \
 		freeglut-2.6.0-1.el6.src.rpm:SOURCE
 
@@ -20,12 +22,13 @@ COMMENT=	Mesa libGL runtime libraries (Linux CentOS ${LINUX_DIST_VER})
 CONFLICTS=	linux_dri-[0-9]* linux_dri-devel-[0-9]* linux-f10-dri-[0-9]* linux-dri-[0-9]*
 
 USES=		linux:c6
-USE_LINUX=	libpciaccess xorglibs
+USE_LINUX=	expat libelf libpciaccess xorglibs
 USE_LINUX_RPM=	yes
 USE_LDCONFIG=	yes
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 post-stage:
 	@${RM} ${STAGEDIR}${PREFIX}/usr/lib/libGL.so.1
+	@${RM} ${STAGEDIR}${PREFIX}/usr/lib64/libGL.so.1
 
 .include <bsd.port.mk>
diff --git a/graphics/linux-c6-dri/distinfo.i386 b/graphics/linux-c6-dri/distinfo.i386
index 1d90e09b0e93..11dfa35bc832 100644
--- a/graphics/linux-c6-dri/distinfo.i386
+++ b/graphics/linux-c6-dri/distinfo.i386
@@ -1,16 +1,20 @@
-TIMESTAMP = 1466256916
+TIMESTAMP = 1478274394
 SHA256 (rpm/i686/centos/6.8/mesa-libGL-11.0.7-4.el6.i686.rpm) = 83568569fee8b38f0ab8d5efa2977a937b4ab5121407210b2b4089f5c28eec13
 SIZE (rpm/i686/centos/6.8/mesa-libGL-11.0.7-4.el6.i686.rpm) = 162340
 SHA256 (rpm/i686/centos/6.8/mesa-libGLU-11.0.7-4.el6.i686.rpm) = 23af90e8395cbdd59eb6f5e08cd011a876883a8f60e66dbe67e70e1268c9e7b0
 SIZE (rpm/i686/centos/6.8/mesa-libGLU-11.0.7-4.el6.i686.rpm) = 200644
 SHA256 (rpm/i686/centos/6.8/mesa-dri-drivers-11.0.7-4.el6.i686.rpm) = 513b7f3e21fe85e3e4aa8dd1e35556417754719cc2b50b344ce476915385d759
 SIZE (rpm/i686/centos/6.8/mesa-dri-drivers-11.0.7-4.el6.i686.rpm) = 4320300
+SHA256 (rpm/i686/centos/6.8/mesa-private-llvm-3.6.2-1.el6.i686.rpm) = 422490005089f282a2c4c44571dd44e9329fc23ba5ebb1273cabe715fc3129de
+SIZE (rpm/i686/centos/6.8/mesa-private-llvm-3.6.2-1.el6.i686.rpm) = 7174860
 SHA256 (rpm/i686/centos/6.8/libdrm-2.4.65-2.el6.i686.rpm) = 9d99918eef5d755b43d5790bcafa04dadccedb11fd1bf33d75626463802c3f0a
 SIZE (rpm/i686/centos/6.8/libdrm-2.4.65-2.el6.i686.rpm) = 143292
 SHA256 (rpm/i686/centos/6.8/freeglut-2.6.0-1.el6.i686.rpm) = fa6cb446baf0b4e02a68c7260e3a2186fc2bb208293d39ccb48dd8ed9c61b606
 SIZE (rpm/i686/centos/6.8/freeglut-2.6.0-1.el6.i686.rpm) = 170044
 SHA256 (rpm/i686/centos/6.8/mesa-11.0.7-4.el6.src.rpm) = 9db7bd5036fcc8fa25585cd5625e56d95118092b816ba09867073e310db44b5d
 SIZE (rpm/i686/centos/6.8/mesa-11.0.7-4.el6.src.rpm) = 129624873
+SHA256 (rpm/i686/centos/6.8/mesa-private-llvm-3.6.2-1.el6.src.rpm) = 5ea1a930ce15e99159edc294ca8f3bf42c7cbc28081a6bae8b45cafae9c1b199
+SIZE (rpm/i686/centos/6.8/mesa-private-llvm-3.6.2-1.el6.src.rpm) = 131903629
 SHA256 (rpm/i686/centos/6.8/libdrm-2.4.65-2.el6.src.rpm) = 6ddaefc6000fb04ee906d157053509b15a7783251e2be8532bbd7b389c4de793
 SIZE (rpm/i686/centos/6.8/libdrm-2.4.65-2.el6.src.rpm) = 687561
 SHA256 (rpm/i686/centos/6.8/freeglut-2.6.0-1.el6.src.rpm) = 04ca4b3c4917110e7878df3d82f52639a76274ed3c0611ff72b86ea5e242d037
diff --git a/graphics/linux-c6-dri/distinfo.x86_64 b/graphics/linux-c6-dri/distinfo.x86_64
index b83638407f90..1989e4f93908 100644
--- a/graphics/linux-c6-dri/distinfo.x86_64
+++ b/graphics/linux-c6-dri/distinfo.x86_64
@@ -1,10 +1,12 @@
-TIMESTAMP = 1466257533
+TIMESTAMP = 1478274822
 SHA256 (rpm/x86_64/centos/6.8/mesa-libGL-11.0.7-4.el6.i686.rpm) = 83568569fee8b38f0ab8d5efa2977a937b4ab5121407210b2b4089f5c28eec13
 SIZE (rpm/x86_64/centos/6.8/mesa-libGL-11.0.7-4.el6.i686.rpm) = 162340
 SHA256 (rpm/x86_64/centos/6.8/mesa-libGLU-11.0.7-4.el6.i686.rpm) = 23af90e8395cbdd59eb6f5e08cd011a876883a8f60e66dbe67e70e1268c9e7b0
 SIZE (rpm/x86_64/centos/6.8/mesa-libGLU-11.0.7-4.el6.i686.rpm) = 200644
 SHA256 (rpm/x86_64/centos/6.8/mesa-dri-drivers-11.0.7-4.el6.i686.rpm) = 513b7f3e21fe85e3e4aa8dd1e35556417754719cc2b50b344ce476915385d759
 SIZE (rpm/x86_64/centos/6.8/mesa-dri-drivers-11.0.7-4.el6.i686.rpm) = 4320300
+SHA256 (rpm/x86_64/centos/6.8/mesa-private-llvm-3.6.2-1.el6.i686.rpm) = 422490005089f282a2c4c44571dd44e9329fc23ba5ebb1273cabe715fc3129de
+SIZE (rpm/x86_64/centos/6.8/mesa-private-llvm-3.6.2-1.el6.i686.rpm) = 7174860
 SHA256 (rpm/x86_64/centos/6.8/libdrm-2.4.65-2.el6.i686.rpm) = 9d99918eef5d755b43d5790bcafa04dadccedb11fd1bf33d75626463802c3f0a
 SIZE (rpm/x86_64/centos/6.8/libdrm-2.4.65-2.el6.i686.rpm) = 143292
 SHA256 (rpm/x86_64/centos/6.8/freeglut-2.6.0-1.el6.i686.rpm) = fa6cb446baf0b4e02a68c7260e3a2186fc2bb208293d39ccb48dd8ed9c61b606
@@ -15,12 +17,16 @@ SHA256 (rpm/x86_64/centos/6.8/mesa-libGLU-11.0.7-4.el6.x86_64.rpm) = b56e0217bf2
 SIZE (rpm/x86_64/centos/6.8/mesa-libGLU-11.0.7-4.el6.x86_64.rpm) = 202272
 SHA256 (rpm/x86_64/centos/6.8/mesa-dri-drivers-11.0.7-4.el6.x86_64.rpm) = 9d6229146f751141ce3c6fc79eaaa93b9a2c6d2e5f59d254aaec6d4dbfc2a88c
 SIZE (rpm/x86_64/centos/6.8/mesa-dri-drivers-11.0.7-4.el6.x86_64.rpm) = 4250876
+SHA256 (rpm/x86_64/centos/6.8/mesa-private-llvm-3.6.2-1.el6.x86_64.rpm) = 13b79d5d9e72b18427392fc31f8ccb4936e02f821b335bcf78aad68744f2100c
+SIZE (rpm/x86_64/centos/6.8/mesa-private-llvm-3.6.2-1.el6.x86_64.rpm) = 6777220
 SHA256 (rpm/x86_64/centos/6.8/libdrm-2.4.65-2.el6.x86_64.rpm) = b7a8d49c31f1cdb9f2a5a3e2b89416b0411c75332ce49422961435e205db8291
 SIZE (rpm/x86_64/centos/6.8/libdrm-2.4.65-2.el6.x86_64.rpm) = 139324
 SHA256 (rpm/x86_64/centos/6.8/freeglut-2.6.0-1.el6.x86_64.rpm) = 5d4fd35678aae535319678f90b11c345ee9e1e415be2c2de05d8838adb8153bd
 SIZE (rpm/x86_64/centos/6.8/freeglut-2.6.0-1.el6.x86_64.rpm) = 175576
 SHA256 (rpm/x86_64/centos/6.8/mesa-11.0.7-4.el6.src.rpm) = 9db7bd5036fcc8fa25585cd5625e56d95118092b816ba09867073e310db44b5d
 SIZE (rpm/x86_64/centos/6.8/mesa-11.0.7-4.el6.src.rpm) = 129624873
+SHA256 (rpm/x86_64/centos/6.8/mesa-private-llvm-3.6.2-1.el6.src.rpm) = 5ea1a930ce15e99159edc294ca8f3bf42c7cbc28081a6bae8b45cafae9c1b199
+SIZE (rpm/x86_64/centos/6.8/mesa-private-llvm-3.6.2-1.el6.src.rpm) = 131903629
 SHA256 (rpm/x86_64/centos/6.8/libdrm-2.4.65-2.el6.src.rpm) = 6ddaefc6000fb04ee906d157053509b15a7783251e2be8532bbd7b389c4de793
 SIZE (rpm/x86_64/centos/6.8/libdrm-2.4.65-2.el6.src.rpm) = 687561
 SHA256 (rpm/x86_64/centos/6.8/freeglut-2.6.0-1.el6.src.rpm) = 04ca4b3c4917110e7878df3d82f52639a76274ed3c0611ff72b86ea5e242d037
diff --git a/graphics/linux-c6-dri/pkg-plist.i386 b/graphics/linux-c6-dri/pkg-plist.i386
index a4850a928128..ffa3fd6650d4 100644
--- a/graphics/linux-c6-dri/pkg-plist.i386
+++ b/graphics/linux-c6-dri/pkg-plist.i386
@@ -14,6 +14,7 @@ usr/lib/dri/vmwgfx_dri.so
 usr/lib/libGL.so.1.2.0
 usr/lib/libGLU.so.1
 usr/lib/libGLU.so.1.3.1
+usr/lib/libLLVM-3.6-mesa.so
 usr/lib/libdrm.so.2
 usr/lib/libdrm.so.2.4.0
 usr/lib/libdrm_amdgpu.so.1
@@ -47,3 +48,4 @@ usr/share/doc/freeglut-2.6.0/ogl_sm.png
 usr/share/doc/freeglut-2.6.0/progress.html
 usr/share/doc/freeglut-2.6.0/structure.html
 usr/share/doc/libdrm-2.4.65/README
+usr/share/doc/mesa-private-llvm-3.6.2/LICENSE.TXT
diff --git a/graphics/linux-c6-dri/pkg-plist.x86_64 b/graphics/linux-c6-dri/pkg-plist.x86_64
index bee016189caa..909f209ac038 100644
--- a/graphics/linux-c6-dri/pkg-plist.x86_64
+++ b/graphics/linux-c6-dri/pkg-plist.x86_64
@@ -14,6 +14,7 @@ usr/lib/dri/vmwgfx_dri.so
 usr/lib/libGL.so.1.2.0
 usr/lib/libGLU.so.1
 usr/lib/libGLU.so.1.3.1
+usr/lib/libLLVM-3.6-mesa.so
 usr/lib/libdrm.so.2
 usr/lib/libdrm.so.2.4.0
 usr/lib/libdrm_amdgpu.so.1
@@ -45,6 +46,7 @@ usr/lib64/dri/vmwgfx_dri.so
 usr/lib64/libGL.so.1.2.0
 usr/lib64/libGLU.so.1
 usr/lib64/libGLU.so.1.3.1
+usr/lib64/libLLVM-3.6-mesa.so
 usr/lib64/libdrm.so.2
 usr/lib64/libdrm.so.2.4.0
 usr/lib64/libdrm_amdgpu.so.1
@@ -78,3 +80,4 @@ usr/share/doc/freeglut-2.6.0/ogl_sm.png
 usr/share/doc/freeglut-2.6.0/progress.html
 usr/share/doc/freeglut-2.6.0/structure.html
 usr/share/doc/libdrm-2.4.65/README
+usr/share/doc/mesa-private-llvm-3.6.2/LICENSE.TXT