diff options
author | rxg <rxg@pkgsrc.org> | 2006-01-16 13:01:16 +0000 |
---|---|---|
committer | rxg <rxg@pkgsrc.org> | 2006-01-16 13:01:16 +0000 |
commit | 7530b4030dbdb95f315a416215df84e4c7cad269 (patch) | |
tree | c4ee2e5103a9c170768d3c2d1746caff8f076fe9 /inputmethod/gcin/patches | |
parent | 45f9ce6f135ec91d5e25699ffb091dfaad74d255 (diff) | |
download | pkgsrc-7530b4030dbdb95f315a416215df84e4c7cad269.tar.gz |
Initial import gcin-1.1.5.
gcin is a Chinese input method server for Big5 Traditional Chinese character
sets. It features a GTK user interface.
Diffstat (limited to 'inputmethod/gcin/patches')
-rw-r--r-- | inputmethod/gcin/patches/patch-aa | 77 | ||||
-rw-r--r-- | inputmethod/gcin/patches/patch-ab | 41 | ||||
-rw-r--r-- | inputmethod/gcin/patches/patch-ac | 14 | ||||
-rw-r--r-- | inputmethod/gcin/patches/patch-ad | 33 | ||||
-rw-r--r-- | inputmethod/gcin/patches/patch-ae | 32 | ||||
-rw-r--r-- | inputmethod/gcin/patches/patch-af | 14 | ||||
-rw-r--r-- | inputmethod/gcin/patches/patch-ag | 25 |
7 files changed, 236 insertions, 0 deletions
diff --git a/inputmethod/gcin/patches/patch-aa b/inputmethod/gcin/patches/patch-aa new file mode 100644 index 00000000000..a2d597ba9fc --- /dev/null +++ b/inputmethod/gcin/patches/patch-aa @@ -0,0 +1,77 @@ +$NetBSD: patch-aa,v 1.1.1.1 2006/01/16 13:01:16 rxg 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" ]; 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" >> 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 diff --git a/inputmethod/gcin/patches/patch-ab b/inputmethod/gcin/patches/patch-ab new file mode 100644 index 00000000000..2c841e4922f --- /dev/null +++ b/inputmethod/gcin/patches/patch-ab @@ -0,0 +1,41 @@ +$NetBSD: patch-ab,v 1.1.1.1 2006/01/16 13:01:16 rxg Exp $ + +--- Makefile.orig 2005-10-16 10:19:45.000000000 +0800 ++++ Makefile +@@ -36,8 +36,8 @@ endif + + im-srv = im-srv/im-srv.a + +-.c.E: +- $(CC) $(CFLAGS) -E -o $@ $< ++.c.o: ++ $(LIBTOOL) --mode=compile $(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 diff --git a/inputmethod/gcin/patches/patch-ac b/inputmethod/gcin/patches/patch-ac new file mode 100644 index 00000000000..5ec93ada02d --- /dev/null +++ b/inputmethod/gcin/patches/patch-ac @@ -0,0 +1,14 @@ +$NetBSD: patch-ac,v 1.1.1.1 2006/01/16 13:01:16 rxg 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 $(CC) -c $(CFLAGS) -o $@ $< ++ + im-srv.a: $(OBJS) + ar cr $@ $(OBJS) + ranlib $@ diff --git a/inputmethod/gcin/patches/patch-ad b/inputmethod/gcin/patches/patch-ad new file mode 100644 index 00000000000..a274e71e6f5 --- /dev/null +++ b/inputmethod/gcin/patches/patch-ad @@ -0,0 +1,33 @@ +$NetBSD: patch-ad,v 1.1.1.1 2006/01/16 13:01:16 rxg Exp $ + +--- im-client/Makefile.orig 2005-05-09 12:23:22.000000000 +0800 ++++ im-client/Makefile +@@ -6,23 +6,18 @@ CFLAGS= $(WALL) $(OPTFLAGS) -I. -I.. -I. + -DCLIENT_LIB=1 -DGCIN_BIN_DIR=\"$(GCIN_BIN_DIR)\" \ + -DDEBUG="0$(GCIN_DEBUG)" -DGCIN_TABLE_DIR=\"$(GCIN_TABLE_DIR)\" \ + -DFREEBSD=$(FREEBSD) +-OBJS = gcin-im-client.o im-addr.o gcin-conf.o util.o gcin-crypt.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 $(CC) -c $(CFLAGS) -o $@ $< + +-libgcin-im-client.so: $(OBJS) +- $(CC) -shared $(OBJS) -o $@ ++libgcin-im-client.la: $(OBJS) ++ $(LIBTOOL) --mode=link $(CC) $(OBJS:.o=.lo) -o $@ -rpath $(libdir) -version-info 1:1 + $(MAKE) -C ../gtk-im + + install: + install -d $(libdir) +- install -m 755 libgcin-im-client.so $(libdir) +- if [ $(prefix) = /usr/local ]; then \ +- grep /usr/local/lib /etc/ld.so.conf > /dev/null 2>&1 || \ +- echo /usr/local/lib >> /etc/ld.so.conf; \ +- PATH=/sbin:/usr/sbin:$(PATH); ldconfig; \ +- fi; \ ++ $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) libgcin-im-client.la $(libdir) + install -d $(includedir); \ + install -m 444 gcin-im-client.h $(includedir) + diff --git a/inputmethod/gcin/patches/patch-ae b/inputmethod/gcin/patches/patch-ae new file mode 100644 index 00000000000..a16059abde4 --- /dev/null +++ b/inputmethod/gcin/patches/patch-ae @@ -0,0 +1,32 @@ +$NetBSD: patch-ae,v 1.1.1.1 2006/01/16 13:01:16 rxg Exp $ + +--- gtk-im/Makefile.orig 2005-09-14 00:29:56.000000000 +0800 ++++ gtk-im/Makefile +@@ -13,23 +13,18 @@ CFLAGS += -DNEW_GTK_IM=1 + endif + + .c.o: +- $(CC) -c -fpic $(CFLAGS) -o $@ $< ++ $(LIBTOOL) --mode=compile $(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 $(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 > $@ diff --git a/inputmethod/gcin/patches/patch-af b/inputmethod/gcin/patches/patch-af new file mode 100644 index 00000000000..6238971d6a1 --- /dev/null +++ b/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: diff --git a/inputmethod/gcin/patches/patch-ag b/inputmethod/gcin/patches/patch-ag new file mode 100644 index 00000000000..8afc6e31b0c --- /dev/null +++ b/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) *~ |