Import of pkgsrc-2013Q2

inputmethod/skktools/DESCR

@@ -0,0 +1 @@
+Small collection of commands to maintain SKK dictionaries.

inputmethod/skktools/Makefile

@@ -0,0 +1,31 @@
+# $NetBSD: Makefile,v 1.9 2012/10/06 14:25:19 asau Exp $
+#
+
+DISTNAME=	skktools-1.3.1
+PKGREVISION=	6
+CATEGORIES=	japanese inputmethod
+MASTER_SITES=	http://openlab.ring.gr.jp/skk/tools/
+
+MAINTAINER=	ryoon@NetBSD.org
+HOMEPAGE=	http://openlab.ring.gr.jp/skk/
+COMMENT=	SKK dictionary manipulation tools
+
+CONFLICTS=	skkserv<3.9.4nb7
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--without-gdbm
+
+.include "options.mk"
+
+SUBST_CLASSES+=		prefix
+SUBST_STAGE.prefix=	pre-configure
+SUBST_FILES.prefix=	configure
+SUBST_SED.prefix=	-e 's|/usr/local|${PREFIX}|g'
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Linux"
+.include "../../databases/gdbm_compat/buildlink3.mk"
+.endif
+
+.include "../../mk/bsd.pkg.mk"

inputmethod/skktools/PLIST

@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2010/07/17 08:36:41 obache Exp $
+bin/skkdic-count
+bin/skkdic-expr
+${PLIST.expr2}bin/skkdic-expr2
+bin/skkdic-sort

inputmethod/skktools/distinfo

@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.3 2013/03/28 21:28:12 joerg Exp $
+
+SHA1 (skktools-1.3.1.tar.gz) = 13939bf5533a7d2711724e98ea4dae99a7eac01b
+RMD160 (skktools-1.3.1.tar.gz) = 506ee66cab8d302d267436be36e24aeab8cc7d76
+Size (skktools-1.3.1.tar.gz) = 290215 bytes
+SHA1 (patch-Makefile.in) = e0fd23040781df6dcab97ade30f6f04a373eeee3
+SHA1 (patch-skkdic-expr.c) = 36a07ca9bd0cdc33aecd54f90dc07495c9ea3bbf

inputmethod/skktools/options.mk

@@ -0,0 +1,22 @@
+# $NetBSD: options.mk,v 1.1.1.1 2010/07/17 08:36:41 obache Exp $
+#
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.skktools
+PKG_SUPPORTED_OPTIONS=	skkdic-expr2
+PKG_SUGGESTED_OPTIONS=	skkdic-expr2
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=	expr2
+
+#
+# Enable skkdic-expr2, faster tool.
+#
+.if !empty(PKG_OPTIONS:Mskkdic-expr2)
+CONFIGURE_ARGS+=	--with-skkdic-expr2
+.include "../../devel/glib2/buildlink3.mk"
+USE_TOOLS+=	pkg-config
+PLIST.expr2=	yes
+.else
+CONFIGURE_ARGS+=	--without-skkdic-expr2
+.endif

inputmethod/skktools/patches/patch-Makefile.in

@@ -0,0 +1,13 @@
+$NetBSD: patch-Makefile.in,v 1.1 2011/12/03 09:22:37 sbd Exp $
+
+--- Makefile.in.orig	2007-09-21 23:32:51.000000000 +0000
++++ Makefile.in
+@@ -56,7 +56,7 @@ bindir = $(exec_prefix)/bin
+ 
+ EXEEXT= @EXEEXT@
+ 
+-DEFS = -I. -I$(srcdir) -I$(top_srcdir) $(CFLAGS)
++DEFS = -I. -I$(srcdir) -I$(top_srcdir) $(CFLAGS) $(LDFLAGS)
+ 
+ SNAPBASE  = skktools-`$(DATE) '+%Y%m%d'`
+ TARGETS = skkdic-expr$(EXEEXT) skkdic-sort$(EXEEXT) skkdic-count$(EXEEXT) @SKKDIC_EXPR2@

inputmethod/skktools/patches/patch-skkdic-expr.c

@@ -0,0 +1,47 @@
+$NetBSD: patch-skkdic-expr.c,v 1.1 2013/03/28 21:28:12 joerg Exp $
+
+--- skkdic-expr.c.orig	2013-03-27 12:46:31.000000000 +0000
++++ skkdic-expr.c
+@@ -328,9 +328,7 @@ static void append_item(base, s, e)
+ /* 各送りがなエントリは、"わりこmみ"のようなキーを持ち、
+  * その値は、"/割り込/割込/"となる
+  */
+-static char *add_okuri_item(key, s)
+-     datum 		*key;
+-     unsigned char 	*s;
++static void add_okuri_item(datum *key, unsigned char *s)
+ {
+     unsigned char	*p, *headtop;
+     unsigned char	keybuf[BLEN];
+@@ -547,9 +545,7 @@ delete_item(base, s, e)
+ /* 各送りがなエントリは、"わりこmみ"のようなキーを持つことになる
+  * その値は、"/割り込/割込/"となる
+  */
+-static char *subtract_okuri_item(key, s)
+-     datum 		*key;
+-     unsigned char 	*s;
++static void subtract_okuri_item(datum *key, unsigned char *s)
+ {
+     unsigned char	*p, *headtop;
+     unsigned char	keybuf[BLEN];
+@@ -597,8 +593,7 @@ static char *subtract_okuri_item(key, s)
+ 
+ /* tailで指している文字列からlineに含まれる語尾を削除
+  */
+-static int subtract_okuri_tail_line(tails, line)
+-     unsigned char 	*tails, *line;
++static void subtract_okuri_tail_line(unsigned char *tails, unsigned char *line)
+ {
+     unsigned char     	*s, *e;
+ 
+@@ -700,9 +695,7 @@ static void subtract_file(srcname)
+     fclose(fp);
+ }
+ 
+-static int	okuri_type_out(key, output)
+-     datum	*key;
+-     FILE	*output;
++static void	okuri_type_out(datum *key, FILE *output)
+ {
+     unsigned char	*s, *e, *headtop;
+     unsigned char	keybuf[BLEN];