66 files changed, 170 insertions, 193 deletions

diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile
index 6c71e65bf7af..71aa0f375b1f 100644
--- a/databases/xmysqladmin/Makefile
+++ b/databases/xmysqladmin/Makefile
@@ -22,4 +22,15 @@ USE_X_PREFIX=	yes
 USE_XPM=	yes
 ALL_TARGET=	xmysqladmin
 
-.include <bsd.port.mk>
+pre-su-install:
+	@${MKDIR} ${PREFIX}/include/X11/pixmaps
+
+.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/databases/xmysqladmin/pkg-plist b/databases/xmysqladmin/pkg-plist
index 76ef5587ac90..1cebab36da03 100644
--- a/databases/xmysqladmin/pkg-plist
+++ b/databases/xmysqladmin/pkg-plist
@@ -1,2 +1,3 @@
 bin/xmysqladmin
 include/X11/pixmaps/mysql.xpm
+%%NEWMTREE%%@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true
diff --git a/graphics/hobbes-icons-xpm/Makefile b/graphics/hobbes-icons-xpm/Makefile
index 89388e1f7ae4..0c1668b8f4ee 100644
--- a/graphics/hobbes-icons-xpm/Makefile
+++ b/graphics/hobbes-icons-xpm/Makefile
@@ -34,4 +34,12 @@ post-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/*.shar ${DOCSDIR}
 .endif
 
-.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/graphics/hobbes-icons-xpm/pkg-plist b/graphics/hobbes-icons-xpm/pkg-plist
index 9de035f730ad..c9b180e1cc51 100644
--- a/graphics/hobbes-icons-xpm/pkg-plist
+++ b/graphics/hobbes-icons-xpm/pkg-plist
@@ -3417,3 +3417,4 @@ include/X11/pixmaps/z/zug2.xpm
 @dirrm include/X11/pixmaps/x
 @dirrm include/X11/pixmaps/y
 @dirrm include/X11/pixmaps/z
+%%NEWMTREE%%@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true
diff --git a/graphics/xpcd/Makefile b/graphics/xpcd/Makefile
index d494d826f25e..227b4339f373 100644
--- a/graphics/xpcd/Makefile
+++ b/graphics/xpcd/Makefile
@@ -28,4 +28,12 @@ MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 USE_X_PREFIX=	yes
 MAN1=		pcdtoppm.1 pcdview.1 xpcd.1
 
-.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/graphics/xpcd/pkg-plist b/graphics/xpcd/pkg-plist
index b9db9807768b..8a10e958d75f 100644
--- a/graphics/xpcd/pkg-plist
+++ b/graphics/xpcd/pkg-plist
@@ -11,3 +11,4 @@ lib/X11/xpcd/system.xpcdrc
 @dirrm lib/X11/de/app-defaults
 @dirrm lib/X11/de
 @dirrm lib/X11/xpcd
+%%NEWMTREE%%@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true
diff --git a/japanese/kterm16c/Makefile b/japanese/kterm16c/Makefile
index 56b77dbc9b09..46a0767d1fc5 100644
--- a/japanese/kterm16c/Makefile
+++ b/japanese/kterm16c/Makefile
@@ -38,12 +38,6 @@ USE_XPM=	yes
 
 DOCDIR=		${PREFIX}/share/doc/kterm16c
 
-.if ${X_WINDOW_SYSTEM:L} == xorg
-PLIST_SUB+=	NEWMTREE=""
-.else
-PLIST_SUB+=	NEWMTREE="@comment "
-.endif
-
 post-extract:
 	@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
 		${DISTDIR}/${DIST_SUBDIR}/pcemu1.01alpha.tar.gz \
diff --git a/japanese/kterm16c/pkg-plist b/japanese/kterm16c/pkg-plist
index b15cee379c46..56b77b0eab10 100644
--- a/japanese/kterm16c/pkg-plist
+++ b/japanese/kterm16c/pkg-plist
@@ -6,4 +6,4 @@ lib/X11/fonts/misc/vga.pcf.gz
 share/doc/kterm16c/dot.termcap
 share/doc/kterm16c/kterm16c.doc
 @dirrm share/doc/kterm16c
-%%NEWMTREE%%@unexec rmdir %D/lib/X11/fonts/misc 2>/dev/null || true
+@unexec rmdir %D/lib/X11/fonts/misc 2>/dev/null || true
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
diff --git a/x11-fonts/intlfonts/Makefile b/x11-fonts/intlfonts/Makefile
index 4dca71e2adf0..c7a6dc9d7bbc 100644
--- a/x11-fonts/intlfonts/Makefile
+++ b/x11-fonts/intlfonts/Makefile
@@ -55,7 +55,6 @@ do-build:
 			-e 's,%%T1_FONTSDIR%%,${T1_FONTSDIR},g' \
 			-e 's,%%TT_FONTSDIR%%,${TT_FONTSDIR},g' \
 			-e 's,%%LOCALBASE%%,${LOCALBASE},g' \
-			-e 's,%%XWINSYS%%,${X_WINDOW_SYSTEM:L},g' \
 			< ${FILESDIR}/$${file}.tmpl > ${WRKDIR}/$${file}; \
 	done
 
diff --git a/x11-fonts/intlfonts/files/DEINSTALL.tmpl b/x11-fonts/intlfonts/files/DEINSTALL.tmpl
index b6e1d96284d7..3b66be76ac2c 100644
--- a/x11-fonts/intlfonts/files/DEINSTALL.tmpl
+++ b/x11-fonts/intlfonts/files/DEINSTALL.tmpl
@@ -15,6 +15,5 @@ if [ "x$2" = "xPOST-DEINSTALL" ]; then
 	[ `wc -c ${PKG_PREFIX}/%%T1_FONTSDIR%%/fonts.scale | awk '{print $1}'` = 2 ] && rm -f ${PKG_PREFIX}/%%T1_FONTSDIR%%/fonts.scale
 # Remove a backup file made by type1inst
 	rm -f ${PKG_PREFIX}/%%T1_FONTSDIR%%/fonts.scale.bak
-	[ "%%XWINSYS%%" = "xorg" ] && \
-	    (rmdir ${PKG_PREFIX}/%%T1_FONTSDIR%% 2>/dev/null || true)
+	rmdir ${PKG_PREFIX}/%%T1_FONTSDIR%% 2>/dev/null || true
 fi
diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile
index f539d17cf1d9..c469f839c602 100644
--- a/x11-fonts/libXfont/Makefile
+++ b/x11-fonts/libXfont/Makefile
@@ -28,12 +28,4 @@ CONFIGURE_ARGS=	--enable-freetype
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack pkgconfig
 
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} == xorg
-PLIST_SUB+=	NEWMTREE=""
-.else
-PLIST_SUB+=	NEWMTREE="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-fonts/libXfont/pkg-plist b/x11-fonts/libXfont/pkg-plist
index e3a1735d1674..874de36d6e0c 100644
--- a/x11-fonts/libXfont/pkg-plist
+++ b/x11-fonts/libXfont/pkg-plist
@@ -13,4 +13,4 @@ lib/libXfont.la
 lib/libXfont.so
 lib/libXfont.so.1
 libdata/pkgconfig/xfont.pc
-%%NEWMTREE%%@dirrm include/X11/fonts
+@dirrm include/X11/fonts
diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile
index d20a0946116b..9c83072f3137 100644
--- a/x11-fonts/libXft/Makefile
+++ b/x11-fonts/libXft/Makefile
@@ -33,6 +33,12 @@ MAN3=		Xft.3
 IGNORE=	Xft requires Render extension headers/library to build.
 .endif
 
+.if ${X_WINDOW_SYSTEM:L} == xfree86-4
+PLIST_SUB+=	NEWMTREE=""
+.else
+PLIST_SUB+=	NEWMTREE="@comment "
+.endif
+
 .if defined(WITH_CJK)
 PATCH_SITES=	ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/ \
 		http://bsdchat.com/dist/firefly-cjk-patchset/
diff --git a/x11-fonts/libXft/pkg-plist b/x11-fonts/libXft/pkg-plist
index 75c5e1209701..84173a9f777a 100644
--- a/x11-fonts/libXft/pkg-plist
+++ b/x11-fonts/libXft/pkg-plist
@@ -5,3 +5,4 @@ lib/libXft.a
 lib/libXft.so
 lib/libXft.so.2
 libdata/pkgconfig/xft.pc
+%%NEWMTREE%%@dirrm include/X11/Xft
diff --git a/x11-fonts/tv-fonts/Makefile b/x11-fonts/tv-fonts/Makefile
index c139c7fbe115..c7ac1e4967b5 100644
--- a/x11-fonts/tv-fonts/Makefile
+++ b/x11-fonts/tv-fonts/Makefile
@@ -38,12 +38,4 @@ do-install:
 post-install:
 	@-${X11BASE}/bin/fc-cache -f -v ${FONTSDIR}
 
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} == xorg
-PLIST_SUB+=	NEWMTREE=""
-.else
-PLIST_SUB+=	NEWMTREE="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-fonts/tv-fonts/pkg-plist b/x11-fonts/tv-fonts/pkg-plist
index d4be0f73ecd2..0a80a7c40aa4 100644
--- a/x11-fonts/tv-fonts/pkg-plist
+++ b/x11-fonts/tv-fonts/pkg-plist
@@ -22,5 +22,5 @@ lib/X11/fonts/misc/teletext4.pcf.gz
 lib/X11/fonts/misc/teletext4i.pcf.gz
 @unexec rm %D/lib/X11/fonts/misc/fonts.cache-1 || true
 @unexec fc-cache -f -v %D/lib/X11/fonts/misc || true
-%%NEWMTREE%%@unexec if [ ! -s %D/lib/X11/fonts/misc/fonts.cache-1 ]; then rm %D/lib/X11/fonts/misc/fonts.cache-1; fi
-%%NEWMTREE%%@unexec rmdir %D/lib/X11/fonts/misc 2>/dev/null || true
+@unexec if [ ! -s %D/lib/X11/fonts/misc/fonts.cache-1 ]; then rm %D/lib/X11/fonts/misc/fonts.cache-1; fi
+@unexec rmdir %D/lib/X11/fonts/misc 2>/dev/null || true
diff --git a/x11-servers/xorg-server/files/BSD.x11-xorg.dist b/x11-servers/xorg-server/files/BSD.x11-xorg.dist
index ca1bab4c7b87..ef9eefd8ad6f 100644
--- a/x11-servers/xorg-server/files/BSD.x11-xorg.dist
+++ b/x11-servers/xorg-server/files/BSD.x11-xorg.dist
@@ -1,4 +1,4 @@
-# $FreeBSD: /tmp/pcvs/ports/x11-servers/xorg-server/files/Attic/BSD.x11-xorg.dist,v 1.2 2005-03-25 07:03:04 lesi Exp $
+# $FreeBSD: /tmp/pcvs/ports/x11-servers/xorg-server/files/Attic/BSD.x11-xorg.dist,v 1.3 2005-06-15 02:42:12 lesi Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -520,5 +520,7 @@
                 ..
             ..
         ..
+        pixmaps
+        ..
     ..
 ..
diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile
index 048ef7f001d5..8ff895d46df4 100644
--- a/x11-toolkits/libXaw/Makefile
+++ b/x11-toolkits/libXaw/Makefile
@@ -36,12 +36,4 @@ USE_GNOME=	gnomehack pkgconfig
 
 MAN3=		Xaw.3
 
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} == xorg
-PLIST_SUB+=	NEWMTREE=""
-.else
-PLIST_SUB+=	NEWMTREE="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/libXaw/pkg-plist b/x11-toolkits/libXaw/pkg-plist
index bfd6f52dcd47..c3b287571af6 100644
--- a/x11-toolkits/libXaw/pkg-plist
+++ b/x11-toolkits/libXaw/pkg-plist
@@ -73,4 +73,4 @@ lib/libXaw.la
 lib/libXaw.so
 lib/libXaw.so.7
 libdata/pkgconfig/xaw.pc
-%%NEWMTREE%%@dirrm include/X11/Xaw
+@dirrm include/X11/Xaw
diff --git a/x11-toolkits/libXmu/Makefile b/x11-toolkits/libXmu/Makefile
index 27cb4e497874..5d4770bb755a 100644
--- a/x11-toolkits/libXmu/Makefile
+++ b/x11-toolkits/libXmu/Makefile
@@ -30,12 +30,4 @@ CFLAGS+=	-DMALLOC_0_RETURNS_NULL
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack pkgconfig
 
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} == xorg
-PLIST_SUB+=	NEWMTREE=""
-.else
-PLIST_SUB+=	NEWMTREE="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/libXmu/pkg-plist b/x11-toolkits/libXmu/pkg-plist
index 952f9b3e7968..5b20f35ea4e4 100644
--- a/x11-toolkits/libXmu/pkg-plist
+++ b/x11-toolkits/libXmu/pkg-plist
@@ -30,4 +30,4 @@ lib/libXmuu.so
 lib/libXmuu.so.1
 libdata/pkgconfig/xmu.pc
 libdata/pkgconfig/xmuu.pc
-%%NEWMTREE%%@dirrm include/X11/Xmu
+@dirrm include/X11/Xmu
diff --git a/x11-toolkits/xview/pkg-plist b/x11-toolkits/xview/pkg-plist
index 07267c571ec9..481436e10b27 100644
--- a/x11-toolkits/xview/pkg-plist
+++ b/x11-toolkits/xview/pkg-plist
@@ -510,6 +510,7 @@ include/xview_private/xv_color.h
 include/xview_private/xv_debug.h
 include/xview_private/xv_list.h
 include/xview_private/xv_path_util.h
+@unexec rmdir %D/include/bitmaps 2>/dev/null || true
 @dirrm include/images
 @dirrm include/olgx
 @dirrm include/olgx_private
diff --git a/x11-wm/afterstep-i18n/Makefile b/x11-wm/afterstep-i18n/Makefile
index 156de704b0e8..c3b97037011b 100644
--- a/x11-wm/afterstep-i18n/Makefile
+++ b/x11-wm/afterstep-i18n/Makefile
@@ -83,4 +83,12 @@ post-install:
 .endfor
 .endif
 
-.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-wm/afterstep-i18n/pkg-plist b/x11-wm/afterstep-i18n/pkg-plist
index adba01ff20b3..4886fe60fb1e 100644
--- a/x11-wm/afterstep-i18n/pkg-plist
+++ b/x11-wm/afterstep-i18n/pkg-plist
@@ -66,3 +66,4 @@ share/doc/afterstep/CHANGES.I18N
 share/doc/afterstep/README.I18N
 share/doc/afterstep/README.I18N.jis
 @dirrm share/doc/afterstep
+%%NEWMTREE%%@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true
diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile
index c5d4f6425b4e..1b93f19c9475 100644
--- a/x11-wm/afterstep/Makefile
+++ b/x11-wm/afterstep/Makefile
@@ -65,4 +65,12 @@ post-install:
 			${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/lib/X11/afterstep/doc/; \
 		done
 
-.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-wm/afterstep/pkg-plist b/x11-wm/afterstep/pkg-plist
index 8f0f3110b05a..c93a8d327010 100644
--- a/x11-wm/afterstep/pkg-plist
+++ b/x11-wm/afterstep/pkg-plist
@@ -58,3 +58,4 @@ lib/X11/afterstep/system.steprc
 @dirrm lib/X11/afterstep/doc
 @dirrm lib/X11/afterstep/sounds
 @dirrm lib/X11/afterstep
+%%NEWMTREE%%@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true
diff --git a/x11-wm/ctwm/Makefile b/x11-wm/ctwm/Makefile
index a3b5ff171a47..57c1f2c64da1 100644
--- a/x11-wm/ctwm/Makefile
+++ b/x11-wm/ctwm/Makefile
@@ -25,12 +25,4 @@ MAN1=		ctwm.1
 post-extract:
 	@(cd ${WRKSRC} && ${LN} -s ../xpm xpm)
 
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} == xorg
-PLIST_SUB+=	NEWMTREE=""
-.else
-PLIST_SUB+=	NEWMTREE="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/ctwm/pkg-plist b/x11-wm/ctwm/pkg-plist
index a4646df20bb6..86ea2c6eaa5e 100644
--- a/x11-wm/ctwm/pkg-plist
+++ b/x11-wm/ctwm/pkg-plist
@@ -90,4 +90,4 @@ lib/X11/twm/images/xrn.xpm
 lib/X11/twm/images/xterm.xpm
 lib/X11/twm/system.ctwmrc
 @dirrm lib/X11/twm/images
-%%NEWMTREE%%@unexec rmdir %D/lib/X11/twm 2>/dev/null || true
+@unexec rmdir %D/lib/X11/twm 2>/dev/null || true
diff --git a/x11-wm/fvwm/Makefile b/x11-wm/fvwm/Makefile
index f712eed33d25..0bdf72db26d6 100644
--- a/x11-wm/fvwm/Makefile
+++ b/x11-wm/fvwm/Makefile
@@ -30,4 +30,12 @@ post-install:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
 	${WRKSRC}/fvwm_icons/*.xpm ${PREFIX}/include/X11/pixmaps
 
-.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-wm/fvwm/pkg-plist b/x11-wm/fvwm/pkg-plist
index 41e54ea570f0..49ce4a029b3b 100644
--- a/x11-wm/fvwm/pkg-plist
+++ b/x11-wm/fvwm/pkg-plist
@@ -59,3 +59,4 @@ include/X11/pixmaps/xterm-sol.xpm
 include/X11/pixmaps/xterm-sun.xpm
 include/X11/pixmaps/xterm.xpm
 @dirrm lib/X11/fvwm
+%%NEWMTREE%%@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true
diff --git a/x11-wm/vtwm/Makefile b/x11-wm/vtwm/Makefile
index 0874291863fa..7dde582f2b3f 100644
--- a/x11-wm/vtwm/Makefile
+++ b/x11-wm/vtwm/Makefile
@@ -19,12 +19,4 @@ USE_XPM=	yes
 
 MAN1=		vtwm.1
 
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} == xorg
-PLIST_SUB+=	NEWMTREE=""
-.else
-PLIST_SUB+=	NEWMTREE="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/vtwm/pkg-plist b/x11-wm/vtwm/pkg-plist
index 1dd612a354a3..86318680eff8 100644
--- a/x11-wm/vtwm/pkg-plist
+++ b/x11-wm/vtwm/pkg-plist
@@ -1,3 +1,3 @@
 bin/vtwm
 lib/X11/twm/system.vtwmrc
-%%NEWMTREE%%@unexec rmdir %D/lib/X11/twm 2>/dev/null || true
+@unexec rmdir %D/lib/X11/twm 2>/dev/null || true
diff --git a/x11/XFree86-aoutlibs/Makefile b/x11/XFree86-aoutlibs/Makefile
index fd5cf182a39c..56091cc2516b 100644
--- a/x11/XFree86-aoutlibs/Makefile
+++ b/x11/XFree86-aoutlibs/Makefile
@@ -22,6 +22,12 @@ USE_X_PREFIX=	yes
 
 .include <bsd.port.pre.mk>
 
+.if ${X_WINDOW_SYSTEM:L} == xfree86-4
+PLIST_SUB+=	NEWMTREE=""
+.else
+PLIST_SUB+=	NEWMTREE="@comment "
+.endif
+
 .if ${OSVERSION} >= 500113
 STRIP=
 .endif
diff --git a/x11/XFree86-aoutlibs/pkg-plist b/x11/XFree86-aoutlibs/pkg-plist
index c56fe55aa485..1155af5fce6f 100644
--- a/x11/XFree86-aoutlibs/pkg-plist
+++ b/x11/XFree86-aoutlibs/pkg-plist
@@ -14,3 +14,4 @@ lib/aout/libXtst.so.6.1
 lib/aout/liboldX.so.6.0
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+%%NEWMTREE%%@dirrm lib/aout
diff --git a/x11/bricons/Makefile b/x11/bricons/Makefile
index 116f354a94e6..37ff1a0f46bd 100644
--- a/x11/bricons/Makefile
+++ b/x11/bricons/Makefile
@@ -22,12 +22,20 @@ MAN1=		bricons.1
 
 .include <bsd.port.pre.mk>
 
+.if ${X_WINDOW_SYSTEM:L} == xfree86-4
+PLIST_SUB+=	NEWMTREE=""
+.else
+PLIST_SUB+=	NEWMTREE="@comment "
+.endif
+
 post-patch:
 	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/Xbricons
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/Xbricons ${PREFIX}/lib/X11/app-defaults
+	${MKDIR} ${PREFIX}/include/X11/bitmaps
 	${INSTALL_DATA} ${WRKSRC}/bitmaps/* ${PREFIX}/include/X11/bitmaps
+	${MKDIR} ${PREFIX}/include/X11/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/*.xpm ${PREFIX}/include/X11/pixmaps
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "     Use ./files/DOTbriconsrc as an example. This  file"
diff --git a/x11/bricons/pkg-plist b/x11/bricons/pkg-plist
index b7251ac0458f..0c488ffd2d83 100644
--- a/x11/bricons/pkg-plist
+++ b/x11/bricons/pkg-plist
@@ -8,3 +8,5 @@ include/X11/pixmaps/clock.xpm
 include/X11/pixmaps/editor.xpm
 include/X11/pixmaps/mail.xpm
 include/X11/pixmaps/news.xpm
+%%NEWMTREE%%@unexec rmdir %D/include/X11/bitmaps 2>/dev/null || true
+%%NEWMTREE%%@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true
diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile
index 54804bc1d7c7..37c8671d24cb 100644
--- a/x11/libICE/Makefile
+++ b/x11/libICE/Makefile
@@ -29,12 +29,4 @@ USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack pkgconfig
 
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} == xorg
-PLIST_SUB+=	NEWMTREE=""
-.else
-PLIST_SUB+=	NEWMTREE="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/libICE/pkg-plist b/x11/libICE/pkg-plist
index 70f3203b41b7..6ca157c05f4e 100644
--- a/x11/libICE/pkg-plist
+++ b/x11/libICE/pkg-plist
@@ -10,4 +10,4 @@ lib/libICE.la
 lib/libICE.so
 lib/libICE.so.6
 libdata/pkgconfig/ice.pc
-%%NEWMTREE%%@dirrm include/X11/ICE
+@dirrm include/X11/ICE
diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
index 50fbc75f42a4..f092977a6c65 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -29,12 +29,4 @@ USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack pkgconfig
 
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} == xorg
-PLIST_SUB+=	NEWMTREE=""
-.else
-PLIST_SUB+=	NEWMTREE="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/libSM/pkg-plist b/x11/libSM/pkg-plist
index 9facfbb580a0..ccb0046d833c 100644
--- a/x11/libSM/pkg-plist
+++ b/x11/libSM/pkg-plist
@@ -6,4 +6,4 @@ lib/libSM.la
 lib/libSM.so
 lib/libSM.so.6
 libdata/pkgconfig/sm.pc
-%%NEWMTREE%%@dirrm include/X11/SM
+@dirrm include/X11/SM
diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile
index 2409ff398345..59e0b37fd97b 100644
--- a/x11/libXcursor/Makefile
+++ b/x11/libXcursor/Makefile
@@ -35,12 +35,4 @@ MAN3=		Xcursor.3
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack pkgconfig
 
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} == xorg
-PLIST_SUB+=	NEWMTREE=""
-.else
-PLIST_SUB+=	NEWMTREE="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/libXcursor/pkg-plist b/x11/libXcursor/pkg-plist
index e48cebfa64ae..0a6c4807af0b 100644
--- a/x11/libXcursor/pkg-plist
+++ b/x11/libXcursor/pkg-plist
@@ -4,4 +4,4 @@ lib/libXcursor.la
 lib/libXcursor.so
 lib/libXcursor.so.1
 libdata/pkgconfig/xcursor.pc
-%%NEWMTREE%%@dirrm include/X11/Xcursor
+@dirrm include/X11/Xcursor
diff --git a/x11/libXfont/Makefile b/x11/libXfont/Makefile
index f539d17cf1d9..c469f839c602 100644
--- a/x11/libXfont/Makefile
+++ b/x11/libXfont/Makefile
@@ -28,12 +28,4 @@ CONFIGURE_ARGS=	--enable-freetype
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack pkgconfig
 
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} == xorg
-PLIST_SUB+=	NEWMTREE=""
-.else
-PLIST_SUB+=	NEWMTREE="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/libXfont/pkg-plist b/x11/libXfont/pkg-plist
index e3a1735d1674..874de36d6e0c 100644
--- a/x11/libXfont/pkg-plist
+++ b/x11/libXfont/pkg-plist
@@ -13,4 +13,4 @@ lib/libXfont.la
 lib/libXfont.so
 lib/libXfont.so.1
 libdata/pkgconfig/xfont.pc
-%%NEWMTREE%%@dirrm include/X11/fonts
+@dirrm include/X11/fonts
diff --git a/x11/panoramixext/Makefile b/x11/panoramixext/Makefile
index 70067598b5ac..dd18038b3917 100644
--- a/x11/panoramixext/Makefile
+++ b/x11/panoramixext/Makefile
@@ -22,12 +22,4 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack
 
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} == xorg
-PLIST_SUB+=	NEWMTREE=""
-.else
-PLIST_SUB+=	NEWMTREE="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/panoramixext/pkg-plist b/x11/panoramixext/pkg-plist
index 07eea2b5f045..1192f167d8e7 100644
--- a/x11/panoramixext/pkg-plist
+++ b/x11/panoramixext/pkg-plist
@@ -1,4 +1,4 @@
 include/X11/extensions/panoramiXext.h
 include/X11/extensions/panoramiXproto.h
 libdata/pkgconfig/panoramixext.pc
-%%NEWMTREE%%@unexec rmdir %D/include/X11/extensions 2>/dev/null || true
+@unexec rmdir %D/include/X11/extensions 2>/dev/null || true
diff --git a/x11/printext/Makefile b/x11/printext/Makefile
index f3a7aee0048e..c30f81c78a07 100644
--- a/x11/printext/Makefile
+++ b/x11/printext/Makefile
@@ -31,12 +31,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/Print.h ${DEST}
 	${INSTALL_DATA} ${WRKSRC}/Printstr.h ${DEST}
 
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} == xorg
-PLIST_SUB+=	NEWMTREE=""
-.else
-PLIST_SUB+=	NEWMTREE="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/printext/pkg-plist b/x11/printext/pkg-plist
index 1b313ce50faf..e1463b7ea562 100644
--- a/x11/printext/pkg-plist
+++ b/x11/printext/pkg-plist
@@ -1,3 +1,3 @@
 include/X11/extensions/Print.h
 include/X11/extensions/Printstr.h
-%%NEWMTREE%%@unexec rmdir %D/include/X11/extensions 2>/dev/null || true
+@unexec rmdir %D/include/X11/extensions 2>/dev/null || true
diff --git a/x11/randrext/Makefile b/x11/randrext/Makefile
index 73b4dcd1e0ff..0100ed2092d3 100644
--- a/x11/randrext/Makefile
+++ b/x11/randrext/Makefile
@@ -22,12 +22,4 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 NO_BUILD=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} == xorg
-PLIST_SUB+=	NEWMTREE=""
-.else
-PLIST_SUB+=	NEWMTREE="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/randrext/pkg-plist b/x11/randrext/pkg-plist
index 1b90cc35b183..18ab2f63a4c5 100644
--- a/x11/randrext/pkg-plist
+++ b/x11/randrext/pkg-plist
@@ -3,4 +3,4 @@ include/X11/extensions/randrproto.h
 libdata/pkgconfig/randr.pc
 %%DOCSDIR%%/protocol
 @dirrm %%DOCSDIR%%
-%%NEWMTREE%%@unexec rmdir %D/include/X11/extensions 2>/dev/null || true
+@unexec rmdir %D/include/X11/extensions 2>/dev/null || true
diff --git a/x11/renderext/Makefile b/x11/renderext/Makefile
index 4ef86b0c7e80..ca4b5a2b099b 100644
--- a/x11/renderext/Makefile
+++ b/x11/renderext/Makefile
@@ -23,12 +23,4 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig
 
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} == xorg
-PLIST_SUB+=	NEWMTREE=""
-.else
-PLIST_SUB+=	NEWMTREE="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/renderext/pkg-plist b/x11/renderext/pkg-plist
index 3aa1fa5a134e..f751a38b9f0d 100644
--- a/x11/renderext/pkg-plist
+++ b/x11/renderext/pkg-plist
@@ -4,4 +4,4 @@ libdata/pkgconfig/render.pc
 %%DOCSDIR%%/library
 %%DOCSDIR%%/protocol
 @dirrm %%DOCSDIR%%
-%%NEWMTREE%%@unexec rmdir %D/include/X11/extensions 2>/dev/null || true
+@unexec rmdir %D/include/X11/extensions 2>/dev/null || true
diff --git a/x11/resourceext/Makefile b/x11/resourceext/Makefile
index c82986ec7468..7cfa50a222e8 100644
--- a/x11/resourceext/Makefile
+++ b/x11/resourceext/Makefile
@@ -24,12 +24,4 @@ USE_GMAKE=	yes
 NO_BUILD=	yes
 USE_GNOME=	gnomehack
 
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} == xorg
-PLIST_SUB+=	NEWMTREE=""
-.else
-PLIST_SUB+=	NEWMTREE="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/resourceext/pkg-plist b/x11/resourceext/pkg-plist
index c799fc83f252..2fe2fddaa2de 100644
--- a/x11/resourceext/pkg-plist
+++ b/x11/resourceext/pkg-plist
@@ -1,3 +1,3 @@
 include/X11/extensions/XResproto.h
 libdata/pkgconfig/resourceext.pc
-%%NEWMTREE%%@unexec rmdir %D/include/X11/extensions 2>/dev/null || true
+@unexec rmdir %D/include/X11/extensions 2>/dev/null || true
diff --git a/x11/xextensions/Makefile b/x11/xextensions/Makefile
index 10de5b88c80b..3907fdea0c03 100644
--- a/x11/xextensions/Makefile
+++ b/x11/xextensions/Makefile
@@ -26,12 +26,4 @@ USE_GMAKE=	yes
 NO_BUILD=	yes
 USE_GNOME=	gnomehack
 
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} == xorg
-PLIST_SUB+=	NEWMTREE=""
-.else
-PLIST_SUB+=	NEWMTREE="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/xextensions/pkg-plist b/x11/xextensions/pkg-plist
index 98bfc8c3fd5e..37714321fd51 100644
--- a/x11/xextensions/pkg-plist
+++ b/x11/xextensions/pkg-plist
@@ -52,4 +52,4 @@ include/X11/extensions/xtestext1.h
 include/X11/extensions/xteststr.h
 libdata/pkgconfig/xextensions.pc
 @dirrm share/doc/xextensions
-%%NEWMTREE%%@unexec rmdir %D/include/X11/extensions 2>/dev/null || true
+@unexec rmdir %D/include/X11/extensions 2>/dev/null || true
diff --git a/x11/xfree86_xkb_xml/Makefile b/x11/xfree86_xkb_xml/Makefile
index 9d4204eee5e9..0f2bc1825c90 100644
--- a/x11/xfree86_xkb_xml/Makefile
+++ b/x11/xfree86_xkb_xml/Makefile
@@ -27,12 +27,4 @@ CONFIGURE_ARGS=	--with-xkb-base=${X11BASE}/lib/X11/xkb
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} == xorg
-PLIST_SUB+=	NEWMTREE=""
-.else
-PLIST_SUB+=	NEWMTREE="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/xfree86_xkb_xml/pkg-plist b/x11/xfree86_xkb_xml/pkg-plist
index e31f5ca63962..78ef562c8655 100644
--- a/x11/xfree86_xkb_xml/pkg-plist
+++ b/x11/xfree86_xkb_xml/pkg-plist
@@ -2,5 +2,5 @@ lib/X11/xkb/rules/xfree86.xml
 lib/X11/xkb/rules/xkb.dtd
 share/locale/bg/LC_MESSAGES/xfree86_xkb_xml.mo
 share/locale/ru/LC_MESSAGES/xfree86_xkb_xml.mo
-%%NEWMTREE%%@unexec rmdir %D/lib/X11/xkb/rules 2>/dev/null || true
-%%NEWMTREE%%@unexec rmdir %D/lib/X11/xkb 2>/dev/null || true
+@unexec rmdir %D/lib/X11/xkb/rules 2>/dev/null || true
+@unexec rmdir %D/lib/X11/xkb 2>/dev/null || true