Import of pkgsrc-2013Q2

inputmethod/gcin/DESCR

@@ -0,0 +1,2 @@
+gcin is a Chinese input method server for Big5 Traditional Chinese character
+sets. It features a GTK user interface.

inputmethod/gcin/Makefile

@@ -0,0 +1,38 @@
+# $NetBSD: Makefile,v 1.25 2013/06/06 12:54:36 wiz Exp $
+#
+
+DISTNAME=		gcin-1.1.7
+PKGREVISION=		13
+CATEGORIES=		inputmethod
+#MASTER_SITES=		http://www.csie.nctu.edu.tw/~cp76/gcin/download/
+MASTER_SITES=		http://cle.linux.org.tw/gcin/download/gcin-old/gcin-1.1.x/
+EXTRACT_SUFX=		.tar.bz2
+
+MAINTAINER=		rxg@NetBSD.org
+HOMEPAGE=		http://www.csie.nctu.edu.tw/~cp76/gcin/
+COMMENT=		Gtk Chinese INput application in X
+
+MAKE_JOBS_SAFE=		no
+
+USE_LIBTOOL=		yes
+HAS_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
+CONFIGURE_ARGS+=	--x11base=${X11BASE:Q}
+CONFIGURE_ARGS+=	--use_xim=Y
+CONFIGURE_ARGS+=	--new_gtk_im=Y
+USE_TOOLS+=		pkg-config gmake
+GTK2_IMMODULES=		yes
+.include "../../x11/gtk2/modules.mk"
+
+REPLACE_INTERPRETER+=	sh
+REPLACE.sh.old=		/bin/bash
+REPLACE.sh.new=		${SH}
+REPLACE_FILES.sh=	configure
+REPLACE_FILES.sh+=	scripts/gcin-user-setup
+REPLACE_FILES.sh+=	scripts/modify-XIM
+REPLACE_FILES.sh+=	scripts/utf8-edit
+
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libXtst/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../mk/bsd.pkg.mk"

inputmethod/gcin/PLIST

@@ -0,0 +1,54 @@
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:01:29 joerg Exp $
+bin/gcin
+bin/gcin-setup
+bin/gcin2tab
+bin/juyin-learn
+bin/phoa2d
+bin/phod2a
+bin/sim2trad
+bin/tsa2d
+bin/tsd2a
+bin/tslearn
+include/gcin-im-client.h
+lib/gtk-2.0/immodules/im-gcin.la
+lib/libgcin-im-client.la
+lib/menu/gcin
+lib/menu/gcin-setup
+man/man1/gcin.1
+man/man1/gcin2tab.1
+share/applications/gcin-setup.desktop
+share/control-center-2.0/capplets/gcin-setup.desktop
+share/doc/${PKGNAME}/Changelog
+share/doc/${PKGNAME}/README
+share/gcin/script/gcin-user-setup
+share/gcin/script/modify-XIM
+share/gcin/script/utf8-edit
+share/gcin/table/ar30.gtab
+share/gcin/table/cj-punc.gtab
+share/gcin/table/cj.gtab
+share/gcin/table/cj5.gtab
+share/gcin/table/dayi3.gtab
+share/gcin/table/et-asdf.kbm
+share/gcin/table/et.kbm
+share/gcin/table/et26-asdf.kbm
+share/gcin/table/et26.kbm
+share/gcin/table/greek.gtab
+share/gcin/table/gtab.list
+share/gcin/table/hsu.kbm
+share/gcin/table/ibm.kbm
+share/gcin/table/jyutping.gtab
+share/gcin/table/kana-nippon.gtab
+share/gcin/table/latin-letters.gtab
+share/gcin/table/pho-huge.tab
+share/gcin/table/pho.tab
+share/gcin/table/phrase.table
+share/gcin/table/pinyin.gtab
+share/gcin/table/simplex.gtab
+share/gcin/table/symbol-table
+share/gcin/table/tsin
+share/gcin/table/tsin.idx
+share/gcin/table/zo-asdf.kbm
+share/gcin/table/zo.kbm
+share/icons/gcin.png
+share/icons/gcin/pin-fixed24.png
+share/icons/gcin/pin-float16.png

inputmethod/gcin/distinfo

@@ -0,0 +1,15 @@
+$NetBSD: distinfo,v 1.7 2013/02/26 11:09:46 joerg Exp $
+
+SHA1 (gcin-1.1.7.tar.bz2) = 0dd2cf64703d276fca3e5492e4ad1aaaed6fe290
+RMD160 (gcin-1.1.7.tar.bz2) = 2c89f8a879e2ada52fb576bb6f91ac83e909a675
+Size (gcin-1.1.7.tar.bz2) = 1392767 bytes
+SHA1 (patch-aa) = 0cecd77d5bdd0e5cbf212adbe85c131a8d2e319a
+SHA1 (patch-ab) = 2aa3dda5a55a591e4cb36b4b28da254eb8873585
+SHA1 (patch-ac) = 2722d0b0f099644e2fd305339b869d574b0aa854
+SHA1 (patch-ad) = 961b0a597a5f6ee6fac4bbd4873616471e295c26
+SHA1 (patch-ae) = f7718fbb9a6a788a51c0d4198e2ba67048e59315
+SHA1 (patch-af) = e66965a840e67afe007c4ddaa55cba572cf49e6f
+SHA1 (patch-ag) = d3e16fd690f132bd687ceda2d13041e447147f6e
+SHA1 (patch-ah) = 9edfc9e2df42fe0f9b7817a679b5727a86571fe4
+SHA1 (patch-gcin-setup-list.c) = ef6d7ebe9e277aab42098bdeb4b7043743b3709f
+SHA1 (patch-gtk-im_gtkimcontextgcin.c) = 52aa90dba9fb80786bce3bc662b3471b829d19f6

inputmethod/gcin/patches/patch-aa

@@ -0,0 +1,77 @@
+$NetBSD: patch-aa,v 1.3 2011/12/15 18:53:51 marino Exp $
+
+--- configure.orig	2006-01-04 19:37:46.000000000 +0800
++++ configure
+@@ -9,13 +9,13 @@ if [ "$1" = "-h" -o "$1" = "--help" -o "
+ fi
+ 
+ MAKE=make
+-which gmake >& /dev/null
++which gmake > /dev/null
+ if [ $? = 0 ]; then
+   MAKE=gmake
+ fi
+ 
+-uname | grep FreeBSD >& /dev/null
+-if [ $? = 0 ]; then
++OS=`uname -s`
++if [ $OS = "FreeBSD" ] || [ $OS = "NetBSD" ]|| [ $OS = "DragonFly" ]; then
+   FREEBSD=1
+ else
+   FREEBSD=0
+@@ -23,6 +23,7 @@ fi
+ 
+ 
+ prefix="/usr/local"
++x11base="/usr/X11R6"
+ use_xim='Y'
+ new_gtk_im='N'
+ 
+@@ -34,6 +35,8 @@ for opt do
+   case "$opt" in
+   --prefix=*) prefix=`echo $opt | cut -d '=' -f 2`
+   ;;
++  --x11base=*) x11base=`echo $opt | cut -d '=' -f 2`
++  ;;
+   --use_xim=*) use_xim=`echo $opt | cut -d '=' -f 2`
+   ;;
+   --new_gtk_im=*) new_gtk_im=`echo $opt | cut -d '=' -f 2`
+@@ -88,7 +91,7 @@ fi
+ 
+ bindir=$prefix/bin
+ datadir=$prefix/share
+-mandir=$datadir/man
++mandir=$prefix/man
+ libdir=$prefix/lib
+ includedir=$prefix/include
+ optdir=/opt
+@@ -111,7 +114,7 @@ if [ $QT_IM = 'N' ]; then
+   grep -v qt3/plugins/inputmethods gcin.spec.tmp > gcin.spec
+ fi
+ 
+-grep Cooker /etc/mandriva-release 2>&1 | grep 2006 >& /dev/null
++grep Cooker /etc/mandriva-release 2>&1 | grep 2006 > /dev/null
+ if [ $? = 0 ]; then
+   new_gtk_im='Y'
+   echo "!!!! new gtk-im(im-gcin.so) will be enabled because you are using Cooker 2006."
+@@ -138,7 +141,7 @@ echo "datadir_r=$datadir" >> config.mak
+ echo "libdir=\$(DESTDIR)$libdir" >> config.mak
+ echo "includedir=\$(DESTDIR)$includedir" >> config.mak
+ 
+-echo "LDFLAGS=$GTKLDFLAGS" >> config.mak
++echo "LDFLAGS=$GTKLDFLAGS -L$x11base/lib -Wl,-R$x11base/lib -lX11" >> config.mak
+ echo "GCIN_VERSION=$GCIN_VERSION" >> config.mak
+ echo "GCIN_TABLE_DIR=\$(datadir_r)/gcin/table" >> config.mak
+ echo "GCIN_TABLE_DIR_i=\$(datadir)/gcin/table" >> config.mak
+@@ -164,10 +167,5 @@ cd menu
+ for i in *.in
+ do
+   outf=`echo $i | sed -e "s/\.in//"`
+-#  echo $outf
+-  if [ $bindir = /usr/bin ]; then
+-    sed -e "s~/usr/local/bin~/usr/bin~" < $i > $outf
+-  else
+-    cp $i $outf
+-  fi
++  sed -e "s~/usr/local/bin~$prefix/bin~" < $i > $outf
+ done

inputmethod/gcin/patches/patch-ab

@@ -0,0 +1,50 @@
+$NetBSD: patch-ab,v 1.3 2009/11/26 16:48:26 joerg Exp $
+
+--- Makefile.orig	2006-02-16 17:36:08.000000000 +0800
++++ Makefile
+@@ -23,7 +23,7 @@ OBJS_gcin2tab=gcin2tab.o gtab-util.o uti
+ OBJS_gcin_steup=gcin-setup.o gcin-conf.o util.o gcin-send.o gcin-settings.o \
+ 	gcin-setup-list.o gcin-switch.o locale.o gcin-setup-pho.o about.o
+ WALL=-Wall
+-CFLAGS= $(WALL) $(OPTFLAGS) $(GTKINC) -I./IMdkit/include -DDEBUG="0$(GCIN_DEBUG)" \
++CFLAGS= $(WALL) $(GTKINC) -I./IMdkit/include \
+         -DGCIN_TABLE_DIR=\"$(GCIN_TABLE_DIR)\"  -DDOC_DIR=\"$(DOC_DIR)\" \
+         -DGCIN_ICON_DIR=\"$(GCIN_ICON_DIR)\" -DGCIN_VERSION=\"$(GCIN_VERSION)\" \
+         -DGCIN_SCRIPT_DIR=\"$(GCIN_SCRIPT_DIR)\" -DGCIN_BIN_DIR=\"$(GCIN_BIN_DIR)\" \
+@@ -36,8 +36,8 @@ endif
+ 
+ im-srv = im-srv/im-srv.a
+ 
+-.c.E:
+-	$(CC) $(CFLAGS) -E -o $@ $<
++.c.o:
++	$(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CFLAGS) -o $@ $<
+ 
+ PROGS=gcin tsd2a tsa2d phoa2d phod2a tslearn gcin-setup gcin2tab juyin-learn sim2trad
+ PROGS_CV=kbmcv
+@@ -96,24 +96,16 @@ ibin:
+ 
+ install:
+ 	install -d $(datadir)/icons
+-	install gcin.png $(datadir)/icons
++	install -m 644 gcin.png $(datadir)/icons
+ 	install -d $(GCIN_ICON_DIR_i)
+ 	install -m 644 icons/* $(GCIN_ICON_DIR_i)
+ 	install -d $(bindir)
+ 	$(MAKE) -C data install
+ 	$(MAKE) -C im-client install
+ 	$(MAKE) -C gtk-im install
+-	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im install; fi
+-	if [ $(prefix) = /usr/local ]; then \
+-	   install -m 644 gcin.png /usr/share/icons; \
+-	   install -d $(DOC_DIR); \
+-	   install -m 644 README Changelog $(DOC_DIR); \
+-	   install $(PROGS) $(bindir); \
+-	else \
+ 	   install -d $(DOC_DIR_i); \
+ 	   install -m 644 README Changelog $(DOC_DIR_i); \
+ 	   install -s $(PROGS) $(bindir); \
+-	fi
+ 	$(MAKE) -C scripts install
+ 	$(MAKE) -C menu install
+ 	$(MAKE) -C man install

inputmethod/gcin/patches/patch-ac

@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.2 2009/11/26 16:48:26 joerg Exp $
+
+--- im-srv/Makefile.orig	2006-01-14 23:40:15.000000000 +0800
++++ im-srv/Makefile
+@@ -5,6 +5,9 @@ WALL=-Wall
+ CFLAGS= $(WALL) $(OPTFLAGS) -I.. -I../im-client  -I../IMdkit/include $(GTKINC) -DDEBUG="0$(GCIN_DEBUG)"
+ OBJS = im-srv.o im-addr.o im-dispatch.o ../im-client/gcin-crypt.o
+ 
++.c.o:
++	$(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CFLAGS) -o $@ $<
++
+ im-srv.a:	$(OBJS)
+ 	ar cr $@ $(OBJS)
+ 	ranlib $@

inputmethod/gcin/patches/patch-ad

@@ -0,0 +1,46 @@
+$NetBSD: patch-ad,v 1.4 2009/11/26 16:48:26 joerg Exp $
+
+--- im-client/Makefile.orig	2006-02-16 18:23:34.000000000 +0800
++++ im-client/Makefile
+@@ -3,34 +3,23 @@ include ../config.mak
+ .SUFFIXES:      .c .o .E
+ WALL=-Wall
+ CFLAGS= $(WALL) $(OPTFLAGS) -I. -I.. -I../IMdkit/include $(GTKINC) \
+-        -DCLIENT_LIB=1 -DGCIN_BIN_DIR=\"$(GCIN_BIN_DIR)\" \
+-        -DDEBUG="0$(GCIN_DEBUG)" -DGCIN_TABLE_DIR=\"$(GCIN_TABLE_DIR)\" \
++        -DGCIN_BIN_DIR=\"$(GCIN_BIN_DIR)\" \
++        -DGCIN_TABLE_DIR=\"$(GCIN_TABLE_DIR)\" \
+         -DFREEBSD=$(FREEBSD)
+-OBJS = gcin-im-client.o im-addr.o gcin-conf.o util.o gcin-crypt.o
+-
+-.c.E:
+-	$(CC) $(CFLAGS) -E -o $@ $<
++OBJS = gcin-im-client.o ../im-srv/im-addr.o ../gcin-conf.o ../util.o gcin-crypt.o
+ 
+ .c.o:
+-	$(CC) -c -fpic $(CFLAGS) -o $@ $<
++	$(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CFLAGS) -o $@ $<
+ 
+-libgcin-im-client.so:   $(OBJS)
+-	$(CC) -shared $(OBJS) -o $@
++libgcin-im-client.la:   $(OBJS)
++	$(LIBTOOL) --mode=link --tag=CC $(CC) $(OBJS:.o=.lo) -o $@ -rpath $(libdir) -version-info 1:1
+ 	$(MAKE) -C ../gtk-im
+ 
+ LOCALLIB=/usr/local/$(LIB)
+ 
+ install:
+ 	install -d $(libdir)
+-	if [ $(prefix) = /usr/local ]; then \
+-	  ! [ -d $(LOCALLIB) ] && mkdir $(LOCALLIB) ; \
+-	  install -m 755 libgcin-im-client.so $(LOCALLIB); \
+-	  grep $(LOCALLIB) /etc/ld.so.conf > /dev/null 2>&1 || \
+-	  echo $(LOCALLIB) >> /etc/ld.so.conf; \
+-	  PATH=/sbin:/usr/sbin:$(PATH); ldconfig; \
+-	else \
+-	  install -m 755 libgcin-im-client.so $(libdir); \
+-	fi; \
++	$(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) libgcin-im-client.la $(libdir)
+ 	install -d $(includedir); \
+ 	install -m 444 gcin-im-client.h $(includedir)
+ 

inputmethod/gcin/patches/patch-ae

@@ -0,0 +1,40 @@
+$NetBSD: patch-ae,v 1.4 2009/11/26 16:48:26 joerg Exp $
+
+--- gtk-im/Makefile.orig	2006-02-22 21:11:46.000000000 +0800
++++ gtk-im/Makefile
+@@ -6,30 +6,25 @@ IMMODULES=$(libdir)/$(GTK2IM)
+ IMMODULES_LOCAL=/usr/$(LIB)/$(GTK2IM)
+ 
+ .SUFFIXES:	.c .o .E
+-CFLAGS = $(OPTFLAGS) $(GTKINC) -I../im-client -I.. -I../IMdkit/include -DCLIENT_LIB=1
++CFLAGS = $(OPTFLAGS) $(GTKINC) -I../im-client -I.. -I../IMdkit/include
+ 
+ ifeq ($(NEW_GTK_IM),Y)
+ CFLAGS += -DNEW_GTK_IM=1
+ endif
+ 
+ .c.o:
+-	$(CC) -c -fpic $(CFLAGS) -o $@ $<
++	$(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CFLAGS) -o $@ $<
+ 
+-im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
+-	$(CC) -shared $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
++im-gcin.la:     $(OBJS) ../im-client/libgcin-im-client.la
++	$(LIBTOOL) --mode=link --tag=CC $(CC) $(OBJS:.o=.lo) ../im-client/libgcin-im-client.la -o $@ $(LDFLAGS) -rpath $(IMMODULES) -module -avoid-version
+ 	rm -f core.*
+ 
+ clean:
+ 	rm -f *.o *.so *~ core.* .depend
+ 
+ install:
+-	if [ $(prefix) = /usr/local ]; then \
+-		install -d $(IMMODULES_LOCAL); \
+-		install -m 755 im-gcin.so $(IMMODULES_LOCAL); \
+-	else \
+ 		install -d $(IMMODULES); \
+-		install -m 755 im-gcin.so $(IMMODULES); \
+-	fi
++	$(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) im-gcin.la $(IMMODULES)
+ 
+ .depend:
+ 	$(CC) $(CFLAGS) -MM *.c > $@

inputmethod/gcin/patches/patch-af

@@ -0,0 +1,14 @@
+$NetBSD: patch-af,v 1.1.1.1 2006/01/16 13:01:16 rxg Exp $
+
+--- scripts/Makefile.orig	2005-03-06 12:51:03.000000000 +0800
++++ scripts/Makefile
+@@ -5,9 +5,6 @@ SCRIPTS=gcin-user-setup gcin-utf8-setup 
+ all:	$(SCRIPTS)
+ 
+ install:
+-	if [ $(prefix) = /usr/local ]; then \
+-	   sh modify-XIM; \
+-	fi
+ 	install -d $(GCIN_SCRIPT_DIR_i)
+ 	install -m 755 $(SCRIPTS) $(GCIN_SCRIPT_DIR_i)
+ clean:

inputmethod/gcin/patches/patch-ag

@@ -0,0 +1,25 @@
+$NetBSD: patch-ag,v 1.1.1.1 2006/01/16 13:01:16 rxg Exp $
+
+--- menu/Makefile.orig	2005-08-29 09:40:32.000000000 +0800
++++ menu/Makefile
+@@ -5,19 +5,11 @@ include ../config.mak
+ all:
+ 
+ install:
+-	if [ $(prefix) = /usr/local ]; then \
+-           install gcin-setup.desktop $(GCIN_SETUP_DESKTOP); \
+-	   install gcin-setup.desktop /usr/share/applications; \
+-	   install -d /usr/lib/menu; \
+-	   install -m 644 $(MENUS) /usr/lib/menu; \
+-	   which update-menus >& /dev/null && update-menus || exit 0; \
+-	else \
+ 	   install -d $(libdir)/menu; \
+ 	   install -m 644 $(MENUS) $(libdir)/menu; \
+ 	   install -d $(GCIN_SETUP_DESKTOP_rpm); \
+ 	   install -m 644 gcin-setup.desktop $(GCIN_SETUP_DESKTOP_rpm); \
+ 	   install -d $(datadir)/applications; \
+-	   install -m 644 gcin-setup.desktop $(datadir)/applications; \
+-	fi
++	   install -m 644 gcin-setup.desktop $(datadir)/applications
+ clean:
+ 	rm -f $(MENUS) *~

inputmethod/gcin/patches/patch-ah

@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2006/04/28 18:24:53 joerg Exp $
+
+--- IMdkit/lib/Xtranssock.c.orig	2006-04-28 17:52:23.000000000 +0000
++++ IMdkit/lib/Xtranssock.c
+@@ -95,7 +95,7 @@ from the X Consortium.
+ #ifdef __osf__
+ #include <sys/param.h>
+ #endif /* osf */
+-#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) 
++#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)  || defined(__DragonFly__)
+ #include <machine/endian.h>
+ #endif /* __NetBSD__ || __OpenBSD__ || __FreeBSD__ */
+ #include <netinet/tcp.h>

inputmethod/gcin/patches/patch-gcin-setup-list.c

@@ -0,0 +1,13 @@
+$NetBSD: patch-gcin-setup-list.c,v 1.1 2013/02/26 11:09:46 joerg Exp $
+
+--- gcin-setup-list.c.orig	2013-02-25 17:59:05.000000000 +0000
++++ gcin-setup-list.c
+@@ -184,7 +184,7 @@ static gboolean toggled (GtkCellRenderer
+   int in_no = gcin_switch_keys_lookup(key[0]);
+ 
+   if (in_no < 0)
+-    return;
++    return FALSE;
+ 
+   gcin_flags_im_enabled ^= 1 << in_no;
+   value ^= 1;

inputmethod/gcin/patches/patch-gtk-im_gtkimcontextgcin.c

@@ -0,0 +1,13 @@
+$NetBSD: patch-gtk-im_gtkimcontextgcin.c,v 1.1 2013/02/26 11:09:46 joerg Exp $
+
+--- gtk-im/gtkimcontextgcin.c.orig	2013-02-25 18:00:04.000000000 +0000
++++ gtk-im/gtkimcontextgcin.c
+@@ -321,7 +321,7 @@ gtk_im_context_xim_new (void)
+ static gboolean update_cursor_position(gpointer data)
+ {
+   if (!context_xim_queued)
+-    return;
++    return FALSE;
+ 
+   g_signal_emit_by_name(context_xim_queued, "preedit_changed");
+   context_xim_queued = NULL;