summaryrefslogtreecommitdiff
path: root/japanese
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 /japanese
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 'japanese')
-rw-r--r--japanese/kterm16c/Makefile7
-rw-r--r--japanese/kterm16c/pkg-plist1
2 files changed, 8 insertions, 0 deletions
diff --git a/japanese/kterm16c/Makefile b/japanese/kterm16c/Makefile
index 4c51da0c5efb..56b77dbc9b09 100644
--- a/japanese/kterm16c/Makefile
+++ b/japanese/kterm16c/Makefile
@@ -38,6 +38,12 @@ USE_XPM= yes
DOCDIR= ${PREFIX}/share/doc/kterm16c
+.if ${X_WINDOW_SYSTEM:L} == xorg
+PLIST_SUB+= NEWMTREE=""
+.else
+PLIST_SUB+= NEWMTREE="@comment "
+.endif
+
post-extract:
@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
${DISTDIR}/${DIST_SUBDIR}/pcemu1.01alpha.tar.gz \
@@ -69,6 +75,7 @@ post-patch:
do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/kterm ${PREFIX}/bin/kterm16c
@${INSTALL_DATA} ${WRKSRC}/KTerm.ad ${PREFIX}/lib/X11/app-defaults/KTerm
+ @${MKDIR} ${PREFIX}/lib/X11/fonts/misc
@${INSTALL_DATA} ${WRKDIR}/pcemu1.01alpha/vga.pcf.gz \
${PREFIX}/lib/X11/fonts/misc
@mkfontdir ${PREFIX}/lib/X11/fonts/misc
diff --git a/japanese/kterm16c/pkg-plist b/japanese/kterm16c/pkg-plist
index b5ff5c29ceb8..b15cee379c46 100644
--- a/japanese/kterm16c/pkg-plist
+++ b/japanese/kterm16c/pkg-plist
@@ -6,3 +6,4 @@ lib/X11/fonts/misc/vga.pcf.gz
share/doc/kterm16c/dot.termcap
share/doc/kterm16c/kterm16c.doc
@dirrm share/doc/kterm16c
+%%NEWMTREE%%@unexec rmdir %D/lib/X11/fonts/misc 2>/dev/null || true