From 7d6543498b718f587ff967ca8ecd6ff108e37ab3 Mon Sep 17 00:00:00 2001 From: keith Date: Fri, 8 Dec 2000 09:01:33 +0000 Subject: CJK -> WANT_CJK GS6 -> WANT_GS6 XTT -> WANT_X According to bsd.gnome.mk's logic. --- chinese/arphicttf/Makefile | 20 ++++++++++---------- chinese/arphicttf/pkg-install | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/chinese/arphicttf/Makefile b/chinese/arphicttf/Makefile index a5991ee67ad7..c95be1006358 100644 --- a/chinese/arphicttf/Makefile +++ b/chinese/arphicttf/Makefile @@ -16,28 +16,28 @@ MAINTAINER= keith@FreeBSD.org RUN_DEPENDS= ttfm.sh:${PORTSDIR}/chinese/ttfm -CJK?= NO -GS6?= NO -XTT?= YES +WANT_CJK?= NO +WANT_GS6?= NO +WANT_X?= YES -NO_BUILD= YES +NO_BUILD= yes SHAREMODE= 644 WRKSRC= ${WRKDIR}/arphic -USE_XLIB= YES +USE_XLIB= yes FONTDIR= ${PREFIX}/share/fonts/TrueType XFONTDIR= ${X11BASE}/lib/X11/fonts/TrueType -INSTALL_ENV= PKG_PREFIX=${PREFIX} CJK=${CJK} GS6=${GS6} XTT=${XTT} \ - XFREE86_VERSION=${XFREE86_VERSION} +INSTALL_ENV= PKG_PREFIX=${PREFIX} XFREE86_VERSION=${XFREE86_VERSION} \ + WANT_CJK=${WANT_CJK} WANT_GS6=${WANT_GS6} WANT_X=${WANT_X} .include -.if ${CJK} != "NO" +.if ${WANT_CJK} != "NO" RUN_DEPENDS+= bg5latex:${PORTSDIR}/chinese/CJK .endif -.if ${GS6} != "NO" +.if ${WANT_GS6} != "NO" RUN_DEPENDS+= ${LOCALBASE}/share/ghostscript/CJK/CMap/B5pc-H:${PORTSDIR}/chinese/ghostscript6 .endif -.if ${XFREE86_VERSION} == 3 && ${XTT} != "NO" +.if ${XFREE86_VERSION} == 3 && ${WANT_X} != "NO" RUN_DEPENDS+= mkfontdir.pl:${PORTSDIR}/x11-servers/XttXF86srv-common .endif diff --git a/chinese/arphicttf/pkg-install b/chinese/arphicttf/pkg-install index c1d5fa4f208e..35212ea489b7 100644 --- a/chinese/arphicttf/pkg-install +++ b/chinese/arphicttf/pkg-install @@ -13,7 +13,7 @@ FONTS="bkai00mp.ttf bsmi00lp.ttf gbsn00lp.ttf gkai00mp.ttf" DEFAULTMING="bsmi00lp.ttf gbsn00lp.ttf" DEFAULTKAI="bkai00mp.ttf gkai00mp.ttf" -[ "X$XTT" = "X" ] && XTT=YES +[ "X$WANT_X" = "X" ] && WANT_X=YES if [ ! -x $TTFM ]; then echo "$TTFM not found!" @@ -22,11 +22,11 @@ fi rm -f $FONTDIR/$PKGNAME -if [ "$CJK" = "YES" -o "$CJK" = "yes" ]; then +if [ "$WANT_CJK" = "YES" -o "$WANT_CJK" = "yes" ]; then # There's no CJK module now. fi -if [ "$GS6" = "YES" -o "$GS6" = "yes" ]; then +if [ "$WANT_GS6" = "YES" -o "$WANT_GS6" = "yes" ]; then for f in $FONTS; do $TTFM --add ghostscript6 $FONTDIR/$f done @@ -39,7 +39,7 @@ if [ "$GS6" = "YES" -o "$GS6" = "yes" ]; then echo "ghostscript6" >> $FONTDIR/$PKGNAME fi -if [ "$XTT" = "YES" -o "$XTT" = "yes" ]; then +if [ "$WANT_X" = "YES" -o "$WANT_X" = "yes" ]; then for f in $FONTS; do $TTFM --add xttfm $FONTDIR/$f done -- cgit