3 files changed, 5 insertions, 11 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index fef8d7a..323bd80 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -155,24 +155,23 @@ pre-everything::
 post-patch:
 	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
 		${WRKSRC}/configure
-# build libglx.so and manualy install it.
+# build libglx.so but don't install it yet. which is done in pre-install.
 	@${REINPLACE_CMD} -e 's|@GLX_TRUE@GLXMODS =|@GLX_BOGUS@GLXMODS =|g' \
 		-e 's|^LTLIBRARIES = |LTLIBRARIES = libglx.la |g' \
 		${WRKSRC}/hw/xfree86/dixmods/Makefile.in
 
 .if ${SLAVE_PORT} == "no"
-pre-install:
+pre-su-install:
 # The .xorg dir is so it loads the rigth libglx library.
 	${MKDIR} ${PREFIX}/lib/xorg/modules/extensions/.xorg
 	${INSTALL_LIB} ${WRKSRC}/hw/xfree86/dixmods/.libs/libglx.so \
 		${PREFIX}/lib/xorg/modules/extensions/.xorg/
-	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
 .if defined(WITH_NEW_XORG)
 	@${MKDIR} ${PREFIX}/share/X11/xorg.conf.d
 .endif
-	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-servers/xorg-server/files/pkg-deinstall.in b/x11-servers/xorg-server/files/pkg-deinstall.in
index 3f903b1..f186683 100644
--- a/x11-servers/xorg-server/files/pkg-deinstall.in
+++ b/x11-servers/xorg-server/files/pkg-deinstall.in
@@ -6,7 +6,7 @@
 PREFIX="${PKG_PREFIX-/usr/local}"
 
 case $2 in
-  POST-DEINSTALL)
+DEINSTALL)
 	/bin/rm -rf ${PREFIX}/lib/xorg/modules/extensions/libglx.so*
 	;;
 esac
diff --git a/x11-servers/xorg-server/files/pkg-install.in b/x11-servers/xorg-server/files/pkg-install.in
index 1120085..37c4fb8 100644
--- a/x11-servers/xorg-server/files/pkg-install.in
+++ b/x11-servers/xorg-server/files/pkg-install.in
@@ -6,12 +6,7 @@
 PREFIX="${PKG_PREFIX-/usr/local}"
 
 case $2 in
-# Do we need this?
-  PRE-INSTALL)
-	/bin/rm -f ${PREFIX}/lib/xorg/modules/extensions/libglx.*
-	;;
-
-  POST-INSTALL)
+POST-INSTALL)
 	if [ -f ${PREFIX}/lib/xorg/modules/extensions/.nvidia/libglx.so.1 ]; then
 	  /bin/ln -f ${PREFIX}/lib/xorg/modules/extensions/.nvidia/libglx.so.1 \
 		${PREFIX}/lib/xorg/modules/extensions/libglx.so