Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2013Q2

Browse Source
This commit is contained in:
Lionel Sambuc
2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
inputmethod/kinput2/DESCR Normal file
View File

@@ -0,0 +1,12 @@
Kinput2 is an input server for X11 applications that want Japanese
text input.
A client that wants kana-kanji conversion service for Japanese text
sends a request to kinput2. Kinput2 receives the request, does
kana-kanji conversion, and sends the converted text back to the
client.
The port supports Wnn4. Egg key binding is available,
if you run
kinput2 -ccdef ccdef.kinput2.egg

9
inputmethod/kinput2/MESSAGE Normal file
View File

@@ -0,0 +1,9 @@
===========================================================================
$NetBSD: MESSAGE,v 1.2 2002/09/24 12:30:20 wiz Exp $
If you want to use Egg key binding on kinput2, then
you should run
kinput2 -ccdef ccdef.kinput2.egg
===========================================================================

31
inputmethod/kinput2/Makefile Normal file
View File

@@ -0,0 +1,31 @@
# $NetBSD: Makefile,v 1.23 2012/10/06 14:25:14 asau Exp $
DISTNAME= kinput2-v3.1
PKGNAME= kinput2-3.1
PKGREVISION= 3
CATEGORIES= japanese inputmethod
MASTER_SITES= ftp://ftp.sra.co.jp/pub/x11/kinput2/
MAINTAINER= tech-pkg-ja@jp.NetBSD.org
COMMENT= Input server of Japanese text
MAKE_JOBS_SAFE= NO
USE_IMAKE= YES
PLIST_SRC= ${PKGDIR}/PLIST-common
.include "options.mk"
MAKE_ENV+= PORT_IMAKE_DEFINES=${KINPUT2_DEFS:Q}
pre-configure:
${MV} -f ${WRKSRC}/Kinput2.conf ${WRKSRC}/Kinput2.conf.org
${CP} ${FILESDIR}/Kinput2.conf ${WRKSRC}/Kinput2.conf
do-configure:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF}
.include "../../x11/libXaw/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

4
inputmethod/kinput2/PLIST-common Normal file
View File

@@ -0,0 +1,4 @@
@comment $NetBSD: PLIST-common,v 1.2 2003/03/02 20:18:50 jschauma Exp $
bin/kinput2
lib/X11/app-defaults/Kinput2
${IMAKE_MAN_DIR}/kinput2.${IMAKE_MANNEWSUFFIX}

14
inputmethod/kinput2/PLIST-freewnn Normal file
View File

@@ -0,0 +1,14 @@
@comment $NetBSD: PLIST-freewnn,v 1.2 2009/06/14 18:01:31 joerg Exp $
lib/X11/ccdef/ccdef.kinput2
lib/X11/ccdef/rule.eggfunc
lib/X11/ccdef/rule.func
lib/X11/ccdef/rule.greek
lib/X11/ccdef/rule.kana
lib/X11/ccdef/rule.kana2
lib/X11/ccdef/rule.roma
lib/X11/ccdef/rule.wnnroma
lib/X11/ccdef/rule.zascii
lib/X11/ccdef/ccdef.kinput2.egg
lib/X11/ccdef/rule.hiragana.egg
lib/X11/ccdef/rule.katakana.egg
lib/X11/ccdef/rule.kigou.egg

6
inputmethod/kinput2/PLIST-sj3 Normal file
View File

@@ -0,0 +1,6 @@
@comment $NetBSD: PLIST-sj3,v 1.2 2009/06/14 18:01:31 joerg Exp $
lib/X11/sj3def/sjhk
lib/X11/sj3def/sjrc
lib/X11/sj3def/sjrk
lib/X11/sj3def/sjsb
lib/X11/sj3def/sjzh

16
inputmethod/kinput2/distinfo Normal file
View File

@@ -0,0 +1,16 @@
$NetBSD: distinfo,v 1.6 2011/09/13 07:28:48 mef Exp $
SHA1 (kinput2-v3.1.tar.gz) = 48050f70e7c0cc67193ea260f8d7f6e822a02ca3
RMD160 (kinput2-v3.1.tar.gz) = c56684769859bbee5f8238cd1af061796ff931e8
Size (kinput2-v3.1.tar.gz) = 512177 bytes
SHA1 (patch-Imakefile) = 2ec731b5ff7ef4cac3497c60b179e0f1ce0a4a05
SHA1 (patch-aa) = 3eaca25000c756d71fcafbb09a8ad8fd15142437
SHA1 (patch-ab) = a084421f399e753f25040fd0cba6d43a391fc15b
SHA1 (patch-ac) = 83d74ddffa6ddb870b3de1755a94e1258e06f793
SHA1 (patch-cmd_kinput2.c) = 5f8bcada8ee247d536d6cbb1ac0404de4e55b90d
SHA1 (patch-lib_Canna.c) = 75af9e02e84281c02c7d36bc237e6c05afbb8c80
SHA1 (patch-lib_ConvCtrl.c) = bd5dcd286bf1f1ac8153a2f51c54930d4173de56
SHA1 (patch-lib_KIProto.c) = 8545746a50b85986cd2a727667d30ca054860962
SHA1 (patch-lib_XimpProto.c) = 9931af45d19aea41916b1cdec933d0fea34769a6
SHA1 (patch-lib_ctext.c) = 97093817ebf73ddc1d9ddcfb068b0c96c93e1f8e
SHA1 (patch-lib_wnnlib.c) = 0b5e66372294f27dcbaf0b4a53da50a739b362f3

22
inputmethod/kinput2/files/Kinput2.conf Normal file
View File

@@ -0,0 +1,22 @@
XCOMM Each parameter in this file is explained in the original
XCOMM Kinput2.conf (probably Kinput2.conf.org)
XCOMM Redefine $(IMAKE_CMD) for FreeBSD ports (by S. Taoka)
IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES) $(PORT_IMAKE_DEFINES)
CCDEF_DIR = $(LIBDIR)/ccdef
WNNSRC = port_WNNSRC
WNNINCDIR = port_WNNINCDIR
WNNLIB = port_WNNLIB
CANNAINSTDIR = port_CANNAINSTDIR
CANNASRC = port_CANNASRC
CANNALIB = port_CANNALIB
SJ3DEF_DIR = $(LIBDIR)/sj3def
SJ3SRC = port_SJ3SRC
SJ3LIB = port_SJ3LIB
TRANSPORTDEFS =

37
inputmethod/kinput2/options.mk Normal file
View File

@@ -0,0 +1,37 @@
# $NetBSD: options.mk,v 1.2 2010/02/15 13:41:17 obache Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.kinput2
PKG_OPTIONS_NONEMPTY_SETS= inputmethod
PKG_OPTIONS_SET.inputmethod= canna wnn4 sj3
PKG_SUGGESTED_OPTIONS= canna wnn4 sj3
#PKG_OPTIONS_SET.inputmethod+= wnn6
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mcanna)
.include "../../inputmethod/canna-lib/buildlink3.mk"
KINPUT2_DEFS+= -DUseCanna
KINPUT2_DEFS+= -Dport_CANNASRC=${BUILDLINK_PREFIX.Canna-lib}/include
KINPUT2_DEFS+= -Dport_CANNALIB="${LDFLAGS} -lcanna16"
.endif
#.if !empty(PKG_OPTIONS:Mwnn6)
#DEPENDS+=
#KINPUT2_DEFS+= -DUseWnn -DUseWnn6 -Dport_WNNINCDIR=${LOCALBASE}/include/wnn \
# -Dport_WNNLIB="${LDFLAGS} -lwnn6 -lcrypt"
#.elif !empty(PKG_OPTIONS:Mwnn4)
.if !empty(PKG_OPTIONS:Mwnn4)
.include "../../inputmethod/ja-freewnn-lib/buildlink3.mk"
KINPUT2_DEFS+= -DUseWnn
KINPUT2_DEFS+= -Dport_WNNINCDIR=${BUILDLINK_PREFIX.ja-FreeWnn-lib}/include/wnn
KINPUT2_DEFS+= -Dport_WNNLIB="${LDFLAGS} -lwnn -lcrypt"
PLIST_SRC+= ${PKGDIR}/PLIST-freewnn
.endif
.if !empty(PKG_OPTIONS:Msj3)
.include "../../inputmethod/sj3-client/buildlink3.mk"
KINPUT2_DEFS+= -DUseSj3
KINPUT2_DEFS+= -Dport_SJ3SRC=${BUILDLINK_PREFIX.sj3-lib}/include
KINPUT2_DEFS+= -Dport_SJ3LIB="${LDFLAGS} -lsj3lib"
PLIST_SRC+= ${PKGDIR}/PLIST-sj3
.endif

18
inputmethod/kinput2/patches/patch-aa Normal file
View File

@@ -0,0 +1,18 @@
$NetBSD: patch-aa,v 1.3 2011/09/13 07:28:48 mef Exp $
--- include/wnnlib.h.orig 2002-10-03 09:35:27.000000000 +0000
+++ include/wnnlib.h
@@ -107,11 +107,11 @@ typedef struct {
#ifdef __STDC__
extern struct wnn_buf *jcOpen(char *server, char *envname,
int override, char *rcfile,
- void (*error)(), int (*confirm)(),
+ int (*error)(const char *), int (*confirm)(const char *),
int timeout);
extern struct wnn_buf *jcOpen2(char *server, char *envname,
int override, char *rcfile4, char *rcfile6,
- void (*error)(), int (*confirm)(),
+ int (*error)(const char *), int (*confirm)(const char *),
int timeout);
extern int jcClose(struct wnn_buf *wnn);
extern int jcIsConnect(struct wnn_buf *wnn);

13
inputmethod/kinput2/patches/patch-ab Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-ab,v 1.2 2010/02/15 13:41:18 obache Exp $
--- sj3def/Imakefile.orig 2002-10-03 09:35:31.000000000 +0000
+++ sj3def/Imakefile
@@ -24,7 +24,7 @@ SjdefTarget(sjrc)
SjdefTarget(sjrk)
SjdefTarget(sjsb)
SjdefTarget(sjzh)
-SingleProgramTarget(jcode,$(OBJS),$(XLIB),)
+SingleProgramTarget(jcode,$(OBJS),$(SJ3LIB),)
MakeDirectories(install,$(SJ3DEF_DIR))
InstallMultipleFlags($(SJ3DEF_FILES),$(SJ3DEF_DIR),$(INSTDATFLAGS))

61
inputmethod/kinput2/patches/patch-ac Normal file
View File

@@ -0,0 +1,61 @@
$NetBSD: patch-ac,v 1.3 2011/09/13 07:28:48 mef Exp $
Avoid to conflict with getline(3) in IEEE Std 1003.1-2008.
--- lib/cconv.c.orig 2002-10-03 09:35:28.000000000 +0000
+++ lib/cconv.c
@@ -604,6 +604,7 @@ static char *rcsid = "$Id: cconv.c,v 10.
#endif
#include <stdio.h>
+#include <stdlib.h>
#include <X11/Xlib.h>
#include <X11/keysym.h>
#include <X11/Xutil.h>
@@ -790,7 +791,7 @@ static wchar *promptsave(wchar *);
static int parseLine(uchar *, uchar **, int);
static FILE *openfile(char *);
static int doinclude(uchar *, Files *, void (*)());
-static uchar *getline(uchar *, int, Files *, void (*)());
+static uchar *get_line(uchar *, int, Files *, void (*)());
static int readRuleFile(ccRule, char *);
static int registMode(ccRule, int, uchar **);
static int newMode(ccRule, Files *, _strbufRec *, _funcbufRec *,
@@ -1035,8 +1036,8 @@ void (*efunc)();
return 0;
}
-/* getline -- 1$B9TFI$_9~$`(B ($B$=$N:](B include $B$N=hM}$r9T$J$&(B) */
-static uchar *getline(line, linesize, files, efunc)
+/* get_line -- 1$B9TFI$_9~$`(B ($B$=$N:](B include $B$N=hM}$r9T$J$&(B) */
+static uchar *get_line(line, linesize, files, efunc)
uchar *line;
int linesize;
Files *files;
@@ -1100,7 +1101,7 @@ char *file;
rule->nmode = 0;
rule->initialmode = -1;
- while (getline(line, sizeof(line), &files, efunc)) {
+ while (get_line(line, sizeof(line), &files, efunc)) {
(void)Strcpy(tmp, line);
if ((argc = parseLine(tmp, argv, 20)) == 0)
continue;
@@ -1269,7 +1270,7 @@ uchar **av;
cdbuf.cdbuf = NULL;
/* $B%k!<%k$rFI$s$G%9%H%"$9$k(B */
- while (getline(line, sizeof(line), files, efunc)) {
+ while (get_line(line, sizeof(line), files, efunc)) {
/* '#' $B$G;O$^$k9T$O%3%a%s%H(B */
if (*line == '\0' || *line == '\n' || *line == '#')
continue;
@@ -1282,7 +1283,7 @@ uchar **av;
}
/* $B%k!<%k$N%9%H%"(B */
- cdp->key = inkey;
+ cdp->key = (ulong *) inkey;
cdp->mask = modmask;
cdp->context = *context ? wstrsave(srec, wrev(context)) : 0;
cdp->result = *result ? wstrsave(srec, result) : 0;

15
inputmethod/kinput2/patches/patch-cmd_kinput2.c Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-cmd_kinput2.c,v 1.1 2011/09/13 07:28:48 mef Exp $
To compile with ja-freewnn-lib-1.11alpah22
--- cmd/kinput2.c.orig 2002-10-03 09:35:26.000000000 +0000
+++ cmd/kinput2.c
@@ -26,6 +26,8 @@ static char *rcsid = "$Id: kinput2.c,v 1
#include <stdio.h>
#include <signal.h>
+#include <unistd.h>
+#include <stdlib.h>
#include <X11/Intrinsic.h>
#include <X11/StringDefs.h>
#include <X11/Shell.h>

14
inputmethod/kinput2/patches/patch-lib_Canna.c Normal file
View File

@@ -0,0 +1,14 @@
$NetBSD: patch-lib_Canna.c,v 1.1 2011/09/13 07:28:48 mef Exp $
To compile with ja-freewnn-lib-1.11alpah22
--- lib/Canna.c.orig 2002-10-03 09:35:27.000000000 +0000
+++ lib/Canna.c
@@ -58,6 +58,7 @@ static char *rcsid = "$Id: Canna.c,v 1.5
#if XtSpecificationRelease > 4
#include <X11/Xfuncs.h>
#endif
+#include <stdlib.h>
#include "CannaP.h"
#include "DebugPrint.h"

14
inputmethod/kinput2/patches/patch-lib_ConvCtrl.c Normal file
View File

@@ -0,0 +1,14 @@
$NetBSD: patch-lib_ConvCtrl.c,v 1.1 2011/09/13 07:28:48 mef Exp $
To compile with ja-freewnn-lib-1.11alpah22
--- lib/ConvCtrl.c.orig 2002-10-03 09:35:27.000000000 +0000
+++ lib/ConvCtrl.c
@@ -21,6 +21,7 @@ static char *rcsid = "$Id: ConvCtrl.c,v
#include <X11/IntrinsicP.h>
#include <X11/StringDefs.h>
#include <X11/Xmu/CharSet.h>
+#include <stdio.h>
#include "ConvCtrlP.h"
#include "InputConv.h"
#include "ConvDisp.h"

14
inputmethod/kinput2/patches/patch-lib_KIProto.c Normal file
View File

@@ -0,0 +1,14 @@
$NetBSD: patch-lib_KIProto.c,v 1.1 2011/09/13 07:28:48 mef Exp $
To compile with ja-freewnn-lib-1.11alpah22
--- lib/KIProto.c.orig 2002-10-03 09:35:28.000000000 +0000
+++ lib/KIProto.c
@@ -23,6 +23,7 @@ static char *rcsid = "$Id: KIProto.c,v 1
#include <X11/Xatom.h>
#include <X11/Xmu/Atoms.h>
#include <X11/Xmu/CharSet.h>
+#include <stdio.h>
#include "KIProtoP.h"
#include "ConvMgr.h"
#include "OverConv.h"

14
inputmethod/kinput2/patches/patch-lib_XimpProto.c Normal file
View File

@@ -0,0 +1,14 @@
$NetBSD: patch-lib_XimpProto.c,v 1.1 2011/09/13 07:28:48 mef Exp $
To compile with ja-freewnn-lib-1.11alpah22
--- lib/XimpProto.c.orig 2002-10-03 09:35:28.000000000 +0000
+++ lib/XimpProto.c
@@ -28,6 +28,7 @@ static char *rcsid = "$Id: XimpProto.c,v
#include <X11/Xatom.h>
#include <X11/Xmu/Atoms.h>
#include <X11/Xmu/CharSet.h>
+#include <stdio.h>
#include "XIMProto.h"
#include "XimpProtoP.h"
#include "ConvMgr.h"

13
inputmethod/kinput2/patches/patch-lib_ctext.c Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-lib_ctext.c,v 1.1 2011/09/13 07:28:48 mef Exp $
To compile with ja-freewnn-lib-1.11alpah22
--- lib/ctext.c.orig 2002-10-03 09:35:28.000000000 +0000
+++ lib/ctext.c
@@ -72,4 +72,6 @@ static char *rcsid = "$Id: ctext.c,v 2.6
#endif
+#include <string.h>
+
typedef unsigned short wchar;

54
inputmethod/kinput2/patches/patch-lib_wnnlib.c Normal file
View File

@@ -0,0 +1,54 @@
$NetBSD: patch-lib_wnnlib.c,v 1.1 2011/09/13 07:28:48 mef Exp $
To compile with ja-freewnn-lib-1.11alpah22
--- lib/wnnlib.c.orig 2002-10-03 18:35:28.000000000 +0900
+++ lib/wnnlib.c 2011-05-08 23:37:11.000000000 +0900
@@ -282,7 +282,7 @@
*
* struct wnn_buf jcOpen(char *servername, char *envname,
* char *rcfilename, int override,
- * void (*errmsgfunc)(), int (*confirmfunc)(),
+ * int (*errmsgfunc)(const char *), int (*confirmfunc)(const char *),
* int timeout)
* jl_open $B$"$k$$$O(B jl_open_lang $B$KBP1~$7$?(B wnnlib $B$N%$%s%?%U%'!<(B
* $B%9$G!"$3$N4X?t$NCf$G<B:]$K(B jl_open $B$"$k$$$O(B jl_open_lang $B$r8F(B
@@ -581,6 +581,7 @@
#include "wnnlib.h"
#include "WStr.h"
#include <string.h>
+#include <stdlib.h>
#include <pwd.h>
#include <X11/Xos.h>
@@ -1367,7 +1368,7 @@
/* $BJQ49J8;zNs$ND9$5$N%A%'%C%/(B */
clp = buf->clauseInfo + cl;
- len = jl_kanji_len(buf->wnn, cl);
+ len = jl_kanji_len(buf->wnn, cl, -1);
diff = len - ((clp + 1)->dispp - clp->dispp);
newlen = (buf->displayEnd - buf->displayBuf) + diff;
if (newlen > buf->bufferSize) {
@@ -3449,8 +3450,8 @@
char *envname;
int override;
char *rcfile;
-void (*errmsg)();
-int (*confirm)();
+int (*errmsg)(const char *);
+int (*confirm)(const char *);
int timeout;
{
return jcOpen2(server, envname, override, rcfile, rcfile, errmsg, confirm, timeout);
@@ -3463,8 +3464,8 @@
int override;
char *rcfile4; /* wnnenvrc for Wnn4 */
char *rcfile6; /* wnnenvrc for Wnn6 */
-void (*errmsg)();
-int (*confirm)();
+int (*errmsg)(const char *);
+int (*confirm)(const char *);
int timeout;
{
struct wnn_buf *wnnbuf;