Fixups after removal of separate mtree file for X_WINDOW_SYSTEM=XOrg case.

8 files changed, 8 insertions, 40 deletions

diff --git a/x11-fm/asfiles/Makefile b/x11-fm/asfiles/Makefile
index 84e755b34e25..c623cf6dccc3 100644
--- a/x11-fm/asfiles/Makefile
+++ b/x11-fm/asfiles/Makefile
@@ -30,12 +30,4 @@ post-install:
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	${MV} ${WRKSRC}/src/Files.ad.orig ${WRKSRC}/src/Files.ad
 
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} == xfree86-4
-PLIST_SUB+=	NEWMTREE=""
-.else
-PLIST_SUB+=	NEWMTREE="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-fm/asfiles/pkg-plist b/x11-fm/asfiles/pkg-plist
index ff9236e60721..eb83e0c90062 100644
--- a/x11-fm/asfiles/pkg-plist
+++ b/x11-fm/asfiles/pkg-plist
@@ -225,4 +225,4 @@ lib/X11/app-defaults/Files.ad
 share/OffiX/FilesMagic
 share/OffiX/Filesrc
 @dirrm share/OffiX
-%%NEWMTREE%%@unexec rmdir %D/include/bitmaps 2>/dev/null || true
+@unexec rmdir %D/include/bitmaps 2>/dev/null || true
diff --git a/x11-fm/offix-files/Makefile b/x11-fm/offix-files/Makefile
index 17f5f67ca61e..f9aa98c4d58a 100644
--- a/x11-fm/offix-files/Makefile
+++ b/x11-fm/offix-files/Makefile
@@ -31,12 +31,4 @@ MAN3=		regexp.3
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/src/Files.ad ${PREFIX}/share/OffiX/
 
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} == xfree86-4
-PLIST_SUB+=	NEWMTREE=""
-.else
-PLIST_SUB+=	NEWMTREE="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-fm/offix-files/pkg-plist b/x11-fm/offix-files/pkg-plist
index ed1b6a524c3d..addf7df17062 100644
--- a/x11-fm/offix-files/pkg-plist
+++ b/x11-fm/offix-files/pkg-plist
@@ -273,4 +273,4 @@ include/bitmaps/zoo.xbm
 share/OffiX/Files.ad
 share/OffiX/FilesMagic
 share/OffiX/Filesrc
-%%NEWMTREE%%@unexec rmdir %D/include/bitmaps 2>/dev/null || true
+@unexec rmdir %D/include/bitmaps 2>/dev/null || true
diff --git a/x11-fm/workplace/Makefile b/x11-fm/workplace/Makefile
index da9f494d99bc..a78b98549cd0 100644
--- a/x11-fm/workplace/Makefile
+++ b/x11-fm/workplace/Makefile
@@ -42,12 +42,4 @@ do-install:
 	@ ${MKDIR} ${PREFIX}/share/examples/workplace
 	@ ${INSTALL_DATA} ${WRKSRC}/example/* ${PREFIX}/share/examples/workplace
 
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} == xfree86-4
-PLIST_SUB+=	NEWMTREE=""
-.else
-PLIST_SUB+=	NEWMTREE="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-fm/workplace/pkg-plist b/x11-fm/workplace/pkg-plist
index 6531e4513566..befc7fd2f6fd 100644
--- a/x11-fm/workplace/pkg-plist
+++ b/x11-fm/workplace/pkg-plist
@@ -69,4 +69,4 @@ share/examples/workplace/WPPref
 share/examples/workplace/WPSuffix
 @dirrm share/doc/workplace
 @dirrm share/examples/workplace
-%%NEWMTREE%%@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true
+@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true
diff --git a/x11-fm/x-files/Makefile b/x11-fm/x-files/Makefile
index 97bd1e11505f..d922b751a310 100644
--- a/x11-fm/x-files/Makefile
+++ b/x11-fm/x-files/Makefile
@@ -39,12 +39,4 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/X-Files.xpm ${X11BASE}/include/X11/pixmaps
 	@${INSTALL_MAN} ${WRKSRC}/X-Files.1x ${X11BASE}/man/man1
 
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} == xfree86-4
-PLIST_SUB+=	NEWMTREE=""
-.else
-PLIST_SUB+=	NEWMTREE="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-fm/x-files/pkg-plist b/x11-fm/x-files/pkg-plist
index bf98aa48cef2..bd07baf74971 100644
--- a/x11-fm/x-files/pkg-plist
+++ b/x11-fm/x-files/pkg-plist
@@ -23,4 +23,4 @@ lib/X11/X-Files/xfiles.user_pophelp
 lib/X11/X-Files/xfilesrc
 lib/X11/X-Files/xflogo.gif
 @dirrm lib/X11/X-Files
-%%NEWMTREE%%@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true
+@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true