aboutsummaryrefslogtreecommitdiff
path: root/x11-wm/vtwm
diff options
context:
space:
mode:
authorDejan Lesjak <lesi@FreeBSD.org>2005-03-17 23:22:13 +0000
committerDejan Lesjak <lesi@FreeBSD.org>2005-03-17 23:22:13 +0000
commitac39221672c3c391a6c127d2fcc67a1fe3d4512e (patch)
treede7ec01912bcb217296d86bd4fad9fd5b211f0cf /x11-wm/vtwm
parent7534bc4462725b61b62a62d09f6b0c18686624b9 (diff)
downloadports-ac39221672c3c391a6c127d2fcc67a1fe3d4512e.tar.gz
ports-ac39221672c3c391a6c127d2fcc67a1fe3d4512e.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)
Notes
Notes: svn path=/head/; revision=131533
Diffstat (limited to 'x11-wm/vtwm')
-rw-r--r--x11-wm/vtwm/Makefile10
-rw-r--r--x11-wm/vtwm/pkg-plist1
2 files changed, 10 insertions, 1 deletions
diff --git a/x11-wm/vtwm/Makefile b/x11-wm/vtwm/Makefile
index 7dde582f2b3f..0874291863fa 100644
--- a/x11-wm/vtwm/Makefile
+++ b/x11-wm/vtwm/Makefile
@@ -19,4 +19,12 @@ USE_XPM= yes
MAN1= vtwm.1
-.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/vtwm/pkg-plist b/x11-wm/vtwm/pkg-plist
index 2be80dd2f8b4..1dd612a354a3 100644
--- a/x11-wm/vtwm/pkg-plist
+++ b/x11-wm/vtwm/pkg-plist
@@ -1,2 +1,3 @@
bin/vtwm
lib/X11/twm/system.vtwmrc
+%%NEWMTREE%%@unexec rmdir %D/lib/X11/twm 2>/dev/null || true