29 files changed, 29 insertions, 133 deletions

diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile
index 71aa0f375b1f..7babaf472da3 100644
--- a/databases/xmysqladmin/Makefile
+++ b/databases/xmysqladmin/Makefile
@@ -25,12 +25,4 @@ ALL_TARGET=	xmysqladmin
 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>
+.include <bsd.port.mk>
diff --git a/databases/xmysqladmin/pkg-plist b/databases/xmysqladmin/pkg-plist
index 1cebab36da03..76b5f9e98bbc 100644
--- a/databases/xmysqladmin/pkg-plist
+++ b/databases/xmysqladmin/pkg-plist
@@ -1,3 +1,3 @@
 bin/xmysqladmin
 include/X11/pixmaps/mysql.xpm
-%%NEWMTREE%%@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true
+@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 0c1668b8f4ee..89388e1f7ae4 100644
--- a/graphics/hobbes-icons-xpm/Makefile
+++ b/graphics/hobbes-icons-xpm/Makefile
@@ -34,12 +34,4 @@ post-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/*.shar ${DOCSDIR}
 .endif
 
-.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/graphics/hobbes-icons-xpm/pkg-plist b/graphics/hobbes-icons-xpm/pkg-plist
index c9b180e1cc51..83fa785e204e 100644
--- a/graphics/hobbes-icons-xpm/pkg-plist
+++ b/graphics/hobbes-icons-xpm/pkg-plist
@@ -3417,4 +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
+@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true
diff --git a/graphics/xpcd/Makefile b/graphics/xpcd/Makefile
index 227b4339f373..d494d826f25e 100644
--- a/graphics/xpcd/Makefile
+++ b/graphics/xpcd/Makefile
@@ -28,12 +28,4 @@ MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 USE_X_PREFIX=	yes
 MAN1=		pcdtoppm.1 pcdview.1 xpcd.1
 
-.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/graphics/xpcd/pkg-plist b/graphics/xpcd/pkg-plist
index 8a10e958d75f..06f6878533e0 100644
--- a/graphics/xpcd/pkg-plist
+++ b/graphics/xpcd/pkg-plist
@@ -11,4 +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
+@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true
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
diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile
index b4834c137926..74c47b83bbad 100644
--- a/x11-fonts/libXft/Makefile
+++ b/x11-fonts/libXft/Makefile
@@ -39,10 +39,4 @@ PATCHFILES+=    cjk-patch-libXft-20050716.diff.gz
 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
-
 .include <bsd.port.post.mk>
diff --git a/x11-fonts/libXft/pkg-plist b/x11-fonts/libXft/pkg-plist
index 84173a9f777a..775edc9e6719 100644
--- a/x11-fonts/libXft/pkg-plist
+++ b/x11-fonts/libXft/pkg-plist
@@ -5,4 +5,4 @@ lib/libXft.a
 lib/libXft.so
 lib/libXft.so.2
 libdata/pkgconfig/xft.pc
-%%NEWMTREE%%@dirrm include/X11/Xft
+@dirrm include/X11/Xft
diff --git a/x11-servers/xorg-server-snap/pkg-plist b/x11-servers/xorg-server-snap/pkg-plist
index 2216cd1341ee..1b3331588efb 100644
--- a/x11-servers/xorg-server-snap/pkg-plist
+++ b/x11-servers/xorg-server-snap/pkg-plist
@@ -29,10 +29,6 @@ include/X11/bitmaps/shorter.xbm
 include/X11/bitmaps/taller.xbm
 include/X11/bitmaps/up.xbm
 include/X11/bitmaps/wider.xbm
-include/X11/fonts/bdfint.h
-include/X11/fonts/pcf.h
-include/X11/misc.h
-include/X11/os.h
 include/X11/pixmaps/card.xpm
 include/X11/pixmaps/computer.xpm
 include/X11/pixmaps/keyboard.xpm
@@ -209,4 +205,8 @@ lib/modules/multimedia/uda1380_drv.so
 @dirrm lib/modules/extensions
 @dirrm lib/modules/drivers
 @dirrm lib/X11/getconfig
+@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true
 @unexec rmdir %D/lib/X11/doc 2>/dev/null || true
+@unexec rmdir %D/lib/X11/etc 2>/dev/null || true
+@unexec rmdir %D/lib/X11/xserver 2>/dev/null || true
+@unexec rmdir %D/lib/modules 2>/dev/null || true
diff --git a/x11-toolkits/xview/Makefile b/x11-toolkits/xview/Makefile
index 3c7b0cbb81bb..2eae0fdbaf37 100644
--- a/x11-toolkits/xview/Makefile
+++ b/x11-toolkits/xview/Makefile
@@ -30,12 +30,6 @@ MAN1=		msgfmt.1 xgettext.1 xview.1
 
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} == "xorg"
-PLIST_SUB+=	XORG="@comment "
-.else
-PLIST_SUB+=	XORG=""
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's+/usr/X11R6+${PREFIX}+;' \
 	  ${WRKSRC}/config/XView.cf
diff --git a/x11-toolkits/xview/pkg-plist b/x11-toolkits/xview/pkg-plist
index a445358b2048..481436e10b27 100644
--- a/x11-toolkits/xview/pkg-plist
+++ b/x11-toolkits/xview/pkg-plist
@@ -510,7 +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
-%%XORG%%@unexec rmdir %D/include/bitmaps 2>/dev/null || true
+@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 ca019d518f41..e54224ff2fc6 100644
--- a/x11-wm/afterstep-i18n/Makefile
+++ b/x11-wm/afterstep-i18n/Makefile
@@ -82,12 +82,4 @@ post-install:
 .endfor
 .endif
 
-.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-wm/afterstep-i18n/pkg-plist b/x11-wm/afterstep-i18n/pkg-plist
index 4886fe60fb1e..9bcdadd227c6 100644
--- a/x11-wm/afterstep-i18n/pkg-plist
+++ b/x11-wm/afterstep-i18n/pkg-plist
@@ -66,4 +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
+@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true
diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile
index 2f51518e972b..dd21e86dba9a 100644
--- a/x11-wm/afterstep/Makefile
+++ b/x11-wm/afterstep/Makefile
@@ -71,12 +71,4 @@ post-install:
 			${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/lib/X11/afterstep/doc/; \
 		done
 
-.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-wm/afterstep/pkg-plist b/x11-wm/afterstep/pkg-plist
index 5e8e3f18ed44..6ccad541f2ba 100644
--- a/x11-wm/afterstep/pkg-plist
+++ b/x11-wm/afterstep/pkg-plist
@@ -59,4 +59,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
+@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true
diff --git a/x11-wm/fvwm/Makefile b/x11-wm/fvwm/Makefile
index 746605a1d08a..55d3cc788f35 100644
--- a/x11-wm/fvwm/Makefile
+++ b/x11-wm/fvwm/Makefile
@@ -37,12 +37,4 @@ post-install:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
 	${WRKSRC}/fvwm_icons/*.xpm ${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>
+.include <bsd.port.mk>
diff --git a/x11-wm/fvwm/pkg-plist b/x11-wm/fvwm/pkg-plist
index 49ce4a029b3b..3c7c2913a09b 100644
--- a/x11-wm/fvwm/pkg-plist
+++ b/x11-wm/fvwm/pkg-plist
@@ -59,4 +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
+@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true
diff --git a/x11/XFree86-aoutlibs/Makefile b/x11/XFree86-aoutlibs/Makefile
index 56091cc2516b..fd5cf182a39c 100644
--- a/x11/XFree86-aoutlibs/Makefile
+++ b/x11/XFree86-aoutlibs/Makefile
@@ -22,12 +22,6 @@ 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 1155af5fce6f..ad3bc6a4c9df 100644
--- a/x11/XFree86-aoutlibs/pkg-plist
+++ b/x11/XFree86-aoutlibs/pkg-plist
@@ -14,4 +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
+@dirrm lib/aout
diff --git a/x11/bricons/Makefile b/x11/bricons/Makefile
index 37ff1a0f46bd..5346068baa55 100644
--- a/x11/bricons/Makefile
+++ b/x11/bricons/Makefile
@@ -22,12 +22,6 @@ 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
 
diff --git a/x11/bricons/pkg-plist b/x11/bricons/pkg-plist
index 0c488ffd2d83..239f1a11077f 100644
--- a/x11/bricons/pkg-plist
+++ b/x11/bricons/pkg-plist
@@ -8,5 +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
+@unexec rmdir %D/include/X11/bitmaps 2>/dev/null || true
+@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true