diff options
Diffstat (limited to 'chinese')
36 files changed, 94 insertions, 96 deletions
diff --git a/chinese/BBMan/Makefile b/chinese/BBMan/Makefile index 8abfdc7..d5cf7fe 100644 --- a/chinese/BBMan/Makefile +++ b/chinese/BBMan/Makefile @@ -7,9 +7,9 @@ PORTNAME= BBMan PORTVERSION= 1.7.7.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= chinese net -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= ${PORTNAME:L} DISTNAME= ${PORTNAME}-src-v${PORTVERSION:S,.,-,g} @@ -17,7 +17,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= BBMan is a BBS client for X Window System WRKSRC= ${WRKDIR}/${PORTNAME} -USE_X_PREFIX= yes USE_ZIP= yes USE_WX= 2.4 USE_GCC= 3.3 diff --git a/chinese/auto-cn-l10n/Makefile b/chinese/auto-cn-l10n/Makefile index d881e13..0ff5bb0 100644 --- a/chinese/auto-cn-l10n/Makefile +++ b/chinese/auto-cn-l10n/Makefile @@ -27,7 +27,7 @@ OPTIONS= WQY "WenQuanYi Bitmap Song Font" on \ .include <bsd.port.pre.mk> .if !defined(WITHOUT_WQY) -RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/wqy/wenquanyi_10pt.pcf:${PORTSDIR}/x11-fonts/wqy +RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/wqy/wenquanyi_10pt.pcf:${PORTSDIR}/x11-fonts/wqy .endif .if defined(WITH_FIREFLYTTF) @@ -52,7 +52,7 @@ RUN_DEPENDS+= relaxconf:${PORTSDIR}/sysutils/relaxconf .endif post-patch: - @${REINPLACE_CMD} -e "s|%%X11BASE%%|${X11BASE}|g; \ + @${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g; \ s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/dot.xselector ${WRKSRC}/dot.xinitrc do-install: diff --git a/chinese/chinput3/Makefile b/chinese/chinput3/Makefile index 449c46d..0dd7e79 100644 --- a/chinese/chinput3/Makefile +++ b/chinese/chinput3/Makefile @@ -7,7 +7,7 @@ PORTNAME= chinput PORTVERSION= 3.0.2.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= chinese x11 MASTER_SITES= http://ftp.jaist.ac.jp/pub/FreeBSD/distfiles/ \ http://www.gtlib.gatech.edu/pub/FreeBSD/distfiles/ @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Chinese GB2312,BIG5 code input server LATEST_LINK= zh-chinput3 -USE_XLIB= yes +USE_XORG= x11 xt USE_GETTEXT= yes USE_GNOME= gtk12 imlib USE_LDCONFIG= ${PREFIX}/lib/Chinput/im/ @@ -42,7 +42,7 @@ pre-build: s|-I/usr/include|-I${LOCALBASE}/include|; \ s|-L/usr/lib|-L${LOCALBASE}/lib|; \ s|-L/usr/X11R6|-L${LOCALBASE}/lib -L/usr/X11R6|; \ - s|/usr/X11R6|${X11BASE}|' + s|/usr/X11R6|${LOCALBASE}|' post-install: @${CAT} ${PKGMESSAGE} diff --git a/chinese/chinput3/files/pkg-message.in b/chinese/chinput3/files/pkg-message.in index eb3bb5e..7d5d416 100644 --- a/chinese/chinput3/files/pkg-message.in +++ b/chinese/chinput3/files/pkg-message.in @@ -1,7 +1,7 @@ ------------------------------------------------------------------------------- Please check the following files: - %%X11BASE%%/lib/X11/locale/zh_CN/XI18N_OBJS -If not exist, copy %%X11BASE%%/lib/X11/locale/zh/XI18N_OBJS to it. + %%LOCALBASE%%/lib/X11/locale/zh_CN/XI18N_OBJS +If not exist, copy %%LOCALBASE%%/lib/X11/locale/zh/XI18N_OBJS to it. Remember to set environment varible XMODIFIERS: csh/tcsh: setenv XMODIFIERS @im=Chinput diff --git a/chinese/cmexfonts/Makefile b/chinese/cmexfonts/Makefile index 6b0b172..fd3c2ef 100644 --- a/chinese/cmexfonts/Makefile +++ b/chinese/cmexfonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= cmexfonts PORTVERSION= 0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= chinese x11-fonts MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= X11/fonts @@ -15,10 +15,11 @@ MASTER_SITE_SUBDIR= X11/fonts MAINTAINER= ports@FreeBSD.org COMMENT= Big5+ Chinese Mingti bitmap font (by CMEX & DynaLab) for X11 -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 -USE_X_PREFIX= yes +USE_XORG= x11 NO_BUILD= yes WRKSRC= ${WRKDIR}/cmexfonts diff --git a/chinese/cxterm/Makefile b/chinese/cxterm/Makefile index 651bae8..e0a23bf 100644 --- a/chinese/cxterm/Makefile +++ b/chinese/cxterm/Makefile @@ -8,7 +8,7 @@ PORTNAME= cxterm PORTVERSION= 5.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= chinese x11 MASTER_SITES= ftp://ftp.cuhk.hk/pub/chinese/ifcss/software/x-win/cxterm/ \ http://www.525183.com/freebsd/cxterm/ \ @@ -23,8 +23,10 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= sunrychen@gmail.com COMMENT= An xterm that speaks Chinese -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_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale WRKSRC= ${WRKDIR}/cxterm-5.0 USE_IMAKE= yes diff --git a/chinese/cxterm/scripts/pre-install b/chinese/cxterm/scripts/pre-install index a03377b..8526701 100644 --- a/chinese/cxterm/scripts/pre-install +++ b/chinese/cxterm/scripts/pre-install @@ -22,7 +22,7 @@ echo "" >> $CXTERM_SH # look for Simple fonts from the X11R6 misc fonts collection -if [ ! -f ${X11BASE}/lib/X11/fonts/misc/gb16st.pcf.Z ]; then +if [ ! -f ${LOCALBASE}/lib/X11/fonts/misc/gb16st.pcf.Z ]; then echo "" echo "You need to install the X11R6 misc fonts in order to get the" echo "Simple Chinese fonts." diff --git a/chinese/eterm/Makefile b/chinese/eterm/Makefile index 710480d..dfe5304 100644 --- a/chinese/eterm/Makefile +++ b/chinese/eterm/Makefile @@ -20,6 +20,6 @@ CONFIGURE_ARGS= --enable-trans --enable-utmp \ PKGDIR= ${.CURDIR} PLIST= ${MASTERDIR}/pkg-plist -RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/local/kc15f.pcf.gz:${PORTSDIR}/chinese/kcfonts +RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/local/kc15f.pcf.gz:${PORTSDIR}/chinese/kcfonts .include "${MASTERDIR}/Makefile" diff --git a/chinese/fireflyttf/Makefile b/chinese/fireflyttf/Makefile index b7aa813..d565667 100644 --- a/chinese/fireflyttf/Makefile +++ b/chinese/fireflyttf/Makefile @@ -54,7 +54,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/${TTF} ${FONTSDIR} ${INSTALL_DATA} ${FILESDIR}/local.conf-sung ${FONTSDIR} .if !defined(WITHOUT_X11) - ${INSTALL_DATA} ${FILESDIR}/local.conf-sung ${X11BASE}/etc/fonts/local.conf + ${INSTALL_DATA} ${FILESDIR}/local.conf-sung ${LOCALBASE}/etc/fonts/local.conf .endif .include "${PORTSDIR}/chinese/ttfm/Makefile.ttf" diff --git a/chinese/fireflyttf/pkg-plist b/chinese/fireflyttf/pkg-plist index 51ad1eb..7fa95af 100644 --- a/chinese/fireflyttf/pkg-plist +++ b/chinese/fireflyttf/pkg-plist @@ -1,3 +1,3 @@ -%%X11%%@unexec if cmp -s %%X11BASE%%/etc/fonts/local.conf %D/%%FONTSDIR%%/local.conf-sung; then rm -f %%X11BASE%%/etc/fonts/local.conf; fi +%%X11%%@unexec if cmp -s %%LOCALBASE%%/etc/fonts/local.conf %D/%%FONTSDIR%%/local.conf-sung; then rm -f %%LOCALBASE%%/etc/fonts/local.conf; fi %%FONTSDIR%%/local.conf-sung -%%X11%%@exec cp %D/%%FONTSDIR%%/local.conf-sung %%X11BASE%%/etc/fonts/local.conf +%%X11%%@exec cp %D/%%FONTSDIR%%/local.conf-sung %%LOCALBASE%%/etc/fonts/local.conf diff --git a/chinese/gcin-devel/Makefile b/chinese/gcin-devel/Makefile index f78021f..f1a33dd 100644 --- a/chinese/gcin-devel/Makefile +++ b/chinese/gcin-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= gcin PORTVERSION= 1.3.9 +PORTREVISION= 1 CATEGORIES= chinese textproc gnome MASTER_SITES= http://cle.linux.org.tw/gcin/download/:main \ http://ftp.twaren.net/local-distfiles/gcin/:main \ @@ -22,7 +23,7 @@ USE_BZIP2= YES HAS_CONFIGURE= YES USE_GNOME= gtk20 USE_GMAKE= YES -USE_GCC= 3.4+ +USE_XORG= xtst INSTALLS_ICONS= YES USE_LDCONFIG= YES OPTIONS= BOSHIAMY "enable Boshiamy Input Method" off @@ -58,17 +59,17 @@ pre-patch: @${REINPLACE_CMD} -e 's,/usr/local,/usr,g' \ ${WRKSRC}/gtk-im/Makefile ${WRKSRC}/menu/Makefile @${REINPLACE_CMD} -e 's,/usr/lib,${LOCALBASE}/lib,g; \ - s,/usr/include,${X11BASE}/include,g; s,Xft2/X11/Xft,X11/Xft,' \ + s,/usr/include,${LOCALBASE}/include,g; s,Xft2/X11/Xft,X11/Xft,' \ ${WRKSRC}/qt-im/Makefile @${REINPLACE_CMD} -e 's,modify-XIM ,,; 8,10 d' \ ${WRKSRC}/scripts/Makefile - @${REINPLACE_CMD} -e 's,bash,sh,; s/&//; s,/opt/gnome,${X11BASE},;' \ + @${REINPLACE_CMD} -e 's,bash,sh,; s/&//; s,/opt/gnome,${LOCALBASE},;' \ ${WRKSRC}/scripts/utf8-edit ${WRKSRC}/scripts/gcin-user-setup \ ${WRKSRC}/scripts/gtab.append_prepare @${REINPLACE_CMD} -e 's,wget,fetch,' ${WRKSRC}/scripts/noseeing-inst @${REINPLACE_CMD} -e 's,gcin-im-client.h,im-client/gcin-im-client.h,;' \ ${WRKSRC}/gtk-im/gtkimcontextgcin.c - @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},' \ + @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},' \ ${WRKSRC}/IMdkit/lib/Makefile ${WRKSRC}/Makefile \ ${WRKSRC}/qt-im/Makefile ${WRKSRC}/scripts/modify-XIM \ ${WRKSRC}/scripts/utf8-edit diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile index f78021f..f1a33dd 100644 --- a/chinese/gcin/Makefile +++ b/chinese/gcin/Makefile @@ -7,6 +7,7 @@ PORTNAME= gcin PORTVERSION= 1.3.9 +PORTREVISION= 1 CATEGORIES= chinese textproc gnome MASTER_SITES= http://cle.linux.org.tw/gcin/download/:main \ http://ftp.twaren.net/local-distfiles/gcin/:main \ @@ -22,7 +23,7 @@ USE_BZIP2= YES HAS_CONFIGURE= YES USE_GNOME= gtk20 USE_GMAKE= YES -USE_GCC= 3.4+ +USE_XORG= xtst INSTALLS_ICONS= YES USE_LDCONFIG= YES OPTIONS= BOSHIAMY "enable Boshiamy Input Method" off @@ -58,17 +59,17 @@ pre-patch: @${REINPLACE_CMD} -e 's,/usr/local,/usr,g' \ ${WRKSRC}/gtk-im/Makefile ${WRKSRC}/menu/Makefile @${REINPLACE_CMD} -e 's,/usr/lib,${LOCALBASE}/lib,g; \ - s,/usr/include,${X11BASE}/include,g; s,Xft2/X11/Xft,X11/Xft,' \ + s,/usr/include,${LOCALBASE}/include,g; s,Xft2/X11/Xft,X11/Xft,' \ ${WRKSRC}/qt-im/Makefile @${REINPLACE_CMD} -e 's,modify-XIM ,,; 8,10 d' \ ${WRKSRC}/scripts/Makefile - @${REINPLACE_CMD} -e 's,bash,sh,; s/&//; s,/opt/gnome,${X11BASE},;' \ + @${REINPLACE_CMD} -e 's,bash,sh,; s/&//; s,/opt/gnome,${LOCALBASE},;' \ ${WRKSRC}/scripts/utf8-edit ${WRKSRC}/scripts/gcin-user-setup \ ${WRKSRC}/scripts/gtab.append_prepare @${REINPLACE_CMD} -e 's,wget,fetch,' ${WRKSRC}/scripts/noseeing-inst @${REINPLACE_CMD} -e 's,gcin-im-client.h,im-client/gcin-im-client.h,;' \ ${WRKSRC}/gtk-im/gtkimcontextgcin.c - @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},' \ + @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},' \ ${WRKSRC}/IMdkit/lib/Makefile ${WRKSRC}/Makefile \ ${WRKSRC}/qt-im/Makefile ${WRKSRC}/scripts/modify-XIM \ ${WRKSRC}/scripts/utf8-edit diff --git a/chinese/gugod-clean/Makefile b/chinese/gugod-clean/Makefile index baee248..b36705e 100644 --- a/chinese/gugod-clean/Makefile +++ b/chinese/gugod-clean/Makefile @@ -5,23 +5,23 @@ PORTNAME= gugod-clean PORTVERSION= 1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= chinese x11-fonts MASTER_SITES= ftp://freebsd.sinica.edu.tw/pub/gugod/ MAINTAINER= gugod@gugod.org COMMENT= A pretty font modifyed from X11 schumacher-clean that match kcfonts -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} - -USE_X_PREFIX= yes +RUN_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale FONTFILES= gugod16.bdf gugod18.bdf gugod20.bdf gugod22.bdf WRKSRC= ${WRKDIR} NO_BUILD= yes SHAREMODE= 644 -XFONTDIR= ${X11BASE}/lib/X11/fonts/local +XFONTDIR= ${LOCALBASE}/lib/X11/fonts/local do-install: @${MKDIR} ${XFONTDIR} diff --git a/chinese/hanzim/files/patch-Makefile b/chinese/hanzim/files/patch-Makefile index 8234eae..49b7177 100644 --- a/chinese/hanzim/files/patch-Makefile +++ b/chinese/hanzim/files/patch-Makefile @@ -32,7 +32,7 @@ # location of x library -LIBXDIR = -L /usr/X11/lib -+LIBXDIR = -L${X11BASE}/lib ++LIBXDIR = -L${LOCALBASE}/lib # you might need to change "libtcl" and "libtk" to "libtcl8.x" and "libtk8.x" -LIBS = $(LIBXDIR) $(LIBTCLDIR) -ltk -ltcl -lX11 -lm -ldl @@ -47,7 +47,7 @@ -CC = cc -DEFINES = -D$(OS) -DLIBDIR=\"$(LIBDIR)\" -CFLAGS = -O2 $(DEFINES) -+DEFINES = -D$(OS) -DLIBDIR=\"$(LIBDIR)\" -I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include/tcl8.4 -I${X11BASE}/include ++DEFINES = -D$(OS) -DLIBDIR=\"$(LIBDIR)\" -I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include +CFLAGS += $(DEFINES) #CFLAGS = -O2 -Wall -pedantic -ansi $(DEFINES) LFLAGS = $(LIBS) -s diff --git a/chinese/iiimf-le-newpy/Makefile b/chinese/iiimf-le-newpy/Makefile index 53d7657..3e451f0 100644 --- a/chinese/iiimf-le-newpy/Makefile +++ b/chinese/iiimf-le-newpy/Makefile @@ -32,8 +32,8 @@ LE_TARGETS= newpy .if !defined(WITHOUT_XAUX) LE_TARGETS+= newpy/xaux USE_MOTIF= yes -CFLAGS+= -I${X11BASE}/include -LDFLAGS+= -L${X11BASE}/lib +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB+= WANT_XAUX="" .else PLIST_SUB+= WANT_XAUX="@comment " diff --git a/chinese/iiimf-le-xcin/Makefile b/chinese/iiimf-le-xcin/Makefile index 7b39edb..43a6c85 100644 --- a/chinese/iiimf-le-xcin/Makefile +++ b/chinese/iiimf-le-xcin/Makefile @@ -7,7 +7,7 @@ PORTNAME= iiimf-le-xcin PORTVERSION= 0.1.7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= chinese textproc MASTER_SITES= http://people.redhat.com/llch/iiimf-xcin/${PORTVERSION}/ EXTRACT_SUFX= -11.src.rpm @@ -20,7 +20,6 @@ RUN_DEPENDS= iiimd:${PORTSDIR}/textproc/iiimf-server WRKSRC= ${WRKDIR}/iiimf-xcin USE_BZIP2= yes -USE_XLIB= yes USE_GNOME= libxml2 USE_AUTOTOOLS= automake:19 autoheader:261 autoconf:261 libtool:15 AUTOMAKE_ARGS= --add-missing diff --git a/chinese/libtabe/Makefile b/chinese/libtabe/Makefile index 4f33536..8475264 100644 --- a/chinese/libtabe/Makefile +++ b/chinese/libtabe/Makefile @@ -7,7 +7,7 @@ PORTNAME= libtabe PORTVERSION= 0.2.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= chinese MASTER_SITES= ftp://cle.linux.org.tw/pub/xcin/cvs/ @@ -32,7 +32,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \ .include <bsd.port.pre.mk> .if !defined(WITHOUT_X11) -USE_XLIB= yes +USE_XORG= x11 PLIST_SUB+= X11="" .else CONFIGURE_ARGS+=--without-x diff --git a/chinese/miniChinput/Makefile b/chinese/miniChinput/Makefile index 94d12a7..16e845c 100644 --- a/chinese/miniChinput/Makefile +++ b/chinese/miniChinput/Makefile @@ -7,10 +7,9 @@ PORTNAME= miniChinput PORTVERSION= 0.1.9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= chinese -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= minichinput +MASTER_SITES= SF/minichinput MAINTAINER= ports@FreeBSD.org COMMENT= A tiny version of Chinput @@ -18,7 +17,7 @@ COMMENT= A tiny version of Chinput GNU_CONFIGURE= yes USE_GMAKE= yes USE_ICONV= yes -USE_XLIB= yes +USE_XORG= x11 xt USE_LDCONFIG= yes ALL_TARGET= all data INSTALL_TARGET= install data-install @@ -37,7 +36,7 @@ post-patch: @${REINPLACE_CMD} -e 's#$$(prefix)$$(imdir)/{gb,gbk,big5}#$$(prefix)$$(imdir)/gb $$(prefix)$$(imdir)/gbk $$(prefix)$$(imdir)/big5#g' ${WRKSRC}/ImmModules/turbo/Makefile.in @${REINPLACE_CMD} -e 's,-@PACKAGE_VERSION@,,g' ${WRKSRC}/doc/Makefile.in @${REINPLACE_CMD} -e 's,/share/man,/man,g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/src/IMdkit/Makefile + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/src/IMdkit/Makefile post-install: @${CAT} ${PKGMESSAGE} diff --git a/chinese/moettf/pkg-plist b/chinese/moettf/pkg-plist index 08da29a..afbfc80 100644 --- a/chinese/moettf/pkg-plist +++ b/chinese/moettf/pkg-plist @@ -1,2 +1,2 @@ -@exec sed -e "s/ ° ê ¦ r ¼ Ð · Ç § º Å é/twmoe_sung/g" -e "s/ t w m o e _ k a i/twmoe_kai/g" %%X11BASE%%/%%XFONTSDIR%%/fonts.dir > %%X11BASE%%/%%XFONTSDIR%%/fonts.dir.tmp && mv %%X11BASE%%/%%XFONTSDIR%%/fonts.dir.tmp %%X11BASE%%/%%XFONTSDIR%%/fonts.dir -@exec sed -e "s/ ° ê ¦ r ¼ Ð · Ç § º Å é/twmoe_sung/g" -e "s/ t w m o e _ k a i/twmoe_kai/g" %%X11BASE%%/%%XFONTSDIR%%/fonts.alias > %%X11BASE%%/%%XFONTSDIR%%/fonts.alias.tmp && mv %%X11BASE%%/%%XFONTSDIR%%/fonts.alias.tmp %%X11BASE%%/%%XFONTSDIR%%/fonts.alias +@exec sed -e "s/ ° ê ¦ r ¼ Ð · Ç § º Å é/twmoe_sung/g" -e "s/ t w m o e _ k a i/twmoe_kai/g" %%LOCALBASE%%/%%XFONTSDIR%%/fonts.dir > %%LOCALBASE%%/%%XFONTSDIR%%/fonts.dir.tmp && mv %%LOCALBASE%%/%%XFONTSDIR%%/fonts.dir.tmp %%LOCALBASE%%/%%XFONTSDIR%%/fonts.dir +@exec sed -e "s/ ° ê ¦ r ¼ Ð · Ç § º Å é/twmoe_sung/g" -e "s/ t w m o e _ k a i/twmoe_kai/g" %%LOCALBASE%%/%%XFONTSDIR%%/fonts.alias > %%LOCALBASE%%/%%XFONTSDIR%%/fonts.alias.tmp && mv %%LOCALBASE%%/%%XFONTSDIR%%/fonts.alias.tmp %%LOCALBASE%%/%%XFONTSDIR%%/fonts.alias diff --git a/chinese/mplayer-fonts/Makefile b/chinese/mplayer-fonts/Makefile index 557b51b..2ba64d2 100644 --- a/chinese/mplayer-fonts/Makefile +++ b/chinese/mplayer-fonts/Makefile @@ -32,7 +32,7 @@ SUBFONT_DISTNAME= subfont-c-0.90pre6 MPLAYER_FONTDIR= ${LOCALBASE}/share/mplayer/fonts/chinese FREETYPE_CONFIG= ${LOCALBASE}/bin/freetype-config -ARPHIC_FONTDIR= ${X11BASE}/lib/X11/fonts/TrueType +ARPHIC_FONTDIR= ${LOCALBASE}/lib/X11/fonts/TrueType ARPHIC_FONTS_BIG5= bkai00mp bsmi00lp ARPHIC_FONTS_GB2312= gbsn00lp gkai00mp ALL_FONTS= ${ARPHIC_FONTS_BIG5} ${ARPHIC_FONTS_GB2312} diff --git a/chinese/msttf/Makefile b/chinese/msttf/Makefile index ff6fbdd..0887324 100644 --- a/chinese/msttf/Makefile +++ b/chinese/msttf/Makefile @@ -7,7 +7,7 @@ PORTNAME= msttf PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= chinese x11-fonts MASTER_SITES= # DISTFILES= ${MSTTF_SIMHEI} ${MSTTF_SIMSUN} ${MSTTF_TAHOMA} @@ -29,9 +29,9 @@ RESTRICTED= "Redistribution of pre-compiled binaries is not permitted" NO_BUILD= yes SHAREMODE= 644 NO_WRKSUBDIR= yes -USE_XLIB= yes +USE_XORG= x11 FONTDIR= ${PREFIX}/share/fonts/TrueType -XFONTDIR= ${X11BASE}/lib/X11/fonts/TrueType +XFONTDIR= ${LOCALBASE}/lib/X11/fonts/TrueType INSTALL_ENV= PKG_PREFIX=${PREFIX} XFREE86_VERSION=${XFREE86_VERSION} \ WANT_GS=${WANT_GS} WITHOUT_X=${WITHOUT_X} diff --git a/chinese/opendesktop-fonts/Makefile b/chinese/opendesktop-fonts/Makefile index 1ee9179..be4c0b5 100644 --- a/chinese/opendesktop-fonts/Makefile +++ b/chinese/opendesktop-fonts/Makefile @@ -45,7 +45,7 @@ do-install: .endfor ${INSTALL_DATA} ${FILESDIR}/local.conf-odo ${FONTSDIR} .if !defined(WITHOUT_X11) - ${INSTALL_DATA} ${FILESDIR}/local.conf-odo ${X11BASE}/etc/fonts/local.conf + ${INSTALL_DATA} ${FILESDIR}/local.conf-odo ${LOCALBASE}/etc/fonts/local.conf .endif .include "${PORTSDIR}/chinese/ttfm/Makefile.ttf" diff --git a/chinese/opendesktop-fonts/pkg-plist b/chinese/opendesktop-fonts/pkg-plist index a965e94..5fd370c 100644 --- a/chinese/opendesktop-fonts/pkg-plist +++ b/chinese/opendesktop-fonts/pkg-plist @@ -1,3 +1,3 @@ -%%X11%%@unexec if cmp -s %%X11BASE%%/etc/fonts/local.conf %D/%%FONTSDIR%%/local.conf-odo; then rm -f %%X11BASE%%/etc/fonts/local.conf; fi +%%X11%%@unexec if cmp -s %%LOCALBASE%%/etc/fonts/local.conf %D/%%FONTSDIR%%/local.conf-odo; then rm -f %%LOCALBASE%%/etc/fonts/local.conf; fi %%FONTSDIR%%/local.conf-odo -%%X11%%@exec cp %D/%%FONTSDIR%%/local.conf-odo %%X11BASE%%/etc/fonts/local.conf +%%X11%%@exec cp %D/%%FONTSDIR%%/local.conf-odo %%LOCALBASE%%/etc/fonts/local.conf diff --git a/chinese/oxim/Makefile b/chinese/oxim/Makefile index 1770810..99cfbeb 100644 --- a/chinese/oxim/Makefile +++ b/chinese/oxim/Makefile @@ -32,7 +32,7 @@ WANT_GNOME= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include +CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -liconv CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" diff --git a/chinese/pyDict/Makefile b/chinese/pyDict/Makefile index 19b400e..6010f4c 100644 --- a/chinese/pyDict/Makefile +++ b/chinese/pyDict/Makefile @@ -18,7 +18,7 @@ MAINTAINER= sunrychen@gmail.com COMMENT= A Chinese <-> English dictionary, under both console and X11 RUN_DEPENDS= ${LOCALBASE}/include/pygtk/pygtk.h:${PORTSDIR}/x11-toolkits/py-gtk \ - ${X11BASE}/lib/X11/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf + ${LOCALBASE}/lib/X11/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf WRKSRC= ${WRKDIR}/dict NO_BUILD= yes diff --git a/chinese/qterm/Makefile b/chinese/qterm/Makefile index 4893096..998bbd8 100644 --- a/chinese/qterm/Makefile +++ b/chinese/qterm/Makefile @@ -7,6 +7,7 @@ PORTNAME= qterm PORTVERSION= 0.4.1 +PORTREVISION= 1 CATEGORIES= chinese MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.yuanjue.net/download/ @@ -16,13 +17,14 @@ PKGNAMEPREFIX= zh- MAINTAINER= yuanjue@yuanjue.net COMMENT= QTerm is a BBS client for BSD/Linux +USE_XORG= x11 ice xext xt xaw xpm xi xproto xextproto USE_BZIP2= yes USE_PERL5_BUILD=yes USE_QT_VER= 3 HAS_CONFIGURE= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --enable-mt --prefix=${PREFIX} \ - --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include +CONFIGURE_ARGS= --enable-mt --prefix=${PREFIX} +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" .if !defined(WITHOUT_PYTHON) USE_PYTHON= 2.3+ diff --git a/chinese/srecite/Makefile b/chinese/srecite/Makefile index 36bbc3d..04850b1 100644 --- a/chinese/srecite/Makefile +++ b/chinese/srecite/Makefile @@ -7,7 +7,7 @@ PORTNAME= srecite PORTVERSION= 0.6.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= chinese textproc MASTER_SITES= SF DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \ @@ -22,7 +22,6 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" USE_GMAKE= yes -USE_X_PREFIX= yes USE_GNOME= gnomehack gnomeprefix libgnomeui WORDBOOKS_PATH= ${PREFIX}/share/${PORTNAME}/wordbooks diff --git a/chinese/tcl83/Makefile b/chinese/tcl83/Makefile index abb6f5c..d7feffc 100644 --- a/chinese/tcl83/Makefile +++ b/chinese/tcl83/Makefile @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/unix GNU_CONFIGURE= yes CONFIGURE_ENV= PORTSDIR=${PORTSDIR} CONFIGURE_ARGS= --enable-shared --enable-i18nImprove -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes NOPRECIOUSMAKEVARS= yes # Otherwise 'make readmes' is broken MAKE_ENV= SHORT_TCL_VER=83 PKGINSTALL= ${PKGDIR}/INSTALL.tclsh diff --git a/chinese/tk83/Makefile b/chinese/tk83/Makefile index 5f50ad0..c321b46 100644 --- a/chinese/tk83/Makefile +++ b/chinese/tk83/Makefile @@ -7,7 +7,7 @@ PORTNAME= tk PORTVERSION= 8.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= chinese x11-toolkits tk MASTER_SITES= ${MASTER_SITE_TCLTK} MASTER_SITE_SUBDIR= tcl8_3 @@ -18,7 +18,7 @@ COMMENT= Graphical toolkit for TCL which supports Chinese LIB_DEPENDS= tcl83.1:${PORTSDIR}/chinese/tcl83 -USE_XLIB= yes +USE_XORG= xt WRKSRC= ${WRKDIR}/${DISTNAME}/unix GNU_CONFIGURE= yes CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk83.so.1 diff --git a/chinese/ttfm/Makefile.ttf b/chinese/ttfm/Makefile.ttf index 47b0c07..efaaf28 100644 --- a/chinese/ttfm/Makefile.ttf +++ b/chinese/ttfm/Makefile.ttf @@ -16,12 +16,12 @@ FONTSDIR?= ${PREFIX}/share/fonts/TrueType FONTSDIR_REL= ${FONTSDIR:S,^${PREFIX}/,,} PLIST_SUB+= FONTSDIR=${FONTSDIR_REL} -XFONTSDIR?= ${X11BASE}/lib/X11/fonts/TrueType -XFONTSDIR_REL= ${XFONTSDIR:S,${X11BASE}/,,} +XFONTSDIR?= ${LOCALBASE}/lib/X11/fonts/TrueType +XFONTSDIR_REL= ${XFONTSDIR:S,${LOCALBASE}/,,} PLIST_SUB+= XFONTSDIR=${XFONTSDIR_REL} .if !defined(WITHOUT_X11) -RUN_DEPENDS+= ${X11BASE}/bin/fc-cache:${PORTSDIR}/x11-fonts/fontconfig +RUN_DEPENDS+= ${LOCALBASE}/bin/fc-cache:${PORTSDIR}/x11-fonts/fontconfig _TTF_MODULES= xttfm .endif @@ -62,7 +62,7 @@ do-install-ttf: .endfor .if !defined(WITHOUT_X11) @${ECHO_MSG} "===> Running fc-cache" - -@${X11BASE}/bin/fc-cache -f -v ${XFONTSDIR} + -@${LOCALBASE}/bin/fc-cache -f -v ${XFONTSDIR} .endif add-plist-post: add-plist-ttf @@ -81,8 +81,8 @@ add-plist-ttf: . endfor .endfor .if !defined(WITHOUT_X11) - @${ECHO_CMD} "@unexec ${X11BASE}/bin/fc-cache -f -v ${XFONTSDIR} || true" >> ${TMPPLIST} - @${ECHO_CMD} "@exec ${X11BASE}/bin/fc-cache -f -v ${XFONTSDIR} || true" >> ${TMPPLIST} + @${ECHO_CMD} "@unexec ${LOCALBASE}/bin/fc-cache -f -v ${XFONTSDIR} || true" >> ${TMPPLIST} + @${ECHO_CMD} "@exec ${LOCALBASE}/bin/fc-cache -f -v ${XFONTSDIR} || true" >> ${TMPPLIST} @${ECHO_CMD} "@unexec find ${XFONTSDIR} -size -3c -delete || true" >> ${TMPPLIST} @${ECHO_CMD} "@unexec rmdir ${XFONTSDIR} 2>/dev/null || true" >> ${TMPPLIST} .endif diff --git a/chinese/vflib/Makefile b/chinese/vflib/Makefile index 8ca3658..aff90e7 100644 --- a/chinese/vflib/Makefile +++ b/chinese/vflib/Makefile @@ -7,7 +7,7 @@ PORTNAME= vflib PORTVERSION= ${VFLIB_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= chinese print MASTER_SITES= ftp://freebsd.sinica.edu.tw/pub/keith/VFlib2/ \ ftp://gull.se.hiroshima-u.ac.jp/pub/TypeHack/ @@ -22,7 +22,7 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= ports@FreeBSD.org COMMENT= Vector font library with free vector font, BIG5 and GB supported -BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake VFLIB_VERSION= 2.25.6 PLIST_SUB= VFLIB_VERSION=${VFLIB_VERSION} @@ -33,14 +33,14 @@ CONFIGURE_ARGS= --with-freetype \ --with-freetype-includedir=${LOCALBASE}/include/freetype1/freetype \ --with-freetype-libdir=${LOCALBASE}/lib USE_FREETYPE= yes -USE_XLIB= yes +USE_XORG= x11 xext USE_LDCONFIG= yes USE_GETTEXT= yes .include <bsd.port.pre.mk> pre-patch: - @${SED} -e "s;%%LOCALBASE%%;${LOCALBASE};g" -e "s;%%X11BASE%%;${X11BASE};g" ${DISTDIR}/zh-vfontcap.in > ${WRKSRC}/vfontcap + @${SED} -e "s;%%LOCALBASE%%;${LOCALBASE};g" -e "s;%%X11BASE%%;${LOCALBASE};g" ${DISTDIR}/zh-vfontcap.in > ${WRKSRC}/vfontcap post-patch: @${REINPLACE_CMD} -e "s,varargs.h,stdarg.h," ${WRKSRC}/tools/disol.c diff --git a/chinese/wenju/Makefile b/chinese/wenju/Makefile index c54e154..df7338f 100644 --- a/chinese/wenju/Makefile +++ b/chinese/wenju/Makefile @@ -7,10 +7,9 @@ PORTNAME= wenju PORTVERSION= 1.3 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= chinese -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= wenju +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Collection of writing tools in Chinese @@ -18,7 +17,6 @@ COMMENT= Collection of writing tools in Chinese USE_AUTOTOOLS= libtool:15 USE_GNOME= gtk20 USE_LDCONFIG= yes -USE_XLIB= yes .if !defined(WITHOUT_NLS) USE_GETTEXT= yes diff --git a/chinese/xmms/Makefile b/chinese/xmms/Makefile index 4a487c8..5880636 100644 --- a/chinese/xmms/Makefile +++ b/chinese/xmms/Makefile @@ -16,6 +16,4 @@ EXTRA_PATCHES= ${.CURDIR}/files/extra-patch-xmms-1.2.x-xfont MAINTAINER= clive@FreeBSD.org -#RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf - .include "${MASTERDIR}/Makefile" diff --git a/chinese/xpdf/files/dot.xpdfrc.in b/chinese/xpdf/files/dot.xpdfrc.in index 4f19117..0c3e438 100644 --- a/chinese/xpdf/files/dot.xpdfrc.in +++ b/chinese/xpdf/files/dot.xpdfrc.in @@ -1,16 +1,16 @@ #----- begin Chinese Traditional support package (2004-jul-27) -cidToUnicode Adobe-CNS1 %%X11BASE%%/share/xpdf/chinese-traditional/Adobe-CNS1.cidToUnicode -unicodeMap Big5 %%X11BASE%%/share/xpdf/chinese-traditional/Big5.unicodeMap -unicodeMap Big5ascii %%X11BASE%%/share/xpdf/chinese-traditional/Big5ascii.unicodeMap +cidToUnicode Adobe-CNS1 %%LOCALBASE%%/share/xpdf/chinese-traditional/Adobe-CNS1.cidToUnicode +unicodeMap Big5 %%LOCALBASE%%/share/xpdf/chinese-traditional/Big5.unicodeMap +unicodeMap Big5ascii %%LOCALBASE%%/share/xpdf/chinese-traditional/Big5ascii.unicodeMap cMapDir Adobe-CNS1 %%ADOBECMAPDIR%% toUnicodeDir %%ADOBECMAPDIR%% displayCIDFontTT Adobe-CNS1 %%LOCALBASE%%/share/fonts/TrueType/bkai00mp.ttf #----- end Chinese Traditional support package #----- begin Chinese Simplified support package (2004-jul-27) -cidToUnicode Adobe-GB1 %%X11BASE%%/share/xpdf/chinese-simplified/Adobe-GB1.cidToUnicode -unicodeMap ISO-2022-CN %%X11BASE%%/share/xpdf/chinese-simplified/ISO-2022-CN.unicodeMap -unicodeMap EUC-CN %%X11BASE%%/share/xpdf/chinese-simplified/EUC-CN.unicodeMap -unicodeMap GBK %%X11BASE%%/share/xpdf/chinese-simplified/GBK.unicodeMap +cidToUnicode Adobe-GB1 %%LOCALBASE%%/share/xpdf/chinese-simplified/Adobe-GB1.cidToUnicode +unicodeMap ISO-2022-CN %%LOCALBASE%%/share/xpdf/chinese-simplified/ISO-2022-CN.unicodeMap +unicodeMap EUC-CN %%LOCALBASE%%/share/xpdf/chinese-simplified/EUC-CN.unicodeMap +unicodeMap GBK %%LOCALBASE%%/share/xpdf/chinese-simplified/GBK.unicodeMap cMapDir Adobe-GB1 %%ADOBECMAPDIR%% toUnicodeDir %%ADOBECMAPDIR%% displayCIDFontTT Adobe-GB1 %%LOCALBASE%%/share/fonts/TrueType/gkai00mp.ttf diff --git a/chinese/xsim/Makefile b/chinese/xsim/Makefile index 76e6f6e..9749e2a 100644 --- a/chinese/xsim/Makefile +++ b/chinese/xsim/Makefile @@ -7,17 +7,16 @@ PORTNAME= xsim PORTVERSION= 0.3.9.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= chinese -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz \ ${PORTNAME}-data-freebsd-gb2312.tar.gz MAINTAINER= ports@FreeBSD.org COMMENT= A simple and fast GBK Chinese XIM server -USE_XLIB= yes +USE_XORG= x11 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-cn-locale=eucCN PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/chinese/xsim/files/pkg-message.in b/chinese/xsim/files/pkg-message.in index 2962664..39fa6e1 100644 --- a/chinese/xsim/files/pkg-message.in +++ b/chinese/xsim/files/pkg-message.in @@ -1,13 +1,13 @@ ------------------------------------------------------------------------------- Please check the following files: - %%X11BASE%%/lib/X11/locale/zh_CN/XI18N_OBJS -If not exist, copy %%X11BASE%%/lib/X11/locale/zh/XI18N_OBJS to it. + %%LOCALBASE%%/lib/X11/locale/zh_CN/XI18N_OBJS +If not exist, copy %%LOCALBASE%%/lib/X11/locale/zh/XI18N_OBJS to it. If you got the message: XSIM: Failed opening share library function: Undefined symbol "__XlcEucLoader" Comment XLC common/xlocale _XlcEucLoader # XLC_open -in %%X11BASE%%/lib/X11/locale/zh_CN/XI18N_OBJS +in %%LOCALBASE%%/lib/X11/locale/zh_CN/XI18N_OBJS Remember to set environment varible XMODIFIERS: csh/tcsh: setenv XMODIFIERS @im=XSIM |
