8 files changed, 41 insertions, 4 deletions
diff --git a/x11-fm/asfiles/Makefile b/x11-fm/asfiles/Makefile
index c623cf6dccc3..84e755b34e25 100644
--- a/x11-fm/asfiles/Makefile
+++ b/x11-fm/asfiles/Makefile
@@ -30,4 +30,12 @@ post-install:
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	${MV} ${WRKSRC}/src/Files.ad.orig ${WRKSRC}/src/Files.ad
 
-.include <bsd.port.mk>
+.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>
diff --git a/x11-fm/asfiles/pkg-plist b/x11-fm/asfiles/pkg-plist
index 25da6285fdca..ff9236e60721 100644
--- a/x11-fm/asfiles/pkg-plist
+++ b/x11-fm/asfiles/pkg-plist
@@ -225,3 +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
diff --git a/x11-fm/offix-files/Makefile b/x11-fm/offix-files/Makefile
index 2e990cf0758b..2fa1b93673ed 100644
--- a/x11-fm/offix-files/Makefile
+++ b/x11-fm/offix-files/Makefile
@@ -31,4 +31,12 @@ MAN3=		regexp.3
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/src/Files.ad ${PREFIX}/share/OffiX/
 
-.include <bsd.port.mk>
+.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>
diff --git a/x11-fm/offix-files/pkg-plist b/x11-fm/offix-files/pkg-plist
index 61946b38a501..ed1b6a524c3d 100644
--- a/x11-fm/offix-files/pkg-plist
+++ b/x11-fm/offix-files/pkg-plist
@@ -273,3 +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
diff --git a/x11-fm/workplace/Makefile b/x11-fm/workplace/Makefile
index a78b98549cd0..da9f494d99bc 100644
--- a/x11-fm/workplace/Makefile
+++ b/x11-fm/workplace/Makefile
@@ -42,4 +42,12 @@ do-install:
 	@ ${MKDIR} ${PREFIX}/share/examples/workplace
 	@ ${INSTALL_DATA} ${WRKSRC}/example/* ${PREFIX}/share/examples/workplace
 
-.include <bsd.port.mk>
+.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>
diff --git a/x11-fm/workplace/pkg-plist b/x11-fm/workplace/pkg-plist
index 3f296fd035bd..6531e4513566 100644
--- a/x11-fm/workplace/pkg-plist
+++ b/x11-fm/workplace/pkg-plist
@@ -69,3 +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
diff --git a/x11-fm/x-files/Makefile b/x11-fm/x-files/Makefile
index c6c1fdc3a86c..97bd1e11505f 100644
--- a/x11-fm/x-files/Makefile
+++ b/x11-fm/x-files/Makefile
@@ -35,7 +35,16 @@ do-install:
 .endfor
 	@${CHMOD} 0555 ${PREFIX}/lib/X11/X-Files/X-Files.tcl
 	@${LN} -s ${PREFIX}/lib/X11/X-Files/X-Files.tcl ${PREFIX}/bin/X-Files
+	@${MKDIR} ${X11BASE}/include/X11/pixmaps
 	@${INSTALL_DATA} ${WRKSRC}/X-Files.xpm ${X11BASE}/include/X11/pixmaps
 	@${INSTALL_MAN} ${WRKSRC}/X-Files.1x ${X11BASE}/man/man1
 
-.include <bsd.port.mk>
+.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>
diff --git a/x11-fm/x-files/pkg-plist b/x11-fm/x-files/pkg-plist
index aca64c8b06c2..bf98aa48cef2 100644
--- a/x11-fm/x-files/pkg-plist
+++ b/x11-fm/x-files/pkg-plist
@@ -23,3 +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