Remove scim-bridge, integraged into scim-1.4.14 as scim-im-agent.

12 files changed, 0 insertions, 211 deletions

diff --git a/inputmethod/scim-bridge/DESCR b/inputmethod/scim-bridge/DESCR
deleted file mode 100644
index 35e62e3a566..00000000000
--- a/inputmethod/scim-bridge/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Scim-bridge is wrapper library for SCIM, written in C. It is firstly written to
-solve problems occured by the ABI transition of GNU libstdc++ between 3.* branch
-and 4.* branch. That's not the problem in the most of cases because you usually
-used the same compiler for SCIM and GUI apps.
diff --git a/inputmethod/scim-bridge/Makefile b/inputmethod/scim-bridge/Makefile
deleted file mode 100644
index eb209b84d74..00000000000
--- a/inputmethod/scim-bridge/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2012/03/03 00:13:23 wiz Exp $
-#
-
-DISTNAME=	scim-bridge-0.4.16
-PKGREVISION=	11
-CATEGORIES=	inputmethod
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scim/}
-
-MAINTAINER=	obache@NetBSD.org
-HOMEPAGE=	http://www.scim-im.org/projects/scim_bridge
-COMMENT=	C wrapper library for SCIM
-LICENSE=	gnu-gpl-v2 OR gnu-lgpl-v2.1
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_LANGUAGES=	c c++
-USE_TOOLS+=	pkg-config
-
-CONFIGURE_ARGS+=	--enable-agent
-CONFIGURE_ARGS+=	--disable-documents
-CONFIGURE_ARGS+=	--disable-tests
-
-.include "options.mk"
-
-CHECK_PORTABILITY_SKIP=	tests/*
-
-.include "../../inputmethod/scim/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/scim-bridge/PLIST b/inputmethod/scim-bridge/PLIST
deleted file mode 100644
index 7e637a8d67d..00000000000
--- a/inputmethod/scim-bridge/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/11/24 11:49:44 obache Exp $
-bin/scim-bridge
-${PLIST.gtk}lib/gtk-2.0/immodules/im-scim-bridge.la
-${PLIST.qt}qt4/plugins/inputmethods/im-scim-bridge.la
diff --git a/inputmethod/scim-bridge/distinfo b/inputmethod/scim-bridge/distinfo
deleted file mode 100644
index fdec91dcd40..00000000000
--- a/inputmethod/scim-bridge/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.5 2012/05/19 06:55:03 obache Exp $
-
-SHA1 (scim-bridge-0.4.16.tar.gz) = 6a7a714592dbecc9a1f44794f37319bafe2bdfae
-RMD160 (scim-bridge-0.4.16.tar.gz) = 37aed056fb880358b013f104f08b2e58c3de4188
-Size (scim-bridge-0.4.16.tar.gz) = 508870 bytes
-SHA1 (patch-aa) = e4d0803a8d572e2efb79128c307d25bd867007ac
-SHA1 (patch-ab) = 7c103b3da298e8ed72e84c239a3fc4617a647ce5
-SHA1 (patch-ac) = e7dd5f64e3fcd9cdc03199d041fefb09fce9ff8f
-SHA1 (patch-ad) = cc87a5c24af8c066482d164b2805602ed90e2acb
-SHA1 (patch-ae) = 2e8f264da95760b90d40355202fe21b81e0f12c8
-SHA1 (patch-af) = ebd541765c9c1b1105f05d6f1254c38bdc442689
-SHA1 (patch-ag) = 45915bc63fd6228fe2033336fe3313f7ce639ef6
diff --git a/inputmethod/scim-bridge/options.mk b/inputmethod/scim-bridge/options.mk
deleted file mode 100644
index a53fbf5cb52..00000000000
--- a/inputmethod/scim-bridge/options.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: options.mk,v 1.1.1.1 2009/11/24 11:49:44 obache Exp $
-#
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.scim-bridge
-PKG_SUPPORTED_OPTIONS=	gtk qt
-PKG_SUGGESTED_OPTIONS=	gtk
-
-PLIST_VARS+=	gtk qt
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mgtk)
-GTK2_IMMODULES=		yes
-.include "../../x11/gtk2/modules.mk"
-CONFIGURE_ARGS+=	--enable-gtk2-immodule
-PLIST.gtk=		yes
-.else
-CONFIGURE_ARGS+=	--enable-gtk2-immodule=no
-.endif
-
-#.if !empty(PKG_OPTIONS:Mqt3)
-#.include "../../x11/qt3-libs/buildlink3.mk"
-#CONFIGURE_ARGS+=	--enable-qt3-immodule
-#PLIST.qt=		yes
-#.else
-#CONFIGURE_ARGS+=	--disable-qt3-immodule
-#.endif
-
-.if !empty(PKG_OPTIONS:Mqt)
-.include "../../x11/qt4-libs/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-qt4-immodule
-PLIST.qt=		yes
-.else
-CONFIGURE_ARGS+=	--disable-qt4-immodule
-.endif
diff --git a/inputmethod/scim-bridge/patches/patch-aa b/inputmethod/scim-bridge/patches/patch-aa
deleted file mode 100644
index 3e17c619d24..00000000000
--- a/inputmethod/scim-bridge/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/11/24 11:49:44 obache Exp $
-
---- agent/scim-bridge-agent.cpp.orig	2009-01-18 02:58:59.000000000 +0000
-+++ agent/scim-bridge-agent.cpp
-@@ -192,7 +192,7 @@ ScimBridgeAgent *ScimBridgeAgent::alloc 
- 
- 
- ScimBridgeAgentImpl::ScimBridgeAgentImpl ():
--running (true), noexit_enabled (false), standalone_enabled (false), client_app_count (0),
-+running (true), noexit_enabled (false), standalone_enabled (false), client_app_count (0), scim_config_module(0),
- accept_listener (NULL), interruption_listener (NULL), panel_listener (NULL), signal_listener (NULL), display (NULL)
- {
- }
diff --git a/inputmethod/scim-bridge/patches/patch-ab b/inputmethod/scim-bridge/patches/patch-ab
deleted file mode 100644
index 2d8eaab38e3..00000000000
--- a/inputmethod/scim-bridge/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/11/24 11:49:44 obache Exp $
-
---- client-common/scim-bridge-client-output.c.orig	2008-11-02 06:44:34.000000000 +0000
-+++ client-common/scim-bridge-client-output.c
-@@ -20,6 +20,7 @@
- #include <stdarg.h>
- #include <stdio.h>
- #include <string.h>
-+#include <stdlib.h>
- 
- #include "scim-bridge-debug.h"
- #include "scim-bridge-output.h"
diff --git a/inputmethod/scim-bridge/patches/patch-ac b/inputmethod/scim-bridge/patches/patch-ac
deleted file mode 100644
index 0cd65ea1e4b..00000000000
--- a/inputmethod/scim-bridge/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2009/11/24 11:49:44 obache Exp $
-
---- client-gtk/scim-bridge-client-imcontext-gtk.c.orig	2008-11-02 06:44:23.000000000 +0000
-+++ client-gtk/scim-bridge-client-imcontext-gtk.c
-@@ -674,6 +674,7 @@ void scim_bridge_client_imcontext_regist
-         0,
-         /* object initizlier */
-         (GtkObjectInitFunc) scim_bridge_client_imcontext_initialize,
-+	0
-     };
- 
-     if (!class_type) class_type = g_type_module_register_type (type_module, GTK_TYPE_IM_CONTEXT, "ScimBridgeClientIMContext", &klass_info, 0);
diff --git a/inputmethod/scim-bridge/patches/patch-ad b/inputmethod/scim-bridge/patches/patch-ad
deleted file mode 100644
index 0c655cb3e76..00000000000
--- a/inputmethod/scim-bridge/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2009/11/24 11:49:44 obache Exp $
-
---- common/scim-bridge-messenger.h.orig	2008-11-02 06:44:32.000000000 +0000
-+++ common/scim-bridge-messenger.h
-@@ -33,6 +33,8 @@
-  */
- typedef struct _ScimBridgeMessenger ScimBridgeMessenger;
- 
-+struct timeval;
-+
- #ifdef __cplusplus
- extern "C"
- {
diff --git a/inputmethod/scim-bridge/patches/patch-ae b/inputmethod/scim-bridge/patches/patch-ae
deleted file mode 100644
index c1fb33d3251..00000000000
--- a/inputmethod/scim-bridge/patches/patch-ae
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2009/11/26 12:30:12 obache Exp $
-
---- agent/scim-bridge-agent-accept-listener.cpp.orig	2009-04-19 03:42:18.000000000 +0000
-+++ agent/scim-bridge-agent-accept-listener.cpp
-@@ -30,6 +30,10 @@
- #include <sys/types.h>
- #include <sys/un.h>
- 
-+#ifndef SUN_LEN
-+#define SUN_LEN(x) (sizeof(*(x)) - sizeof((x)->sun_path +  strlen ((x)->sun_path))
-+#endif
-+
- #include "scim-bridge-output.h"
- #include "scim-bridge-path.h"
- 
-@@ -111,7 +115,7 @@ retval_t ScimBridgeAgentAcceptListenerIm
-     const int MAX_TRIAL = 5;
-     for (int i = 0; i < MAX_TRIAL; ++i) {
-         scim_bridge_pdebugln (8, "Pinging for the another agent process...");
--        if (connect (socket_fd, (struct sockaddr*)&socket_addr, sizeof (socket_addr.sun_family) + strlen (socket_addr.sun_path))) {
-+        if (connect (socket_fd, (struct sockaddr*)&socket_addr, SUN_LEN(&socket_addr))) {
-             if (i == MAX_TRIAL - 1) {
-                 scim_bridge_pdebugln (6, "It seems like there is no other agent for the old socket.");
-                 break;
-@@ -163,7 +167,7 @@ retval_t ScimBridgeAgentAcceptListenerIm
-         return RETVAL_FAILED;
-     }
-     
--    if (bind (socket_fd, (struct sockaddr*)&socket_addr, strlen (socket_addr.sun_path) + sizeof (socket_addr.sun_family)) != 0) {
-+    if (bind (socket_fd, (struct sockaddr*)&socket_addr, SUN_LEN(&socket_addr)) != 0) {
-         scim_bridge_perrorln ("Cannot bind the socket: %s", strerror (errno));
-         close (socket_fd);
-         socket_fd = -1;
diff --git a/inputmethod/scim-bridge/patches/patch-af b/inputmethod/scim-bridge/patches/patch-af
deleted file mode 100644
index 689ee420344..00000000000
--- a/inputmethod/scim-bridge/patches/patch-af
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-af,v 1.2 2012/05/19 06:55:04 obache Exp $
-
---- agent/scim-bridge-agent-application.cpp.orig	2009-01-17 17:04:20.000000000 +0000
-+++ agent/scim-bridge-agent-application.cpp
-@@ -60,12 +60,12 @@ int main (int argc, char *argv[])
-         {0, 0, NULL, 0}
-     };
- 
--    char short_options[] = "vhqdls:b:";
-+    char short_options[] = "vhql:sn";
- 
-     unsigned int tmp_uint;
- 
-     int option = 0;
--    while (option != EOF) {
-+    while (option != -1) {
-         option = getopt_long (argc, argv, short_options, long_options, NULL);
-         switch (option) {
-             case 'v':
diff --git a/inputmethod/scim-bridge/patches/patch-ag b/inputmethod/scim-bridge/patches/patch-ag
deleted file mode 100644
index ae562913cff..00000000000
--- a/inputmethod/scim-bridge/patches/patch-ag
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2009/11/26 12:30:12 obache Exp $
-
---- client-common/scim-bridge-client.c.orig	2008-11-02 06:44:34.000000000 +0000
-+++ client-common/scim-bridge-client.c
-@@ -29,6 +29,10 @@
- #include <sys/un.h>
- #include <sys/wait.h>
- 
-+#ifndef SUN_LEN
-+#define SUN_LEN(x) (sizeof(*(x)) - sizeof((x)->sun_path +  strlen ((x)->sun_path))
-+#endif
-+
- #include "scim-bridge-client.h"
- #include "scim-bridge-client-imcontext.h"
- #include "scim-bridge-client-protected.h"
-@@ -1052,7 +1056,7 @@ retval_t scim_bridge_client_open_messeng
-         socket_addr.sun_family = AF_UNIX;
-         strcpy (socket_addr.sun_path, scim_bridge_path_get_socket ());
- 
--        if (connect (socket_fd, (struct sockaddr*)&socket_addr, sizeof (socket_addr.sun_family) + strlen (socket_addr.sun_path))) {
-+        if (connect (socket_fd, (struct sockaddr*)&socket_addr, SUN_LEN(&socket_addr))) {
-             if (i == 5 && launch_agent ()) {
-                 scim_bridge_perrorln ("Cannot launch the agent");
-                 return RETVAL_FAILED;