diff options
-rw-r--r-- | chinese/kon2/Makefile | 12 | ||||
-rw-r--r-- | chinese/kon2/files/patch-kon.cfg.FreeBSD | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/chinese/kon2/Makefile b/chinese/kon2/Makefile index 04ed0775b81e..8b8a61b8faa4 100644 --- a/chinese/kon2/Makefile +++ b/chinese/kon2/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 1 +PORTREVISION= 2 MASTERDIR= ${.CURDIR}/../../japanese/kon2-16dot CATEGORIES= chinese @@ -13,14 +13,14 @@ CATEGORIES= chinese MAINTAINER= statue@freebsd.netlab.cse.yzu.edu.tw BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/chinese/kcfonts:patch \ - ${NONEXISTENT}:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps:extract + ${NONEXISTENT}:${PORTSDIR}/chinese/cce:extract USE_REINPLACE= yes KCFONTS_WRKSRC= `cd ${PORTSDIR}/chinese/kcfonts; make -V WRKSRC` -GB16ST_WRKSRC= `cd ${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps; make -V WRKSRC` +CCE_WRKSRC= `cd ${PORTSDIR}/chinese/cce; make -V WRKSRC` PLIST_FILES= share/fonts/bdf/kc15f.bdf.gz \ - share/fonts/bdf/gb16st.bdf.gz \ + share/fonts/bdf/gb16fs.bdf.gz \ share/fonts/bdf/8x16.bdf.gz post-patch: post-patch-zhkon2 @@ -38,7 +38,7 @@ post-install: post-install-zhkon2 post-install-zhkon2: @${MKDIR} ${PREFIX}/share/fonts/bdf cd ${KCFONTS_WRKSRC} && ./kc15f | ${GZIP_CMD} - > ${PREFIX}/share/fonts/bdf/kc15f.bdf.gz - cd ${GB16ST_WRKSRC} && cat fonts/bdf/misc/gb16st.bdf | ${GZIP_CMD} - > ${PREFIX}/share/fonts/bdf/gb16st.bdf.gz - cd ${GB16ST_WRKSRC} && cat fonts/bdf/misc/8x16.bdf | ${GZIP_CMD} - > ${PREFIX}/share/fonts/bdf/8x16.bdf.gz + cd ${CCE_WRKSRC} && cat fonts/gb16fs.bdf | ${GZIP_CMD} - > ${PREFIX}/share/fonts/bdf/gb16fs.bdf.gz + cd ${CCE_WRKSRC} && cat fonts/8x16.bdf | ${GZIP_CMD} - > ${PREFIX}/share/fonts/bdf/8x16.bdf.gz .include "${MASTERDIR}/Makefile" diff --git a/chinese/kon2/files/patch-kon.cfg.FreeBSD b/chinese/kon2/files/patch-kon.cfg.FreeBSD index b11467dd261d..581483d536bf 100644 --- a/chinese/kon2/files/patch-kon.cfg.FreeBSD +++ b/chinese/kon2/files/patch-kon.cfg.FreeBSD @@ -8,7 +8,7 @@ gzip -cd @@PREFIX@@/share/fonts/bdf/jiskan16.bdf.gz | /usr/local/bin/fld -t bdf -n - gzip -cd @@PREFIX@@/share/fonts/bdf/8x16rk.bdf.gz | /usr/local/bin/fld -t bdf -n + gzip -cd @@PREFIX@@/share/fonts/bdf/kc15f.bdf.gz | /usr/local/bin/fld -t bdf -n -+ gzip -cd @@PREFIX@@/share/fonts/bdf/gb16st.bdf.gz | /usr/local/bin/fld -t bdf -n ++ gzip -cd @@PREFIX@@/share/fonts/bdf/gb16fs.bdf.gz | /usr/local/bin/fld -t bdf -n bdf-zcat14:@@KON14FONT@@ gzip -cd @@PREFIX@@/share/fonts/bdf/k14.bdf.gz | /usr/local/bin/fld -t bdf -n gzip -cd @@PREFIX@@/share/fonts/bdf/7x14rk.bdf.gz | /usr/local/bin/fld -t bdf -n |