aboutsummaryrefslogtreecommitdiffstats
path: root/japanese
diff options
context:
space:
mode:
Diffstat (limited to 'japanese')
-rw-r--r--japanese/Wnn6-lib/Makefile10
-rw-r--r--japanese/Wnn7-lib/Makefile10
-rw-r--r--japanese/alias-fonts/Makefile11
-rw-r--r--japanese/elisa10x8/Makefile6
-rw-r--r--japanese/elisa8x8/Makefile6
-rw-r--r--japanese/font-mplus/Makefile8
-rw-r--r--japanese/font-shinonome/Makefile8
-rw-r--r--japanese/iv/Makefile10
-rw-r--r--japanese/jisx0213-fonts/Makefile13
-rw-r--r--japanese/k10/Makefile9
-rw-r--r--japanese/k12/Makefile8
-rw-r--r--japanese/kanji18/Makefile9
-rw-r--r--japanese/kappa20/Makefile9
-rw-r--r--japanese/kterm16c/Makefile9
-rw-r--r--japanese/marumoji-fonts/Makefile9
-rw-r--r--japanese/monafonts/Makefile11
-rw-r--r--japanese/mplusfonts/Makefile8
-rw-r--r--japanese/ngraph-fonts/Makefile11
-rw-r--r--japanese/oleo/Makefile2
-rw-r--r--japanese/shinonome/Makefile8
-rw-r--r--japanese/vflib/Makefile2
21 files changed, 59 insertions, 118 deletions
diff --git a/japanese/Wnn6-lib/Makefile b/japanese/Wnn6-lib/Makefile
index 6098756e685b..ad99568f65c1 100644
--- a/japanese/Wnn6-lib/Makefile
+++ b/japanese/Wnn6-lib/Makefile
@@ -14,13 +14,7 @@ DISTNAME= Wnn6-SDK
MAINTAINER= taoka@FreeBSD.org
COMMENT= Include files and a library of Wnn6
-.include <bsd.port.pre.mk>
-
-.if ${XFREE86_VERSION} == 3
-BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake
-.else
-BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake-4
-.endif
+BUILD_DEPENDS= imake:${X_IMAKE_PORT}
WRKSRC= ${WRKDIR}/src/contrib/im/Xsi
DOCDIR= ${PREFIX}/share/doc/ja-Wnn6-lib
@@ -31,6 +25,8 @@ INSTALLS_SHLIB= yes
do-build:
( cd ${WRKSRC} ; make World -f Makefile.ini )
+.include <bsd.port.pre.mk>
+
post-install:
.if ${PORTOBJFORMAT} == "aout"
${LN} -sf libwnn6.so.1.0 ${PREFIX}/lib/libwnn6.so
diff --git a/japanese/Wnn7-lib/Makefile b/japanese/Wnn7-lib/Makefile
index 8758da751955..ec94e50574ce 100644
--- a/japanese/Wnn7-lib/Makefile
+++ b/japanese/Wnn7-lib/Makefile
@@ -15,13 +15,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= taoka@FreeBSD.org
COMMENT= Include files and a library of Wnn7
-.include <bsd.port.pre.mk>
-
-.if ${XFREE86_VERSION} == 3
-BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake
-.else
-BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake-4
-.endif
+BUILD_DEPENDS= imake:${X_IMAKE_PORT}
WRKSRC= ${WRKDIR}/src
DOCDIR= ${PREFIX}/share/doc/ja-Wnn7-lib
@@ -32,6 +26,8 @@ INSTALLS_SHLIB= yes
do-build:
( cd ${WRKSRC} ; make World -f Makefile.ini )
+.include <bsd.port.pre.mk>
+
post-install:
.if ${PORTOBJFORMAT} == "aout"
${LN} -sf libwnn7.so.1.0 ${PREFIX}/lib/libwnn7.so
diff --git a/japanese/alias-fonts/Makefile b/japanese/alias-fonts/Makefile
index 0c9867f78b62..0df9826f68dc 100644
--- a/japanese/alias-fonts/Makefile
+++ b/japanese/alias-fonts/Makefile
@@ -20,21 +20,16 @@ RUN_DEPENDS= \
${FONTSDIR}/kanji18.pcf.gz:${PORTSDIR}/japanese/kanji18 \
${FONTSDIR}/k20b.pcf.gz:${PORTSDIR}/japanese/kappa20 \
${FONTSDIR}/kanji26.pcf.gz:${PORTSDIR}/japanese/kanji26 \
- ${FONTSDIR}/K12-1.pcf.gz:${PORTSDIR}/japanese/jisx0213-fonts
+ ${FONTSDIR}/K12-1.pcf.gz:${PORTSDIR}/japanese/jisx0213-fonts \
+ mkfontdir:${X_CLIENTS_PORT}
NO_BUILD= yes
USE_X_PREFIX= yes
-.include <bsd.port.pre.mk>
-
-.if ${XFREE86_VERSION} == 4
-RUN_DEPENDS+= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
-.endif
-
FONTSDIR= ${X11BASE}/lib/X11/fonts/local
do-install:
@${SETENV} PKG_PREFIX=${PREFIX} \
${PERL} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/elisa10x8/Makefile b/japanese/elisa10x8/Makefile
index bfcdc1472d85..0dfdf549e9ca 100644
--- a/japanese/elisa10x8/Makefile
+++ b/japanese/elisa10x8/Makefile
@@ -19,14 +19,12 @@ EXTRACT_ONLY= elisau10.tgz
MAINTAINER= ishijima@tri.pref.osaka.jp
COMMENT= X11 8-dot kanji font 'elisa font'
+RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT}
+
USE_X_PREFIX= yes
.include <bsd.port.pre.mk>
-.if ${XFREE86_VERSION} == 4
-RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
-.endif
-
NO_WRKSUBDIR= yes
FONTSDIR= lib/X11/fonts/local
diff --git a/japanese/elisa8x8/Makefile b/japanese/elisa8x8/Makefile
index 2466f88298d0..427abd8f5568 100644
--- a/japanese/elisa8x8/Makefile
+++ b/japanese/elisa8x8/Makefile
@@ -14,14 +14,12 @@ DISTNAME= elisat10
MAINTAINER= toshi@tea.forus.or.jp
COMMENT= X11 8-dot kanji font 'elisa font'
+RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT}
+
USE_X_PREFIX= yes
.include <bsd.port.pre.mk>
-.if ${XFREE86_VERSION} == 4
-RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
-.endif
-
NO_WRKSUBDIR= yes
BDFTOPCF_CMD= ${PREFIX}/bin/bdftopcf
diff --git a/japanese/font-mplus/Makefile b/japanese/font-mplus/Makefile
index 11bf1d8dc56d..9e376fa3b6c4 100644
--- a/japanese/font-mplus/Makefile
+++ b/japanese/font-mplus/Makefile
@@ -15,16 +15,14 @@ DISTNAME= mplus_bitmap_fonts-${PORTVERSION}
MAINTAINER= Ys@PixyGarden.net
COMMENT= 12x13 dots X11 kanji fonts with simple and readable design
+BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT}
+RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT}
+
NO_BUILD= yes
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
-
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}
DOCS= INSTALL_E LICENSE_E README_E \
INSTALL_J LICENSE_J README_J
diff --git a/japanese/font-shinonome/Makefile b/japanese/font-shinonome/Makefile
index afbe6a9140cd..e9f5ea9858fe 100644
--- a/japanese/font-shinonome/Makefile
+++ b/japanese/font-shinonome/Makefile
@@ -15,6 +15,9 @@ MASTER_SITE_SUBDIR= . old
MAINTAINER= yoichi@FreeBSD.org
COMMENT= Japanese 12,14,16 dot fonts
+BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT}
+RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT}
+
USE_BZIP2= yes
HAS_CONFIGURE= yes
USE_GMAKE= yes
@@ -25,11 +28,6 @@ CONFIGURE_ARGS= --with-fontdir=${PREFIX}/${FONTSDIR} --enable-compress
.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
-
FONTNAMES=\
shnm6x12a shnm6x12ab shnm6x12ai shnm6x12abi \
shnm6x12r shnm6x12rb shnm6x12ri shnm6x12rbi \
diff --git a/japanese/iv/Makefile b/japanese/iv/Makefile
index 96cfa5ca4adb..52bde70ea97d 100644
--- a/japanese/iv/Makefile
+++ b/japanese/iv/Makefile
@@ -21,19 +21,15 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= ports@FreeBSD.org
COMMENT= A toolkit from Stanford University and Silicon Graphics + Japanese patches
+# Warning: we cannot use USE_IMAKE.
+BUILD_DEPENDS= imake:${X_IMAKE_PORT}
+
.include <bsd.port.pre.mk>
.if ${OSVERSION} > 502112
BROKEN= "Does not compile on FreeBSD >= 5.x"
.endif
-# Warning: we cannot use USE_IMAKE.
-.if ${XFREE86_VERSION} == 3
-BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake
-.else
-BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake-4
-.endif
-
USE_GCC= 2.95
USE_XLIB= yes
DIST_SUBDIR= iv
diff --git a/japanese/jisx0213-fonts/Makefile b/japanese/jisx0213-fonts/Makefile
index 93bbf766e562..f7b2e0e53332 100644
--- a/japanese/jisx0213-fonts/Makefile
+++ b/japanese/jisx0213-fonts/Makefile
@@ -19,19 +19,14 @@ MAINTAINER= yoichi@FreeBSD.org
COMMENT= Japanese jisx0213 fonts
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}
NO_WRKSUBDIR= yes
USE_X_PREFIX= yes
FONTSDIR= lib/X11/fonts/local
-.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= ${CP}
EXTRACT_BEFORE_ARGS= -p
EXTRACT_AFTER_ARGS= ${WRKDIR}
@@ -50,4 +45,4 @@ pre-install:
post-install:
@(cd ${PREFIX}/${FONTSDIR}; mkfontdir)
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/k10/Makefile b/japanese/k10/Makefile
index 6d8f93f0aa00..84e3c2b8117f 100644
--- a/japanese/k10/Makefile
+++ b/japanese/k10/Makefile
@@ -16,17 +16,14 @@ MAINTAINER= usagi@clave.gr.jp
COMMENT= X11 10-dot kanji font 'naga10 font'
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}
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
-
FONTSDIR= lib/X11/fonts/local
MAKE_ENV= FONTSDIR=${FONTSDIR}
PLIST_SUB= FONTSDIR=${FONTSDIR}
diff --git a/japanese/k12/Makefile b/japanese/k12/Makefile
index 975d78148620..9f235201e378 100644
--- a/japanese/k12/Makefile
+++ b/japanese/k12/Makefile
@@ -17,15 +17,13 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
MAINTAINER= mita@jp.FreeBSD.org
COMMENT= X11 12-dot kanji font
+BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT}
+RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT}
+
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
-
WRKSRC= ${WRKDIR}/fonts
EXTRACT_ONLY= knm_new_linux.tar.gz
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)
diff --git a/japanese/kappa20/Makefile b/japanese/kappa20/Makefile
index b970eaee6c88..0f09bd0b2db2 100644
--- a/japanese/kappa20/Makefile
+++ b/japanese/kappa20/Makefile
@@ -23,15 +23,12 @@ USE_BZIP2= yes
AYUDISTNAME= ayu20gothic-1.4
AYU_SUFFIX= .tar.gz
-BUILD_DEPENDS= mkitalic:${PORTSDIR}/x11-fonts/mkitalic
+BUILD_DEPENDS= mkitalic:${PORTSDIR}/x11-fonts/mkitalic \
+ bdftopcf:${X_CLIENTS_PORT}
+RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT}
.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
-
FONTSDIR= lib/X11/fonts/local
MAKE_ENV= INSTALL_DATA="${INSTALL_DATA}"
MAKE_ARGS= FONTSDIR="${FONTSDIR}"
diff --git a/japanese/kterm16c/Makefile b/japanese/kterm16c/Makefile
index e9d08ff00bd3..96c1971974cb 100644
--- a/japanese/kterm16c/Makefile
+++ b/japanese/kterm16c/Makefile
@@ -27,18 +27,15 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= kiri@FreeBSD.org
COMMENT= An xterm that speaks Japanese with 16 colors like on a VGA
-BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/nkf
+BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/nkf \
+ mkfontdir:${X_CLIENTS_PORT}
+EXTRACT_DEPENDS=bdftopcf:${X_CLIENTS_PORT}
USE_IMAKE= yes
USE_XPM= yes
.include <bsd.port.pre.mk>
-.if ${XFREE86_VERSION} == 4
-EXTRACT_DEPENDS+=bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
-BUILD_DEPENDS+= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
-.endif
-
DOCDIR= ${PREFIX}/share/doc/kterm16c
post-extract:
diff --git a/japanese/marumoji-fonts/Makefile b/japanese/marumoji-fonts/Makefile
index 39979c0d8928..d97064adc008 100644
--- a/japanese/marumoji-fonts/Makefile
+++ b/japanese/marumoji-fonts/Makefile
@@ -24,7 +24,9 @@ MAINTAINER= yoichi@FreeBSD.org
COMMENT= Japanese marumoji fonts
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}
NO_WRKSUBDIR= yes
USE_X_PREFIX= yes
@@ -32,11 +34,6 @@ FONTSDIR= lib/X11/fonts/local
.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= ${CP}
EXTRACT_BEFORE_ARGS= -p
EXTRACT_AFTER_ARGS= ${WRKDIR}
diff --git a/japanese/monafonts/Makefile b/japanese/monafonts/Makefile
index 390998116d3b..4c0b55ae500a 100644
--- a/japanese/monafonts/Makefile
+++ b/japanese/monafonts/Makefile
@@ -16,17 +16,14 @@ DISTNAME= monafont-${PORTVERSION}
MAINTAINER= nobutaka@FreeBSD.org
COMMENT= X11 12,14,16-dot kanji fonts
+BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT}
+RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT}
+
FONTSDIR= lib/X11/fonts/local
USE_BZIP2= yes
USE_X_PREFIX= yes
ALL_TARGET= bdf
MAKE_ARGS= PREFIX=${PREFIX}
-.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
PLIST_SUB= FONTSDIR=${FONTSDIR}
@@ -34,4 +31,4 @@ pre-install:
@${SETENV} PKG_PREFIX=${PREFIX} \
${SH} ${PKGREQ} ${PKGNAME} INSTALL
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/mplusfonts/Makefile b/japanese/mplusfonts/Makefile
index 11bf1d8dc56d..9e376fa3b6c4 100644
--- a/japanese/mplusfonts/Makefile
+++ b/japanese/mplusfonts/Makefile
@@ -15,16 +15,14 @@ DISTNAME= mplus_bitmap_fonts-${PORTVERSION}
MAINTAINER= Ys@PixyGarden.net
COMMENT= 12x13 dots X11 kanji fonts with simple and readable design
+BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT}
+RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT}
+
NO_BUILD= yes
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
-
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}
DOCS= INSTALL_E LICENSE_E README_E \
INSTALL_J LICENSE_J README_J
diff --git a/japanese/ngraph-fonts/Makefile b/japanese/ngraph-fonts/Makefile
index d23e7a70d499..6e975f202dd5 100644
--- a/japanese/ngraph-fonts/Makefile
+++ b/japanese/ngraph-fonts/Makefile
@@ -16,18 +16,13 @@ COMMENT= Japanese Font Setup for math/ngraph
RUN_DEPENDS= \
${X11BASE}/lib/X11/fonts/local/kanji18.pcf.gz:${PORTSDIR}/japanese/kanji18 \
- ${X11BASE}/lib/X11/fonts/local/kanji26.pcf.gz:${PORTSDIR}/japanese/kanji26
+ ${X11BASE}/lib/X11/fonts/local/kanji26.pcf.gz:${PORTSDIR}/japanese/kanji26 \
+ mkfontdir:${X_CLIENTS_PORT}
USE_X_PREFIX= yes
-.include <bsd.port.pre.mk>
-
-.if ${XFREE86_VERSION} == 4
-RUN_DEPENDS+= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
-.endif
-
NO_BUILD= yes
do-install: # empty
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/oleo/Makefile b/japanese/oleo/Makefile
index d78cba87ae0b..1e1a2c92d9df 100644
--- a/japanese/oleo/Makefile
+++ b/japanese/oleo/Makefile
@@ -22,7 +22,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A Spreadsheet Program + Japanese patches
# xmkmf is for configure script, not for USE_IMAKE.
-BUILD_DEPENDS= xmkmf:${PORTSDIR}/devel/imake-4
+BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/japanese/shinonome/Makefile b/japanese/shinonome/Makefile
index afbe6a9140cd..e9f5ea9858fe 100644
--- a/japanese/shinonome/Makefile
+++ b/japanese/shinonome/Makefile
@@ -15,6 +15,9 @@ MASTER_SITE_SUBDIR= . old
MAINTAINER= yoichi@FreeBSD.org
COMMENT= Japanese 12,14,16 dot fonts
+BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT}
+RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT}
+
USE_BZIP2= yes
HAS_CONFIGURE= yes
USE_GMAKE= yes
@@ -25,11 +28,6 @@ CONFIGURE_ARGS= --with-fontdir=${PREFIX}/${FONTSDIR} --enable-compress
.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
-
FONTNAMES=\
shnm6x12a shnm6x12ab shnm6x12ai shnm6x12abi \
shnm6x12r shnm6x12rb shnm6x12ri shnm6x12rbi \
diff --git a/japanese/vflib/Makefile b/japanese/vflib/Makefile
index d9a1575d1abb..9bfbcc2ec389 100644
--- a/japanese/vflib/Makefile
+++ b/japanese/vflib/Makefile
@@ -16,7 +16,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= mita@FreeBSD.org
COMMENT= Japanese Vector font library
-BUILD_DEPENDS= xmkmf:${PORTSDIR}/devel/imake-4
+BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT}
RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTSDIR}/japanese/kochi-ttfonts
VFLIB_VERSION= 2.25.6
generated by cgit (git 2.34.1) at 2025-02-19 07:41:09 +0800