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

5
inputmethod/unicon-im/DESCR Normal file
View File

@@ -0,0 +1,5 @@
The Unicon project intend to implement display/input CJK
(Chinese/Japanese/Korean) characters under the Framebuffer under
Linux.
This package will install the libraries and modules for Chinput.

28
inputmethod/unicon-im/Makefile Normal file
View File

@@ -0,0 +1,28 @@
# $NetBSD: Makefile,v 1.20 2012/10/06 14:25:21 asau Exp $
DISTNAME= unicon-1.2
PKGNAME= unicon-im-1.2
PKGREVISION= 5
CATEGORIES= inputmethod
# The site points at a parking domain. Let it fall back to NetBSD
#MASTER_SITES= http://www.opencjk.org/~yumj/download/
MAINTAINER= rxg@NetBSD.org
#HOMEPAGE= http://www.opencjk.org/~yumj/project-chinput.html
COMMENT= Libraries and modules of Unicon
MAKE_JOBS_SAFE= no
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
.include "../../mk/bsd.prefs.mk"
CFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=0
INSTALL_MAKE_FLAGS= prefix=${DESTDIR}${PREFIX}
.include "../../devel/pth/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

35
inputmethod/unicon-im/PLIST Normal file
View File

@@ -0,0 +1,35 @@
@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:01:33 joerg Exp $
lib/libimm_server.la
lib/libimmclient.la
lib/unicon/TL_hzinput.la
lib/unicon/big5/cantonese.tab
lib/unicon/big5/cj.tab
lib/unicon/big5/pinyin.tab
lib/unicon/big5/simplex.tab
lib/unicon/cce_hzinput.la
lib/unicon/cce_pinyin.la
lib/unicon/freepy/pinyin.cin
lib/unicon/freepy/pinyin.imm
lib/unicon/freepy/pinyin.map
lib/unicon/freepy/pinyin.tab
lib/unicon/freepy/pinyin.tab.lx
lib/unicon/freepy/pinyin.tab.phr
lib/unicon/freepy/sysphrase.tab
lib/unicon/freepy/sysphrase.txt
lib/unicon/freepy/usrphrase.tab
lib/unicon/freepy/usrphrase.txt
lib/unicon/gb/CCDOSPY.tab
lib/unicon/gb/CTLau.tab
lib/unicon/gb/CangJie.tab
lib/unicon/gb/English.tab
lib/unicon/gb/PY.tab
lib/unicon/gb/QianMa.tab
lib/unicon/gb/SW.tab
lib/unicon/gb/WuBi.tab
lib/unicon/gb/ziranma.tab
lib/unicon/gb/zrm-2.tab
lib/unicon/gbk/gbkpy_mb.tab
lib/unicon/sys-big5.tab
lib/unicon/sys-gb.tab
lib/unicon/tl_sysphrase.big5.bin
lib/unicon/tl_sysphrase.gb.bin

15
inputmethod/unicon-im/buildlink3.mk Normal file
View File

@@ -0,0 +1,15 @@
# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:47 joerg Exp $
BUILDLINK_TREE+= unicon-im
.if !defined(UNICON_IM_BUILDLINK3_MK)
UNICON_IM_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.unicon-im+= unicon-im>=1.2nb2
BUILDLINK_ABI_DEPENDS.unicon-im+= unicon-im>=1.2nb4
BUILDLINK_PKGSRCDIR.unicon-im?= ../../inputmethod/unicon-im
.include "../../devel/pth/buildlink3.mk"
.endif # UNICON_IM_BUILDLINK3_MK
BUILDLINK_TREE+= -unicon-im

21
inputmethod/unicon-im/distinfo Normal file
View File

@@ -0,0 +1,21 @@
$NetBSD: distinfo,v 1.9 2011/12/14 18:31:48 marino Exp $
SHA1 (unicon-1.2.tar.gz) = 61854d160547f645f8033f0b4fd15ebb15ab92a8
RMD160 (unicon-1.2.tar.gz) = c862f03ba561fe4c3641cf8b364a9bae40a78c03
Size (unicon-1.2.tar.gz) = 7815217 bytes
SHA1 (patch-ImmModules_TL-1_xl__mfile.c) = 733383b9196ec16d2c0ff274487c012631b8e985
SHA1 (patch-aa) = b9103d7fb810a6151144ccff9ff537fe8e505d51
SHA1 (patch-ab) = d4e24eddee10e18a213933c05a4c53292a33266e
SHA1 (patch-ac) = 1d39276efc5f20d7394fe08d6c9eb75308829d9b
SHA1 (patch-ad) = 31799d412fd4c17670d8200f1e8cf548477717d3
SHA1 (patch-ae) = f9c16c3a1216e399561c9b9de5e272f88426637f
SHA1 (patch-af) = d4d729c75c1f3f9ea02b3cc5087069732df5f0a9
SHA1 (patch-ag) = 7955678370e49317b8e9244616fd49f65667d167
SHA1 (patch-ah) = 1e9413af0b2904cb17a028d5cedfd1ded6eca22b
SHA1 (patch-ai) = de5452fea6a9183cc008fd0b8f37b00e7f4a066c
SHA1 (patch-aj) = 13592873c58a68837fd9a62052640121452dd343
SHA1 (patch-ak) = e73ed21080cf92db41038acec7ea3f574b3bad59
SHA1 (patch-al) = af704d8e0b5712f0bc1286f7c1dfbf2f761e735b
SHA1 (patch-am) = 36bed0bf2167a3ab5919d02d191e405e68687108
SHA1 (patch-server_TLS__ImmOp.cpp) = 89992124de68fd00ba5a7f4c73c9638a23a559d0
SHA1 (patch-server_TLS__MemFile.cpp) = f5231f5af38e9d833035bc6dccf7758beb02764c

11
inputmethod/unicon-im/patches/patch-ImmModules_TL-1_xl__mfile.c Normal file
View File

@@ -0,0 +1,11 @@
$NetBSD: patch-ImmModules_TL-1_xl__mfile.c,v 1.1 2011/11/26 17:13:30 joerg Exp $
--- ImmModules/TL-1/xl_mfile.c.orig 2011-11-26 03:23:49.000000000 +0000
+++ ImmModules/TL-1/xl_mfile.c
@@ -1,5 +1,6 @@
#include <stdlib.h>
#include <stdio.h>
+#include <string.h>
#include <memwatch.h>
typedef struct MemFile_handle

35
inputmethod/unicon-im/patches/patch-aa Normal file
View File

@@ -0,0 +1,35 @@
$NetBSD: patch-aa,v 1.1.1.1 2002/06/15 09:29:15 shell Exp $
--- Makefile.in.orig Mon May 22 17:21:20 2000
+++ Makefile.in
@@ -2,7 +2,6 @@
all:
cd server; make
cd client; make
- cd unicon; make
cd ImmModules/CCE; make
cd ImmModules/TL-1; make
@@ -15,19 +14,14 @@
data: gbdata big5data
install:
- if [ ! -d $(prefix) ] ; then mkdir -p $(prefix); fi
- if [ ! -d $(prefix)/lib/unicon2 ] ; then mkdir -p $(prefix)/lib/unicon2; fi
- if [ ! -d $(prefix)/bin ] ; then mkdir -p $(prefix)/bin; fi
- if [ ! -d $(prefix)/lib/unicon2/gbk ] ; then mkdir -p $(prefix)/lib/unicon2/gbk; fi
- if [ ! -d $(prefix)/lib/unicon2/gb ] ; then mkdir -p $(prefix)/lib/unicon2/gb; fi
- if [ ! -d $(prefix)/lib/unicon2/big5 ] ; then mkdir -p $(prefix)/lib/unicon2/big5; fi
- if [ ! -d $(prefix)/lib/unicon2/freepy ] ; then mkdir -p $(prefix)/lib/unicon2/freepy; fi
+ $(BSD_INSTALL_DATA_DIR) $(prefix)/lib/unicon
cd data; make install
cd server; make install
cd client; make install
- cd unicon; make install
cd ImmModules/CCE; make install
cd ImmModules/TL-1; make install
+ $(BSD_INSTALL_DATA) unicon/sys-big5.tab $(prefix)/lib/unicon
+ $(BSD_INSTALL_DATA) unicon/sys-gb.tab $(prefix)/lib/unicon
clean:
cd server; make clean

54
inputmethod/unicon-im/patches/patch-ab Normal file
View File

@@ -0,0 +1,54 @@
$NetBSD: patch-ab,v 1.3 2006/01/15 13:56:10 rxg Exp $
--- server/Makefile.in.orig Mon May 22 03:32:04 2000
+++ server/Makefile.in
@@ -1,7 +1,8 @@
prefix=@prefix@
-CFLAGS = @CFLAGS@
+CFLAGS = -Wall -I. -I../include @CFLAGS@
+LDFLAGS = @LDFLAGS@
APP_PROG = imm_server
-DLIB_PROG = libimm_server.so
+DLIB_PROG = libimm_server.la
APP_OBJS = TLS_HzInput.o TLS_ImmOp.o TLS_TcpipMain.o TLS_MemFile.o \
TLS_PthSocket.o TLS_Debug.o \
@@ -11,19 +12,18 @@ DLIB_OBJS = TLS_HzInput.o TLS_ImmOp.o TL
TLS_Debug.o TLS_LibMain.o TLS_DoubleByteConvertor.o \
TLS_AsciiConvertor.o
-LIBS = /usr/local/lib/libpth.so -ldl
+LIBS = -lpth
# CFLAGS = -g -D__IMM_DEBUG__ -Wall -I. -I/usr/local/include -I../include
-CFLAGS = -g -Wall -I. -I/usr/local/include -I../include
-CC=g++
+CC = $(LIBTOOL) --mode=compile $(CXX)
all: $(DLIB_PROG)
-libimm_server.so: $(DLIB_OBJS)
- $(CC) $(DLIB_OBJS) -shared -o $(DLIB_PROG)
+libimm_server.la: $(DLIB_OBJS)
+ $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $(DLIB_PROG) $(DLIB_OBJS:.o=.lo) -rpath $(prefix)/lib -version-info 1:2 $(LIBS)
TLS_LibMain.o : TLS_LibMain.cpp
- $(CC) $(CFLAGS) -DUNICON2_LIB=\"$(prefix)/lib/unicon2\" -c TLS_LibMain.cpp -o TLS_LibMain.o
+ $(CC) $(CFLAGS) -DUNICON2_LIB=\"$(prefix)/lib/unicon\" -c TLS_LibMain.cpp -o TLS_LibMain.o
app: $(APP_OBJS)
$(CC) $(APP_OBJS) $(LIBS) -o $(APP_PROG)
@@ -44,11 +44,8 @@ TLS_DoubleByteConvertor.o : TLS_DoubleBy
TLS_AsciiConvertor.o : TLS_AsciiConvertor.cpp
$(CC) $(CFLAGS) -c TLS_AsciiConvertor.cpp -o TLS_AsciiConvertor.o
-install: all
- mkdir -p $(prefix)/bin
- mkdir -p $(prefix)/lib/unicon2
- if [ -f $(APP_PROG) ]; then cp -f $(APP_PROG) $(prefix)/bin; fi
- if [ -f $(DLIB_PROG) ]; then cp -f $(DLIB_PROG) $(prefix)/lib/unicon2; fi
+install:
+ $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(DLIB_PROG) $(prefix)/lib
clean:
if test -e $(PROG); then rm -f $(PROG); fi

13
inputmethod/unicon-im/patches/patch-ac Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-ac,v 1.1.1.1 2002/06/15 09:29:15 shell Exp $
--- server/TLS_Debug.hpp.orig Sat Jun 8 14:12:06 2002
+++ server/TLS_Debug.hpp
@@ -3,6 +3,8 @@
#include <stdio.h>
#include <stdlib.h>
+#include <stdarg.h>
+#include <sys/types.h>
typedef char * PSTR;
class TLS_CDebug

51
inputmethod/unicon-im/patches/patch-ad Normal file
View File

@@ -0,0 +1,51 @@
$NetBSD: patch-ad,v 1.2 2006/01/15 13:56:10 rxg Exp $
--- client/Makefile.in.orig Mon May 22 17:47:14 2000
+++ client/Makefile.in
@@ -1,20 +1,21 @@
prefix=@prefix@
-CFLAGS = @CFLAGS@
+CFLAGS = -Wall -I. -I../include -I../server -I../client @CFLAGS@
PROG_LIB = libimmclient.a
SLIB_OBJS = TLC_TcpipImmClient.o TLC_ImmServer.o TLC_Utils.o \
TLC_MemFile.o TLC_SocketClient.o
DLIB_OBJS = TLC_LibImmClient.o TLC_Utils.o
SERVER_LIB=../server/libimm_server.so
-CFLAGS = -g -Wall -I. -I../include -I../server -I../client
# CFLAGS = -g -D__IMM_DEBUG__ -Wall -I. -I../include
+CC = $(LIBTOOL) --mode=compile $(CXX)
-all: $(PROG_LIB)
+all: $(DLIB_OBJS)
+ $(LIBTOOL) --mode=link $(CXX) -o $(PROG_LIB:.a=.la) $(DLIB_OBJS:.o=.lo) -rpath $(prefix)/lib -version-info 1:2
libimmclient.a: $(DLIB_OBJS)
ar rc $(PROG_LIB) $(DLIB_OBJS)
TLC_LibImmClient.o: TLC_LibImmClient.cpp
- gcc $(CFLAGS) -c TLC_LibImmClient.cpp -o TLC_LibImmClient.o
+ $(CC) $(CFLAGS) -c TLC_LibImmClient.cpp -o TLC_LibImmClient.o
slib: $(SLIB_OBJS)
ar rc $(PROG_LIB) $(SLIB_OBJS)
@@ -23,7 +24,7 @@
TLC_ImmServer.o: TLC_ImmServer.cpp TLC_ImmServer.hpp
gcc $(CFLAGS) -c TLC_ImmServer.cpp -o TLC_ImmServer.o
TLC_Utils.o: TLC_Utils.cpp
- gcc $(CFLAGS) -c TLC_Utils.cpp -o TLC_Utils.o
+ $(CC) $(CFLAGS) -c TLC_Utils.cpp -o TLC_Utils.o
TLC_MemFile.o: TLC_MemFile.cpp TLC_MemFile.hpp
gcc $(CFLAGS) -c TLC_MemFile.cpp -o TLC_MemFile.o
TLC_SocketClient.o: TLC_SocketClient.cpp TLC_SocketClient.hpp
@@ -32,9 +33,8 @@
test: all $(SERVER_LIB)
g++ $(CFLAGS) -D__DLL_SUPPORT__ -ldl -lpth test.cpp $(PROG_LIB) $(SERVER_LIB) -o test
-install: all
- mkdir -p $(prefix)/lib/unicon2
- cp -f $(PROG_LIB) $(prefix)/lib/unicon2
+install:
+ $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(PROG_LIB:.a=.la) $(prefix)/lib
clean:
rm -f *.o *.bak $(PROG_LIB) $(PROG)

55
inputmethod/unicon-im/patches/patch-ae Normal file
View File

@@ -0,0 +1,55 @@
$NetBSD: patch-ae,v 1.2 2006/01/15 13:56:10 rxg Exp $
--- ImmModules/CCE/Makefile.in.orig Mon May 22 17:21:42 2000
+++ ImmModules/CCE/Makefile.in
@@ -1,24 +1,27 @@
prefix=@prefix@
-CFLAGS = @CFLAGS@
-PROG = cce_hzinput.so
-CCE_OBJS = xl_hzinput.o CCE_hzinput.o \
- xl_pinyin.o CCE_pinyin.o
-
-CFLAGS = -g -Wall -I../../include -I.
-
-all: cce_hzinput.so cce_pinyin.so test
+CFLAGS = -Wall -I../../include -I. @CFLAGS@
+HZ_PROG = cce_hzinput.a
+PY_PROG = cce_pinyin.a
+HZ_OBJS = xl_hzinput.o CCE_hzinput.o
+PY_OBJS = xl_pinyin.o CCE_pinyin.o
+
+CC = $(LIBTOOL) --mode=compile @CC@
+
+all: $(HZ_OBJS) $(PY_OBJS)
+ $(LIBTOOL) --mode=link @CC@ -o $(HZ_PROG:.a=.la) $(HZ_OBJS:.o=.lo) -rpath $(prefix)/lib/unicon -module -avoid-version
+ $(LIBTOOL) --mode=link @CC@ -o $(PY_PROG:.a=.la) $(PY_OBJS:.o=.lo) -rpath $(prefix)/lib/unicon -module -avoid-version
CCE_hzinput.o : CCE_hzinput.c
- gcc $(CFLAGS) -c CCE_hzinput.c -o CCE_hzinput.o
+ $(CC) $(CFLAGS) -c CCE_hzinput.c -o CCE_hzinput.o
xl_hzinput.o : xl_hzinput.c
- gcc $(CFLAGS) -c xl_hzinput.c -o xl_hzinput.o
+ $(CC) $(CFLAGS) -c xl_hzinput.c -o xl_hzinput.o
cce_hzinput.so: CCE_hzinput.o xl_hzinput.o
gcc CCE_hzinput.o xl_hzinput.o -shared -o cce_hzinput.so
xl_pinyin.o : xl_pinyin.c xl_pinyin.h
- gcc $(CFLAGS) -c xl_pinyin.c -o xl_pinyin.o
+ $(CC) $(CFLAGS) -c xl_pinyin.c -o xl_pinyin.o
CCE_pinyin.o : CCE_pinyin.c
- gcc $(CFLAGS) -c CCE_pinyin.c -o CCE_pinyin.o
+ $(CC) $(CFLAGS) -c CCE_pinyin.c -o CCE_pinyin.o
cce_pinyin.so : xl_pinyin.o CCE_pinyin.o
gcc CCE_pinyin.o xl_pinyin.o -shared -o cce_pinyin.so
@@ -29,8 +32,8 @@
gcc -g -I../../include -I. cin2tab.c -o cin2tab
install:
- mkdir -p $(prefix)/lib/unicon2
- cp *.so $(prefix)/lib/unicon2
+ $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(HZ_PROG:.a=.la) $(prefix)/lib/unicon
+ $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(PY_PROG:.a=.la) $(prefix)/lib/unicon
clean:
rm -f *.o core a.out *.bak test *.so

61
inputmethod/unicon-im/patches/patch-af Normal file
View File

@@ -0,0 +1,61 @@
$NetBSD: patch-af,v 1.2 2006/01/15 13:56:10 rxg Exp $
--- ImmModules/TL-1/Makefile.in.orig Wed Jun 7 13:49:56 2000
+++ ImmModules/TL-1/Makefile.in
@@ -1,24 +1,26 @@
# Generated automatically from Makefile.in by configure.
prefix=@prefix@
-CFLAGS=@CFLAGS@
-PROG = TL_hzinput.so
+CFLAGS=-Wall -I../../include -I. @CFLAGS@
+PROG = TL_hzinput.a
TL_OBJS = xl_hzinput.o TL_hzinput.o xl_phrase.o xl_sysphrase.o xl_mfile.o
-CFLAGS = -g -Wall -I../../include -I.
+CC = $(LIBTOOL) --mode=compile @CC@
+
+all: $(TL_OBJS)
+ $(LIBTOOL) --mode=link @CC@ -o $(PROG:.a=.la) $(TL_OBJS:.o=.lo) -rpath $(prefix)/lib/unicon -module -avoid-version
-all:dlib
dlib: $(PROG)
xl_mfile.o : xl_mfile.c xl_mfile.h
- gcc $(CFLAGS) -c xl_mfile.c -o xl_mfile.o
+ $(CC) $(CFLAGS) -c xl_mfile.c -o xl_mfile.o
TL_hzinput.o : TL_hzinput.c
- gcc $(CFLAGS) -DUNICON2_LIB=\"$(prefix)/lib/unicon2\" -c TL_hzinput.c -o TL_hzinput.o
+ $(CC) $(CFLAGS) -DUNICON2_LIB=\"$(prefix)/lib/unicon\" -c TL_hzinput.c -o TL_hzinput.o
xl_hzinput.o : xl_hzinput.c
- gcc $(CFLAGS) -c xl_hzinput.c -o xl_hzinput.o
+ $(CC) $(CFLAGS) -c xl_hzinput.c -o xl_hzinput.o
xl_phrase.o : xl_phrase.c
- gcc $(CFLAGS) -c xl_phrase.c -o xl_phrase.o
+ $(CC) $(CFLAGS) -c xl_phrase.c -o xl_phrase.o
xl_sysphrase.o : xl_sysphrase.c
- gcc $(CFLAGS) -c xl_sysphrase.c -o xl_sysphrase.o
+ $(CC) $(CFLAGS) -c xl_sysphrase.c -o xl_sysphrase.o
$(PROG): $(TL_OBJS)
gcc $(TL_OBJS) -shared -o $(PROG)
@@ -60,12 +62,14 @@
levelphrase : levelphrase.c
gcc -g -I../../include -I. levelphrase.c -o levelphrase
install:
- mkdir -p $(prefix)/lib/unicon2/{gb,gbk,big5}
- cp -f *.so $(prefix)/lib/unicon2
- cp -f *.bin $(prefix)/lib/unicon2
- cp -f gb/*.tab $(prefix)/lib/unicon2/gb
- cp -f gbk/*.tab $(prefix)/lib/unicon2/gbk
- cp -f xcin-25/*.tab $(prefix)/lib/unicon2/big5
+ $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(PROG:.a=.la) $(prefix)/lib/unicon
+ $(BSD_INSTALL_DATA) *.bin $(prefix)/lib/unicon
+ $(BSD_INSTALL_DATA_DIR) $(prefix)/lib/unicon/gb
+ $(BSD_INSTALL_DATA) gb/*.tab $(prefix)/lib/unicon/gb
+ $(BSD_INSTALL_DATA_DIR) $(prefix)/lib/unicon/gbk
+ $(BSD_INSTALL_DATA) gbk/*.tab $(prefix)/lib/unicon/gbk
+ $(BSD_INSTALL_DATA_DIR) $(prefix)/lib/unicon/big5
+ $(BSD_INSTALL_DATA) xcin-25/*.tab $(prefix)/lib/unicon/big5
clean:
rm -f *.o core a.out *.bak cin2tab test *.so

14
inputmethod/unicon-im/patches/patch-ag Normal file
View File

@@ -0,0 +1,14 @@
$NetBSD: patch-ag,v 1.1.1.1 2002/06/15 09:29:16 shell Exp $
--- data/Makefile.in.orig Sat Jun 8 20:34:49 2002
+++ data/Makefile.in
@@ -1,7 +1,7 @@
prefix=@prefix@
CFLAGS = @CFLAGS@
install:
- mkdir -p $(prefix)/lib/unicon2/freepy
- cp pinyin* sysphrase* usrphrase* $(prefix)/lib/unicon2/freepy
+ $(BSD_INSTALL_DATA_DIR) $(prefix)/lib/unicon/freepy
+ $(BSD_INSTALL_DATA) pinyin* sysphrase* usrphrase* $(prefix)/lib/unicon/freepy
distclean:
rm -f Makefile *.bak

20
inputmethod/unicon-im/patches/patch-ah Normal file
View File

@@ -0,0 +1,20 @@
$NetBSD: patch-ah,v 1.1 2005/12/08 12:09:54 rxg Exp $
--- server/TLS_Debug.cpp.orig 2000-05-12 14:53:46.000000000 +0800
+++ server/TLS_Debug.cpp
@@ -1,14 +1,12 @@
#include <stdio.h>
#include <stdlib.h>
-#include <iostream.h>
-#include <fstream.h>
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
#include <string.h>
#include <TLS_Debug.hpp>
-TLS_CDebug::TLS_CDebug (char *szFileName, int mode = 0)
+TLS_CDebug::TLS_CDebug (char *szFileName, int mode)
{
if (szFileName == NULL)
{

15
inputmethod/unicon-im/patches/patch-ai Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-ai,v 1.1 2005/12/08 12:09:54 rxg Exp $
--- server/TLS_LibMain.cpp.orig 2005-12-06 21:43:48.000000000 +0800
+++ server/TLS_LibMain.cpp
@@ -33,10 +33,8 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <signal.h>
#include <netdb.h>
#include <unistd.h>
-#include <iostream.h>
#include <pth.h>
#include <TLS_MemFile.hpp>

22
inputmethod/unicon-im/patches/patch-aj Normal file
View File

@@ -0,0 +1,22 @@
$NetBSD: patch-aj,v 1.1 2007/03/24 16:04:56 joerg Exp $
--- server/TLS_PthSocket.cpp.orig 2000-05-12 06:53:46.000000000 +0000
+++ server/TLS_PthSocket.cpp
@@ -58,7 +58,7 @@ int TLS_CPthSocket::PollWrite (char *buf
return b;
}
-int TLS_CPthSocket::read (void *buf, int buflen)
+int TLS_CPthSocket::socket_read (void *buf, int buflen)
{
short len;
#ifdef __IMM_DEBUG__
@@ -77,7 +77,7 @@ int TLS_CPthSocket::read (void *buf, int
return len;
}
-int TLS_CPthSocket::write (void *buf, int len)
+int TLS_CPthSocket::socket_write (void *buf, int len)
{
short len0 = len;
#ifdef __IMM_DEBUG__

15
inputmethod/unicon-im/patches/patch-ak Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-ak,v 1.1 2007/03/24 16:04:56 joerg Exp $
--- server/TLS_PthSocket.hpp.orig 2007-03-24 15:47:15.000000000 +0000
+++ server/TLS_PthSocket.hpp
@@ -11,8 +11,8 @@ private:
public:
TLS_CPthSocket (int fd);
~TLS_CPthSocket ();
- int read (void *buf, int len);
- int write (void *buf, int len);
+ int socket_read (void *buf, int len);
+ int socket_write (void *buf, int len);
};
#endif

22
inputmethod/unicon-im/patches/patch-al Normal file
View File

@@ -0,0 +1,22 @@
$NetBSD: patch-al,v 1.1 2011/12/14 18:31:48 marino Exp $
--- server/TLS_TcpipMain.cpp.orig 2000-06-14 04:00:01.000000000 +0000
+++ server/TLS_TcpipMain.cpp
@@ -91,7 +91,7 @@ static void *handler(void *_arg)
printf ("========== Begin New Client Socket =========== \n");
/* read request */
while (bExit == 0) {
- n = MyTLS_CPthSocket.read (caLine, MAXREQLINE);
+ n = MyTLS_CPthSocket.socket_read (caLine, MAXREQLINE);
if (n < 0) {
fprintf(stderr, "read error: errno=%d\n", errno);
close(fd);
@@ -237,7 +237,7 @@ static void *handler(void *_arg)
}
/* simulate a little bit of processing ;) */
pth_yield (NULL);
- n = MyTLS_CPthSocket.write (MemOut->pGetBuf (), MemOut->GetBufLen());
+ n = MyTLS_CPthSocket.socket_write (MemOut->pGetBuf (), MemOut->GetBufLen());
//pth_write(fd, MemOut->pGetBuf (), MemOut->GetBufLen());
}
/* close connection and let thread die */

12
inputmethod/unicon-im/patches/patch-am Normal file
View File

@@ -0,0 +1,12 @@
$NetBSD: patch-am,v 1.1 2009/02/07 22:47:14 joerg Exp $
--- ImmModules/TL-1/xl_hzinput.c.orig 2009-02-07 23:43:25.000000000 +0100
+++ ImmModules/TL-1/xl_hzinput.c
@@ -46,7 +46,6 @@
#define error printf
-static void UnloadInputMethod (hz_input_table *p);
void ResetInput (HzInputTable_T *pClient);
static void GetAssociatePhrases (HzInputTable_T *pClient, unsigned char *p);
static void FindMatchKey (HzInputTable_T *pClient);

10
inputmethod/unicon-im/patches/patch-server_TLS__ImmOp.cpp Normal file
View File

@@ -0,0 +1,10 @@
$NetBSD: patch-server_TLS__ImmOp.cpp,v 1.1 2011/11/26 17:13:30 joerg Exp $
--- server/TLS_ImmOp.cpp.orig 2011-11-26 03:22:12.000000000 +0000
+++ server/TLS_ImmOp.cpp
@@ -1,4 +1,4 @@
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
#include <string.h>
#include <dlfcn.h>

11
inputmethod/unicon-im/patches/patch-server_TLS__MemFile.cpp Normal file
View File

@@ -0,0 +1,11 @@
$NetBSD: patch-server_TLS__MemFile.cpp,v 1.1 2011/11/26 17:13:30 joerg Exp $
--- server/TLS_MemFile.cpp.orig 2011-11-26 03:22:28.000000000 +0000
+++ server/TLS_MemFile.cpp
@@ -1,4 +1,5 @@
-#include <iostream.h>
+#include <iostream>
+using std::cout;
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>