diff options
| author | obache <obache@pkgsrc.org> | 2010-02-15 13:35:21 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2010-02-15 13:35:21 +0000 |
| commit | 778d65ea5f04ca8061bbad5d504e051983a88961 (patch) | |
| tree | 40e1f213a84ec8f81a20482616fc6a2c2c5beb5f /inputmethod | |
| parent | 982390a4ca9cfd61198fa51efb90f685952cbe1e (diff) | |
| download | pkgsrc-778d65ea5f04ca8061bbad5d504e051983a88961.tar.gz | |
Update sj3 to 2.0.1.23p1.
Re-arranged packages:
* sj3-lib:removed
* sj3-dict: removed
* sj3-server-bin: removed
* sj3-client: added (lib + client tools)
* sj3-server: no more meta-pkg (server + dict)
* sj3: added (sj3-server + sj3-client)
Notable changes since 2.0.1.21:
* changed to gnu-configure.
* sj3lib is shared library.
* using lua for server settings.
* sj3 command was removed.
* sj3serv no longer listen network socket. Set "false" to "strict_auth" and
invoke sj3proxy additionaly if require it.
* dictionaty directry was changed, please refer MigrationGuide from HOMEPAGE.
On pkgsrc, new location is ${VARBASE}/sj3/dict.
Diffstat (limited to 'inputmethod')
58 files changed, 228 insertions, 1094 deletions
diff --git a/inputmethod/sj3-client/DESCR b/inputmethod/sj3-client/DESCR new file mode 100644 index 00000000000..a87b65eba05 --- /dev/null +++ b/inputmethod/sj3-client/DESCR @@ -0,0 +1,3 @@ +SJ3 is is a Japanese input system developed by Sony Corporation. + +This package contains the Kana-Kanji conversion library and client utilities. diff --git a/inputmethod/sj3-client/Makefile b/inputmethod/sj3-client/Makefile new file mode 100644 index 00000000000..11df0ccdade --- /dev/null +++ b/inputmethod/sj3-client/Makefile @@ -0,0 +1,16 @@ +# $NetBSD: Makefile,v 1.1 2010/02/15 13:35:21 obache Exp $ +# + +.include "../../inputmethod/sj3/Makefile.common" + +PKGNAME= ${DISTNAME:S/sj3-/sj3-client-/} + +COMMENT= SJ3 Japanese input method client & library + +CONFLICTS= sj3-lib-[0-9]* sj3-server-bin-[0-9]* + +PKG_DESTDIR_SUPPORT= user-destdir + +CONFIGURE_ARGS+= --enable-client + +.include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/sj3-client/PLIST b/inputmethod/sj3-client/PLIST new file mode 100644 index 00000000000..467c862a7d6 --- /dev/null +++ b/inputmethod/sj3-client/PLIST @@ -0,0 +1,9 @@ +@comment $NetBSD: PLIST,v 1.1 2010/02/15 13:35:21 obache Exp $ +bin/sj3dic +bin/sj3stat +include/sj3lib.h +lib/libsj3lib.la +lib/pkgconfig/sj3lib.pc +man/man1/sj3dic.1 +share/doc/sj3/Nihongo.ps +share/doc/sj3/sj3lib.ms diff --git a/inputmethod/sj3-client/buildlink3.mk b/inputmethod/sj3-client/buildlink3.mk new file mode 100644 index 00000000000..64ba48cf51f --- /dev/null +++ b/inputmethod/sj3-client/buildlink3.mk @@ -0,0 +1,13 @@ +# $NetBSD: buildlink3.mk,v 1.1 2010/02/15 13:35:21 obache Exp $ +# + +BUILDLINK_TREE+= sj3-client + +.if !defined(SJ3_CLIENT_BUILDLINK3_MK) +SJ3_CLIENT_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.sj3-client+= sj3-client>=2.0.1.23 +BUILDLINK_PKGSRCDIR.sj3-client?= ../../inputmethod/sj3-client +.endif # SJ3_CLIENT_BUILDLINK3_MK + +BUILDLINK_TREE+= -sj3-client diff --git a/inputmethod/sj3-dict/DESCR b/inputmethod/sj3-dict/DESCR deleted file mode 100644 index f7814379cba..00000000000 --- a/inputmethod/sj3-dict/DESCR +++ /dev/null @@ -1,6 +0,0 @@ -SJ3 is a Japanese input method developed by Sony Corporation. SJ3 is -composed of a Kana-Kanji conversion server (sj3serv), a Kana-Kanji -conversion client for terminals (sj3) and Kana-Kanji conversion library -(sj3lib). - -This package contains the Kana-Kanji dictionary file. diff --git a/inputmethod/sj3-dict/Makefile b/inputmethod/sj3-dict/Makefile deleted file mode 100644 index d5f4dc87805..00000000000 --- a/inputmethod/sj3-dict/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# $NetBSD: Makefile,v 1.14 2008/03/04 15:55:14 jlam Exp $ -# - -DISTNAME= sj3-2.0.1.20 -PKGNAME= sj3-dict-2.0.1.20 -PKGREVISION= 3 -CATEGORIES= japanese inputmethod -MASTER_SITES= ftp://ftp.sony.co.jp/pub/unsupported/src/ \ - ftp://ftp.cs.titech.ac.jp/pub/japanese/sj3/ - -MAINTAINER= tech-pkg-ja@jp.NetBSD.org -COMMENT= SJ3 Japanese input method dictionary - -BUILD_DEPENDS+= sj3-server-bin>=2.0.1.20nb1:../../inputmethod/sj3-server-bin - -FILESDIR= ${.CURDIR}/../sj3-lib/files -DISTINFO_FILE= ${.CURDIR}/../sj3-lib/distinfo -PATCHDIR= ${.CURDIR}/../sj3-lib/patches - -PKG_DESTDIR_SUPPORT= user-destdir - -.include "../../mk/bsd.prefs.mk" - -USE_TOOLS+= itools -USE_IMAKE= yes -MAKE_ENV+= SJ3OWNER=${SJ3OWNER:Q} SJ3GROUP=${SJ3GROUP:Q} \ - IMDICTDIR=${IMDICTDIR:Q} LOCAL_LDFLAGS=${LDFLAGS:M*:Q} -FILES_SUBST+= SJ3OWNER=${SJ3OWNER} SJ3GROUP=${SJ3GROUP} IMDICTDIR=${IMDICTDIR} -EVAL_PREFIX+= SJ3SERVERBINDIR=sj3-server-bin - -CONFIGURE_DIRS+= dict/dict - -SJ3OWNER?= daemon -SJ3GROUP?= daemon - -INSTALLATION_DIRS= ${PREFIX}/libdata - -pre-configure: - @${CHMOD} +w ${WRKSRC}/dict/dict/Imakefile* - @${MV} ${WRKSRC}/dict/dict/Imakefile ${WRKSRC}/dict/dict/Imakefile.orig - @${SED} -e 's|$$(TOOL_DIR)/|${SJ3SERVERBINDIR}/bin/|' \ - ${WRKSRC}/dict/dict/Imakefile.orig \ - > ${WRKSRC}/dict/dict/Imakefile - -do-install: - ${INSTALL_DATA} ${WRKSRC}/dict/dict/sj3main.dic \ - ${DESTDIR}${PREFIX}/libdata - -.include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/sj3-dict/PLIST b/inputmethod/sj3-dict/PLIST deleted file mode 100644 index c424ae0d0a1..00000000000 --- a/inputmethod/sj3-dict/PLIST +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2006/07/05 04:55:23 jlam Exp $ -libdata/sj3main.dic diff --git a/inputmethod/sj3-lib/DESCR b/inputmethod/sj3-lib/DESCR deleted file mode 100644 index 93fcb26c55a..00000000000 --- a/inputmethod/sj3-lib/DESCR +++ /dev/null @@ -1,6 +0,0 @@ -SJ3 is a Japanese input method developed by Sony Corporation. SJ3 is -composed of a Kana-Kanji conversion server (sj3serv), a Kana-Kanji -conversion client for terminals (sj3) and Kana-Kanji conversion library -(sj3lib). - -This package contains the Kana-Kanji conversion library (sj3lib). diff --git a/inputmethod/sj3-lib/Makefile b/inputmethod/sj3-lib/Makefile deleted file mode 100644 index b63e74e2a52..00000000000 --- a/inputmethod/sj3-lib/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# $NetBSD: Makefile,v 1.12 2010/01/09 11:37:10 obache Exp $ - -DISTNAME= sj3-2.0.1.20 -PKGNAME= sj3-lib-2.0.1.20 -PKGREVISION= 3 -CATEGORIES= japanese inputmethod -MASTER_SITES= ftp://ftp.sony.co.jp/pub/unsupported/src/ \ - ftp://ftp.cs.titech.ac.jp/pub/japanese/sj3/ - -MAINTAINER= tech-pkg-ja@jp.NetBSD.org -COMMENT= SJ3 Japanese input method library - -PKG_DESTDIR_SUPPORT= destdir - -USE_TOOLS+= itools -USE_IMAKE= yes -MAKE_ENV+= IMDICTDIR=${IMDICTDIR:Q} - -pre-configure: - @${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.orig - @${SED} -e 's|\(SUBDIRS = \).*\(sj3lib\).*|\1\2|' \ - ${WRKSRC}/Imakefile.orig > ${WRKSRC}/Imakefile - -.include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/sj3-lib/PLIST b/inputmethod/sj3-lib/PLIST deleted file mode 100644 index 7eba911f0b8..00000000000 --- a/inputmethod/sj3-lib/PLIST +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2002/08/25 19:23:00 jlam Exp $ -include/sj3lib.h -lib/libsj3lib.a diff --git a/inputmethod/sj3-lib/buildlink3.mk b/inputmethod/sj3-lib/buildlink3.mk deleted file mode 100644 index 74b8f604442..00000000000 --- a/inputmethod/sj3-lib/buildlink3.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:47 joerg Exp $ - -BUILDLINK_TREE+= sj3-lib - -.if !defined(SJ3_LIB_BUILDLINK3_MK) -SJ3_LIB_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.sj3-lib+= sj3-lib>=2.0.1.20nb1 -BUILDLINK_PKGSRCDIR.sj3-lib?= ../../inputmethod/sj3-lib -BUILDLINK_DEPMETHOD.sj3-lib?= build -.endif # SJ3_LIB_BUILDLINK3_MK - -BUILDLINK_TREE+= -sj3-lib diff --git a/inputmethod/sj3-lib/distinfo b/inputmethod/sj3-lib/distinfo deleted file mode 100644 index e6b68f1bf22..00000000000 --- a/inputmethod/sj3-lib/distinfo +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: distinfo,v 1.9 2009/10/06 17:41:49 joerg Exp $ - -SHA1 (sj3-2.0.1.20.tar.gz) = b1cae59065ebc9caf5e198143ceb9558c932f259 -RMD160 (sj3-2.0.1.20.tar.gz) = b25f2c585485516fddf3b9168e4cb8552cd26f71 -Size (sj3-2.0.1.20.tar.gz) = 584065 bytes -SHA1 (patch-aa) = b818996516360d1cdbef193eed5eb93fb488ef89 -SHA1 (patch-ab) = a64f78ccb3db3f4349f191abe47c6daebb2bbadd -SHA1 (patch-ac) = a2a9c21618e7de1e56d371cb05cf866d549d50a1 -SHA1 (patch-ad) = 6f45996f04f894e28f2dd5d1276c31b3c6a7b12a -SHA1 (patch-ae) = 3b07eb2ea9d72049a8f322220836a631598ea7dc -SHA1 (patch-af) = 33ac72303dfa13929d423ecaf5d9b7cb308f8ff5 -SHA1 (patch-ag) = 14744940b736cee683a59a25a2bda0a2ce85d319 -SHA1 (patch-ah) = 77dd83b13facb0c99fc50ebb883591b590a2cab1 -SHA1 (patch-ai) = c29e6770c8679baa7401e20a7a0e2655382bcd7a -SHA1 (patch-aj) = a8055ef4e06f70b344f5eadf1c2f0042e22781db -SHA1 (patch-ak) = 3aab5f0e57212414e0ec2b5a71dd3583a1379e5c -SHA1 (patch-al) = 330b4580fccb0cb70541376620916dc32662e378 -SHA1 (patch-am) = dd5f2b962b64969c05e3fc020ceae8bfa6e8e220 -SHA1 (patch-ao) = d260a370cafc1943f6063de8e3f6be444e3d18bc -SHA1 (patch-ap) = a2c619a2f2fe040ba0a3b570ce34b8f72512c970 -SHA1 (patch-aq) = d24e22974b088c02bfdca75cf97d0e8d7a8d8992 -SHA1 (patch-ar) = 3cdbb095338b2052398bbc5c7cd69cd50cd46d31 -SHA1 (patch-as) = fbe7d015904f38ada14ec9ae5cc8332f725bbeac -SHA1 (patch-at) = a00e1505af56f7b566232338ef910f899b401ac7 -SHA1 (patch-au) = 57ac169871ef5f38fb4d1fd4387fc4197419b7c6 -SHA1 (patch-av) = 6e2569b3240d09bfd57b2dcde8611e5b9ed9bf14 -SHA1 (patch-aw) = 078fa620e5fe099441dbc6fcba36a0441cc222ca -SHA1 (patch-ax) = 3ea04cd507909c6dd6b0163230dd03b8c21fbced -SHA1 (patch-ay) = ec24897bab84adda7873995f708eb70e1a6f03a7 -SHA1 (patch-az) = b8cbe3decf83c3b1dca10dfc674988423f3cd998 -SHA1 (patch-ba) = 773d37a4125ecf0c76aaef679a5b944a034bf4c9 -SHA1 (patch-bb) = c75a239de17f67647e3e87ff87b5f371f9614566 -SHA1 (patch-bc) = ccdacbab35ab001f57010af9fc3071eb4c42348f -SHA1 (patch-bd) = f29a875734c17c7e6d4b51db081b58af1baf4d04 -SHA1 (patch-be) = e59571ea5d7036900f48a8df75a79de77f9a5594 diff --git a/inputmethod/sj3-lib/patches/patch-aa b/inputmethod/sj3-lib/patches/patch-aa deleted file mode 100644 index 8a1475ef698..00000000000 --- a/inputmethod/sj3-lib/patches/patch-aa +++ /dev/null @@ -1,65 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2005/12/02 22:57:32 joerg Exp $ - ---- sj3/sj3.c.orig 2005-12-02 22:27:01.000000000 +0000 -+++ sj3/sj3.c -@@ -38,14 +38,12 @@ - #include "sj_sysvdef.h" - #include "wchar16.h" - #include <signal.h> --#include <sys/errno.h> --#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__) --#if defined(__NetBSD__) || defined(__bsdi__) -+#include <errno.h> -+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__) || defined(__DragonFly__) - #define USE_OLD_TTY - #if defined(__NetBSD__) - #define LACKOF_SETLOCALE - #endif --#endif - #include <curses.h> - #endif - -@@ -473,7 +471,7 @@ getmaster () - * Because FreeBSD's master pseudo-devices are pty[p-sP-S][0-9a-v]. - * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/10 - */ --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__DragonFly__) - struct stat stb; - int h, i, j, k1, k2; - #else /* !__FreeBSD__ */ -@@ -492,7 +490,7 @@ getmaster () - * Because FreeBSD's master pseudo-devices are pty[p-sP-S][0-9a-v]. - * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/10 - */ --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__DragonFly__) - for (h = 0; h < 8; h++) { - line[k1] = "pqrsPQRS"[h]; - line[k2] = '0'; -@@ -852,7 +850,7 @@ shellprocess () - SCPYN(Utmp.ut_line, strrchr (slave_name, '/') + 1); - time (&Utmp.ut_time); - --#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__) -+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__) || defined(__DragonFly__) - if (setsid() < 0) - perror("setsid()"); - #else -@@ -937,7 +935,7 @@ getslave () - done2 (); - } - #ifndef SYSV_TERMIOS --#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__) -+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__) || defined(__DragonFly__) - ioctl(slave, TIOCSCTTY, NULL); - #endif - ioctl (slave, TIOCSETP, (char *)&b); -@@ -1085,7 +1083,6 @@ suspend () - SELECT_FD ifds; - int nc; - struct timeval t; -- extern int errno; - - clear_guide_line (); - diff --git a/inputmethod/sj3-lib/patches/patch-ab b/inputmethod/sj3-lib/patches/patch-ab deleted file mode 100644 index 6c976890d62..00000000000 --- a/inputmethod/sj3-lib/patches/patch-ab +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2002/08/25 19:23:01 jlam Exp $ - ---- include/Const.h.orig Thu Jan 23 12:20:52 1997 -+++ include/Const.h Wed Dec 8 10:33:54 1999 -@@ -70,7 +70,15 @@ - #define ProtoName "tcp" - #define PortNumber "3000" - #else -+/* -+ * Change the default Port number of sj3 for FreeBSD. -+ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/20 -+ */ -+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) -+#define PortNumber 3086 -+#else /* ! __FreeBSD__ __NetBSD__ __OpenBSD__ */ - #define PortNumber 3000 -+#endif /* ! __FreeBSD__ __NetBSD__ __OpenBSD__ */ - #endif - #define DirectryMode 0755 - #define DictFileMode 0644 diff --git a/inputmethod/sj3-lib/patches/patch-ac b/inputmethod/sj3-lib/patches/patch-ac deleted file mode 100644 index 3357d7d607c..00000000000 --- a/inputmethod/sj3-lib/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2002/08/25 19:23:01 jlam Exp $ - ---- dict/dict/Imakefile.~1~ Thu Jan 23 20:20:51 1997 -+++ dict/dict/Imakefile Tue Aug 18 10:51:14 1998 -@@ -48,7 +48,7 @@ - - XCOMM INSTFLAGS = -o $(SJ3OWNER) -g $(SJ3GROUP) -m 444 - --all: $(OBJS) -+all:: $(OBJS) - - $(OBJS): $(SRCS) - $(TOOL_DIR)/$(TOOL_NAME) $(SRCS) $(OBJS) > $(OUTPUT) diff --git a/inputmethod/sj3-lib/patches/patch-ad b/inputmethod/sj3-lib/patches/patch-ad deleted file mode 100644 index 4f0bef831da..00000000000 --- a/inputmethod/sj3-lib/patches/patch-ad +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2002/08/25 19:23:01 jlam Exp $ - ---- sj3.tmpl.orig Thu Jan 23 20:20:58 1997 -+++ sj3.tmpl Fri Jul 30 20:27:08 1999 -@@ -32,12 +32,12 @@ - * $SonyDate: 1997/01/23 11:20:57 $ - */ - --SJ3TOP = /usr/local -+SJ3TOP = $(PREFIX) - SJ3BINDIR = $(SJ3TOP)/bin - SJ3HDRDIR = $(SJ3TOP)/include - SJ3LIBDIR = $(SJ3TOP)/lib --SJ3CONFDIR = $(SJ3TOP)/lib/sj3 --SJ3DICTDIR = $(SJ3CONFDIR)/dict -+SJ3CONFDIR = $(SJ3TOP)/share/sj3 -+SJ3DICTDIR = $(IMDICTDIR)/sj3 - - /* - * Change for FreeBSD. -@@ -45,10 +45,11 @@ - * return NULL, use it in library libxpg4 - * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/10 - */ -+#if 0 - #if defined(FreeBSDArchitecture) - - CODE_LIBS = -lxpg4 --SJ3OWNER = root -+SJ3OWNER = bin - SJ3GROUP = bin - - #else -@@ -61,4 +62,5 @@ - SJ3GROUP = staff - #endif - -+#endif - #endif diff --git a/inputmethod/sj3-lib/patches/patch-ae b/inputmethod/sj3-lib/patches/patch-ae deleted file mode 100644 index 4ab7f251130..00000000000 --- a/inputmethod/sj3-lib/patches/patch-ae +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-ae,v 1.3 2002/08/25 19:23:01 jlam Exp $ - ---- include/Paths.h.in.orig Thu Jan 23 20:20:57 1997 -+++ include/Paths.h.in Tue Aug 18 11:29:00 1998 -@@ -33,7 +33,22 @@ - * $SonyDate: 1997/01/23 11:20:55 $ - */ - --#define ErrorOutFile "/dev/console" -+/* -+ * Change ErrotOutFile variable. -+ * Because suppress a error when sj3serv start up, change to "/dev/stderr". -+ * This error is "Cannot Open "/dev/console".". -+ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/10 -+ * -+ * Change ErrotOutFile variable. -+ * This default value is "/dev/null" in document. -+ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/11 -+ */ -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) -+#define ErrorOutFile "/dev/console" -+#else -+/* #define ErrorOutFile "/dev/stderr" */ /* for test */ -+#define ErrorOutFile "/dev/null" -+#endif - - #define SocketName "/tmp/sj3sock" - #define LockFile "/tmp/SJ3SERV.EXIST" diff --git a/inputmethod/sj3-lib/patches/patch-af b/inputmethod/sj3-lib/patches/patch-af deleted file mode 100644 index d7fa53c12da..00000000000 --- a/inputmethod/sj3-lib/patches/patch-af +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-af,v 1.3 2002/08/25 19:23:01 jlam Exp $ - ---- server/main.c.orig Mon Mar 23 19:48:03 1998 -+++ server/main.c Mon Aug 2 19:26:45 1999 -@@ -215,9 +215,11 @@ - (void) setlocale(LC_CTYPE, "ja_JP.EUC"); - #endif - opening(); -+#ifndef __NetBSD__ - if (setuid(geteuid())) { - fprintf(stderr, "error at setuid.\r\n"); exit(1); - } -+#endif - - parse_arg(argc, argv); - read_runcmd(); diff --git a/inputmethod/sj3-lib/patches/patch-ag b/inputmethod/sj3-lib/patches/patch-ag deleted file mode 100644 index ecb090f0273..00000000000 --- a/inputmethod/sj3-lib/patches/patch-ag +++ /dev/null @@ -1,130 +0,0 @@ -$NetBSD: patch-ag,v 1.5 2005/09/28 18:22:11 rillig Exp $ - -- Don't abuse an int as a pointer (optarg). -- Consistently provide lowercase and MixedCase options. - ---- server/setup.c.orig Mon Mar 23 11:48:02 1998 -+++ server/setup.c Wed Sep 28 20:06:34 2005 -@@ -139,10 +139,13 @@ u_char *src, *dst; - - - --static u_char *get_str(p, dst) -+static u_char *get_str(p, pv_dst) - u_char *p; --char **dst; -+void *pv_dst; - { -+ char **dst; -+ -+ dst = pv_dst; - if (!*dst) { - *dst = malloc(strlen((char *)p) + 1); - if (!*dst) RcError("no more memory"); -@@ -151,21 +154,26 @@ char **dst; - while (*p++) ; - return p; - } --static u_char *get_int(p, dst) -+static u_char *get_int(p, pv_dst) - u_char *p; --int *dst; -+void *pv_dst; - { - register char *fmt; -+ int *dst; - -+ dst = pv_dst; - fmt = (*p == '0') ? "%o" : "%d"; - if (sscanf((char *)p, fmt, dst) != 1) RcError("bad integer"); - while (*p++) ; - return p; - } --static u_char *get_flag(p, dst) -+static u_char *get_flag(p, pv_dst) - u_char *p; --int *dst; -+void *pv_dst; - { -+ int *dst; -+ -+ dst = pv_dst; - if (sscanf((char *)p, "%d", dst) == 1) - ; - else if (!cmpstr("on", p)) -@@ -219,33 +227,56 @@ StrList **dst; - struct optlist { - char *optname; - u_char *(*optfunc)(); -- int optarg; -+ void *optarg; - } option[] = { -- "DebugOut", get_str, (int)&debug_file, -- "DebugLevel", get_int, (int)&debug_level, -- "ForkFlag", get_flag, (int)&fork_flag, -+/* -+ * Add option flag. -+ * Because They are lacked in here. See document. -+ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/10 -+ */ -+ "DebugOut", get_str, &debug_file, -+ "debugout", get_str, &debug_file, -+ "DebugLevel", get_int, &debug_level, -+ "debuglevel", get_int, &debug_level, -+ "ForkFlag", get_flag, &fork_flag, -+ "forkflag", get_flag, &fork_flag, - -- "PortName", get_str, (int)&port_name, -+ "PortName", get_str, &port_name, -+ "portname", get_str, &port_name, - #ifdef TLI -- "PortNumber", get_str, (int)&port_number, -- "ProtoName", get_str, (int)&proto_name, -+ "PortNumber", get_str, &port_number, -+ "portnumber", get_str, &port_number, -+ "ProtoName", get_str, &proto_name, -+ "protoname", get_str, &proto_name, - #else -- "PortNumber", get_int, (int)&port_number, -+ "PortNumber", get_int, &port_number, -+ "portnumber", get_int, &port_number, - #endif -- "SocketName", get_str, (int)&socket_name, -+ "SocketName", get_str, &socket_name, -+ "socketname", get_str, &socket_name, - #ifdef LOCK_FILE -- "LockFile", get_str, (int)&lock_file; -+ "LockFile", get_str, &lock_file; -+ "lockfile", get_str, &lock_file; - #endif - -- "maxclient", get_int, (int)&max_client, -- "dictdir", get_str, (int)&dict_dir, -- "readdict", get_list, (int)&read_dict, -- "opendict", get_list, (int)&open_dict, -- "errorout", get_str, (int)&error_file, -- "logout", get_str, (int)&log_file, -- "dirmode", get_int, (int)&dir_mode, -- "filemode", get_int, (int)&file_mode, -- "allowuser", get_list, (int)&allow_user, -+ "MaxClient", get_int, &max_client, -+ "maxclient", get_int, &max_client, -+ "DictDir", get_str, &dict_dir, -+ "dictdir", get_str, &dict_dir, -+ "ReadDict", get_list, &read_dict, -+ "readdict", get_list, &read_dict, -+ "OpenDict", get_list, &open_dict, -+ "opendict", get_list, &open_dict, -+ "ErrorOut", get_str, &error_file, -+ "errorout", get_str, &error_file, -+ "LogOut", get_str, &log_file, -+ "logout", get_str, &log_file, -+ "DirMode", get_int, &dir_mode, -+ "dirmode", get_int, &dir_mode, -+ "FileMode", get_int, &file_mode, -+ "filemode", get_int, &file_mode, -+ "AllowUser", get_list, &allow_user, -+ "allowuser", get_list, &allow_user, - 0, 0, 0 - }; - diff --git a/inputmethod/sj3-lib/patches/patch-ah b/inputmethod/sj3-lib/patches/patch-ah deleted file mode 100644 index f515c0aa2fa..00000000000 --- a/inputmethod/sj3-lib/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2005/09/28 17:32:17 rillig Exp $ - ---- doc/doc/sj3serv.ms.orig Fri Jun 3 10:00:50 1994 -+++ doc/doc/sj3serv.ms Wed Sep 28 19:19:34 2005 -@@ -111,7 +111,7 @@ DictDir \fIdirectory_name\fP - ¤½¤Î¥Õ¥¡¥¤¥ë̾¤òÀäÂХѥ¹¤È¤·¤Æ¼½ñ¤Ë¥¢¥¯¥»¥¹¤·¤Þ¤¹¤¬¡¢\'/\'°Ê³°¤Î¤È¤¤Ë¤Ï¡¢ - ¤³¤³¤Ç»ØÄꤵ¤ì¤ë¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¤ÎÁêÂХѥ¹¤È¤·¤Æ¼½ñ¤Ë¥¢¥¯¥»¥¹¤·¤Þ¤¹¡£ - .br --¥Ç¥Õ¥©¥ë¥È¤Ï /usr/dict/sj3 ¤Ç¤¹¡£ -+¥Ç¥Õ¥©¥ë¥È¤Ï /usr/local/lib/sj3/dict ¤Ç¤¹¡£ - .RE - .sp - .NH 3 diff --git a/inputmethod/sj3-lib/patches/patch-ai b/inputmethod/sj3-lib/patches/patch-ai deleted file mode 100644 index 6f5be9bf2ce..00000000000 --- a/inputmethod/sj3-lib/patches/patch-ai +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2005/09/28 17:32:17 rillig Exp $ - ---- doc/man/sj3.1.orig Fri Jun 3 10:00:51 1994 -+++ doc/man/sj3.1 Wed Sep 28 19:19:34 2005 -@@ -109,13 +109,13 @@ sj3 \- ÆüËܸìÆþÎÏ¥Õ¥í¥ó¥È¥¨¥ó¥É¥×¥í¥»¥Ã¥ - .SH ´ØÏ¢¥Õ¥¡¥¤¥ë - .PD 0 - .TP 15 --/usr/dict/sj3/user/$USER/private.dic -+/usr/local/lib/sj3/dict/user/$USER/private.dic - ²¾Ì¾´Á»úÊÑ´¹¥æ¡¼¥¶¼½ñ - .TP --/usr/dict/sj3/user/$USER/study.dat -+/usr/local/lib/sj3/dict/user/$USER/study.dat - ²¾Ì¾´Á»úÊÑ´¹³Ø½¬¥Õ¥¡¥¤¥ë - .TP --/usr/lib/sj3/sjrk -+/usr/local/lib/sj3/sjrk - ¥Ç¥Õ¥©¥ë¥È¥í¡¼¥Þ»ú²¾Ì¾ÊÑ´¹µ¬Â§ÄêµÁ¥Õ¥¡¥¤¥ë - .SH ´ØÏ¢»ö¹à - sj3serv(1), sj3lib(3) diff --git a/inputmethod/sj3-lib/patches/patch-aj b/inputmethod/sj3-lib/patches/patch-aj deleted file mode 100644 index 5f9a335a30c..00000000000 --- a/inputmethod/sj3-lib/patches/patch-aj +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2005/09/28 17:32:17 rillig Exp $ - ---- doc/man/sj3dic.1.orig Fri Jun 3 10:00:52 1994 -+++ doc/man/sj3dic.1 Wed Sep 28 19:19:35 2005 -@@ -105,16 +105,16 @@ sj3dic \- sj3 ¥æ¡¼¥¶¼½ñ¥á¥ó¥Æ¥Ê¥ó¥¹¥Ä¡¼ - .SH ´ØÏ¢¥Õ¥¡¥¤¥ë - .PD 0 - .TP \w'\ \ \ \ user/\fIusername\fP/private.dic'u+2n --/usr/bin/sj3serv -+/usr/local/bin/sj3serv - ¤«¤Ê´Á»úÊÑ´¹¥µ¡¼¥Ð - .TP --/usr/lib/sj3/serverrc -+/usr/local/lib/sj3/serverrc - ¤«¤Ê´Á»úÊÑ´¹¥µ¡¼¥Ð ¥»¥Ã¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë - .TP --/usr/bin/sj3 -+/usr/local/bin/sj3 - ÆüËܸìÆþÎÏ¥Õ¥í¥ó¥È¥¨¥ó¥É¥×¥í¥»¥Ã¥µ - .TP --/usr/dict/sj3/ -+/usr/local/lib/sj3/dict/ - ¤«¤Ê´Á»úÊÑ´¹¥µ¡¼¥Ð ¥Ç¥Õ¥©¥ë¥È¼½ñ¥Ç¥£¥ì¥¯¥È¥ê - .TP - sj3main.dic -@@ -126,10 +126,10 @@ sj3dic \- sj3 ¥æ¡¼¥¶¼½ñ¥á¥ó¥Æ¥Ê¥ó¥¹¥Ä¡¼ - user/\fIusername\fP/study.dat - ¤«¤Ê´Á»úÊÑ´¹³Ø½¬¥Õ¥¡¥¤¥ë - .TP --/usr/include/sj3lib.h -+/usr/local/include/sj3lib.h - ¤«¤Ê´Á»úÊÑ´¹¥é¥¤¥Ö¥é¥êÍÑ¥¤¥ó¥¯¥ë¡¼¥É¥Õ¥¡¥¤¥ë - .TP --/usr/lib/libsj3lib.a -+/usr/local/lib/libsj3lib.a - ¤«¤Ê´Á»úÊÑ´¹¥é¥¤¥Ö¥é¥ê - .\".TP - .\"/usr/sony/demo/sj3/* diff --git a/inputmethod/sj3-lib/patches/patch-ak b/inputmethod/sj3-lib/patches/patch-ak deleted file mode 100644 index bf8b6a4fe5d..00000000000 --- a/inputmethod/sj3-lib/patches/patch-ak +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-ak,v 1.1 2005/09/28 17:32:17 rillig Exp $ - ---- doc/man/sj3mkdic.1.orig Thu Sep 5 14:08:27 1996 -+++ doc/man/sj3mkdic.1 Wed Sep 28 19:19:35 2005 -@@ -539,16 +539,16 @@ - .SH ¥Õ¥¡¥¤¥ë - .PD 0 - .TP \w'\ \ \ \ user/\f2username\f1/private.dic'u+2n --.B /usr/bin/sj3serv -+.B /usr/local/bin/sj3serv - ¤«¤Ê´Á»úÊÑ´¹¥µ¡¼¥Ð - .TP --.B /usr/lib/sj3/serverrc -+.B /usr/local/lib/sj3/serverrc - ¤«¤Ê´Á»úÊÑ´¹¥µ¡¼¥Ð ¥»¥Ã¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë - .TP --.B /usr/bin/sj3 -+.B /usr/local/bin/sj3 - ÆüËܸìÆþÎÏ¥Õ¥í¥ó¥È¥¨¥ó¥É¥×¥í¥»¥Ã¥µ - .TP --.B /usr/dict/sj3/ -+.B /usr/local/lib/sj3/dict/ - ¤«¤Ê´Á»úÊÑ´¹¥µ¡¼¥Ð ¥Ç¥Õ¥©¥ë¥È¼½ñ¥Ç¥£¥ì¥¯¥È¥ê - .TP - .B " sj3main.dic -@@ -560,14 +560,14 @@ - .B " user/\f2username\f1/study.dat - ¤«¤Ê´Á»úÊÑ´¹³Ø½¬¥Õ¥¡¥¤¥ë - .TP --.B /usr/include/sj3lib.h -+.B /usr/local/include/sj3lib.h - ¤«¤Ê´Á»úÊÑ´¹¥é¥¤¥Ö¥é¥êÍÑ¥¤¥ó¥¯¥ë¡¼¥É¥Õ¥¡¥¤¥ë - .TP --.B /usr/lib/libsj3lib.a -+.B /usr/local/lib/libsj3lib.a - ¤«¤Ê´Á»úÊÑ´¹¥é¥¤¥Ö¥é¥ê --.TP --\f3/usr/demo/sj3/ *\f1 --¤«¤Ê´Á»úÊÑ´¹¥é¥¤¥Ö¥é¥ê »ÈÍÑË¡¥µ¥ó¥×¥ë -+.\".TP -+.\"\f3/usr/local/demo/sj3/ *\f1 -+.\"¤«¤Ê´Á»úÊÑ´¹¥é¥¤¥Ö¥é¥ê »ÈÍÑË¡¥µ¥ó¥×¥ë - .PD - .SH ´ØÏ¢¹àÌÜ - \f4sj3\f1 (1), diff --git a/inputmethod/sj3-lib/patches/patch-al b/inputmethod/sj3-lib/patches/patch-al deleted file mode 100644 index a2a9fc9e45d..00000000000 --- a/inputmethod/sj3-lib/patches/patch-al +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-al,v 1.1 2005/09/28 17:32:17 rillig Exp $ - ---- doc/man/sj3serv.1.orig Fri Jun 3 10:00:53 1994 -+++ doc/man/sj3serv.1 Wed Sep 28 19:19:35 2005 -@@ -47,17 +47,17 @@ sj3serv \- ²¾Ì¾´Á»úÊÑ´¹¥µ¡¼¥Ð - ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢\fIsj3serv\fP ¤ÎÆɤ߹þ¤à¥»¥Ã¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£ - .br - \fIsj3serv\fP ¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¥»¥Ã¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë --¡Æ/usr/lib/sj3/serverrc¡Ç¤òÆɤ߹þ¤ß¤Þ¤¹¤¬¡¢ -+¡Æ/usr/local/lib/sj3/serverrc¡Ç¤òÆɤ߹þ¤ß¤Þ¤¹¤¬¡¢ - ¤³¤Î¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤¿¤È¤¤Ë¤Ï¤«¤ï¤ê¤Ë - ¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤵ¤ì¤¿¥»¥Ã¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¤Þ¤¹¡£ - .br - .SH ´ØÏ¢¥Õ¥¡¥¤¥ë - .PD 0 - .TP \w'\ \ \ \ user/\fIusername\fP/private.dic'u+2n --/usr/lib/sj3/serverrc -+/usr/local/lib/sj3/serverrc - ¥Ç¥Õ¥©¥ë¥È²¾Ì¾ÊÑ´¹¥µ¡¼¥Ð ¥»¥Ã¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë - .TP --/usr/sony/dict/sj3/ -+/usr/local/lib/sj3/dict/ - ¤«¤Ê´Á»úÊÑ´¹¥µ¡¼¥Ð ¥Ç¥Õ¥©¥ë¥È¼½ñ¥Ç¥£¥ì¥¯¥È¥ê - .TP - sj3main.dic diff --git a/inputmethod/sj3-lib/patches/patch-am b/inputmethod/sj3-lib/patches/patch-am deleted file mode 100644 index 2fab6c3522f..00000000000 --- a/inputmethod/sj3-lib/patches/patch-am +++ /dev/null @@ -1,76 +0,0 @@ -$NetBSD: patch-am,v 1.1 2005/09/28 17:32:17 rillig Exp $ - ---- doc/doc/sj3lib.ms.orig Fri Jun 3 10:00:49 1994 -+++ doc/doc/sj3lib.ms Wed Sep 28 19:19:34 2005 -@@ -56,7 +56,7 @@ JIS ¤ò»ÈÍѤ·¤Þ¤¹¡£ - .IP ¡¦ - ¥á¥¤¥ó¼½ñ¡¢¥æ¡¼¥¶¼½ñ¡¢³Ø½¬¥Õ¥¡¥¤¥ë¤Ï¡¢Àܳ¤¹¤ë¥µ¡¼¥Ð¤ÎÆ°ºî¤·¤Æ¤¤¤ë¥Þ¥·¥ó¾å¤Î¤â¤Î¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£ - .br --¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¥Ç¥£¥ì¥¯¥È¥ê \fB/usr/dict/sj3\fP ¤Î²¼¤Ë¤ª¤«¤ì¤Þ¤¹¤¬¡¢¥µ¡¼¥Ð¤Î¥»¥Ã¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤Ë¤è¤êÊѹ¹¤¬²Äǽ¤Ç¤¹¡£ -+¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¥Ç¥£¥ì¥¯¥È¥ê \fB/usr/local/lib/sj3/dict\fP ¤Î²¼¤Ë¤ª¤«¤ì¤Þ¤¹¤¬¡¢¥µ¡¼¥Ð¤Î¥»¥Ã¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤Ë¤è¤êÊѹ¹¤¬²Äǽ¤Ç¤¹¡£ - .IP ¡¦ - ¥æ¡¼¥¶¼½ñ¤È³Ø½¬¥Õ¥¡¥¤¥ë¤Ï¡¢´Ø¿ô sj3_open ¤Ç»ØÄꤵ¤ì¤¿¥æ¡¼¥¶Ì¾¤ò USER ¤È - ¤¹¤ì¤Ð¡¢\fBuser/USER/private.dic\fP ¤È \fBuser/USER/study.dat\fP ¤Ç¤¹¡£ -@@ -91,7 +91,7 @@ char *uname; /* ¥æ¡¼¥¶Ì¾¤Ø¤Î¥Ý¥¤¥ó¥¿ */ - ¥µ¡¼¥Ð¤ÈÀµ¾ï¤ËÀܳ¤Ç¤¤¿¤È¤¤Ë¤Ï 0 ¤ò¡¢²¿¤«¥¨¥é¡¼¤Î¤¢¤Ã¤¿¤È¤¤Ë¤Ï 0 °Ê³°¤Î - ¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤òÊÖ¤·¤Þ¤¹¡£ - .sp --¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤Ï¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë \fB/usr/include/sj3lib.h\fP ¤Ç -+¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤Ï¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë \fB/usr/local/include/sj3lib.h\fP ¤Ç - ÄêµÁ¤µ¤ì¤ë¥Ó¥Ã¥È¥¢¥µ¥¤¥ó¤µ¤ì¤¿Ãͤǡ¢¾ÜºÙ¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£ - .sp - .IP "\fBSJ3_SERVER_DEAD\fP -@@ -138,7 +138,7 @@ sj3_close() - ¥µ¡¼¥Ð¤È¤Î»ÈÍѤòÀµ¾ï¤Ë½ªÎ»¤Ç¤¤¿¤È¤¤Ë¤Ï 0 ¤ò¡¢ - ²¿¤«¥¨¥é¡¼¤Î¤¢¤Ã¤¿¤È¤¤Ë¤Ï 0 °Ê³°¤Î¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤òÊÖ¤·¤Þ¤¹¡£ - .sp --¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤Ï¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë \fB/usr/include/sj3lib.h\fP ¤Ç -+¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤Ï¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë \fB/usr/local/include/sj3lib.h\fP ¤Ç - ÄêµÁ¤µ¤ì¤ë¥Ó¥Ã¥È¥¢¥µ¥¤¥ó¤µ¤ì¤¿Ãͤǡ¢¾ÜºÙ¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£ - .sp - .IP "\fBSJ3_SERVER_DEAD\fP -@@ -187,7 +187,7 @@ int knjsiz; /* ´Á»úʸ»úÎó³ÊǼÎΰè¤ÎÂç¤ - ÊÑ´¹·ë²Ì¤Î´Á»úʸ»úÎó¤ò¡¢ÇÛÎó \fBstruct bunsetu bun[]\fP ¤Ë - ³ÆʸÀá¤Ë´Ø¤¹¤ë¾ðÊó¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£ - .br --\fBstruct bunsetu\fP ¤Ï¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë \fB/usr/include/sj3lib.h\fP ¤Ç -+\fBstruct bunsetu\fP ¤Ï¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë \fB/usr/local/include/sj3lib.h\fP ¤Ç - Àë¸À¤µ¤ì¤Æ¤¤¤ë°Ê²¼¤Î¤è¤¦¤Ê¹½Â¤ÂΤǤ¹¡£ - .sp - .RS -@@ -417,7 +417,7 @@ int hinsi; /* Éʻ쥳¡¼¥É * - ¤Ê¤ê¤Þ¤»¤ó¡£ - ¤Þ¤¿¤½¤ÎŤµ¤Ï¡¢ºÇÂç¤Ç¤â 32 ʸ»ú¤ò±Û¤¨¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡£ - .sp --Éʻ쥳¡¼¥É¤Ï¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë \fB/usr/include/sj3lib.h\fP ¤Ç -+Éʻ쥳¡¼¥É¤Ï¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë \fB/usr/local/include/sj3lib.h\fP ¤Ç - ÄêµÁ¤µ¤ì¤ë°Ê²¼¤ÎÉÊ»ì¤Î¤¦¤Á¤Î°ì¤Ä¤Ç¤¹¡£ - .sp - .RS -@@ -445,7 +445,7 @@ SJ3_H_ADJECT ·ÁÍÆ»ì SJ3_H_SI - ÅÐÏ¿¤Ç¤¤¿¤È¤¤Ë¤Ï 0 ¤¬¡¢ÅÐÏ¿¤Ç¤¤Ê¤«¤Ã¤¿¤È¤¤Ë¤Ï¤½¤ì°Ê³°¤Î - ¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£ - .sp --¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤Ï¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë \fB/usr/include/sj3lib.h\fP ¤Ç -+¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤Ï¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë \fB/usr/local/include/sj3lib.h\fP ¤Ç - ÄêµÁ¤µ¤ì¡¢¾ÜºÙ¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£ - .sp - .IP "\fBSJ3_DICT_ERROR\fP -@@ -519,7 +519,7 @@ int hinsi; /* Éʻ쥳¡¼¥É */ - ¤Ê¤ê¤Þ¤»¤ó¡£ - ¤Þ¤¿¤½¤ÎŤµ¤Ï¡¢ºÇÂç¤Ç¤â 32 ʸ»ú¤ò±Û¤¨¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡£ - .sp --Éʻ쥳¡¼¥É¤Ï \fB/usr/include/sj3lib.h\fP ¤ÇÄêµÁ¤µ¤ì¤ë°Ê²¼¤ÎÉÊ»ì¤Î -+Éʻ쥳¡¼¥É¤Ï \fB/usr/local/include/sj3lib.h\fP ¤ÇÄêµÁ¤µ¤ì¤ë°Ê²¼¤ÎÉÊ»ì¤Î - ¤¦¤Á¤Î°ì¤Ä¤Ç¤¹¡£ - .sp - .RS -@@ -547,7 +547,7 @@ SJ3_H_ADJECT ·ÁÍÆ»ì SJ3_H_SI - ºï½ü¤Ç¤¤¿¤È¤¤Ë¤Ï 0 ¤¬¡¢ºï½ü¤Ç¤¤Ê¤«¤Ã¤¿¤È¤¤Ë¤Ï¤½¤ì°Ê³°¤Î - ¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£ - .sp --¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤Ï \fB/usr/include/sj3lib.h\fP ¤ÇÄêµÁ¤µ¤ì¡¢ -+¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤Ï \fB/usr/local/include/sj3lib.h\fP ¤ÇÄêµÁ¤µ¤ì¡¢ - ¾ÜºÙ¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£ - .sp - .IP "\fBSJ3_DICT_ERROR\fP diff --git a/inputmethod/sj3-lib/patches/patch-ao b/inputmethod/sj3-lib/patches/patch-ao deleted file mode 100644 index 618ac285144..00000000000 --- a/inputmethod/sj3-lib/patches/patch-ao +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ao,v 1.1 2005/12/02 22:57:32 joerg Exp $ - ---- sj3lib/level1.c.orig 2005-12-02 22:29:21.000000000 +0000 -+++ sj3lib/level1.c -@@ -303,7 +303,7 @@ static open_unix() - } - - len = strlen(sunix.sun_path)+sizeof(sunix.sun_family); --#if defined(__NetBSD__) || defined(__FreeBSD__) -+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) - len += sizeof(sunix.sun_len); - #endif - if (connect(fd, (struct sockaddr *)&sunix, len) diff --git a/inputmethod/sj3-lib/patches/patch-ap b/inputmethod/sj3-lib/patches/patch-ap deleted file mode 100644 index 5f18b4aede9..00000000000 --- a/inputmethod/sj3-lib/patches/patch-ap +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2005/12/02 22:57:32 joerg Exp $ - ---- sj3/sjgetchar.c.orig 2005-12-02 22:29:41.000000000 +0000 -+++ sj3/sjgetchar.c -@@ -48,14 +48,12 @@ - #include <sys/types.h> - #include <sys/fcntl.h> - #endif --#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__) --#if defined(__NetBSD__) || defined(__bsdi__) -+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__) || defined(__DragonFly__) - #define USE_OLD_TTY --#endif - #include <curses.h> - #endif - --#include <sys/errno.h> -+#include <errno.h> - #include <sys/file.h> - #include "sj2.h" - #include "select.h" -@@ -72,7 +70,6 @@ static wchar16_t backup = (wchar16_t) 0 - - static int eucmode = 0; - extern int master; --extern int errno; - - wchar16_t SJ_getchar() - { diff --git a/inputmethod/sj3-lib/patches/patch-aq b/inputmethod/sj3-lib/patches/patch-aq deleted file mode 100644 index 4d6533cc8ef..00000000000 --- a/inputmethod/sj3-lib/patches/patch-aq +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-aq,v 1.1 2005/12/02 22:57:32 joerg Exp $ - ---- kanakan/depend.c.orig 2005-12-02 22:30:03.000000000 +0000 -+++ kanakan/depend.c -@@ -318,7 +318,7 @@ char *passwd; - serv_errno = SJ3_IncorrectPasswd; goto error1; - } - --#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__) -+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__) || defined(__DragonFly__) - if ((dp = (Uchar *)malloc((long)sbuf.st_size)) == NULL) { - #else - if ((dp = (Uchar *)malloc(sbuf.st_size)) == NULL) { -@@ -330,7 +330,7 @@ char *passwd; - } - memset(dfp, '\0', sizeof(*dfp)); - --#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__) -+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__) || defined(__DragonFly__) - if (fgetfile(fp, 0L, (long)sbuf.st_size, dp) == ERROR) goto error3; - #else - if (fgetfile(fp, 0L, sbuf.st_size, dp) == ERROR) goto error3; diff --git a/inputmethod/sj3-lib/patches/patch-ar b/inputmethod/sj3-lib/patches/patch-ar deleted file mode 100644 index ef24ebdcf38..00000000000 --- a/inputmethod/sj3-lib/patches/patch-ar +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ar,v 1.1 2005/12/02 22:57:32 joerg Exp $ - ---- include/Paths.h.in.orig 2005-12-02 22:30:39.000000000 +0000 -+++ include/Paths.h.in -@@ -43,7 +43,7 @@ - * This default value is "/dev/null" in document. - * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/11 - */ --#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__) - #define ErrorOutFile "/dev/console" - #else - /* #define ErrorOutFile "/dev/stderr" */ /* for test */ diff --git a/inputmethod/sj3-lib/patches/patch-as b/inputmethod/sj3-lib/patches/patch-as deleted file mode 100644 index 3574c224876..00000000000 --- a/inputmethod/sj3-lib/patches/patch-as +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-as,v 1.1 2005/12/02 22:57:32 joerg Exp $ - ---- include/Const.h.orig 2005-12-02 22:31:07.000000000 +0000 -+++ include/Const.h -@@ -74,7 +74,7 @@ - * Change the default Port number of sj3 for FreeBSD. - * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/20 - */ --#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) - #define PortNumber 3086 - #else /* ! __FreeBSD__ __NetBSD__ __OpenBSD__ */ - #define PortNumber 3000 diff --git a/inputmethod/sj3-lib/patches/patch-at b/inputmethod/sj3-lib/patches/patch-at deleted file mode 100644 index 4e2b566d4e2..00000000000 --- a/inputmethod/sj3-lib/patches/patch-at +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-at,v 1.1 2005/12/02 22:57:32 joerg Exp $ - ---- dict/tool/file.c.orig 2005-12-02 22:31:36.000000000 +0000 -+++ dict/tool/file.c -@@ -124,7 +124,7 @@ char *filename; - { - struct stat buf; - --#if defined(__NetBSD__) || defined(__FreeBSD__) -+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) - if (stat(filename, &buf) == 0) return (long)buf.st_size; - #else - if (stat(filename, &buf) == 0) return buf.st_size; diff --git a/inputmethod/sj3-lib/patches/patch-au b/inputmethod/sj3-lib/patches/patch-au deleted file mode 100644 index 7f14c1b8560..00000000000 --- a/inputmethod/sj3-lib/patches/patch-au +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-au,v 1.1 2005/12/02 22:57:32 joerg Exp $ - ---- kanakan/depend.c.orig 2005-12-02 22:33:25.000000000 +0000 -+++ kanakan/depend.c -@@ -50,7 +50,6 @@ - # define FD_CLR __FD_CLR - #endif - --extern int errno; - extern int serv_errno; - extern Global *work_base; - char *malloc(); diff --git a/inputmethod/sj3-lib/patches/patch-av b/inputmethod/sj3-lib/patches/patch-av deleted file mode 100644 index 7779b26d41f..00000000000 --- a/inputmethod/sj3-lib/patches/patch-av +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-av,v 1.1 2005/12/02 22:57:32 joerg Exp $ - ---- sj3/conv.c.orig 2005-12-02 22:43:26.000000000 +0000 -+++ sj3/conv.c -@@ -35,7 +35,7 @@ - - - --#include <sys/errno.h> -+#include <errno.h> - #include "wchar16.h" - #include "select.h" - #include "key.h" -@@ -204,7 +204,6 @@ register int *count; - register int n; - SELECT_FD ifds; - struct timeval t; -- extern int errno; - register wchar16_t *s; - int value; - diff --git a/inputmethod/sj3-lib/patches/patch-aw b/inputmethod/sj3-lib/patches/patch-aw deleted file mode 100644 index f6b5cc56c6c..00000000000 --- a/inputmethod/sj3-lib/patches/patch-aw +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-aw,v 1.1 2005/12/02 22:57:32 joerg Exp $ - ---- sj3/display.c.orig 2005-12-02 22:43:59.000000000 +0000 -+++ sj3/display.c -@@ -36,7 +36,7 @@ - - - #include "sj_sysvdef.h" --#include <sys/errno.h> -+#include <errno.h> - #include "common.h" - #include "inkey.h" - #include "select.h" -@@ -201,7 +201,6 @@ master_flush () - SELECT_FD ifds; - int nc; - struct timeval t; -- extern int errno; - - do { - cont: diff --git a/inputmethod/sj3-lib/patches/patch-ax b/inputmethod/sj3-lib/patches/patch-ax deleted file mode 100644 index abd20e4dbab..00000000000 --- a/inputmethod/sj3-lib/patches/patch-ax +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ax,v 1.1 2005/12/02 22:57:32 joerg Exp $ - ---- server/comuni.c.orig 2005-12-02 22:44:55.000000000 +0000 -+++ server/comuni.c -@@ -98,7 +98,6 @@ extern char *proto_name; - extern int port_number; - #endif - extern int max_client; --extern int errno; - - static int fd_inet = -1; - static int fd_unix = -1; diff --git a/inputmethod/sj3-lib/patches/patch-ay b/inputmethod/sj3-lib/patches/patch-ay deleted file mode 100644 index ceaa3a59029..00000000000 --- a/inputmethod/sj3-lib/patches/patch-ay +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ay,v 1.1 2005/12/02 22:57:32 joerg Exp $ - ---- server/execute.c.orig 2005-12-02 22:45:34.000000000 +0000 -+++ server/execute.c -@@ -53,8 +53,6 @@ - #define SJIS_PROTO 1 - #define EUC_PROTO 2 - --extern int errno; -- - extern Global *work_base; - extern STDY *stdy_base; - extern int serv_errno; -@@ -82,7 +80,6 @@ static Client *cur_cli; - static Uchar defaultchar[2] = {(Uchar)0x81, (Uchar)0x40}; - static int defuse=0, defuse2=0; - --char *malloc(); - DictFile *opendict(); - int closedict(); - StdyFile *openstdy(); diff --git a/inputmethod/sj3-lib/patches/patch-az b/inputmethod/sj3-lib/patches/patch-az deleted file mode 100644 index 239953277cf..00000000000 --- a/inputmethod/sj3-lib/patches/patch-az +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-az,v 1.1 2009/10/06 17:41:49 joerg Exp $ - ---- sj3dic/sjrc.c.orig 2009-10-06 19:30:07.000000000 +0200 -+++ sj3dic/sjrc.c -@@ -108,9 +108,8 @@ sjset_code() - - getsjrc () - { -- FILE *fd, *fopen(); -+ FILE *fd; - register char *p; -- char *getenv(); - - sjset_code(); - RCfile[0] = '\0'; diff --git a/inputmethod/sj3-lib/patches/patch-ba b/inputmethod/sj3-lib/patches/patch-ba deleted file mode 100644 index 0f54d40443a..00000000000 --- a/inputmethod/sj3-lib/patches/patch-ba +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ba,v 1.1 2009/10/06 17:41:49 joerg Exp $ - ---- sj3/nmttyslot.c.orig 2009-10-06 19:31:25.000000000 +0200 -+++ sj3/nmttyslot.c -@@ -40,14 +40,13 @@ - - - -+#include <string.h> -+#include <unistd.h> - - - - -- --char *ttyname(); --char *getttys(); --char *strrchr(); -+static char *getttys(); - static char *ttys = "/etc/ttys"; - - #define NULL 0 diff --git a/inputmethod/sj3-lib/patches/patch-bb b/inputmethod/sj3-lib/patches/patch-bb deleted file mode 100644 index 9ac651adeda..00000000000 --- a/inputmethod/sj3-lib/patches/patch-bb +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bb,v 1.1 2009/10/06 17:41:49 joerg Exp $ - ---- sj3rkcv/sj3_rkcv.c.orig 2009-10-06 19:36:40.000000000 +0200 -+++ sj3rkcv/sj3_rkcv.c -@@ -33,7 +33,7 @@ - * $SonyDate: 1995/02/10 06:02:25 $ - */ - -- -+#include <string.h> - - #include "wchar16.h" - #include "sj.h" diff --git a/inputmethod/sj3-lib/patches/patch-bc b/inputmethod/sj3-lib/patches/patch-bc deleted file mode 100644 index 28ebc770abd..00000000000 --- a/inputmethod/sj3-lib/patches/patch-bc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bc,v 1.1 2009/10/06 17:41:49 joerg Exp $ - ---- sj3dic/sjrc.c.orig 2009-10-06 19:37:25.000000000 +0200 -+++ sj3dic/sjrc.c -@@ -36,7 +36,7 @@ - - - -- -+#include <string.h> - #include <stdio.h> - #include <locale.h> - #include <ctype.h> diff --git a/inputmethod/sj3-lib/patches/patch-bd b/inputmethod/sj3-lib/patches/patch-bd deleted file mode 100644 index 197cebc200a..00000000000 --- a/inputmethod/sj3-lib/patches/patch-bd +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bd,v 1.1 2009/10/06 17:41:49 joerg Exp $ - ---- sj3dic/dictdisp.c.orig 2009-10-06 19:37:59.000000000 +0200 -+++ sj3dic/dictdisp.c -@@ -35,7 +35,7 @@ - - - -- -+#include <string.h> - #include <stdio.h> - #include <ctype.h> - diff --git a/inputmethod/sj3-lib/patches/patch-be b/inputmethod/sj3-lib/patches/patch-be deleted file mode 100644 index 1ccdd0f363c..00000000000 --- a/inputmethod/sj3-lib/patches/patch-be +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-be,v 1.1 2009/10/06 17:41:49 joerg Exp $ - ---- sj3dic/codecnv.c.orig 2009-10-06 19:38:30.000000000 +0200 -+++ sj3dic/codecnv.c -@@ -35,7 +35,7 @@ - - - -- -+#include <string.h> - #include <stdio.h> - #include <ctype.h> - #include <locale.h> diff --git a/inputmethod/sj3-server-bin/DESCR b/inputmethod/sj3-server-bin/DESCR deleted file mode 100644 index cebe440e506..00000000000 --- a/inputmethod/sj3-server-bin/DESCR +++ /dev/null @@ -1,6 +0,0 @@ -SJ3 is a Japanese input method developed by Sony Corporation. SJ3 is -composed of a Kana-Kanji conversion server (sj3serv), a Kana-Kanji -conversion client for terminals (sj3) and Kana-Kanji conversion library -(sj3lib). - -This package contains the Kana-Kanji conversion server and client. diff --git a/inputmethod/sj3-server-bin/MESSAGE b/inputmethod/sj3-server-bin/MESSAGE deleted file mode 100644 index 5697365ad21..00000000000 --- a/inputmethod/sj3-server-bin/MESSAGE +++ /dev/null @@ -1,10 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.1 2006/07/05 04:55:24 jlam Exp $ - -The default port number for the SJ3 service should be added to the -/etc/services database: - - sj3 3086/tcp - -This port number may be changed in configuration files. -=========================================================================== diff --git a/inputmethod/sj3-server-bin/Makefile b/inputmethod/sj3-server-bin/Makefile deleted file mode 100644 index e37f583c805..00000000000 --- a/inputmethod/sj3-server-bin/Makefile +++ /dev/null @@ -1,60 +0,0 @@ -# $NetBSD: Makefile,v 1.16 2010/01/09 16:15:41 joerg Exp $ -# - -DISTNAME= sj3-2.0.1.20 -PKGNAME= sj3-server-bin-2.0.1.20 -PKGREVISION= 6 -CATEGORIES= japanese inputmethod -MASTER_SITES= ftp://ftp.sony.co.jp/pub/unsupported/src/ \ - ftp://ftp.cs.titech.ac.jp/pub/japanese/sj3/ - -MAINTAINER= tech-pkg-ja@jp.NetBSD.org -COMMENT= SJ3 Japanese input method server & client - -DISTINFO_FILE= ${.CURDIR}/../sj3-lib/distinfo -PATCHDIR= ${.CURDIR}/../sj3-lib/patches - -NOT_FOR_PLATFORM+= ${LP64PLATFORMS} - -.include "../../mk/bsd.prefs.mk" - -USE_TOOLS+= itools -USE_IMAKE= yes -MAKE_ENV+= SJ3OWNER=${SJ3OWNER:Q} SJ3GROUP=${SJ3GROUP:Q} \ - IMDICTDIR=${IMDICTDIR:Q} LOCAL_LDFLAGS=${LDFLAGS:M*:Q} - -SJ3OWNER?= daemon -SJ3GROUP?= daemon - -FILES_SUBST+= IMDICTDIR=${IMDICTDIR:Q} -FILES_SUBST+= SJ3OWNER=${SJ3OWNER:Q} -FILES_SUBST+= SJ3GROUP=${SJ3GROUP:Q} - -PKG_GROUPS+= ${SJ3GROUP} -PKG_USERS+= ${SJ3OWNER}:${SJ3GROUP} - -PKG_GROUPS_VARS+= SJ3GROUP -PKG_USERS_VARS+= SJ3USER - -MAKE_DIRS+= ${IMDICTDIR} -OWN_DIRS+= ${IMDICTDIR}/sj3 -OWN_DIRS_PERMS+= ${IMDICTDIR}/sj3/user ${SJ3OWNER} ${SJ3GROUP} 0755 - -RCD_SCRIPTS= sj3 - -pre-configure: - @${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.orig - @${SED} -e 's|\(SUBDIRS = .*\)sj3lib \(.*\)|\1\2|' \ - ${WRKSRC}/Imakefile.orig > ${WRKSRC}/Imakefile - @${MV} ${WRKSRC}/dict/Imakefile ${WRKSRC}/dict/Imakefile.orig - @${SED} -e 's|\(SUBDIRS = .*\)dict|\1|' \ - ${WRKSRC}/dict/Imakefile.orig > ${WRKSRC}/dict/Imakefile - @for file in `${FIND} ${WRKSRC} -name Imakefile -print`; do \ - ${MV} -f $$file $$file.orig; \ - ${SED} -e 's|\(= \).*/lib\(sj3lib\).a|\1-l\2|' \ - -e 's|^DEPLIBS.*|DEPLIBS =|' \ - $$file.orig > $$file; \ - done - -.include "../../inputmethod/sj3-lib/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/sj3-server-bin/PLIST b/inputmethod/sj3-server-bin/PLIST deleted file mode 100644 index 8320379f4ef..00000000000 --- a/inputmethod/sj3-server-bin/PLIST +++ /dev/null @@ -1,23 +0,0 @@ -@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:01:32 joerg Exp $ -bin/sj3 -bin/sj3dic -bin/sj3mkdic -bin/sj3serv -bin/sj3stat -man/ja_JP.EUC/man1/sj3.1 -man/ja_JP.EUC/man1/sj3dic.1 -man/ja_JP.EUC/man1/sj3mkdic.1 -man/ja_JP.EUC/man1/sj3serv.1 -share/examples/rc.d/sj3 -share/sj3/Nihongo.ps.Z -share/sj3/cvtkey.news -share/sj3/cvtkey.nwp511 -share/sj3/cvtkey.nwp517 -share/sj3/cvtkey.xterm -share/sj3/hinsi.ms -share/sj3/makedict.ms -share/sj3/serverrc -share/sj3/sj3lib.ms -share/sj3/sj3serv.ms -share/sj3/sjrc -share/sj3/sjrk diff --git a/inputmethod/sj3-server-bin/files/sj3.sh b/inputmethod/sj3-server-bin/files/sj3.sh deleted file mode 100644 index 745cc890cc7..00000000000 --- a/inputmethod/sj3-server-bin/files/sj3.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!@RCD_SCRIPTS_SHELL@ -# -# $NetBSD: sj3.sh,v 1.2 2006/07/05 04:55:24 jlam Exp $ -# -# PROVIDE: sj3 -# REQUIRE: LOGIN -# - -. /etc/rc.subr - -name="sj3" -rcvar=$name -command="@PREFIX@/bin/sj3serv" -start_precmd="sj3_prestart" - -mkdir_perms() { - dir="$1"; user="$2"; group="$3"; mode="$4" - @TEST@ -d $dir || @MKDIR@ $dir - @CHOWN@ $user $dir - @CHGRP@ $group $dir - @CHMOD@ $mode $dir -} - -sj3_prestart() -{ - @MKDIR@ @IMDICTDIR@/sj3 - mkdir_perms @IMDICTDIR@/sj3/user @SJ3OWNER@ @SJ3GROUP@ 0755 - srcdict="@PREFIX@/libdata/sj3main.dic" - dict="@IMDICTDIR@/sj3/sj3main.dic" - if @TEST@ -f $srcdict; then - @RM@ -f $srcdict - @LN@ -fs $srcdict $dict - fi -} - -load_rc_config $name -run_rc_command "$1" diff --git a/inputmethod/sj3-server/DESCR b/inputmethod/sj3-server/DESCR index 447a901c972..53fd9f009ef 100644 --- a/inputmethod/sj3-server/DESCR +++ b/inputmethod/sj3-server/DESCR @@ -1,4 +1,3 @@ -SJ3 is a Japanese input method developed by Sony Corporation. SJ3 is -composed of a Kana-Kanji conversion server (sj3serv), a Kana-Kanji -conversion client for terminals (sj3) and Kana-Kanji conversion library -(sj3lib). +SJ3 is is a Japanese input system developed by Sony Corporation. + +This package contains the Kana-Kanji conversion server and utilities. diff --git a/inputmethod/sj3-server/Makefile b/inputmethod/sj3-server/Makefile index 4f38c51846b..0a868bf9a92 100644 --- a/inputmethod/sj3-server/Makefile +++ b/inputmethod/sj3-server/Makefile @@ -1,15 +1,41 @@ -# $NetBSD: Makefile,v 1.10 2009/04/08 23:09:59 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2010/02/15 13:35:22 obache Exp $ +# -DISTNAME= sj3-server-2.0.1.20 -PKGREVISION= 3 -CATEGORIES= japanese inputmethod +.include "../../inputmethod/sj3/Makefile.common" + +PKGNAME= ${DISTNAME:S/sj3-/sj3-server-/} -MAINTAINER= tech-pkg-ja@jp.NetBSD.org COMMENT= SJ3 Japanese input method server -META_PACKAGE= # empty +CONFLICTS= sj3-dict-[0-9]* sj3-server-bin-[0-9]* + +PKG_DESTDIR_SUPPORT= user-destdir + +USE_TOOLS+= pkg-config + +CONFIGURE_ARGS+= --with-external-lua +CONFIGURE_ARGS+= --enable-server +CONFIGURE_ARGS+= --enable-dict + +CONF_FILES+= share/examples/sj3/sj3proxy.lua.example \ + ${PKG_SYSCONFDIR}/sj3proxy.lua +CONF_FILES+= share/examples/sj3/sj3serv.lua.example \ + ${PKG_SYSCONFDIR}/sj3serv.lua + +OWN_DIRS_PERMS+= ${VARBASE}/sj3/run ${SJ3OWNER} ${SJ3GROUP} 755 +OWN_DIRS_PERMS+= ${VARBASE}/sj3/dict/user ${SJ3OWNER} ${SJ3GROUP} 700 +CONF_FILES_PERMS+= libdata/sj3main.dic \ + ${VARBASE}/sj3/dict/sj3main.dic \ + ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 644 + +RCD_SCRIPTS= sj3proxy sj3serv + +INSTALLATION_DIRS+= libdata + +post-install: + ${INSTALL_DATA} ${WRKSRC}/dict/sj3main.dic \ + ${DESTDIR}${PREFIX}/libdata/sj3main.dic -DEPENDS+= sj3-server-bin>=2.0.1.20nb6:../../inputmethod/sj3-server-bin -DEPENDS+= sj3-dict>=2.0.1.20nb3:../../inputmethod/sj3-dict +.include "../../lang/lua/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/sj3-server/PLIST b/inputmethod/sj3-server/PLIST new file mode 100644 index 00000000000..c9a3b53e298 --- /dev/null +++ b/inputmethod/sj3-server/PLIST @@ -0,0 +1,17 @@ +@comment $NetBSD: PLIST,v 1.6 2010/02/15 13:35:22 obache Exp $ +bin/sj3mkdic +lib/libsj3core.la +libdata/sj3main.dic +man/man1/sj3mkdic.1 +man/man1/sj3serv.1 +sbin/sj3proxy +sbin/sj3serv +share/doc/sj3/hinsi.ms +share/doc/sj3/makedict.ms +share/doc/sj3/sj3serv.ms +share/examples/rc.d/sj3proxy +share/examples/rc.d/sj3serv +share/examples/sj3/freebsd-sj3.sh.in +share/examples/sj3/freebsd-sj3proxy.sh.in +share/examples/sj3/sj3proxy.lua.example +share/examples/sj3/sj3serv.lua.example diff --git a/inputmethod/sj3-server/files/sj3proxy.sh b/inputmethod/sj3-server/files/sj3proxy.sh new file mode 100644 index 00000000000..83bc9254079 --- /dev/null +++ b/inputmethod/sj3-server/files/sj3proxy.sh @@ -0,0 +1,18 @@ +#!@RCD_SCRIPTS_SHELL@ +# +# $NetBSD: sj3proxy.sh,v 1.1 2010/02/15 13:35:22 obache Exp $ +# +# PROVIDE: sj3proxy +# REQUIRE: sj3serv +# BEFORE: LOGIN +# KEYWORD: shutdown +# + +. /etc/rc.subr + +name="sj3proxy" +rcvar=$name +command="@PREFIX@/sbin/sj3proxy" + +load_rc_config $name +run_rc_command "$1" diff --git a/inputmethod/sj3-server/files/sj3serv.sh b/inputmethod/sj3-server/files/sj3serv.sh new file mode 100644 index 00000000000..ace36699ec7 --- /dev/null +++ b/inputmethod/sj3-server/files/sj3serv.sh @@ -0,0 +1,18 @@ +#!@RCD_SCRIPTS_SHELL@ +# +# $NetBSD: sj3serv.sh,v 1.1 2010/02/15 13:35:22 obache Exp $ +# +# PROVIDE: sj3serv +# REQUIRE: DAEMON +# BEFORE: LOGIN +# KEYWORD: shutdown +# + +. /etc/rc.subr + +name="sj3serv" +rcvar=$name +command="@PREFIX@/sbin/sj3serv" + +load_rc_config $name +run_rc_command "$1" diff --git a/inputmethod/sj3/DESCR b/inputmethod/sj3/DESCR new file mode 100644 index 00000000000..d9b04739cac --- /dev/null +++ b/inputmethod/sj3/DESCR @@ -0,0 +1,4 @@ +SJ3 is is a Japanese input system developed by Sony Corporation. + +SJ3 is composed of Kana-Kanji conversion server(sj3serv), +Kana-Kanji conversion library(sj3lib) and utility tools. diff --git a/inputmethod/sj3/Makefile b/inputmethod/sj3/Makefile new file mode 100644 index 00000000000..8aa77f88b24 --- /dev/null +++ b/inputmethod/sj3/Makefile @@ -0,0 +1,19 @@ +# $NetBSD: Makefile,v 1.1 2010/02/15 13:35:21 obache Exp $ +# + +.include "version.mk" + +DISTNAME= sj3-${SJ3_VERSION} +CATEGORIES= japanese inputmethod +MASTER_SITES= http://sj3.googlecode.com/files/ + +MAINTAINER= obache@NetBSD.org +HOMEPAGE= http://code.google.com/p/sj3/ +COMMENT= SJ3 Japanese input method + +META_PACKAGE= yes + +DEPENDS+= sj3-server>=${SJ3_VERSION}:../../wip/sj3-server +DEPENDS+= sj3-client>=${SJ3_VERSION}:../../wip/sj3-client + +.include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/sj3/Makefile.common b/inputmethod/sj3/Makefile.common new file mode 100644 index 00000000000..9c4d2b56b18 --- /dev/null +++ b/inputmethod/sj3/Makefile.common @@ -0,0 +1,47 @@ +# $NetBSD: Makefile.common,v 1.1 2010/02/15 13:35:21 obache Exp $ +# used by inputmethod/sj3-server/Makefile +# used by inputmethod/sj3-client/Makefile +# + +.include "${.CURDIR}/../../inputmethod/sj3/version.mk" + +DISTNAME= sj3-${SJ3_VERSION} +CATEGORIES= japanese inputmethod +MASTER_SITES= http://sj3.googlecode.com/files/ + +MAINTAINER= obache@NetBSD.org +HOMEPAGE= http://code.google.com/p/sj3/ +COMMENT?= SJ3 Japanese input method + +PKG_DESTDIR_SUPPORT= user-destdir + +DISTINFO_FILE= ${.CURDIR}/../../inputmethod/sj3/distinfo +PATCHDIR= ${.CURDIR}/../../inputmethod/sj3/patches + +GNU_CONFIGURE= yes +USE_LIBTOOL= yes +USE_LANGUAGES= c c++ + +PKGCONFIG_OVERRIDE+= lib/sj3lib/sj3lib.pc.in + +.include "../../mk/bsd.prefs.mk" + +SJ3OWNER?= daemon +SJ3GROUP?= daemon +PKG_GROUPS= ${SJ3GROUP} +PKG_USERS= ${SJ3OWNER}:${SJ3GROUP} +PKG_GROUPS_VARS+= SJ3GROUP +PKG_USERS_VARS+= SJ3OWNER + +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} +CONFIGURE_ARGS+= --localstatedir=${VARBASE}/sj3 +CONFIGURE_ARGS+= --with-user=${SJ3OWNER:Q} +CONFIGURE_ARGS+= --with-group=${SJ3GROUP:Q} +CONFIGURE_ARGS+= --disable-server +CONFIGURE_ARGS+= --disable-client +CONFIGURE_ARGS+= --disable-dict +CONFIGURE_ARGS+= --disable-demo + +BUILD_DEFS+= VARBASE + +PKG_SYSCONFSUBDIR= sj3 diff --git a/inputmethod/sj3/distinfo b/inputmethod/sj3/distinfo new file mode 100644 index 00000000000..2885fb4e93e --- /dev/null +++ b/inputmethod/sj3/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.1 2010/02/15 13:35:21 obache Exp $ + +SHA1 (sj3-2.0.1.23p1.tar.gz) = 313a8f71f03071ad4d6006d18b569ce390edca8d +RMD160 (sj3-2.0.1.23p1.tar.gz) = 2541f19bcf6b74c5b59c2e930fe27bb0ffa97ddf +Size (sj3-2.0.1.23p1.tar.gz) = 1117190 bytes +SHA1 (patch-aa) = 83416c5aeae4514349c6ab1a4f1ac3018feea406 diff --git a/inputmethod/sj3/patches/patch-aa b/inputmethod/sj3/patches/patch-aa new file mode 100644 index 00000000000..30da11e5144 --- /dev/null +++ b/inputmethod/sj3/patches/patch-aa @@ -0,0 +1,18 @@ +$NetBSD: patch-aa,v 1.1 2010/02/15 13:35:21 obache Exp $ + +Handled by pkgsrc framework. + +--- dict/Makefile.in.orig 2010-02-14 14:45:04.000000000 +0000 ++++ dict/Makefile.in +@@ -368,11 +368,6 @@ uninstall-am: uninstall-info-am + @BUILDABLE_SJ3DICT_TRUE@ $(top_builddir)/src/sj3mkdic/sj3mkdic ./visual.dic sj3main.dic > Moutput + + @BUILDABLE_SJ3DICT_TRUE@install:: sj3main.dic +-@BUILDABLE_SJ3DICT_TRUE@ ($(mkdir_p) $(DESTDIR)$(SJ3DICTDIR); \ +-@BUILDABLE_SJ3DICT_TRUE@ $(INSTALL_DATA) sj3main.dic $(DESTDIR)$(SJ3DICTDIR); \ +-@BUILDABLE_SJ3DICT_TRUE@ $(mkdir_p) $(DESTDIR)$(SJ3DICTDIR)/user; \ +-@BUILDABLE_SJ3DICT_TRUE@ chown $(SJ3OWNER) $(DESTDIR)$(SJ3DICTDIR)/user; \ +-@BUILDABLE_SJ3DICT_TRUE@ chgrp $(SJ3GROUP) $(DESTDIR)$(SJ3DICTDIR)/user;) + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff --git a/inputmethod/sj3/version.mk b/inputmethod/sj3/version.mk new file mode 100644 index 00000000000..cfc38a098ad --- /dev/null +++ b/inputmethod/sj3/version.mk @@ -0,0 +1,3 @@ +# $NetBSD: version.mk,v 1.1 2010/02/15 13:35:21 obache Exp $ + +SJ3_VERSION= 2.0.1.23p1 |