aboutsummaryrefslogtreecommitdiffstats
path: root/x11-wm/ctwm
diff options
context:
space:
mode:
authorlesi <lesi@FreeBSD.org>2005-03-18 07:22:13 +0800
committerlesi <lesi@FreeBSD.org>2005-03-18 07:22:13 +0800
commitc39de4d86f08e509ed3f71318fbdea0e86bd8953 (patch)
tree7f52ececf3635c0aba9bd26a93c31ad4a3c0d99a /x11-wm/ctwm
parentab8ea40c4dff90c4f71bc78a344939b476f99580 (diff)
downloadfreebsd-ports-gnome-c39de4d86f08e509ed3f71318fbdea0e86bd8953.tar.gz
freebsd-ports-gnome-c39de4d86f08e509ed3f71318fbdea0e86bd8953.tar.zst
freebsd-ports-gnome-c39de4d86f08e509ed3f71318fbdea0e86bd8953.zip
Upgrade X.Org ports to 6.8.2.
Release notes are available at http://www.x.org/X11R6.8.2/doc/RELNOTES.html Thanks to kris and krion for running several cluster test builds, maintainers of GNOME for prompt responses, portmgr for postponing ports freeze for this update, testers on FreeBSD-X11@ list and others that I might have mised here. Also included: - fix for ATI Mobility on Dell Inspiron 7500 (obtained from Marc Aurele La France; obtained and tested by julian) - fix for kbd driver on Sparc64 (tested by Aaron Dudek, Michael G. Jung and Matthias Muthmann), which still appears to have problems with some keyboards - so - fix for kbd driver on PC98 (reported and tested by NAKAJI Hiroyuki; PR ports/77217) - fix for i810 on HP D530 (obtained from Egbert Eich; obtained and tested by Anders Nor Berle; PR ports/74757)
Diffstat (limited to 'x11-wm/ctwm')
-rw-r--r--x11-wm/ctwm/Makefile10
-rw-r--r--x11-wm/ctwm/pkg-plist1
2 files changed, 10 insertions, 1 deletions
diff --git a/x11-wm/ctwm/Makefile b/x11-wm/ctwm/Makefile
index 57c1f2c64da1..a3b5ff171a47 100644
--- a/x11-wm/ctwm/Makefile
+++ b/x11-wm/ctwm/Makefile
@@ -25,4 +25,12 @@ MAN1= ctwm.1
post-extract:
@(cd ${WRKSRC} && ${LN} -s ../xpm xpm)
-.include <bsd.port.mk>
+.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>
diff --git a/x11-wm/ctwm/pkg-plist b/x11-wm/ctwm/pkg-plist
index 63f9f3f850b0..a4646df20bb6 100644
--- a/x11-wm/ctwm/pkg-plist
+++ b/x11-wm/ctwm/pkg-plist
@@ -90,3 +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