diff options
| author | Dejan Lesjak <lesi@FreeBSD.org> | 2005-03-17 23:22:13 +0000 |
|---|---|---|
| committer | Dejan Lesjak <lesi@FreeBSD.org> | 2005-03-17 23:22:13 +0000 |
| commit | ac39221672c3c391a6c127d2fcc67a1fe3d4512e (patch) | |
| tree | de7ec01912bcb217296d86bd4fad9fd5b211f0cf /x11/xfree86_xkb_xml | |
| parent | - Update to 2.1.3. (diff) | |
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/xfree86_xkb_xml')
| -rw-r--r-- | x11/xfree86_xkb_xml/Makefile | 10 | ||||
| -rw-r--r-- | x11/xfree86_xkb_xml/pkg-plist | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/x11/xfree86_xkb_xml/Makefile b/x11/xfree86_xkb_xml/Makefile index 0f2bc1825c90..9d4204eee5e9 100644 --- a/x11/xfree86_xkb_xml/Makefile +++ b/x11/xfree86_xkb_xml/Makefile @@ -27,4 +27,12 @@ CONFIGURE_ARGS= --with-xkb-base=${X11BASE}/lib/X11/xkb CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -.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/xfree86_xkb_xml/pkg-plist b/x11/xfree86_xkb_xml/pkg-plist index 2fc155b4aa8b..e31f5ca63962 100644 --- a/x11/xfree86_xkb_xml/pkg-plist +++ b/x11/xfree86_xkb_xml/pkg-plist @@ -2,3 +2,5 @@ lib/X11/xkb/rules/xfree86.xml lib/X11/xkb/rules/xkb.dtd share/locale/bg/LC_MESSAGES/xfree86_xkb_xml.mo share/locale/ru/LC_MESSAGES/xfree86_xkb_xml.mo +%%NEWMTREE%%@unexec rmdir %D/lib/X11/xkb/rules 2>/dev/null || true +%%NEWMTREE%%@unexec rmdir %D/lib/X11/xkb 2>/dev/null || true |