Fix up plist after modifications to mtree (BSD.x11-4.dist rev. 1.27).

10 files changed, 34 insertions, 23 deletions

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