7 files changed, 13 insertions, 42 deletions

diff --git a/graphics/libGL/Makefile b/graphics/libGL/Makefile
index e3b49c977239..15dc280efd5f 100644
--- a/graphics/libGL/Makefile
+++ b/graphics/libGL/Makefile
@@ -15,15 +15,13 @@ LIB_DEPENDS+=	libdrm.so:${PORTSDIR}/graphics/libdrm \
 USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto:both \
 		presentproto xshmfence
 
-SUB_FILES=	pkg-install pkg-deinstall
-
 .include <bsd.port.options.mk>
 .include "${.CURDIR}/bsd.mesalib.mk"
 
 .if defined(WITH_NEW_MESA)
-LIBGLREVISION=	0
+LIBGLREVISION=	1
 .else
-LIBGLREVISION=	3
+LIBGLREVISION=	4
 .endif
 
 .if !(${ARCH} == "amd64" || ${ARCH} == "i386")
@@ -31,8 +29,8 @@ CONFIGURE_ARGS+=--disable-gallium-intel
 .endif
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/.libGL
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/.mesa
 	@${MV} ${STAGEDIR}${PREFIX}/lib/libGL* \
-		${STAGEDIR}${PREFIX}/lib/.libGL/
+		${STAGEDIR}${PREFIX}/lib/.mesa/
 
 .include <bsd.port.mk>
diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk
index a15934729564..263850801df7 100644
--- a/graphics/libGL/bsd.mesalib.mk
+++ b/graphics/libGL/bsd.mesalib.mk
@@ -66,6 +66,9 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-isystem${LOCALBASE}/include
 LDFLAGS+=	-Wl,-Y${LOCALBASE}/lib
 
+PKGINSTALL=	${.CURDIR}/pkg-install
+PKGDEINSTALL=	${.CURDIR}/pkg-deinstall
+
 .if ${OSVERSION} < 1000033
 BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
 CONFIGURE_ENV+=	ac_cv_prog_LEX=${LOCALBASE}/bin/flex
diff --git a/graphics/libGL/files/pkg-deinstall.in b/graphics/libGL/files/pkg-deinstall.in
deleted file mode 100644
index 37d895397fcb..000000000000
--- a/graphics/libGL/files/pkg-deinstall.in
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-PREFIX="${PKG_PREFIX-/usr/local}"
-
-case $2 in
-DEINSTALL)
-	/bin/rm -f ${PREFIX}/lib/libGL.so*
-	;;
-esac
diff --git a/graphics/libGL/files/pkg-install.in b/graphics/libGL/files/pkg-install.in
deleted file mode 100644
index f94c9f163ccb..000000000000
--- a/graphics/libGL/files/pkg-install.in
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-PREFIX="${PKG_PREFIX-/usr/local}"
-
-case $2 in
-POST-INSTALL)
-	if [ -f ${PREFIX}/lib/.nvidia/libGL.so.1 ]; then
-	  /bin/ln -f ${PREFIX}/lib/.nvidia/libGL.so.1 ${PREFIX}/lib/libGL.so
-	  /bin/ln -f ${PREFIX}/lib/.nvidia/libGL.so.1 ${PREFIX}/lib/libGL.so.1
-	else
-	  /bin/ln -f ${PREFIX}/lib/.libGL/libGL.so.1 ${PREFIX}/lib/libGL.so
-	  /bin/ln -f ${PREFIX}/lib/.libGL/libGL.so.1.2.0 ${PREFIX}/lib/libGL.so.1.2.0
-	  /bin/ln -f ${PREFIX}/lib/.libGL/libGL.so.1 ${PREFIX}/lib/libGL.so.1
-	fi
-	;;
-esac
diff --git a/graphics/libGL/files-old/pkg-deinstall.in b/graphics/libGL/pkg-deinstall
index 37d895397fcb..37d895397fcb 100644
--- a/graphics/libGL/files-old/pkg-deinstall.in
+++ b/graphics/libGL/pkg-deinstall
diff --git a/graphics/libGL/files-old/pkg-install.in b/graphics/libGL/pkg-install
index 280922c0bbfc..b0f6b7b87e23 100644
--- a/graphics/libGL/files-old/pkg-install.in
+++ b/graphics/libGL/pkg-install
@@ -11,8 +11,9 @@ POST-INSTALL)
 	  /bin/ln -f ${PREFIX}/lib/.nvidia/libGL.so.1 ${PREFIX}/lib/libGL.so
 	  /bin/ln -f ${PREFIX}/lib/.nvidia/libGL.so.1 ${PREFIX}/lib/libGL.so.1
 	else
-	  /bin/ln -f ${PREFIX}/lib/.libGL/libGL.so.1 ${PREFIX}/lib/libGL.so
-	  /bin/ln -f ${PREFIX}/lib/.libGL/libGL.so.1 ${PREFIX}/lib/libGL.so.1
+	  /bin/ln -f ${PREFIX}/lib/.mesa/libGL.so.1.2.0 ${PREFIX}/lib/libGL.so
+	  /bin/ln -f ${PREFIX}/lib/.mesa/libGL.so.1.2.0 ${PREFIX}/lib/libGL.so.1
+	  /bin/ln -f ${PREFIX}/lib/.mesa/libGL.so.1.2.0 ${PREFIX}/lib/libGL.so.1.2.0
 	fi
 	;;
 esac
diff --git a/graphics/libGL/pkg-plist b/graphics/libGL/pkg-plist
index 9a467158be5c..a0e86404f5b9 100644
--- a/graphics/libGL/pkg-plist
+++ b/graphics/libGL/pkg-plist
@@ -10,9 +10,9 @@ include/GL/glxext.h
 include/GL/osmesa.h
 include/GL/wglext.h
 include/GL/wmesa.h
-lib/.libGL/libGL.so
-lib/.libGL/libGL.so.1
-lib/.libGL/libGL.so.1.2.0
+lib/.mesa/libGL.so
+lib/.mesa/libGL.so.1
+lib/.mesa/libGL.so.1.2.0
 @comment lib/libglapi.so
 @comment lib/libglapi.so.0
 @comment lib/libglapi.so.0.0.0