From 5066edac69f0b75a3904e5aaa7fbcf3c140dc131 Mon Sep 17 00:00:00 2001
From: Dejan Lesjak <lesi@FreeBSD.org>
Date: Wed, 15 Jun 2005 02:42:14 +0000
Subject: Fix up plist after modifications to mtree (BSD.x11-4.dist rev. 1.27).

---
 x11-wm/fvwm/Makefile  | 10 +++++++++-
 x11-wm/fvwm/pkg-plist |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'x11-wm/fvwm')

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
-- 
cgit v1.2.3