diff options
| -rw-r--r-- | japanese/skk-tools/Makefile | 35 | ||||
| -rw-r--r-- | japanese/skk-tools/distinfo | 4 | ||||
| -rw-r--r-- | japanese/skk-tools/files/patch-skkdic-expr.c | 83 |
3 files changed, 19 insertions, 103 deletions
diff --git a/japanese/skk-tools/Makefile b/japanese/skk-tools/Makefile index bd6e088e88c8..92067bee8e2e 100644 --- a/japanese/skk-tools/Makefile +++ b/japanese/skk-tools/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= skk-tools -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.3 PORTEPOCH= 1 CATEGORIES= japanese MASTER_SITES= RINGSERVER/elisp/skk/tools \ @@ -14,10 +14,6 @@ COMMENT= Jisyo-tools for the SKK Japanese-input software LICENSE= GPLv2 -OPTIONS_DEFINE= EXPR2 -OPTIONS_DEFAULT= EXPR2 -EXPR2_DESC= Build skkdic-expr2 (needs glib-2.x) - GNU_CONFIGURE= yes DOCSDIR= ${PREFIX}/share/doc/skk @@ -25,25 +21,28 @@ DOCSDIR= ${PREFIX}/share/doc/skk PORTDOCS= README.skktools PLIST_FILES= bin/skkdic-count bin/skkdic-expr bin/skkdic-sort -NO_STAGE= yes +OPTIONS_DEFINE= DOCS EXPR2 +OPTIONS_DEFAULT= EXPR2 + +EXPR2_DESC= Build skkdic-expr2 (needs glib-2.x) +EXPR2_USES= pkgconfig +EXPR2_USE= GNOME=glib20 +EXPR2_PLIST_FILES= bin/skkdic-expr2 +EXPR2_CONFIGURE_WITH= skkdic-expr2 + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MEXPR2} -USE_GNOME= glib20 -USES+= pkgconfig PORTDOCS+= README.skkdic-expr2 -PLIST_FILES+= bin/skkdic-expr2 -.else -CONFIGURE_ARGS= --without-skkdic-expr2 .endif +post-build: + @${LN} -sf README.C ${WRKSRC}/READMEs/README.skktools + post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/READMEs/README.C ${DOCSDIR}/README.skktools -.if ${PORT_OPTIONS:MEXPR2} - ${INSTALL_DATA} ${WRKSRC}/READMEs/README.skkdic-expr2 ${DOCSDIR} -.endif -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for i in ${PORTDOCS} + (cd ${WRKSRC}/READMEs && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR}) +.endfor .include <bsd.port.mk> diff --git a/japanese/skk-tools/distinfo b/japanese/skk-tools/distinfo index 1d96697d2642..15856583337a 100644 --- a/japanese/skk-tools/distinfo +++ b/japanese/skk-tools/distinfo @@ -1,2 +1,2 @@ -SHA256 (skktools-1.3.2.tar.gz) = cd1cc9d6d9674d70bbc69f52ac1d1a99a8067dd113a0fa1d50685a29e58a6791 -SIZE (skktools-1.3.2.tar.gz) = 273594 +SHA256 (skktools-1.3.3.tar.gz) = 0b4c17b6ca5c5147e08e89e66d506065bda06e7fdbeee038e85d7a7c4d10216d +SIZE (skktools-1.3.3.tar.gz) = 285219 diff --git a/japanese/skk-tools/files/patch-skkdic-expr.c b/japanese/skk-tools/files/patch-skkdic-expr.c deleted file mode 100644 index 6a6e1d05b57f..000000000000 --- a/japanese/skk-tools/files/patch-skkdic-expr.c +++ /dev/null @@ -1,83 +0,0 @@ ---- skkdic-expr.c.orig 2011-04-11 04:42:08.000000000 +0900 -+++ skkdic-expr.c 2012-10-13 05:40:10.000000000 +0900 -@@ -336,7 +336,7 @@ - - /* 語尾をtkeyにコピー */ - for (p = headtop; *s != '/'; s++, p++) { -- if (*s < 0x20) return; -+ if (*s < 0x20) return 0; - *p = *s; - } - tkey.dsize = p - keybuf; -@@ -344,12 +344,12 @@ - /* 語幹部分をcontentにコピーする */ - p = content; - for( ; *s != ']'; s++, p++) { -- if (*s < 0x20) return; -+ if (*s < 0x20) return 0; - *p = *s; - } - *p = '\0'; - if (*++s != '/') -- return ; /* フォーマットエラー */ -+ return 0; /* フォーマットエラー */ - - /* 古いものと比べて必要ならappend */ - otails = dbm_fetch(okuriheaddb, tkey); -@@ -555,7 +555,7 @@ - - /* 語尾をtkeyにコピー */ - for (p = headtop; *s != '/'; s++, p++) { -- if (*s < 0x20) return; -+ if (*s < 0x20) return 0; - *p = *s; - } - tkey.dsize = p - keybuf; -@@ -563,12 +563,12 @@ - /* 語幹部分をcontentにコピーする */ - p = content; - for( ; *s != ']'; s++, p++) { -- if (*s < 0x20) return; -+ if (*s < 0x20) return 0; - *p = *s; - } - *p = '\0'; - if (*++s != '/') -- return ; /* フォーマットエラー */ -+ return 0; /* フォーマットエラー */ - - /* 古いものと比べて必要ならreplace/delete */ - otails = dbm_fetch(okuriheaddb, tkey); -@@ -600,12 +600,12 @@ - goto next; - } - } -- return; -+ return 0; - } - } - next:; - } -- return; -+ return 0; - } - - static void -@@ -708,7 +708,7 @@ - - tails = dbm_fetch(okuritaildb, tkey); - if (tails.dptr == NULL) { -- return; -+ return 0; - } else { - fseek(dbcontent, getpos(tails.dptr), 0); - db_gets(tail_content, BLEN, dbcontent); -@@ -717,7 +717,7 @@ - for(e = s; e[1] != '\0'; s = e + 2) { - for (e = s; *e != '/'; e++) - if (*e < 0x20) -- return; -+ return 0; - - strncpy(headtop, s, e - s); - tkey.dsize = (headtop - keybuf) + (e - s); |