diff options
author | Eric Anholt <anholt@FreeBSD.org> | 2004-07-23 19:10:32 +0000 |
---|---|---|
committer | Eric Anholt <anholt@FreeBSD.org> | 2004-07-23 19:10:32 +0000 |
commit | 4eb209da7d941e66e0cb065aead6bda76c9e97f3 (patch) | |
tree | c9cf2fdcee3885499960b9c706dacac0a0080f8e /japanese/kanji18 | |
parent | b188150955302fdc3c1402eb0688a84d1f2cf451 (diff) | |
download | ports-4eb209da7d941e66e0cb065aead6bda76c9e97f3.tar.gz ports-4eb209da7d941e66e0cb065aead6bda76c9e97f3.zip |
- Add the X_WINDOW_SYSTEM={xorg,xfree86-4,xfree86-3} variable to bsd.port.mk,
and make XFREE86_VERSION map to it. XFREE86_VERSION is now deprecated.
- Make xorg the default X_WINDOW_SYSTEM on -current.
- Add several new X_*_PORT variables which point to various pieces of X11 based
on the setting of X_WINDOW_SYSTEM, and make ports use them.
- Add information to CHANGES about how to handle the transition.
PR: ports/68763
Approved by: portmgr (marcus)
Approved by: re (scottl)
Notes
Notes:
svn path=/head/; revision=114511
Diffstat (limited to 'japanese/kanji18')
-rw-r--r-- | japanese/kanji18/Makefile | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/japanese/kanji18/Makefile b/japanese/kanji18/Makefile index 4f6b6cb810b1..a35245b5288f 100644 --- a/japanese/kanji18/Makefile +++ b/japanese/kanji18/Makefile @@ -20,7 +20,9 @@ COMMENT= X11 ${PKGNAMESUFFIX}-dot kanji font EXTRACT_DEPENDS= gunshar:${PORTSDIR}/archivers/sharutils BUILD_DEPENDS= mkbold:${PORTSDIR}/x11-fonts/mkbold \ - mkitalic:${PORTSDIR}/x11-fonts/mkitalic + mkitalic:${PORTSDIR}/x11-fonts/mkitalic \ + bdftopcf:${X_CLIENTS_PORT} +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} DIST_SUBDIR= ${DISTNAME} FONTSDIR= lib/X11/fonts/local @@ -29,11 +31,6 @@ USE_X_PREFIX= yes .include <bsd.port.pre.mk> -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS+= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif - EXTRACT_CMD= zcat EXTRACT_BEFORE_ARGS= EXTRACT_AFTER_ARGS= | gunshar -d $(WRKDIR) |