summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chinese/kon2/Makefile26
-rw-r--r--chinese/kon2/pkg-plist12
-rw-r--r--japanese/kon2-16dot/Makefile16
-rw-r--r--japanese/kon2-16dot/pkg-plist4
4 files changed, 26 insertions, 32 deletions
diff --git a/chinese/kon2/Makefile b/chinese/kon2/Makefile
index 88a6de463e1d..fa63ed557b6f 100644
--- a/chinese/kon2/Makefile
+++ b/chinese/kon2/Makefile
@@ -13,29 +13,35 @@ CATEGORIES= chinese
MAINTAINER= statue@freebsd.netlab.cse.yzu.edu.tw
-BUILD_DEPENDS+= ${LOCALBASE}/share/fonts/bdf/kc15f.bdf.gz:${PORTSDIR}/chinese/kcfonts:patch
+BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/chinese/kcfonts:patch
USE_REINPLACE= yes
-PLIST= pkg-plist
KCFONTS_WRKSRC= `cd ${PORTSDIR}/chinese/kcfonts; make -V WRKSRC`
-post-patch:
- ${REINPLACE_CMD} -e "s;jiskan16.bdf.gz;kc15f.bdf.gz;g" \
+PLIST_FILES= share/fonts/bdf/kc15f.bdf.gz
+
+post-patch: post-patch-zhkon2
+post-patch-zhkon2:
+ @${REINPLACE_CMD} -e "s;jiskan16.bdf.gz;kc15f.bdf.gz;g" \
-e "s;ja_JP.ujis:Coding;ja_JP.ujis:;g" \
-e "s;zh_TW.big5:;zh_TW.big5:Coding;g" \
-e "s;BIG5.HKU-0;BIG5-0;g" \
-e "s,GB2312.1980,GBK,g" \
${WRKSRC}/kon.cfg.FreeBSD
- ${REINPLACE_CMD} -e "s;BIG5.HKU-0;BIG5-0;g" \
+ @${REINPLACE_CMD} -e "s;BIG5.HKU-0;BIG5-0;g" \
-e "s;BIG5, 0;BIG5, 0xfefe;g" \
-e "s,GB2312.1980,GBK,g" \
${WRKSRC}/lib/coding.c
- ${REINPLACE_CMD} -e 's,/dev/vga,/dev/ttyv0,g' ${WRKSRC}/src/term.c \
+ @${REINPLACE_CMD} -e 's,/dev/vga,/dev/ttyv0,g' ${WRKSRC}/src/term.c \
${WRKSRC}/src/display/vga.c
-pre-install:
- ${MKDIR} ${PREFIX}/share/fonts/bdf
- cd ${KCFONTS_WRKSRC} && gcc -O -pipe -o kc15f tran.c kc15f.c && \
- ./kc15f | ${GZIP_CMD} - > ${PREFIX}/share/fonts/bdf/kc15f.bdf.gz
+post-build: post-build-zhkon2
+post-build-zhkon2:
+ @cd ${KCFONTS_WRKSRC} && ${MAKE} kc15f
+
+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
.include "${MASTERDIR}/Makefile"
diff --git a/chinese/kon2/pkg-plist b/chinese/kon2/pkg-plist
deleted file mode 100644
index b0322221178d..000000000000
--- a/chinese/kon2/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-bin/fld
-bin/kon
-etc/kon.cfg
-share/fonts/bdf/7x14rk.bdf.gz
-share/fonts/bdf/k14.bdf.gz
-share/fonts/bdf/8x16rk.bdf.gz
-share/fonts/bdf/jiskan16.bdf.gz
-share/fonts/bdf/kc15f.bdf.gz
-%%DOCSDIR%%/README
-%%DOCSDIR%%/README.FreeBSD
-@dirrm %%DOCSDIR%%
-@dirrm share/fonts/bdf
diff --git a/japanese/kon2-16dot/Makefile b/japanese/kon2-16dot/Makefile
index 6bbad6cede92..e26104e443e8 100644
--- a/japanese/kon2-16dot/Makefile
+++ b/japanese/kon2-16dot/Makefile
@@ -8,27 +8,30 @@
PORTNAME= kon2
PORTVERSION= 0.3
PORTREVISION= 3
-PKGNAMESUFFIX= -${KONFONT}
-CATEGORIES+= japanese # '+=' is for slave ports
+# '+=' is for slave ports
+CATEGORIES+= japanese
# note kon is only in first directory and fonts are only in second directory
MASTER_SITES= ftp://ftp.tut.ac.jp/Linux/Packages/Utils/ \
${MASTER_SITE_PORTS_JP} \
ftp://ftp.xfree86.org/pub/XFree86/3.3.3/untarred/xc/fonts/bdf/misc/ \
ftp://ftp.iij.ad.jp/pub/X/XFree86/3.3.3/untarred/xc/fonts/bdf/misc/
+PKGNAMESUFFIX= -${KONFONT}
DISTNAME= kon2-${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
k14.bdf 7x14rk.bdf \
jiskan16.bdf 8x16rk.bdf
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-MAINTAINER?= ports@FreeBSD.org # '+=' is for slave ports
+# '+=' is for slave ports
+MAINTAINER?= ports@FreeBSD.org
COMMENT= Kanji On Console -- Display kanji characters on your own console
ONLY_FOR_ARCHS= i386
MAN1= kon.1
MANLANG= ja
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
+PORTDOCS= README README.FreeBSD
DOCDIR= ${PREFIX}/share/doc/kon2
.if !defined(KONFONT)
@@ -56,11 +59,10 @@ pre-build:
done
post-install:
- @${INSTALL_MAN} ${WRKSRC}/doc/kon.1 ${PREFIX}/man/ja/man1
+ ${INSTALL_MAN} ${WRKSRC}/doc/kon.1 ${PREFIX}/man/ja/man1
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCDIR}
- @${INSTALL_DATA} ${WRKSRC}/doc/README ${WRKSRC}/doc/README.FreeBSD \
- ${DOCDIR}
+ cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCDIR}
.endif
.include <bsd.port.mk>
diff --git a/japanese/kon2-16dot/pkg-plist b/japanese/kon2-16dot/pkg-plist
index e28aa24d519e..ac17c92f8a25 100644
--- a/japanese/kon2-16dot/pkg-plist
+++ b/japanese/kon2-16dot/pkg-plist
@@ -5,7 +5,5 @@ share/fonts/bdf/7x14rk.bdf.gz
share/fonts/bdf/k14.bdf.gz
share/fonts/bdf/8x16rk.bdf.gz
share/fonts/bdf/jiskan16.bdf.gz
-share/doc/kon2/README
-share/doc/kon2/README.FreeBSD
-@dirrm share/doc/kon2
@dirrm share/fonts/bdf
+@unexec rmdir %D/share/fonts 2>/dev/null || true