diff options
| author | miwi <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
| commit | bce9b81f9d6099820f3839d7809d6b08c1d2ae7b (patch) | |
| tree | f5dd7c3a8dbebad79bdb5e844aeb69c59a9fd12c /japanese | |
| parent | 2eea5f1d2e44418020f8f4db08d40bea6915b6e8 (diff) | |
| download | FreeBSD-ports-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.zip FreeBSD-ports-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.tar.gz | |
- Remove unneeded dependency from gtk12/gtk20 [1]
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG
- Remove X11BASE support in favor of LOCALBASE or PREFIX
- Use USE_LDCONFIG instead of INSTALLS_SHLIB
- Remove unneeded USE_GCC 3.4+
Thanks to all Helpers:
Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr,
ehaupt, nox, itetcu, flz, pav
PR: 116263
Tested on: pointyhat
Approved by: portmgr (pav)
Diffstat (limited to 'japanese')
122 files changed, 271 insertions, 296 deletions
diff --git a/japanese/Canna/Makefile b/japanese/Canna/Makefile index 34c1243..9f6cdb7 100644 --- a/japanese/Canna/Makefile +++ b/japanese/Canna/Makefile @@ -8,6 +8,7 @@ PORTNAME= Canna PORTVERSION= 3.7p3 +PORTREVISION= 1 CATEGORIES= japanese MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} MASTER_SITE_SUBDIR= canna/9565/ @@ -19,7 +20,6 @@ COMMENT= Kana-Kanji conversion system USE_RC_SUBR= yes USE_BZIP2= yes USE_IMAKE= yes -USE_X_PREFIX= no ALL_TARGET= canna USE_LDCONFIG= yes MAKE_ENV+= CC=$(CC) diff --git a/japanese/Wnn6-lib/Makefile b/japanese/Wnn6-lib/Makefile index 4c32bc2..bcb9020 100644 --- a/japanese/Wnn6-lib/Makefile +++ b/japanese/Wnn6-lib/Makefile @@ -14,7 +14,7 @@ DISTNAME= Wnn6-SDK MAINTAINER= ports@FreeBSD.org COMMENT= Include files and a library of Wnn6 -BUILD_DEPENDS= imake:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake WRKSRC= ${WRKDIR}/src/contrib/im/Xsi DOCDIR= ${PREFIX}/share/doc/ja-Wnn6-lib @@ -22,7 +22,7 @@ DOCDIR= ${PREFIX}/share/doc/ja-Wnn6-lib USE_LDCONFIG= yes post-patch: - @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' \ + @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \ ${WRKSRC}/config/Project.tmpl \ ${WRKSRC}/config/X11.tmpl \ ${WRKSRC}/Makefile.ini diff --git a/japanese/Wnn7-lib/Makefile b/japanese/Wnn7-lib/Makefile index 0dde039..0f43ceb 100644 --- a/japanese/Wnn7-lib/Makefile +++ b/japanese/Wnn7-lib/Makefile @@ -15,7 +15,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Include files and a library of Wnn7 -BUILD_DEPENDS= imake:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake WRKSRC= ${WRKDIR}/src DOCDIR= ${PREFIX}/share/doc/ja-Wnn7-lib @@ -25,7 +25,7 @@ USE_LDCONFIG= yes .include <bsd.port.pre.mk> post-patch: - @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' \ + @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \ ${WRKSRC}/config/Project.tmpl \ ${WRKSRC}/config/X11.tmpl \ ${WRKSRC}/Makefile.ini diff --git a/japanese/alias-fonts/Makefile b/japanese/alias-fonts/Makefile index ea1772a..6b8916f 100644 --- a/japanese/alias-fonts/Makefile +++ b/japanese/alias-fonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= alias-fonts PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= japanese x11-fonts DISTFILES= # empty @@ -15,20 +15,21 @@ MAINTAINER= koma2@lovepeers.org COMMENT= A meta-port which setups Japanese fonts RUN_DEPENDS= \ - ${FONTSDIR}/jpnhn4-iso.pcf.gz:${PORTSDIR}/japanese/elisa8x8 \ - ${FONTSDIR}/5x10B.pcf.gz:${PORTSDIR}/japanese/k10 \ - ${FONTSDIR}/shnmk12.pcf.gz:${PORTSDIR}/japanese/shinonome \ - ${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 \ - mkfontdir:${X_CLIENTS_PORT} + ${FONTSDIR}/jpnhn4-iso.pcf.gz:${PORTSDIR}/japanese/elisa8x8 \ + ${FONTSDIR}/5x10B.pcf.gz:${PORTSDIR}/japanese/k10 \ + ${FONTSDIR}/shnmk12.pcf.gz:${PORTSDIR}/japanese/shinonome \ + ${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 +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale NO_BUILD= yes -USE_X_PREFIX= yes USE_PERL5= yes -FONTSDIR= ${X11BASE}/lib/X11/fonts/local +FONTSDIR= ${LOCALBASE}/lib/X11/fonts/local do-install: @${SETENV} PKG_PREFIX=${PREFIX} \ diff --git a/japanese/anthy/Makefile b/japanese/anthy/Makefile index e84ac4c..16f98c8 100644 --- a/japanese/anthy/Makefile +++ b/japanese/anthy/Makefile @@ -18,7 +18,7 @@ MAINTAINER= nobutaka@FreeBSD.org COMMENT= Another kana-kanji conversion system GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_GNOME= gnometarget lthack pkgconfig DOCSDIR= share/doc/ja/anthy diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile index 34c1243..9f6cdb7 100644 --- a/japanese/canna-lib/Makefile +++ b/japanese/canna-lib/Makefile @@ -8,6 +8,7 @@ PORTNAME= Canna PORTVERSION= 3.7p3 +PORTREVISION= 1 CATEGORIES= japanese MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} MASTER_SITE_SUBDIR= canna/9565/ @@ -19,7 +20,6 @@ COMMENT= Kana-Kanji conversion system USE_RC_SUBR= yes USE_BZIP2= yes USE_IMAKE= yes -USE_X_PREFIX= no ALL_TARGET= canna USE_LDCONFIG= yes MAKE_ENV+= CC=$(CC) diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile index 34c1243..9f6cdb7 100644 --- a/japanese/canna-server/Makefile +++ b/japanese/canna-server/Makefile @@ -8,6 +8,7 @@ PORTNAME= Canna PORTVERSION= 3.7p3 +PORTREVISION= 1 CATEGORIES= japanese MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} MASTER_SITE_SUBDIR= canna/9565/ @@ -19,7 +20,6 @@ COMMENT= Kana-Kanji conversion system USE_RC_SUBR= yes USE_BZIP2= yes USE_IMAKE= yes -USE_X_PREFIX= no ALL_TARGET= canna USE_LDCONFIG= yes MAKE_ENV+= CC=$(CC) diff --git a/japanese/ebview-gtk2/Makefile b/japanese/ebview-gtk2/Makefile index c6a70bd..fd63bc2 100644 --- a/japanese/ebview-gtk2/Makefile +++ b/japanese/ebview-gtk2/Makefile @@ -7,10 +7,9 @@ PORTNAME= ebview PORTVERSION= 0.3.6 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= japanese -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF PKGNAMESUFFIX= -gtk2 MAINTAINER= ports@FreeBSD.org @@ -22,7 +21,6 @@ CONFLICTS= ja-ebview-0* USE_GNOME= gtk20 gnometarget USE_GMAKE= yes -USE_X_PREFIX= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-eb-conf=${LOCALBASE}/etc/eb.conf CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/japanese/elisa8x8/Makefile b/japanese/elisa8x8/Makefile index fe183f0..349e46c 100644 --- a/japanese/elisa8x8/Makefile +++ b/japanese/elisa8x8/Makefile @@ -7,7 +7,7 @@ PORTNAME= elisa8x8 PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese x11-fonts MASTER_SITES= http://www.bsdbbq.org/~toshi/distfiles/ DISTNAME= elisat10 @@ -15,9 +15,9 @@ 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 +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale .include <bsd.port.pre.mk> diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile index 9c4f993..db2ca49 100644 --- a/japanese/emacs-emcws/Makefile +++ b/japanese/emacs-emcws/Makefile @@ -7,7 +7,7 @@ PORTNAME= emcws PORTVERSION= ${EMACS_VER} -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= japanese editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= emacs @@ -49,7 +49,7 @@ CONFIGURE_TARGET= ${MACHINE_ARCH}--freebsd .if !defined(NO_X11) CONFIGURE_ARGS= --with-x-toolkit --with-pop -USE_XLIB= YES +USE_X11= x11 .else CONFIGURE_ARGS= --with-x=no --with-pop .endif diff --git a/japanese/font-ipa/Makefile b/japanese/font-ipa/Makefile index 2592d92..2617ef4 100644 --- a/japanese/font-ipa/Makefile +++ b/japanese/font-ipa/Makefile @@ -43,10 +43,10 @@ do-install: ${LN} -s -f \ ${DATADIR}/fonts/ipa*.ttf ${DATADIR}/fonts/M+*.ttf \ ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/ - ${MKDIR} ${X11BASE}/${X_FONTSDIR}/TrueType + ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TrueType ${LN} -s -f \ ${DATADIR}/fonts/ipa*.ttf ${DATADIR}/fonts/M+*.ttf \ - ${X11BASE}/${X_FONTSDIR}/TrueType/ + ${LOCALBASE}/${X_FONTSDIR}/TrueType/ ${MKDIR} ${PREFIX}/etc/fonts/conf.d ${INSTALL_DATA} ${FILESDIR}/20-unhint-ipattfonts.conf \ ${FILESDIR}/62-fonts-ipattfonts.conf \ @@ -57,7 +57,7 @@ do-install: .endif post-install: - ${X11BASE}/bin/fc-cache -f -v ${X11BASE}/${X_FONTSDIR}/TrueType + ${LOCALBASE}/bin/fc-cache -f -v ${LOCALBASE}/${X_FONTSDIR}/TrueType ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/japanese/font-ipa/pkg-plist b/japanese/font-ipa/pkg-plist index 24553e9..ec83895 100644 --- a/japanese/font-ipa/pkg-plist +++ b/japanese/font-ipa/pkg-plist @@ -81,7 +81,6 @@ %%LOCAL_FONTSDIR%%/TrueType/M+1P+IPAG-circle.ttf @dirrmtry %%LOCAL_FONTSDIR%%/TrueType @dirrmtry %%LOCAL_FONTSDIR%% -@cwd %%X11BASE%% etc/fonts/conf.d/20-unhint-ipattfonts.conf etc/fonts/conf.d/62-fonts-ipattfonts.conf %%X_FONTSDIR%%/TrueType/ipag.ttf @@ -95,8 +94,8 @@ etc/fonts/conf.d/62-fonts-ipattfonts.conf %%X_FONTSDIR%%/TrueType/M+1VM+IPAG-circle.ttf %%X_FONTSDIR%%/TrueType/M+1P+IPAG.ttf %%X_FONTSDIR%%/TrueType/M+1P+IPAG-circle.ttf -@exec %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true -@unexec %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true +@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true +@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true @unexec rm -f %D/%%X_FONTSDIR%%/TrueType/fonts.cache-1 @dirrmtry %%X_FONTSDIR%%/TrueType -@unexec if [ -d %D/%%X_FONTSDIR%%/TrueType ]; then %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true; fi +@unexec if [ -d %D/%%X_FONTSDIR%%/TrueType ]; then %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true; fi diff --git a/japanese/font-kochi/Makefile b/japanese/font-kochi/Makefile index 46361a3..6dd53fd 100644 --- a/japanese/font-kochi/Makefile +++ b/japanese/font-kochi/Makefile @@ -7,7 +7,7 @@ PORTNAME= kochi-ttfonts PORTVERSION= 20030809 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese x11-fonts MASTER_SITES= http://downloads.sourceforge.jp/efont/5411/ \ ${MASTER_SITE_PORTS_JP} @@ -16,7 +16,6 @@ DISTFILES= kochi-substitute-${PORTVERSION}.tar.bz2 MAINTAINER= ports@FreeBSD.org COMMENT= Free Japanese TrueType fonts named 'Kochi' -USE_X_PREFIX= yes USE_BZIP2= yes NO_BUILD= yes diff --git a/japanese/font-mplus-ipa/Makefile b/japanese/font-mplus-ipa/Makefile index 2592d92..2617ef4 100644 --- a/japanese/font-mplus-ipa/Makefile +++ b/japanese/font-mplus-ipa/Makefile @@ -43,10 +43,10 @@ do-install: ${LN} -s -f \ ${DATADIR}/fonts/ipa*.ttf ${DATADIR}/fonts/M+*.ttf \ ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/ - ${MKDIR} ${X11BASE}/${X_FONTSDIR}/TrueType + ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TrueType ${LN} -s -f \ ${DATADIR}/fonts/ipa*.ttf ${DATADIR}/fonts/M+*.ttf \ - ${X11BASE}/${X_FONTSDIR}/TrueType/ + ${LOCALBASE}/${X_FONTSDIR}/TrueType/ ${MKDIR} ${PREFIX}/etc/fonts/conf.d ${INSTALL_DATA} ${FILESDIR}/20-unhint-ipattfonts.conf \ ${FILESDIR}/62-fonts-ipattfonts.conf \ @@ -57,7 +57,7 @@ do-install: .endif post-install: - ${X11BASE}/bin/fc-cache -f -v ${X11BASE}/${X_FONTSDIR}/TrueType + ${LOCALBASE}/bin/fc-cache -f -v ${LOCALBASE}/${X_FONTSDIR}/TrueType ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/japanese/font-mplus-ipa/pkg-plist b/japanese/font-mplus-ipa/pkg-plist index 24553e9..ec83895 100644 --- a/japanese/font-mplus-ipa/pkg-plist +++ b/japanese/font-mplus-ipa/pkg-plist @@ -81,7 +81,6 @@ %%LOCAL_FONTSDIR%%/TrueType/M+1P+IPAG-circle.ttf @dirrmtry %%LOCAL_FONTSDIR%%/TrueType @dirrmtry %%LOCAL_FONTSDIR%% -@cwd %%X11BASE%% etc/fonts/conf.d/20-unhint-ipattfonts.conf etc/fonts/conf.d/62-fonts-ipattfonts.conf %%X_FONTSDIR%%/TrueType/ipag.ttf @@ -95,8 +94,8 @@ etc/fonts/conf.d/62-fonts-ipattfonts.conf %%X_FONTSDIR%%/TrueType/M+1VM+IPAG-circle.ttf %%X_FONTSDIR%%/TrueType/M+1P+IPAG.ttf %%X_FONTSDIR%%/TrueType/M+1P+IPAG-circle.ttf -@exec %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true -@unexec %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true +@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true +@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true @unexec rm -f %D/%%X_FONTSDIR%%/TrueType/fonts.cache-1 @dirrmtry %%X_FONTSDIR%%/TrueType -@unexec if [ -d %D/%%X_FONTSDIR%%/TrueType ]; then %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true; fi +@unexec if [ -d %D/%%X_FONTSDIR%%/TrueType ]; then %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true; fi diff --git a/japanese/font-mplus/Makefile b/japanese/font-mplus/Makefile index ad05f2c..85673d0 100644 --- a/japanese/font-mplus/Makefile +++ b/japanese/font-mplus/Makefile @@ -7,7 +7,7 @@ PORTNAME= mplusfonts PORTVERSION= 2.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese x11-fonts MASTER_SITES= http://downloads.sourceforge.jp/mplus-fonts/5030/ \ http://wids.net/archive/mplusfonts/distfiles/ @@ -16,11 +16,11 @@ DISTNAME= mplus_bitmap_fonts-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= 12x13 dots X11 kanji fonts with simple and readable design -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf +RUN_DEPENDES= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale NO_BUILD= yes -USE_X_PREFIX= yes .include <bsd.port.pre.mk> diff --git a/japanese/font-sazanami/Makefile b/japanese/font-sazanami/Makefile index 988c0e1..32b801b 100644 --- a/japanese/font-sazanami/Makefile +++ b/japanese/font-sazanami/Makefile @@ -69,7 +69,7 @@ do-install: .endif post-install: - ${X11BASE}/bin/fc-cache -f -v ${PREFIX}/${FONTSDIR} + ${LOCALBASE}/bin/fc-cache -f -v ${PREFIX}/${FONTSDIR} ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/japanese/font-sazanami/pkg-plist b/japanese/font-sazanami/pkg-plist index e5f4c29..cd108e7 100644 --- a/japanese/font-sazanami/pkg-plist +++ b/japanese/font-sazanami/pkg-plist @@ -18,7 +18,7 @@ etc/fonts/conf.d/3.sazanami-ttf.conf %%PORTDOCS%%@dirrm %%DOCSDIR%%/ayu %%PORTDOCS%%@dirrm %%DOCSDIR%%/kappa %%PORTDOCS%%@dirrm %%DOCSDIR%% -@exec %%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true +@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true @exec mkdir -p %%LOCALFONTSDIR%%/TrueType @exec ln -s -f %D/%%FONTSDIR%%/sazanami-mincho.ttf %%LOCALFONTSDIR%%/TrueType/sazanami-mincho.ttf @exec ln -s -f %D/%%FONTSDIR%%/sazanami-gothic.ttf %%LOCALFONTSDIR%%/TrueType/sazanami-gothic.ttf @@ -26,5 +26,5 @@ etc/fonts/conf.d/3.sazanami-ttf.conf @unexec rm -f %%LOCALFONTSDIR%%/TrueType/sazanami-gothic.ttf @unexec /bin/rmdir %%LOCALFONTSDIR%%/TrueType 2> /dev/null || true @unexec /bin/rmdir %%LOCALFONTSDIR%% 2> /dev/null || true -@unexec %%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true +@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true @unexec if [ -s %D/%%FONTSDIR%%/fonts.cache-1 ]; then rm -f %D/%%FONTSDIR%%/fonts.cache-1; fi diff --git a/japanese/font-vlgothic/pkg-plist b/japanese/font-vlgothic/pkg-plist index df9bd75..ad0db4b 100644 --- a/japanese/font-vlgothic/pkg-plist +++ b/japanese/font-vlgothic/pkg-plist @@ -11,7 +11,7 @@ etc/fonts/conf.d/63-vlgothic.conf %%PORTDOCS%%%%DOCSDIR%%/README.sazanami %%PORTDOCS%%%%DOCSDIR%%/README_J.mplus %%PORTDOCS%%@dirrm %%DOCSDIR%% -@exec %%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true -@unexec %%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true +@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true +@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true @unexec [ -s %D/%%FONTSDIR%%/fonts.cache-1 ] || rm -f %D/%%FONTSDIR%%/fonts.cache-1 @dirrmtry %%FONTSDIR%% diff --git a/japanese/gicq/Makefile b/japanese/gicq/Makefile index a115b52..d8717ec 100644 --- a/japanese/gicq/Makefile +++ b/japanese/gicq/Makefile @@ -7,7 +7,7 @@ PORTNAME= gicq PORTVERSION= 0.33 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= japanese net MASTER_SITES= ${MASTER_SITE_LOCAL} \ ftp://ftp.korsoft.com/pub/gicq/ @@ -24,7 +24,6 @@ COMMENT= GTK based ICQ program LIB_DEPENDS= icq.0:${PORTSDIR}/japanese/libicq -USE_X_PREFIX= yes USE_GNOME= gtk12 GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-gnome --disable-nls diff --git a/japanese/gorua/Makefile b/japanese/gorua/Makefile index 6de1f06..251ae01 100644 --- a/japanese/gorua/Makefile +++ b/japanese/gorua/Makefile @@ -16,7 +16,7 @@ MAINTAINER= nobutaka@FreeBSD.org COMMENT= Gtk+ on Ruby User Agent for 2ch BBS RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/gtk.so:${PORTSDIR}/x11-toolkits/ruby-gtk \ - ${X11BASE}/lib/X11/fonts/local/mona6x12a.pcf.gz:${PORTSDIR}/japanese/monafonts + ${LOCALBASE}/lib/X11/fonts/local/mona6x12a.pcf.gz:${PORTSDIR}/japanese/monafonts USE_BZIP2= yes USE_RUBY= yes diff --git a/japanese/groff/Makefile b/japanese/groff/Makefile index 9172fe9..95f8328 100644 --- a/japanese/groff/Makefile +++ b/japanese/groff/Makefile @@ -115,7 +115,7 @@ post-build: cd ${WRKSRC}/doc && makeinfo --no-split groff.texinfo .endif cd ${WRKSRC} && ${FIND} font -name DESC \ - | ${XARGS} ${REINPLACE_CMD} -E -e 's|pro +(gxditview)|pro ${X11BASE}/bin/\1|g;' + | ${XARGS} ${REINPLACE_CMD} -E -e 's|pro +(gxditview)|pro ${LOCALBASE}/bin/\1|g;' cd ${WRKSRC} && ${FIND} font -name DESC \ | ${XARGS} ${REINPLACE_CMD} -E -e 's|pro +([^/].*)|pro ${PREFIX}/bin/\1|g;' diff --git a/japanese/gtkicq/Makefile b/japanese/gtkicq/Makefile index a1ad1bf..dd0031c 100644 --- a/japanese/gtkicq/Makefile +++ b/japanese/gtkicq/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkicq PORTVERSION= 0.60 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= japanese net MASTER_SITES= ftp://gtkicq.pn.org/pub/gtkicq/ @@ -20,7 +20,6 @@ COMMENT= Icq clone for japanese user BUILD_DEPENDS= ${LOCALBASE}/lib/libjcode.a:${PORTSDIR}/japanese/libjcode -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gtk12 GNU_CONFIGURE= yes diff --git a/japanese/ical/Makefile b/japanese/ical/Makefile index 0bfb45c..ff60106 100644 --- a/japanese/ical/Makefile +++ b/japanese/ical/Makefile @@ -7,7 +7,7 @@ PORTNAME= ical PORTVERSION= 2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese deskutils tk MASTER_SITES= ftp://ftp.sco.com/skunkware/src/shellutil/ \ ftp://ftp.sunet.se/pub/vendor/sco/skunkware/src/shellutil/ \ @@ -30,6 +30,7 @@ EXTRA_PATCHES= ${.CURDIR}/files/patch-* MASTERDIR= ${.CURDIR}/../../deskutils/ical MD5_FILE= ${.CURDIR}/distinfo +USE_XORG= x11 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-tclconfig=${PREFIX}/lib/tcl8.0jp \ --with-tclhdir=${PREFIX}/include/tcl8.0jp \ diff --git a/japanese/iiimf-le-canna/Makefile b/japanese/iiimf-le-canna/Makefile index 4a4afd5..fd7e2c4 100644 --- a/japanese/iiimf-le-canna/Makefile +++ b/japanese/iiimf-le-canna/Makefile @@ -7,7 +7,7 @@ PORTNAME= le-canna PORTVERSION= 12.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= japanese textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- @@ -26,7 +26,6 @@ USE_BZIP2= yes USE_ICONV= yes USE_GMAKE= yes USE_GNOME= gtk20 -USE_XLIB= yes USE_AUTOTOOLS= automake:19:env autoconf:261:env libtool:15:env WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} @@ -38,8 +37,8 @@ BUILDDIR= ${WRKSRC}/leif IGNORE= is supported on FreeBSD 5.3 and later only .endif -CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv ${PTHREAD_LIBS} +CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS} CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" post-patch: diff --git a/japanese/im-ja/Makefile b/japanese/im-ja/Makefile index ab00a04..abf3372 100644 --- a/japanese/im-ja/Makefile +++ b/japanese/im-ja/Makefile @@ -7,7 +7,7 @@ PORTNAME= im-ja PORTVERSION= 1.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= japanese x11-toolkits MASTER_SITES= http://im-ja.sourceforge.net/ @@ -19,7 +19,6 @@ OPTIONS+= CANNA "Use Canna" on OPTIONS+= WNN "Use FreeWnn" on OPTIONS+= GNOMEPANEL "Build GNOME Panel Applet" off -USE_XLIB= yes USE_GNOME= gconf2 gnomehack gnomeprefix gnometarget intlhack libglade2 USE_PERL5_BUILD= yes USE_GMAKE= yes @@ -29,8 +28,8 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= im-ja-conf.1 im-ja-xim-server.1 GCONF_SCHEMAS= im-ja.schemas -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include -DNO_MALLOC_H -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib +CPPFLAGS= -I${LOCALBASE}/include -DNO_MALLOC_H +LDFLAGS= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/japanese/ipa-ttfonts/Makefile b/japanese/ipa-ttfonts/Makefile index 2592d92..2617ef4 100644 --- a/japanese/ipa-ttfonts/Makefile +++ b/japanese/ipa-ttfonts/Makefile @@ -43,10 +43,10 @@ do-install: ${LN} -s -f \ ${DATADIR}/fonts/ipa*.ttf ${DATADIR}/fonts/M+*.ttf \ ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/ - ${MKDIR} ${X11BASE}/${X_FONTSDIR}/TrueType + ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TrueType ${LN} -s -f \ ${DATADIR}/fonts/ipa*.ttf ${DATADIR}/fonts/M+*.ttf \ - ${X11BASE}/${X_FONTSDIR}/TrueType/ + ${LOCALBASE}/${X_FONTSDIR}/TrueType/ ${MKDIR} ${PREFIX}/etc/fonts/conf.d ${INSTALL_DATA} ${FILESDIR}/20-unhint-ipattfonts.conf \ ${FILESDIR}/62-fonts-ipattfonts.conf \ @@ -57,7 +57,7 @@ do-install: .endif post-install: - ${X11BASE}/bin/fc-cache -f -v ${X11BASE}/${X_FONTSDIR}/TrueType + ${LOCALBASE}/bin/fc-cache -f -v ${LOCALBASE}/${X_FONTSDIR}/TrueType ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/japanese/ipa-ttfonts/pkg-plist b/japanese/ipa-ttfonts/pkg-plist index 24553e9..ec83895 100644 --- a/japanese/ipa-ttfonts/pkg-plist +++ b/japanese/ipa-ttfonts/pkg-plist @@ -81,7 +81,6 @@ %%LOCAL_FONTSDIR%%/TrueType/M+1P+IPAG-circle.ttf @dirrmtry %%LOCAL_FONTSDIR%%/TrueType @dirrmtry %%LOCAL_FONTSDIR%% -@cwd %%X11BASE%% etc/fonts/conf.d/20-unhint-ipattfonts.conf etc/fonts/conf.d/62-fonts-ipattfonts.conf %%X_FONTSDIR%%/TrueType/ipag.ttf @@ -95,8 +94,8 @@ etc/fonts/conf.d/62-fonts-ipattfonts.conf %%X_FONTSDIR%%/TrueType/M+1VM+IPAG-circle.ttf %%X_FONTSDIR%%/TrueType/M+1P+IPAG.ttf %%X_FONTSDIR%%/TrueType/M+1P+IPAG-circle.ttf -@exec %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true -@unexec %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true +@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true +@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true @unexec rm -f %D/%%X_FONTSDIR%%/TrueType/fonts.cache-1 @dirrmtry %%X_FONTSDIR%%/TrueType -@unexec if [ -d %D/%%X_FONTSDIR%%/TrueType ]; then %%X11BASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true; fi +@unexec if [ -d %D/%%X_FONTSDIR%%/TrueType ]; then %%LOCALBASE%%/bin/fc-cache -f -v %D/%%X_FONTSDIR%%/TrueType || true; fi diff --git a/japanese/jed/Makefile b/japanese/jed/Makefile index 1ac9775..8603231 100644 --- a/japanese/jed/Makefile +++ b/japanese/jed/Makefile @@ -7,7 +7,7 @@ PORTNAME= jed PORTVERSION= ${VERSION}.j${JP_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= japanese editors MASTER_SITES= ${MASTER_SITE_LOCAL} \ http://www.kondara.org/~g/slang/ @@ -54,7 +54,7 @@ WITHOUT_XJED= yes .if defined(WITHOUT_XJED) || defined(XJED_BROKEN) PLIST_SUB= XJED_ENTRY="@comment xjed is not installed" .else -USE_XLIB= yes +USE_XORG= x11 xext BINSTUFF+= xjed PLIST_SUB= XJED_ENTRY="bin/xjed" .endif diff --git a/japanese/jisx0213-fonts/Makefile b/japanese/jisx0213-fonts/Makefile index b7db5a5..3f24fc2 100644 --- a/japanese/jisx0213-fonts/Makefile +++ b/japanese/jisx0213-fonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= jisx0213-fonts PORTVERSION= 20040425 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese x11-fonts MASTER_SITES= http://www12.ocn.ne.jp/~imamura/ \ http://gitatsu.hp.infoseek.co.jp/bdf/:yagi @@ -21,11 +21,11 @@ MAINTAINER= yoichi@FreeBSD.org COMMENT= Japanese jisx0213 fonts BUILD_DEPENDS= mkbold:${PORTSDIR}/x11-fonts/mkbold-mkitalic \ - bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} + bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale NO_WRKSUBDIR= yes -USE_X_PREFIX= yes FONTSDIR= lib/X11/fonts/local EXTRACT_CMD= ${CP} diff --git a/japanese/jvim/Makefile b/japanese/jvim/Makefile index 2cb1097..378e1f6 100644 --- a/japanese/jvim/Makefile +++ b/japanese/jvim/Makefile @@ -69,7 +69,7 @@ JPLIB!= ${ECHO_CMD} ${JPLIB} | sed 's%^%-lonew${INPUT_METHOD} %' pre-build: cd ${WRKSRC}/src; \ ${SED} -e 's,%LOCALBASE%,${LOCALBASE},g' \ - -e 's,%X11BASE%,${X11BASE},g' \ + -e 's,%LOCALBASE%,${LOCALBASE},g' \ ./makefile.junx > Makefile; \ do-build: diff --git a/japanese/jvim/files/patch-aa b/japanese/jvim/files/patch-aa index 36b0feb..5a0b40f 100644 --- a/japanese/jvim/files/patch-aa +++ b/japanese/jvim/files/patch-aa @@ -23,7 +23,7 @@ - -L/usr/lib + -L/usr/lib \ + -L%LOCALBASE%/lib \ -+ -L%X11BASE%/lib \ ++ -L%LOCALBASE%/lib \ + -L/usr/X11R6/lib + +INSTALL_MAN?= install -c -m ${MANMOD} diff --git a/japanese/jvim3/Makefile b/japanese/jvim3/Makefile index 4ce7e36..c146001 100644 --- a/japanese/jvim3/Makefile +++ b/japanese/jvim3/Makefile @@ -35,13 +35,13 @@ PORT_DOCDIR= ${PREFIX}/share/doc/ja-jvim-${PORTVERSION} # -DUSE_X11 is the cause of a problem treating Japanese MACHINE= -DBSD_UNIX -DUSE_LOCALE CC= cc ${CFLAGS} -Wall -LIBS= -ltermlib -L${PREFIX}/lib +LIBS= -ltermlib -L${PREFIX}/lib .if !defined(WITHOUT_X11) -USE_XLIB= yes +USE_XORG= x11 MACHINE+= -DUSE_X11 -CC+= -I${X11BASE}/include -LIBS+= -L${X11BASE}/lib -lX11 +CC+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib -lX11 .endif # Specifying a velue INPUT_METHOD, and seting values BUILD_DEPENDS, diff --git a/japanese/jyuroku/Makefile b/japanese/jyuroku/Makefile index b45afaf..facd7a8 100644 --- a/japanese/jyuroku/Makefile +++ b/japanese/jyuroku/Makefile @@ -25,7 +25,7 @@ post-patch: s@gtk-config@${GTK_CONFIG}@g" ${WRKSRC}/Makefile do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/jyuroku ${X11BASE}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/jyuroku ${LOCALBASE}/bin post-install: .if !defined(NOPORTDOCS) diff --git a/japanese/k10/Makefile b/japanese/k10/Makefile index d3f2322..676b694 100644 --- a/japanese/k10/Makefile +++ b/japanese/k10/Makefile @@ -7,7 +7,7 @@ PORTNAME= naga10 PORTVERSION= 1.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= japanese x11-fonts MASTER_SITES= http://hp.vector.co.jp/authors/VA013391/fonts/ DISTNAME= knj10-${PORTVERSION} @@ -16,10 +16,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= X11 10-dot kanji font 'naga10 font' BUILD_DEPENDS= mkbold:${PORTSDIR}/x11-fonts/mkbold-mkitalic \ - bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} - -USE_X_PREFIX= yes + bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale .include <bsd.port.pre.mk> diff --git a/japanese/k12/Makefile b/japanese/k12/Makefile index a0a132a..2aa1f5b 100644 --- a/japanese/k12/Makefile +++ b/japanese/k12/Makefile @@ -7,7 +7,7 @@ PORTNAME= kaname12 PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese x11-fonts MASTER_SITES= ${MASTER_SITE_PORTS_JP} \ http://www.din.or.jp/~storm/fonts/ @@ -18,10 +18,9 @@ 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 +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale .include <bsd.port.pre.mk> diff --git a/japanese/kanji18/Makefile b/japanese/kanji18/Makefile index 1722fc2..d20d759 100644 --- a/japanese/kanji18/Makefile +++ b/japanese/kanji18/Makefile @@ -7,7 +7,7 @@ PORTNAME= kanji PORTVERSION?= 1.0 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES= japanese x11-fonts MASTER_SITES= ${MASTER_SITE_PORTS_JP} MASTER_SITE_SUBDIR= ${DISTNAME} @@ -20,13 +20,12 @@ COMMENT= X11 ${PKGNAMESUFFIX}-dot kanji font EXTRACT_DEPENDS= gunshar:${PORTSDIR}/archivers/sharutils BUILD_DEPENDS= mkbold:${PORTSDIR}/x11-fonts/mkbold-mkitalic \ - bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale DIST_SUBDIR= ${DISTNAME} FONTSDIR= lib/X11/fonts/local NO_WRKSUBDIR= yes -USE_X_PREFIX= yes .include <bsd.port.pre.mk> @@ -54,7 +53,7 @@ post-patch: pre-install: @for file in INSTALL DEINSTALL; do \ ${SED} -e 's,%%FONTSDIR%%,${FONTSDIR},g' \ - -e 's,%%X11BASE%%,${X11BASE},g' \ + -e 's,%%LOCALBASE%%,${LOCALBASE},g' \ < ${FILESDIR}/$${file}.tmpl > ${WRKSRC}/$${file}; \ done @${SETENV} PKG_PREFIX=${PREFIX} \ diff --git a/japanese/kanji18/files/DEINSTALL.tmpl b/japanese/kanji18/files/DEINSTALL.tmpl index e31f7ec..dac5752 100644 --- a/japanese/kanji18/files/DEINSTALL.tmpl +++ b/japanese/kanji18/files/DEINSTALL.tmpl @@ -1,8 +1,8 @@ #!/bin/sh if [ "x$2" = "xPOST-DEINSTALL" ]; then - cd ${PKG_PREFIX}/%%FONTSDIR%%; %%X11BASE%%/bin/mkfontdir - %%X11BASE%%/bin/xset fp rehash || + cd ${PKG_PREFIX}/%%FONTSDIR%%; %%LOCALBASE%%/bin/mkfontdir + %%LOCALBASE%%/bin/xset fp rehash || ( echo "**********************************************************" echo "You should restart X server or do 'xset fp rehash' command" diff --git a/japanese/kanji18/files/INSTALL.tmpl b/japanese/kanji18/files/INSTALL.tmpl index c10a3d8..6fa812b 100644 --- a/japanese/kanji18/files/INSTALL.tmpl +++ b/japanese/kanji18/files/INSTALL.tmpl @@ -1,8 +1,8 @@ #!/bin/sh if [ "x$2" = "xPOST-INSTALL" ]; then - cd ${PKG_PREFIX}/%%FONTSDIR%%; %%X11BASE%%/bin/mkfontdir - %%X11BASE%%/bin/xset fp rehash || + cd ${PKG_PREFIX}/%%FONTSDIR%%; %%LOCALBASE%%/bin/mkfontdir + %%LOCALBASE%%/bin/xset fp rehash || ( echo "**********************************************************" echo "You should restart X server or do 'xset fp rehash' command" diff --git a/japanese/kanji18/pkg-descr b/japanese/kanji18/pkg-descr index af1ed79..3736148 100644 --- a/japanese/kanji18/pkg-descr +++ b/japanese/kanji18/pkg-descr @@ -1,6 +1,6 @@ Japanese 18 dot gothic font. Bitmap font is installed the following directory tree: - ${X11BASE}/lib/X11/fonts/local/ + ${LOCALBASE}/lib/X11/fonts/local/ MIHIRA Yoshiro diff --git a/japanese/kanji26/files/DEINSTALL.tmpl b/japanese/kanji26/files/DEINSTALL.tmpl index e31f7ec..dac5752 100644 --- a/japanese/kanji26/files/DEINSTALL.tmpl +++ b/japanese/kanji26/files/DEINSTALL.tmpl @@ -1,8 +1,8 @@ #!/bin/sh if [ "x$2" = "xPOST-DEINSTALL" ]; then - cd ${PKG_PREFIX}/%%FONTSDIR%%; %%X11BASE%%/bin/mkfontdir - %%X11BASE%%/bin/xset fp rehash || + cd ${PKG_PREFIX}/%%FONTSDIR%%; %%LOCALBASE%%/bin/mkfontdir + %%LOCALBASE%%/bin/xset fp rehash || ( echo "**********************************************************" echo "You should restart X server or do 'xset fp rehash' command" diff --git a/japanese/kanji26/files/INSTALL.tmpl b/japanese/kanji26/files/INSTALL.tmpl index c10a3d8..6fa812b 100644 --- a/japanese/kanji26/files/INSTALL.tmpl +++ b/japanese/kanji26/files/INSTALL.tmpl @@ -1,8 +1,8 @@ #!/bin/sh if [ "x$2" = "xPOST-INSTALL" ]; then - cd ${PKG_PREFIX}/%%FONTSDIR%%; %%X11BASE%%/bin/mkfontdir - %%X11BASE%%/bin/xset fp rehash || + cd ${PKG_PREFIX}/%%FONTSDIR%%; %%LOCALBASE%%/bin/mkfontdir + %%LOCALBASE%%/bin/xset fp rehash || ( echo "**********************************************************" echo "You should restart X server or do 'xset fp rehash' command" diff --git a/japanese/kanji26/pkg-descr b/japanese/kanji26/pkg-descr index b545d1d..aceb1a13 100644 --- a/japanese/kanji26/pkg-descr +++ b/japanese/kanji26/pkg-descr @@ -1,6 +1,6 @@ Japanese 26 dot mincho font. Bitmap font is installed the following directory tree: - ${X11BASE}/lib/X11/fonts/local/ + ${LOCALBASE}/lib/X11/fonts/local/ MIHIRA Yoshiro diff --git a/japanese/kanjipad/Makefile b/japanese/kanjipad/Makefile index c4a27b2..2744e31 100644 --- a/japanese/kanjipad/Makefile +++ b/japanese/kanjipad/Makefile @@ -7,14 +7,13 @@ PORTNAME= kanjipad PORTVERSION= 2.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese x11 MASTER_SITES= http://fishsoup.net/software/kanjipad/ MAINTAINER= ports@FreeBSD.org COMMENT= Japanese Handwriting recognition -USE_X_PREFIX= yes USE_GNOME= gtk20 USE_PERL5= yes USE_GMAKE= yes diff --git a/japanese/kappa20/Makefile b/japanese/kappa20/Makefile index 386e471..0f6a436 100644 --- a/japanese/kappa20/Makefile +++ b/japanese/kappa20/Makefile @@ -7,7 +7,7 @@ PORTNAME= k20fonts PORTVERSION= 0.396 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= japanese x11-fonts MASTER_SITES= http://khdd.net/20dot.fonts/:kappa20 \ http://downloads.sourceforge.jp/x-tt/8412/:ayu20 @@ -19,14 +19,14 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= ginga-freebsd@ginganet.org COMMENT= X11 20-dot kanji font 'Kappa20dot + ayu font' -USE_X_PREFIX= yes USE_BZIP2= yes AYUDISTNAME= ayu20gothic-1.6 AYU_SUFFIX= .tar.gz BUILD_DEPENDS= mkitalic:${PORTSDIR}/x11-fonts/mkbold-mkitalic \ - bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} + bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale .include <bsd.port.pre.mk> diff --git a/japanese/kdrill/files/patch-Imakefile b/japanese/kdrill/files/patch-Imakefile index a13101d..75ecd86 100644 --- a/japanese/kdrill/files/patch-Imakefile +++ b/japanese/kdrill/files/patch-Imakefile @@ -20,7 +20,7 @@ -# BINDIR = /usr/local/bin/X11 +BINDIR = $(PREFIX)/bin +LIBDIR = $(PREFIX)/lib/X11 -+CONFIGDIR = $(X11BASE)/lib/X11/config ++CONFIGDIR = $(LOCALBASE)/lib/X11/config +MANPATH = $(PREFIX)/man diff --git a/japanese/kinput2-canna+freewnn+sj3/pkg-descr b/japanese/kinput2-canna+freewnn+sj3/pkg-descr index 4651007..b41f3d6 100644 --- a/japanese/kinput2-canna+freewnn+sj3/pkg-descr +++ b/japanese/kinput2-canna+freewnn+sj3/pkg-descr @@ -10,7 +10,7 @@ The port supports Canna, SJ3 and FreeWnn. (NOTICE) Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/kinput2-canna+freewnn+sj3/pkg-message b/japanese/kinput2-canna+freewnn+sj3/pkg-message index 9c2af09..bae2023 100644 --- a/japanese/kinput2-canna+freewnn+sj3/pkg-message +++ b/japanese/kinput2-canna+freewnn+sj3/pkg-message @@ -1,5 +1,5 @@ ############################################################ Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-canna+freewnn/pkg-descr b/japanese/kinput2-canna+freewnn/pkg-descr index a5b04b4..cd4770a 100644 --- a/japanese/kinput2-canna+freewnn/pkg-descr +++ b/japanese/kinput2-canna+freewnn/pkg-descr @@ -10,7 +10,7 @@ The port supports Canna and FreeWnn. (NOTICE) Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/kinput2-canna+freewnn/pkg-message b/japanese/kinput2-canna+freewnn/pkg-message index 9c2af09..bae2023 100644 --- a/japanese/kinput2-canna+freewnn/pkg-message +++ b/japanese/kinput2-canna+freewnn/pkg-message @@ -1,5 +1,5 @@ ############################################################ Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-canna+sj3+wnn6/pkg-descr b/japanese/kinput2-canna+sj3+wnn6/pkg-descr index 8bd8343..46f66c4 100644 --- a/japanese/kinput2-canna+sj3+wnn6/pkg-descr +++ b/japanese/kinput2-canna+sj3+wnn6/pkg-descr @@ -10,7 +10,7 @@ The port supports Canna, SJ3 and Wnn6. (NOTICE) Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/kinput2-canna+sj3+wnn6/pkg-message b/japanese/kinput2-canna+sj3+wnn6/pkg-message index 9c2af09..bae2023 100644 --- a/japanese/kinput2-canna+sj3+wnn6/pkg-message +++ b/japanese/kinput2-canna+sj3+wnn6/pkg-message @@ -1,5 +1,5 @@ ############################################################ Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-canna+sj3+wnn7/pkg-descr b/japanese/kinput2-canna+sj3+wnn7/pkg-descr index 1e594b0..dbacade 100644 --- a/japanese/kinput2-canna+sj3+wnn7/pkg-descr +++ b/japanese/kinput2-canna+sj3+wnn7/pkg-descr @@ -10,7 +10,7 @@ The port supports Canna, SJ3 and Wnn7(temporary). (NOTICE) Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. Note: Current wnn7 support on kinput2 is done by backward-compatibility with wnn6, and you need to add following line to ${WNNENVRC} diff --git a/japanese/kinput2-canna+sj3+wnn7/pkg-message b/japanese/kinput2-canna+sj3+wnn7/pkg-message index 9c2af09..bae2023 100644 --- a/japanese/kinput2-canna+sj3+wnn7/pkg-message +++ b/japanese/kinput2-canna+sj3+wnn7/pkg-message @@ -1,5 +1,5 @@ ############################################################ Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-canna+wnn6/pkg-descr b/japanese/kinput2-canna+wnn6/pkg-descr index 85e48e7..6a7d6f5 100644 --- a/japanese/kinput2-canna+wnn6/pkg-descr +++ b/japanese/kinput2-canna+wnn6/pkg-descr @@ -10,7 +10,7 @@ The port supports Canna and Wnn6. (NOTICE) Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/kinput2-canna+wnn6/pkg-message b/japanese/kinput2-canna+wnn6/pkg-message index 9c2af09..bae2023 100644 --- a/japanese/kinput2-canna+wnn6/pkg-message +++ b/japanese/kinput2-canna+wnn6/pkg-message @@ -1,5 +1,5 @@ ############################################################ Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-canna+wnn7/pkg-descr b/japanese/kinput2-canna+wnn7/pkg-descr index f28abfb..0332b23 100644 --- a/japanese/kinput2-canna+wnn7/pkg-descr +++ b/japanese/kinput2-canna+wnn7/pkg-descr @@ -10,7 +10,7 @@ The port supports Canna and Wnn7(temporary). (NOTICE) Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. Note: Current wnn7 support on kinput2 is done by backward-compatibility with wnn6, and you need to add following line to ${WNNENVRC} diff --git a/japanese/kinput2-canna+wnn7/pkg-message b/japanese/kinput2-canna+wnn7/pkg-message index 9c2af09..bae2023 100644 --- a/japanese/kinput2-canna+wnn7/pkg-message +++ b/japanese/kinput2-canna+wnn7/pkg-message @@ -1,5 +1,5 @@ ############################################################ Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-freewnn+sj3/pkg-descr b/japanese/kinput2-freewnn+sj3/pkg-descr index 4c220b0..15822ed 100644 --- a/japanese/kinput2-freewnn+sj3/pkg-descr +++ b/japanese/kinput2-freewnn+sj3/pkg-descr @@ -10,7 +10,7 @@ The port supports SJ3 and FreeWnn. (NOTICE) Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/kinput2-freewnn+sj3/pkg-message b/japanese/kinput2-freewnn+sj3/pkg-message index 9c2af09..bae2023 100644 --- a/japanese/kinput2-freewnn+sj3/pkg-message +++ b/japanese/kinput2-freewnn+sj3/pkg-message @@ -1,5 +1,5 @@ ############################################################ Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-freewnn/pkg-descr b/japanese/kinput2-freewnn/pkg-descr index 854c747..79685f61 100644 --- a/japanese/kinput2-freewnn/pkg-descr +++ b/japanese/kinput2-freewnn/pkg-descr @@ -10,7 +10,7 @@ The port supports FreeWnn. (NOTICE) Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/kinput2-freewnn/pkg-message b/japanese/kinput2-freewnn/pkg-message index 9c2af09..bae2023 100644 --- a/japanese/kinput2-freewnn/pkg-message +++ b/japanese/kinput2-freewnn/pkg-message @@ -1,5 +1,5 @@ ############################################################ Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-sj3+wnn6/pkg-descr b/japanese/kinput2-sj3+wnn6/pkg-descr index faf88ac..88693fe 100644 --- a/japanese/kinput2-sj3+wnn6/pkg-descr +++ b/japanese/kinput2-sj3+wnn6/pkg-descr @@ -10,7 +10,7 @@ The port supports SJ3 and Wnn6. (NOTICE) Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/kinput2-sj3+wnn6/pkg-message b/japanese/kinput2-sj3+wnn6/pkg-message index 9c2af09..bae2023 100644 --- a/japanese/kinput2-sj3+wnn6/pkg-message +++ b/japanese/kinput2-sj3+wnn6/pkg-message @@ -1,5 +1,5 @@ ############################################################ Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-sj3+wnn7/pkg-descr b/japanese/kinput2-sj3+wnn7/pkg-descr index 5d8ace8..e43f241 100644 --- a/japanese/kinput2-sj3+wnn7/pkg-descr +++ b/japanese/kinput2-sj3+wnn7/pkg-descr @@ -10,7 +10,7 @@ The port supports SJ3 and Wnn7(temporary). (NOTICE) Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. Note: Current wnn7 support on kinput2 is done by backward-compatibility with wnn6, and you need to add following line to ${WNNENVRC} diff --git a/japanese/kinput2-sj3+wnn7/pkg-message b/japanese/kinput2-sj3+wnn7/pkg-message index 9c2af09..bae2023 100644 --- a/japanese/kinput2-sj3+wnn7/pkg-message +++ b/japanese/kinput2-sj3+wnn7/pkg-message @@ -1,5 +1,5 @@ ############################################################ Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-wnn6/pkg-descr b/japanese/kinput2-wnn6/pkg-descr index 8792ae5..e8850b3 100644 --- a/japanese/kinput2-wnn6/pkg-descr +++ b/japanese/kinput2-wnn6/pkg-descr @@ -10,7 +10,7 @@ The port supports Wnn6. (NOTICE) Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/kinput2-wnn6/pkg-message b/japanese/kinput2-wnn6/pkg-message index 9c2af09..bae2023 100644 --- a/japanese/kinput2-wnn6/pkg-message +++ b/japanese/kinput2-wnn6/pkg-message @@ -1,5 +1,5 @@ ############################################################ Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-wnn7/pkg-descr b/japanese/kinput2-wnn7/pkg-descr index 9d48832..698a281 100644 --- a/japanese/kinput2-wnn7/pkg-descr +++ b/japanese/kinput2-wnn7/pkg-descr @@ -10,7 +10,7 @@ The port supports FreeWnn. (NOTICE) Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. Note: Current wnn7 support on kinput2 is done by backward-compatibility with wnn6, and you need to add following line to ${WNNENVRC} diff --git a/japanese/kinput2-wnn7/pkg-message b/japanese/kinput2-wnn7/pkg-message index 9c2af09..bae2023 100644 --- a/japanese/kinput2-wnn7/pkg-message +++ b/japanese/kinput2-wnn7/pkg-message @@ -1,5 +1,5 @@ ############################################################ Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2/pkg-descr b/japanese/kinput2/pkg-descr index 854c747..79685f61 100644 --- a/japanese/kinput2/pkg-descr +++ b/japanese/kinput2/pkg-descr @@ -10,7 +10,7 @@ The port supports FreeWnn. (NOTICE) Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/kinput2/pkg-message b/japanese/kinput2/pkg-message index 9c2af09..bae2023 100644 --- a/japanese/kinput2/pkg-message +++ b/japanese/kinput2/pkg-message @@ -1,5 +1,5 @@ ############################################################ Default key-binding is changed to "egg" key-binding by defining *CcWnn.ccdef: ccdef.kinput2.egg -in ${X11BASE}/lib/X11/app-defaults/Kinput2. +in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kochi-ttfonts/Makefile b/japanese/kochi-ttfonts/Makefile index 46361a3..6dd53fd 100644 --- a/japanese/kochi-ttfonts/Makefile +++ b/japanese/kochi-ttfonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= kochi-ttfonts PORTVERSION= 20030809 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese x11-fonts MASTER_SITES= http://downloads.sourceforge.jp/efont/5411/ \ ${MASTER_SITE_PORTS_JP} @@ -16,7 +16,6 @@ DISTFILES= kochi-substitute-${PORTVERSION}.tar.bz2 MAINTAINER= ports@FreeBSD.org COMMENT= Free Japanese TrueType fonts named 'Kochi' -USE_X_PREFIX= yes USE_BZIP2= yes NO_BUILD= yes diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile index fea46c1..b517e60 100644 --- a/japanese/kterm/Makefile +++ b/japanese/kterm/Makefile @@ -37,7 +37,7 @@ PATCHFILES= ${DISTNAME}.NFS-xauth.patch:nfs \ PATCH_DIST_STRIP= -p1 USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN1= kterm.1 MANLANG= "" ja @@ -54,7 +54,7 @@ NKFCMD= nkf @${ECHO} "Error: \$${WITH_XAW3DLIB} and \$${WITH_NEXTAWLIB} cannot be specified simultaneously!" @${FALSE} .elif defined(WITH_XAW3DLIB) -LIB_DEPENDS+= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d +LIB_DEPENDS+= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d post-patch: @${ECHO_MSG} "===> Applying Xaw3d scrollbar patch" @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-Xaw3d diff --git a/japanese/kterm16c/Makefile b/japanese/kterm16c/Makefile index c6b696f..853608f 100644 --- a/japanese/kterm16c/Makefile +++ b/japanese/kterm16c/Makefile @@ -28,12 +28,12 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= ports@FreeBSD.org COMMENT= An xterm that speaks Japanese with 16 colors like on a VGA -BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/nkf \ - mkfontdir:${X_CLIENTS_PORT} -EXTRACT_DEPENDS=bdftopcf:${X_CLIENTS_PORT} +BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/nkf +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir +EXTRACT_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm .include <bsd.port.pre.mk> diff --git a/japanese/lyx/Makefile b/japanese/lyx/Makefile index 2195d6e..30af1bf 100644 --- a/japanese/lyx/Makefile +++ b/japanese/lyx/Makefile @@ -21,11 +21,11 @@ COMMENT= Document processor interfaced with LaTeX (nearly WYSIWYG) LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms -USE_XPM= yes +USE_XORG= xpm USE_PERL5= yes GNU_CONFIGURE= yes STRIP= -CONFIGURE_ARGS= --with-extra-lib=${X11BASE}/lib --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11" +CONFIGURE_ARGS= --with-extra-lib=${LOCALBASE}/lib --with-extra-inc="${LOCALBASE}/include ${LOCALBASE}/include/X11" MAN1= lyx.1 reLyX.1 .include <bsd.port.pre.mk> diff --git a/japanese/marumoji-fonts/Makefile b/japanese/marumoji-fonts/Makefile index cf50c41..ae7c6be 100644 --- a/japanese/marumoji-fonts/Makefile +++ b/japanese/marumoji-fonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= marumoji-fonts PORTVERSION= 1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= japanese x11-fonts MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= yoichi @@ -22,11 +22,11 @@ MAINTAINER= yoichi@FreeBSD.org COMMENT= Japanese marumoji fonts BUILD_DEPENDS= mkbold:${PORTSDIR}/x11-fonts/mkbold-mkitalic \ - bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} + bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale NO_WRKSUBDIR= yes -USE_X_PREFIX= yes FONTSDIR= lib/X11/fonts/local .include <bsd.port.pre.mk> diff --git a/japanese/mikachan-ttfonts/Makefile b/japanese/mikachan-ttfonts/Makefile index 457dac3..4ad4364 100644 --- a/japanese/mikachan-ttfonts/Makefile +++ b/japanese/mikachan-ttfonts/Makefile @@ -8,7 +8,7 @@ PORTNAME= mikachan-ttfonts PORTVERSION= 8.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese x11-fonts MASTER_SITES= http://members.tripod.co.jp/mikachan_font/ \ ${MASTER_SITE_PORTS_JP} @@ -26,7 +26,6 @@ EXTRACT_CMD= lha EXTRACT_BEFORE_ARGS= pq EXTRACT_AFTER_ARGS= > ${WRKSRC}/mika.ttf DIST_SUBDIR= ${PORTNAME} -USE_X_PREFIX= yes NO_BUILD= yes NO_WRKSUBDIR= yes MAKE_ENV= FONTSDIR=${FONTSDIR} diff --git a/japanese/ming/Makefile b/japanese/ming/Makefile index 3d1afce..d4687b6 100644 --- a/japanese/ming/Makefile +++ b/japanese/ming/Makefile @@ -23,7 +23,7 @@ CONFLICTS= ming-* WRKSRC= ${WRKDIR}/jaming-${PORTVERSION}/src MAKE_ARGS= NOPROFILE=true -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_BISON= build UTILS= gif2dbl \ diff --git a/japanese/monafonts-ttf/pkg-descr b/japanese/monafonts-ttf/pkg-descr index efe7c52..7995550 100644 --- a/japanese/monafonts-ttf/pkg-descr +++ b/japanese/monafonts-ttf/pkg-descr @@ -1,8 +1,8 @@ -TrueType kanji propotional fonts that have same metric and order as -Japanese Windows font. This is named after ascii art 'mona' used in -'2 channel' ,notrious huge Web BBS. +TrueType kanji propotional fonts that have same metric and order as +Japanese Windows font. This is named after ascii art 'mona' used in +'2 channel' ,notrious huge Web BBS. -This font is installed in {X11BASE}/lib/X11/fonts/TrueType. +This font is installed in {LOCALBASE}/lib/X11/fonts/TrueType. WWW: http://monafont.sourceforge.net/ diff --git a/japanese/monafonts/Makefile b/japanese/monafonts/Makefile index bb55ce0..103dbe9 100644 --- a/japanese/monafonts/Makefile +++ b/japanese/monafonts/Makefile @@ -7,23 +7,24 @@ PORTNAME= monafonts PORTVERSION= 2.90 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= japanese x11-fonts -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= monafont +MASTER_SITES= SF/monafont 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} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir +RUN_DEPENDES= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale + USE_PERL5_BUILD=yes FONTSDIR= lib/X11/fonts/local USE_BZIP2= yes -USE_X_PREFIX= yes ALL_TARGET= bdf MAKE_ARGS= PREFIX=${PREFIX} diff --git a/japanese/monafonts/pkg-descr b/japanese/monafonts/pkg-descr index 4beaceb..1688f14 100644 --- a/japanese/monafonts/pkg-descr +++ b/japanese/monafonts/pkg-descr @@ -1,10 +1,10 @@ -X11 12,14,16-dot kanji propotional fonts that have same metric and order as -Japanese Windows font. This is named after ascii art 'mona' used in -'2 channel' ,notrious huge Web BBS. +X11 12,14,16-dot kanji propotional fonts that have same metric and order as +Japanese Windows font. This is named after ascii art 'mona' used in +'2 channel' ,notrious huge Web BBS. Bitmap font is installed the following directory tree: - ${X11BASE}/lib/X11/fonts/local/ + ${LOCALBASE}/lib/X11/fonts/local/ WWW: http://monafont.sourceforge.net/ diff --git a/japanese/mplusfonts/Makefile b/japanese/mplusfonts/Makefile index ad05f2c..85673d0 100644 --- a/japanese/mplusfonts/Makefile +++ b/japanese/mplusfonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= mplusfonts PORTVERSION= 2.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese x11-fonts MASTER_SITES= http://downloads.sourceforge.jp/mplus-fonts/5030/ \ http://wids.net/archive/mplusfonts/distfiles/ @@ -16,11 +16,11 @@ DISTNAME= mplus_bitmap_fonts-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= 12x13 dots X11 kanji fonts with simple and readable design -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf +RUN_DEPENDES= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale NO_BUILD= yes -USE_X_PREFIX= yes .include <bsd.port.pre.mk> diff --git a/japanese/navi2ch-emacs21/Makefile b/japanese/navi2ch-emacs21/Makefile index 95acbed..76c0d86 100644 --- a/japanese/navi2ch-emacs21/Makefile +++ b/japanese/navi2ch-emacs21/Makefile @@ -10,8 +10,7 @@ PORTVERSION= 1.7.5 PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= japanese www elisp -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF PKGNAMESUFFIX= -${EMACS_PORT_NAME} MAINTAINER= ports@FreeBSD.org @@ -35,7 +34,7 @@ PLIST_SUB+= FSF="@comment " LISPDIR= ${EMACS_VERSION_SITE_LISPDIR} PLIST_SUB+= FSF="" .if !defined(WITHOUT_X11) -RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/local/monak12.pcf.gz:${PORTSDIR}/japanese/monafonts +RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/local/monak12.pcf.gz:${PORTSDIR}/japanese/monafonts .endif .endif diff --git a/japanese/navi2ch-xemacs21-mule/Makefile b/japanese/navi2ch-xemacs21-mule/Makefile index 9666a76..cf99baa 100644 --- a/japanese/navi2ch-xemacs21-mule/Makefile +++ b/japanese/navi2ch-xemacs21-mule/Makefile @@ -11,7 +11,7 @@ USE_EMACS= yes EMACS_PORT_NAME= xemacs21-mule BUILD_DEPENDS= ${LOCALBASE}/lib/xemacs/xemacs-packages/pkginfo/MANIFEST.xemacs-base:${PORTSDIR}/editors/xemacs-packages -RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/local/monak12.pcf.gz:${PORTSDIR}/japanese/monafonts \ +RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/local/monak12.pcf.gz:${PORTSDIR}/japanese/monafonts \ ${BUILD_DEPENDS} .include "${MASTERDIR}/Makefile" diff --git a/japanese/navi2ch/Makefile b/japanese/navi2ch/Makefile index 95acbed..76c0d86 100644 --- a/japanese/navi2ch/Makefile +++ b/japanese/navi2ch/Makefile @@ -10,8 +10,7 @@ PORTVERSION= 1.7.5 PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= japanese www elisp -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF PKGNAMESUFFIX= -${EMACS_PORT_NAME} MAINTAINER= ports@FreeBSD.org @@ -35,7 +34,7 @@ PLIST_SUB+= FSF="@comment " LISPDIR= ${EMACS_VERSION_SITE_LISPDIR} PLIST_SUB+= FSF="" .if !defined(WITHOUT_X11) -RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/local/monak12.pcf.gz:${PORTSDIR}/japanese/monafonts +RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/local/monak12.pcf.gz:${PORTSDIR}/japanese/monafonts .endif .endif diff --git a/japanese/nethack32/Makefile b/japanese/nethack32/Makefile index 8c3d87e..79377ec 100644 --- a/japanese/nethack32/Makefile +++ b/japanese/nethack32/Makefile @@ -19,8 +19,9 @@ PATCHFILES= j${PORTNAME}-${PORTVERSION}.gz MAINTAINER= ports@FreeBSD.org COMMENT= A dungeon explorin', slashin', hackin' game -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale NO_LATEST_LINK= yes @@ -52,7 +53,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/win/X11/JNetHack.ad ${PREFIX}/share/examples/ja/nethack .for i in ibm nh10 ${INSTALL_DATA} ${WRKSRC}/win/X11/$i.bdf ${PREFIX}/share/examples/ja/nethack - ${X11BASE}/bin/bdftopcf ${PREFIX}/share/examples/ja/nethack/$i.bdf \ + ${LOCALBASE}/bin/bdftopcf ${PREFIX}/share/examples/ja/nethack/$i.bdf \ > ${PREFIX}/share/examples/ja/nethack/$i.pcf ${RM} ${PREFIX}/share/examples/ja/nethack/$i.bdf ${GZIP_CMD} ${PREFIX}/share/examples/ja/nethack/$i.pcf diff --git a/japanese/nethack32/files/patch-ae b/japanese/nethack32/files/patch-ae index ab14e67..3521f32 100644 --- a/japanese/nethack32/files/patch-ae +++ b/japanese/nethack32/files/patch-ae @@ -7,8 +7,8 @@ diff -ruN ./sys/unix/Makefile.src ../nethack-3.2.2/sys/unix/Makefile.src -CFLAGS = -g -I../include -LFLAGS = -g -+CFLAGS += -O -I../include -I${X11BASE}/include -+LFLAGS = -L${X11BASE}/lib ++CFLAGS += -O -I../include -I${LOCALBASE}/include ++LFLAGS = -L${LOCALBASE}/lib # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired diff --git a/japanese/nethack34/files/patch-ad b/japanese/nethack34/files/patch-ad index 1b79351..7231626 100644 --- a/japanese/nethack34/files/patch-ad +++ b/japanese/nethack34/files/patch-ad @@ -13,7 +13,7 @@ -CFLAGS = -W -g -O -I../include +CFLAGS += -I../include +ifeq ("$(GRAPHICS)","X11_GRAPHICS") -+CFLAGS += -DX11_GRAPHICS -I${X11BASE}/include ++CFLAGS += -DX11_GRAPHICS -I${LOCALBASE}/include +endif +ifeq ("$(GRAPHICS)","QT_GRAPHICS") +CFLAGS += -DQT_GRAPHICS @@ -66,7 +66,7 @@ # libraries for X11 # If USE_XPM is defined in config.h, you will also need -lXpm here. -WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 -+WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -L${X11BASE}/lib ++WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -L${LOCALBASE}/lib # WINX11LIB = -lXaw -lXmu -lXt -lX11 # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0 diff --git a/japanese/ngraph-fonts/Makefile b/japanese/ngraph-fonts/Makefile index 25032aa..293545c 100644 --- a/japanese/ngraph-fonts/Makefile +++ b/japanese/ngraph-fonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= ngraph-fonts PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese math x11-fonts MASTER_SITES= # empty DISTFILES= # empty @@ -16,11 +16,11 @@ MAINTAINER= sanpei@FreeBSD.org 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 \ - mkfontdir:${X_CLIENTS_PORT} - -USE_X_PREFIX= yes + ${LOCALBASE}/lib/X11/fonts/local/kanji18.pcf.gz:${PORTSDIR}/japanese/kanji18 \ + ${LOCALBASE}/lib/X11/fonts/local/kanji26.pcf.gz:${PORTSDIR}/japanese/kanji26 \ +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale NO_BUILD= yes diff --git a/japanese/ochusha/Makefile b/japanese/ochusha/Makefile index 6e1a3f5..2c23e57 100644 --- a/japanese/ochusha/Makefile +++ b/japanese/ochusha/Makefile @@ -7,7 +7,7 @@ PORTNAME= ochusha PORTVERSION= 0.5.8.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= japanese MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} MASTER_SITE_SUBDIR= ochusha/16560 @@ -18,7 +18,6 @@ COMMENT= A GUI BBS browser for 2ch.net MAN1= ochusha.1 MANCOMPRESSED= no -USE_X_PREFIX= yes USE_BZIP2= yes USE_GNOME= pkgconfig glib20 gtk20 libxml2 GNU_CONFIGURE= yes @@ -26,7 +25,7 @@ USE_LDCONFIG= yes USE_AUTOTOOLS= automake:110 autoconf:261 aclocal:110 libtool:15 DESKTOP_ENTRIES="ochusha" "A GUI BBS browser for 2ch.net" \ - "${X11BASE}/share/ochusha/ochusha32.xpm" \ + "${LOCALBASE}/share/ochusha/ochusha32.xpm" \ "Ochusha" "Application;Network;" \ false diff --git a/japanese/oleo/Makefile b/japanese/oleo/Makefile index 5192d7b..90a28b1 100644 --- a/japanese/oleo/Makefile +++ b/japanese/oleo/Makefile @@ -19,7 +19,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A Spreadsheet Program + Japanese patches # xmkmf is for configure script, not for USE_IMAKE. -BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake USE_BISON= build @@ -29,10 +29,9 @@ BUILD_DEPENDS+= ${LOCALBASE}/include/Xbae/Matrix.h:${PORTSDIR}/x11-toolkits/xbae CONFIGURE_ARGS+=--without-motif .endif -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" GNU_CONFIGURE= yes -USE_XLIB= yes INFO= oleo .include <bsd.port.pre.mk> diff --git a/japanese/onew-freewnn/Makefile b/japanese/onew-freewnn/Makefile index f90f9ba..90a0043 100644 --- a/japanese/onew-freewnn/Makefile +++ b/japanese/onew-freewnn/Makefile @@ -64,7 +64,6 @@ PORT_DOCDIR= ${LOCALBASE}/share/doc/ja-onew${INPUT_METHOD} post-patch: ${SED} -e 's,%LOCALBASE%,${LOCALBASE},g' \ - -e 's,%X11BASE%,${X11BASE},g' \ ${ONEW_CONF} > ${WRKSRC}/ONEW_CONF do-install: diff --git a/japanese/onew/Makefile b/japanese/onew/Makefile index f90f9ba..90a0043 100644 --- a/japanese/onew/Makefile +++ b/japanese/onew/Makefile @@ -64,7 +64,6 @@ PORT_DOCDIR= ${LOCALBASE}/share/doc/ja-onew${INPUT_METHOD} post-patch: ${SED} -e 's,%LOCALBASE%,${LOCALBASE},g' \ - -e 's,%X11BASE%,${X11BASE},g' \ ${ONEW_CONF} > ${WRKSRC}/ONEW_CONF do-install: diff --git a/japanese/prime/Makefile b/japanese/prime/Makefile index a4a5958..6860a94 100644 --- a/japanese/prime/Makefile +++ b/japanese/prime/Makefile @@ -28,7 +28,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-rubydir=${RUBY_SITELIBDIR} USE_AUTOTOOLS= automake:19 autoconf:261 -PLIST_SUB= X11BASE=${X11BASE} +PLIST_SUB= LOCALBASE=${LOCALBASE} pre-configure: @(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL}) diff --git a/japanese/ruby-rdic/Makefile b/japanese/ruby-rdic/Makefile index 4188cdb..5728660 100644 --- a/japanese/ruby-rdic/Makefile +++ b/japanese/ruby-rdic/Makefile @@ -31,7 +31,7 @@ RUBY_RD_FILES= xselection.rd \ USE_XORG= x11 INSTALL_TARGET= site-install -MAKE_ARGS+= CFLAGS='-I ${X11BASE}/include' +MAKE_ARGS+= CFLAGS='-I ${LOCALBASE}/include' DOCS_EN= ChangeLog.rdic \ ChangeLog.xselection \ @@ -53,7 +53,7 @@ DOCS_ETC= eliminate.default \ PKGNAMEPREFIX:= ${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX} post-patch: - ${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|' ${WRKSRC}/extconf.rb + ${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|' ${WRKSRC}/extconf.rb post-install: rb-install doc-install diff --git a/japanese/rxvt/Makefile b/japanese/rxvt/Makefile index 653db93..8609a2e 100644 --- a/japanese/rxvt/Makefile +++ b/japanese/rxvt/Makefile @@ -7,15 +7,14 @@ PORTNAME= rxvt PORTVERSION= 2.7.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese x11 MASTER_SITES= ftp://ftp.rxvt.org/pub/rxvt/ MAINTAINER= ports@FreeBSD.org COMMENT= An xterm replacement that supports pixmap background and Japanese -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= x11 ice xt xpm GNU_CONFIGURE= yes USE_BZIP2= yes MAN1= rxvt.1 rclock.1 @@ -24,8 +23,10 @@ CONFIGURE_ARGS= --enable-xpm-background --enable-transparency \ --enable-languages --with-encoding=eucj \ --disable-backspace-key --disable-delete-key \ --enable-utmp --enable-wtmp \ - --with-xpm --with-xpm-includes=${X11BASE}/include/X11 \ - --with-xpm-library=${X11BASE}/lib + --with-xpm --with-xpm-includes=${LOCALBASE}/include/X11 \ + --with-xpm-library=${LOCALBASE}/lib +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" DOCDIR= ${PREFIX}/share/doc/ja/rxvt RXVTLIB= ${PREFIX}/lib/X11/rxvt diff --git a/japanese/sazanami-ttf/Makefile b/japanese/sazanami-ttf/Makefile index 988c0e1..32b801b 100644 --- a/japanese/sazanami-ttf/Makefile +++ b/japanese/sazanami-ttf/Makefile @@ -69,7 +69,7 @@ do-install: .endif post-install: - ${X11BASE}/bin/fc-cache -f -v ${PREFIX}/${FONTSDIR} + ${LOCALBASE}/bin/fc-cache -f -v ${PREFIX}/${FONTSDIR} ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/japanese/sazanami-ttf/pkg-plist b/japanese/sazanami-ttf/pkg-plist index e5f4c29..cd108e7 100644 --- a/japanese/sazanami-ttf/pkg-plist +++ b/japanese/sazanami-ttf/pkg-plist @@ -18,7 +18,7 @@ etc/fonts/conf.d/3.sazanami-ttf.conf %%PORTDOCS%%@dirrm %%DOCSDIR%%/ayu %%PORTDOCS%%@dirrm %%DOCSDIR%%/kappa %%PORTDOCS%%@dirrm %%DOCSDIR%% -@exec %%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true +@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true @exec mkdir -p %%LOCALFONTSDIR%%/TrueType @exec ln -s -f %D/%%FONTSDIR%%/sazanami-mincho.ttf %%LOCALFONTSDIR%%/TrueType/sazanami-mincho.ttf @exec ln -s -f %D/%%FONTSDIR%%/sazanami-gothic.ttf %%LOCALFONTSDIR%%/TrueType/sazanami-gothic.ttf @@ -26,5 +26,5 @@ etc/fonts/conf.d/3.sazanami-ttf.conf @unexec rm -f %%LOCALFONTSDIR%%/TrueType/sazanami-gothic.ttf @unexec /bin/rmdir %%LOCALFONTSDIR%%/TrueType 2> /dev/null || true @unexec /bin/rmdir %%LOCALFONTSDIR%% 2> /dev/null || true -@unexec %%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true +@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true @unexec if [ -s %D/%%FONTSDIR%%/fonts.cache-1 ]; then rm -f %D/%%FONTSDIR%%/fonts.cache-1; fi diff --git a/japanese/scim-canna/Makefile b/japanese/scim-canna/Makefile index 09cdfeb..aea7b09 100644 --- a/japanese/scim-canna/Makefile +++ b/japanese/scim-canna/Makefile @@ -7,7 +7,7 @@ PORTNAME= scim-canna PORTVERSION= 1.0.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= japanese MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} MASTER_SITE_SUBDIR= scim-imengine/18849 @@ -21,7 +21,6 @@ RUN_DEPENDS= ${BUILD_DEPENDS} USE_AUTOTOOLS= libtool:15 USE_GNOME= lthack -USE_XLIB= yes USE_ICONV= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/japanese/scim-honoka-plugin-romkan/Makefile b/japanese/scim-honoka-plugin-romkan/Makefile index ccbbf49..709bfba 100644 --- a/japanese/scim-honoka-plugin-romkan/Makefile +++ b/japanese/scim-honoka-plugin-romkan/Makefile @@ -34,7 +34,7 @@ CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ IGNORE= does not build in FreeBSD < 5.x .else CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" .endif .include <bsd.port.post.mk> diff --git a/japanese/scim-honoka-plugin-wnn/Makefile b/japanese/scim-honoka-plugin-wnn/Makefile index 969dcbf..4a5db03 100644 --- a/japanese/scim-honoka-plugin-wnn/Makefile +++ b/japanese/scim-honoka-plugin-wnn/Makefile @@ -37,7 +37,7 @@ CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ IGNORE= does not build in FreeBSD < 5.x .else CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" .endif .include <bsd.port.post.mk> diff --git a/japanese/scim-skk/Makefile b/japanese/scim-skk/Makefile index ddae56f..db53373 100644 --- a/japanese/scim-skk/Makefile +++ b/japanese/scim-skk/Makefile @@ -7,7 +7,7 @@ PORTNAME= scim-skk PORTVERSION= 0.5.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= japanese MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} MASTER_SITE_SUBDIR= scim-imengine/18121 @@ -19,7 +19,6 @@ BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim RUN_DEPENDS= ${BUILD_DEPENDS} USE_AUTOTOOLS= libtool:15 -USE_XLIB= yes USE_ICONV= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/japanese/scim-uim/Makefile b/japanese/scim-uim/Makefile index 78d3aa7..92ac2cd 100644 --- a/japanese/scim-uim/Makefile +++ b/japanese/scim-uim/Makefile @@ -9,7 +9,7 @@ PORTNAME= scim-uim PORTVERSION= 0.1.4 PORTREVISION= 8 CATEGORIES= japanese -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ +MASTER_SITES= SF \ http://freedesktop.org/~suzhe/sources/ MASTER_SITE_SUBDIR=scim @@ -35,11 +35,11 @@ EXTRA_PATCHES= ${FILESDIR}/extra-patch-aa ${FILESDIR}/extra-patch-ab .if ${OSVERSION} < 500035 BUILD_DEPENDS+= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport RUN_DEPENDS+= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include -I${LOCALBASE}/include/stlport" \ +CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/stlport" \ LDFLAGS="-L${LOCALBASE}/lib -lstlport_gcc -lintl ${PTHREAD_LIBS}" EXTRA_PATCHES+= ${FILESDIR}/extra-patch-4-stable .else -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include -D__STDC_ISO_10646__" \ +CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \ LDFLAGS="-L${LOCALBASE}/lib -lintl" .endif diff --git a/japanese/tk80/Makefile b/japanese/tk80/Makefile index a1a3445..43e9700 100644 --- a/japanese/tk80/Makefile +++ b/japanese/tk80/Makefile @@ -7,7 +7,7 @@ PORTNAME= tk PORTVERSION= 8.0.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= japanese x11-toolkits tk MASTER_SITES= ${MASTER_SITE_TCLTK} MASTER_SITE_SUBDIR= tcl8_0 @@ -33,10 +33,11 @@ PATCH_DIST_ARGS=-d ${TOPDIR} -E ${PATCH_DIST_STRIP} PATCH_DIST_ARGS=-d ${TOPDIR} --forward --quiet -E ${PATCH_DIST_STRIP} .endif USE_AUTOTOOLS= autoconf:213 -USE_XLIB= yes +USE_XORG= x11 CONFIGURE_ARGS= --enable-shared --with-tcl=${PREFIX}/lib/tcl${VERSION}jp \ - --enable-xlibHack --enable-onTheSpot \ - --x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib + --enable-xlibHack --enable-onTheSpot +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" RANLIB= ranlib USE_LDCONFIG= yes diff --git a/japanese/tkstep80/Makefile b/japanese/tkstep80/Makefile index 50a855d..011513e 100644 --- a/japanese/tkstep80/Makefile +++ b/japanese/tkstep80/Makefile @@ -7,7 +7,7 @@ PORTNAME= tkstep PORTVERSION= 8.0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese tk MASTER_SITES= ${MASTER_SITE_TCLTK} MASTER_SITE_SUBDIR= tcl8_0 @@ -22,8 +22,7 @@ COMMENT= The Tk toolkit with a NeXTSTEP look and more LIB_DEPENDS= tcl80jp.1:${PORTSDIR}/japanese/tcl80 -USE_XLIB= yes -USE_XPM= yes +USE_XORG= xpm USE_AUTOTOOLS= autoconf:213 HAS_CONFIGURE= yes CONFIGURE_ARGS= --enable-gcc --enable-shared --enable-step \ diff --git a/japanese/truetypefonts/Makefile b/japanese/truetypefonts/Makefile index e26aa05..0800ea8 100644 --- a/japanese/truetypefonts/Makefile +++ b/japanese/truetypefonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= truetypefonts PORTVERSION= 2001.08.18.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese x11-fonts MASTER_SITES= ${MASTER_SITE_DEBIAN} MASTER_SITE_SUBDIR= pool/main/t/ttf-xtt @@ -16,7 +16,6 @@ DISTNAME= ttf-xtt_0.${PORTVERSION:R:S/.//g}-${PORTVERSION:E} MAINTAINER= ports@FreeBSD.org COMMENT= Japanese TrueType Fonts -USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/ttf-xtt-0.${PORTVERSION:R:S/.//g} NO_BUILD= yes diff --git a/japanese/vflib/Makefile b/japanese/vflib/Makefile index 51e5098..129f128 100644 --- a/japanese/vflib/Makefile +++ b/japanese/vflib/Makefile @@ -7,7 +7,7 @@ PORTNAME= vflib PORTVERSION= ${VFLIB_VERSION} -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= japanese print MASTER_SITES= ftp://gull.se.hiroshima-u.ac.jp/pub/TypeHack/ DISTNAME= VFlib2-${PORTVERSION} @@ -16,15 +16,15 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= mita@FreeBSD.org COMMENT= Japanese Vector font library -BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} -RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake +RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf VFLIB_VERSION= 2.25.6 PLIST_SUB= VFLIB_VERSION=${VFLIB_VERSION} +USE_XORG= x11 xext USE_FREETYPE= yes USE_GETTEXT= yes -USE_XLIB= yes USE_AUTOTOOLS= autoconf:213 USE_LDCONFIG= yes CONFIGURE_ARGS= --with-freetype \ diff --git a/japanese/vje30/Makefile b/japanese/vje30/Makefile index 64841f89..efb8134 100644 --- a/japanese/vje30/Makefile +++ b/japanese/vje30/Makefile @@ -7,7 +7,7 @@ PORTNAME= vje PORTVERSION= 3.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= japanese MASTER_SITES= ${CD_MOUNTPTS:S,^,file:,:S,$,/freebsd/,} \ ${CD_MOUNTPTS:S,^,file:,:S,$,/source/delta/:source,} \ @@ -34,15 +34,13 @@ ONLY_FOR_ARCHS= i386 USE_RC_SUBR= yes -USE_XLIB= yes - PLIST_SUB= BINSTUFF="${BINSTUFF}" WRKSRC= ${WRKDIR}/usr/local PATCH_WRKSRC= ${WRKDIR} BUILD_WRKSRC= ${WRKDIR}/delta/newFrontend MAKEFILE= Makefile.FreeBSD - +USE_XORG= x11 .include <bsd.port.pre.mk> MAINDIST= ${PORTNAME}-delta-${PORTVERSION}-ELF.tgz @@ -82,7 +80,7 @@ post-patch: @${FIND} ${WRKSRC} -name '*.orig' -delete @${SED} -e 's,%%PREFIX%%,${PREFIX},g' -e 's,%%RC_SUBR%%,${RC_SUBR},g' \ ${FILESDIR}/vje.sh > ${WRKSRC}/etc/rc.d/vje.sh - @${REINPLACE_CMD} 's,/usr/X11R6,${X11BASE},g' ${BUILD_WRKSRC}/${MAKEFILE} + @${REINPLACE_CMD} 's,/usr/X11R6,${LOCALBASE},g' ${BUILD_WRKSRC}/${MAKEFILE} .if defined(NOPORTDOCS) @cd ${WRKSRC}/vje30 && ${RM} -rf doc README FAQ REQUEST .endif diff --git a/japanese/vlgothic/pkg-plist b/japanese/vlgothic/pkg-plist index df9bd75..ad0db4b 100644 --- a/japanese/vlgothic/pkg-plist +++ b/japanese/vlgothic/pkg-plist @@ -11,7 +11,7 @@ etc/fonts/conf.d/63-vlgothic.conf %%PORTDOCS%%%%DOCSDIR%%/README.sazanami %%PORTDOCS%%%%DOCSDIR%%/README_J.mplus %%PORTDOCS%%@dirrm %%DOCSDIR%% -@exec %%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true -@unexec %%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true +@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true +@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true @unexec [ -s %D/%%FONTSDIR%%/fonts.cache-1 ] || rm -f %D/%%FONTSDIR%%/fonts.cache-1 @dirrmtry %%FONTSDIR%% diff --git a/japanese/xdtp/Makefile b/japanese/xdtp/Makefile index 1155689..ffcef95 100644 --- a/japanese/xdtp/Makefile +++ b/japanese/xdtp/Makefile @@ -18,7 +18,7 @@ COMMENT= XDTP (XML Document Transfer Program) LIB_DEPENDS= glibmm-2.4:${PORTSDIR}/devel/glibmm -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_GNOME= libxml2 libxslt pkgconfig GNU_CONFIGURE= yes diff --git a/japanese/xdvik/Makefile b/japanese/xdvik/Makefile index dd87b76..c4d3023 100644 --- a/japanese/xdvik/Makefile +++ b/japanese/xdvik/Makefile @@ -9,8 +9,7 @@ PORTNAME= xdvik PORTVERSION= ${VERSION_XDVIK}.${VERSION_JPATCH} PORTREVISION= 9 CATEGORIES= japanese print -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= xdvi +MASTER_SITES= SF/xdvi PKGNAMEPREFIX= ja- PKGNAMESUFFIX= -tetex DISTNAME= xdvik-${VERSION_XDVIK} @@ -29,8 +28,8 @@ RUN_DEPENDS= ${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \ ${LOCALBASE}/${TEXMFDISTDIR}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \ mktexlsr:${PORTSDIR}/print/teTeX-base \ ${LOCALBASE}/${TEXMFDIR}/fonts/tfm/ptex/min10.tfm:${PORTSDIR}/japanese/ptex \ - ${X11BASE}/${TTFMINCHO}:${PORTSDIR}/japanese/ipa-ttfonts \ - ${X11BASE}/${TTFGOTHIC}:${PORTSDIR}/japanese/ipa-ttfonts + ${LOCALBASE}/${TTFMINCHO}:${PORTSDIR}/japanese/ipa-ttfonts \ + ${LOCALBASE}/${TTFGOTHIC}:${PORTSDIR}/japanese/ipa-ttfonts LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ wwwcore.1:${PORTSDIR}/www/libwww \ t1.5:${PORTSDIR}/devel/t1lib @@ -85,8 +84,8 @@ TTFMINCHO= lib/X11/fonts/TrueType/ipam.ttf TTFGOTHIC= lib/X11/fonts/TrueType/ipag.ttf VFONTCAPFT_SRC= ${WRKSRC}/vfontmap.freetype VFONTCAPFT_SUB= CIDFONTDIR=${LOCALBASE}/${CIDFONTDIR} \ - TTFMINCHO=${X11BASE}/${TTFMINCHO} \ - TTFGOTHIC=${X11BASE}/${TTFGOTHIC} + TTFMINCHO=${LOCALBASE}/${TTFMINCHO} \ + TTFGOTHIC=${LOCALBASE}/${TTFGOTHIC} .include <bsd.port.pre.mk> diff --git a/japanese/xjtext/files/patch-aa b/japanese/xjtext/files/patch-aa index 98c017f..bca9e7b 100644 --- a/japanese/xjtext/files/patch-aa +++ b/japanese/xjtext/files/patch-aa @@ -6,12 +6,12 @@ -INCDIRS =-I/usr/X11R6/include -I/usr/local/include +CC =${CXX} +CFLAGS =${CXXFLAGS} -c -+INCDIRS =-I${X11BASE}/include `imlib-config --cflags` ++INCDIRS =-I${LOCALBASE}/include `imlib-config --cflags` LIBS =-lX11 -lXext -lm -lfl -IMLIBS =-ljpeg -lpng -ltiff -lz -lgif -lImlib -LIBDIRS =-L/usr/X11R6/lib/ -L/usr/local/lib +IMLIBS =`imlib-config --libs` -+LIBDIRS =-L${X11BASE}/lib ++LIBDIRS =-L${LOCALBASE}/lib OBJS =xwindow.o xfont.o xtext.o xjtext.o lex.yy.o parser.tab.o xjtext-main.o all: xjtext @@ -20,7 +20,7 @@ xjtext: ${OBJS} - LD_RUN_PATH=/usr/X11R6/lib/ ${CC} ${OBJS} ${LIBDIRS} ${LIBS} ${IMLIBS}\ -+ LD_RUN_PATH=${X11BASE}/lib/ ${CC} ${OBJS} ${LIBDIRS} ${LIBS} ${IMLIBS}\ ++ LD_RUN_PATH=${LOCALBASE}/lib/ ${CC} ${OBJS} ${LIBDIRS} ${LIBS} ${IMLIBS}\ -o xjtext clean: diff --git a/japanese/xpdf/Makefile b/japanese/xpdf/Makefile index 152d077..ef24722 100644 --- a/japanese/xpdf/Makefile +++ b/japanese/xpdf/Makefile @@ -7,7 +7,7 @@ PORTNAME= xpdf PORTVERSION= 3.00 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= japanese MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ DISTNAME= xpdf-japanese @@ -17,9 +17,8 @@ COMMENT= Japanese xpdf font support RUN_DEPENDS= xpdf:${PORTSDIR}/graphics/xpdf \ ${ADOBECMAPDIR}/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps \ - ${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTSDIR}/japanese/kochi-ttfonts + ${LOCALBASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTSDIR}/japanese/kochi-ttfonts -USE_X_PREFIX= yes NO_BUILD= yes SUB_FILES= dot.xpdfrc SUB_LIST= ADOBECMAPDIR=${ADOBECMAPDIR} diff --git a/japanese/xpdf/files/dot.xpdfrc.in b/japanese/xpdf/files/dot.xpdfrc.in index be3aca3..0bcf1b2 100644 --- a/japanese/xpdf/files/dot.xpdfrc.in +++ b/japanese/xpdf/files/dot.xpdfrc.in @@ -5,24 +5,24 @@ unicodeMap EUC-JP %%PREFIX%%/share/xpdf/japanese/EUC-JP.unicodeMap unicodeMap Shift-JIS %%PREFIX%%/share/xpdf/japanese/Shift-JIS.unicodeMap cMapDir Adobe-Japan1 %%ADOBECMAPDIR%% toUnicodeDir %%ADOBECMAPDIR%% -displayNamedCIDFontTT Ryumin-Light "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" -displayNamedCIDFontTT Ryumin-Light-H "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" -displayNamedCIDFontTT Ryumin-Light-V "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" -displayNamedCIDFontTT Ryumin-Light-Identity "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" -displayNamedCIDFontTT Ryumin-Light-Identity-H "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" -displayNamedCIDFontTT Ryumin-Light-Identity-V "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" -displayNamedCIDFontTT HeiseiMin-W3H "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" -displayNamedCIDFontTT FutoMinA101-Bold "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" -displayNamedCIDFontTT FutoMinA101-Bold-H "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" -displayNamedCIDFontTT FutoMinA101-Bold-V "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" -displayNamedCIDFontTT GothicBBB-Medium "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" -displayNamedCIDFontTT GothicBBB-Medium-H "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" -displayNamedCIDFontTT GothicBBB-Medium-V "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" -displayNamedCIDFontTT GothicBBB-Medium-Identity "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" -displayNamedCIDFontTT GothicBBB-Medium-Identity-H "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" -displayNamedCIDFontTT GothicBBB-Medium-Identity-V "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" -displayNamedCIDFontTT HeiseiKakuGo-W5H "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" -displayNamedCIDFontTT FutoGoB101-Bold "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" -displayNamedCIDFontTT FutoGoB101-Bold-H "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" -displayNamedCIDFontTT FutoGoB101-Bold-V "%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" +displayNamedCIDFontTT Ryumin-Light "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" +displayNamedCIDFontTT Ryumin-Light-H "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" +displayNamedCIDFontTT Ryumin-Light-V "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" +displayNamedCIDFontTT Ryumin-Light-Identity "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" +displayNamedCIDFontTT Ryumin-Light-Identity-H "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" +displayNamedCIDFontTT Ryumin-Light-Identity-V "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" +displayNamedCIDFontTT HeiseiMin-W3H "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" +displayNamedCIDFontTT FutoMinA101-Bold "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" +displayNamedCIDFontTT FutoMinA101-Bold-H "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" +displayNamedCIDFontTT FutoMinA101-Bold-V "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf" +displayNamedCIDFontTT GothicBBB-Medium "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" +displayNamedCIDFontTT GothicBBB-Medium-H "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" +displayNamedCIDFontTT GothicBBB-Medium-V "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" +displayNamedCIDFontTT GothicBBB-Medium-Identity "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" +displayNamedCIDFontTT GothicBBB-Medium-Identity-H "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" +displayNamedCIDFontTT GothicBBB-Medium-Identity-V "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" +displayNamedCIDFontTT HeiseiKakuGo-W5H "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" +displayNamedCIDFontTT FutoGoB101-Bold "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" +displayNamedCIDFontTT FutoGoB101-Bold-H "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" +displayNamedCIDFontTT FutoGoB101-Bold-V "%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf" #Japanese PDF resources diff --git a/japanese/xshodou/Makefile b/japanese/xshodou/Makefile index 79ecafc..09ec881 100644 --- a/japanese/xshodou/Makefile +++ b/japanese/xshodou/Makefile @@ -7,7 +7,7 @@ PORTNAME= xshodou PORTVERSION= 1.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese tk MASTER_SITES= http://www.saturn.dti.ne.jp/~hsakai/myfreesoft/ @@ -16,12 +16,11 @@ COMMENT= A Japanese shodou program for X based on Tcl/Tk RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80 -USE_X_PREFIX= yes - MAN1= xshodou.1 MANCOMPRESSED= yes WISH= ${LOCALBASE}/bin/wish8.0 +USE_XORG= x11 post-patch: @${REINPLACE_CMD} -e \ diff --git a/japanese/xyagamo/Makefile b/japanese/xyagamo/Makefile index 8930b1f..5c9537a 100644 --- a/japanese/xyagamo/Makefile +++ b/japanese/xyagamo/Makefile @@ -7,15 +7,14 @@ PORTNAME= xyagamo PORTVERSION= 0.1b -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese games MASTER_SITES= http://www.dokidoki.ne.jp/home2/shinmaru/mahjong/ MAINTAINER= ports@FreeBSD.org COMMENT= Japanese version of a four player mahjong game -USE_X_PREFIX= YES -USE_XPM= yes +USE_XORG= xpm MAN6= xyagamo.6 MANLANG= ja diff --git a/japanese/xyagamo/files/patch-Makefile b/japanese/xyagamo/files/patch-Makefile index 6937f21..74a8329 100644 --- a/japanese/xyagamo/files/patch-Makefile +++ b/japanese/xyagamo/files/patch-Makefile @@ -4,7 +4,7 @@ INSTALL = install -c -o root -g wheel -X11PREFIX = /usr/X11R6 -+X11PREFIX = $(X11BASE) ++X11PREFIX = $(LOCALBASE) INSTALL_BINDIR = $(X11PREFIX)/bin INSTALL_LIBDIR = $(X11PREFIX)/lib/X11/xyagamo diff --git a/japanese/xyagamo/files/patch-src-Makefile b/japanese/xyagamo/files/patch-src-Makefile index 67f52d7..898257b 100644 --- a/japanese/xyagamo/files/patch-src-Makefile +++ b/japanese/xyagamo/files/patch-src-Makefile @@ -9,7 +9,7 @@ +#LFLAGS = -g -X11PREFIX ?= /usr/X11R6 -+X11PREFIX = $(X11BASE) ++X11PREFIX = $(LOCALBASE) X11INCL = -I$(X11PREFIX)/include -X11LIBS = -L$(X11PREFIX)/lib -lX11 -lXpm -lxpg4 +X11LIBS = -L$(X11PREFIX)/lib -lX11 -lXpm diff --git a/japanese/xyaku/Makefile b/japanese/xyaku/Makefile index 9f3df18..11922f1 100644 --- a/japanese/xyaku/Makefile +++ b/japanese/xyaku/Makefile @@ -7,7 +7,7 @@ PORTNAME= xyaku PORTVERSION= 1.4.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= japanese textproc MASTER_SITES= http://www.sepia.dti.ne.jp/inoue/software/xyaku/ \ http://redundancy.redundancy.org/mirror/ @@ -17,6 +17,8 @@ COMMENT= A general dictionary/search engine front-end for X RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/eb.so:${PORTSDIR}/japanese/ruby-eb +USE_XORG= x11 xt xext ice sm + OPTIONS= UTF8 "Use UTF-8 edict dictionaries" on .if !defined(WITHOUT_UTF8) @@ -28,7 +30,6 @@ RUN_DEPENDS+= ${EDICT_FILE}:${PORTSDIR}/japanese/edict .endif USE_RUBY= yes -USE_XLIB= yes USE_AUTOTOOLS= autoconf:213 libtool:15 CONFIGURE_ARGS= --with-edict="${EDICT_FILE}" \ --with-ruby="${RUBY}" diff --git a/japanese/zangband/files/Makefile.in b/japanese/zangband/files/Makefile.in index 9034917..1742fd8 100644 --- a/japanese/zangband/files/Makefile.in +++ b/japanese/zangband/files/Makefile.in @@ -6,7 +6,7 @@ ANGBANDLIB?= /usr/local/lib/angband all: testing testing: - cd src && make "EXTRA_CFLAGS=-I${X11BASE}/include ${JAPANESE_CFLAGS} -DDEFAULT_PATH=\\\"${ANGBANDLIB}\\\"" + cd src && make "EXTRA_CFLAGS=-I${LOCALBASE}/include ${JAPANESE_CFLAGS} -DDEFAULT_PATH=\\\"${ANGBANDLIB}\\\"" test: testing ANGBAND_PATH=./lib ./testing diff --git a/japanese/zangband/files/patch-aa b/japanese/zangband/files/patch-aa index ebbe907..64b02e8 100644 --- a/japanese/zangband/files/patch-aa +++ b/japanese/zangband/files/patch-aa @@ -33,7 +33,7 @@ +## Variation -- Compile for FreeBSD +## +CFLAGS += -D"USE_X11" -D"USE_GCU" -D"USE_TRANSPARENCY" ${EXTRA_CFLAGS} -+LIBS = -L${X11BASE}/lib -lX11 -lcurses -ltermcap ++LIBS = -L${LOCALBASE}/lib -lX11 -lcurses -ltermcap |
