4 files changed, 4 insertions, 20 deletions
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