Date: Mon, 24 Jan 2011 11:27:33 +0800 (CST) From: chinsan <chinsan@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/154265: [PATCH] chinese/gcin: update to 1.5.1 Message-ID: <20110124032733.E09E7B81C@chinsan.info> Resent-Message-ID: <201101241510.p0OFA9Ec039919@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 154265 >Category: ports >Synopsis: [PATCH] chinese/gcin: update to 1.5.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Jan 24 15:10:09 UTC 2011 >Closed-Date: >Last-Modified: >Originator: chinsan >Release: FreeBSD 7.1-STABLE i386 >Organization: Taiwan >Environment: System: FreeBSD chinsan.info 7.1-STABLE FreeBSD 7.1-STABLE #0: Mon Jan 12 01:44:01 CST 2009 >Description: - Update to 1.5.1 Added file(s): - files/patch-im-client-Makefile Removed file(s): - files/patch-eve.c Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- gcin-1.5.1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/chinese/gcin/Makefile /usr/home/chinsan/projects/gcin/Makefile --- /usr/ports/chinese/gcin/Makefile 2010-04-01 06:06:09.000000000 +0800 +++ /usr/home/chinsan/projects/gcin/Makefile 2010-11-21 10:13:29.000000000 +0800 @@ -6,8 +6,7 @@ # PORTNAME= gcin -PORTVERSION= 1.4.5 -PORTREVISION= 3 +PORTVERSION= 1.5.1 CATEGORIES= chinese textproc gnome MASTER_SITES= http://cle.linux.org.tw/gcin/download/:main \ http://ftp.twaren.net/local-distfiles/gcin/:main \ @@ -24,7 +23,7 @@ HAS_CONFIGURE= YES USE_GNOME= gtk20 USE_GMAKE= YES -USE_XORG= xtst +USE_XORG= x11 xtst INSTALLS_ICONS= YES USE_LDCONFIG= YES OPTIONS= ANTHY "enable Japanese anthy IM module" off \ @@ -86,7 +85,9 @@ ${WRKSRC}/scripts/Makefile @${REINPLACE_CMD} -e 's,bash,sh,; s/&//; s,/opt/gnome,${LOCALBASE},;' \ ${WRKSRC}/scripts/utf8-edit ${WRKSRC}/scripts/gcin-user-setup \ - ${WRKSRC}/scripts/gtab.append_prepare + ${WRKSRC}/scripts/gtab.append_prepare \ + ${WRKSRC}/scripts/tsin-gtab-import \ + ${WRKSRC}/scripts/tsin-gtab-edit @${REINPLACE_CMD} -e 's,bash,sh,; s/&//; 12,13 s/=/ /; \ s/export/setenv/; s/mozilla-firefox/firefox3/;' \ ${WRKSRC}/scripts/html-browser diff -ruN --exclude=CVS /usr/ports/chinese/gcin/distinfo /usr/home/chinsan/projects/gcin/distinfo --- /usr/ports/chinese/gcin/distinfo 2009-05-18 06:06:16.000000000 +0800 +++ /usr/home/chinsan/projects/gcin/distinfo 2010-11-21 10:13:29.000000000 +0800 @@ -1,6 +1,4 @@ -MD5 (gcin-1.4.5.tar.bz2) = b7e5e40804b2a645ae64f4dedb2b3985 -SHA256 (gcin-1.4.5.tar.bz2) = 7f46c468d77c4e1f2bc64f94396007ffa546135b5f9e918854ce7879ef52d05a -SIZE (gcin-1.4.5.tar.bz2) = 2880978 -MD5 (noseeing-12.tar.gz) = ac89cf9bc9ece68b9f287a222197b147 +SHA256 (gcin-1.5.1.tar.bz2) = ded564a35a3d6d40218779682b4ca77dc580fac80796eaeee75623e7f20130d1 +SIZE (gcin-1.5.1.tar.bz2) = 2827298 SHA256 (noseeing-12.tar.gz) = 9082f50db64b9e2971873aca1607c45a8eb41e803b99f66bd239fd587e1ce19b SIZE (noseeing-12.tar.gz) = 416726 diff -ruN --exclude=CVS /usr/ports/chinese/gcin/files/patch-eve.c /usr/home/chinsan/projects/gcin/files/patch-eve.c --- /usr/ports/chinese/gcin/files/patch-eve.c 2009-05-17 17:48:42.000000000 +0800 +++ /usr/home/chinsan/projects/gcin/files/patch-eve.c 1970-01-01 08:00:00.000000000 +0800 @@ -1,14 +0,0 @@ ---- eve.c.orig 2009-05-17 17:08:46.000000000 +0800 -+++ eve.c 2009-05-17 17:09:22.000000000 +0800 -@@ -595,9 +595,11 @@ - #endif - case 10: - break; -+#if USE_ANTHY - case 12: - get_win_anthy_geom(); - break; -+#endif - default: - get_win_gtab_geom(); - break; diff -ruN --exclude=CVS /usr/ports/chinese/gcin/files/patch-im-client-Makefile /usr/home/chinsan/projects/gcin/files/patch-im-client-Makefile --- /usr/ports/chinese/gcin/files/patch-im-client-Makefile 1970-01-01 08:00:00.000000000 +0800 +++ /usr/home/chinsan/projects/gcin/files/patch-im-client-Makefile 2010-11-21 10:13:29.000000000 +0800 @@ -0,0 +1,11 @@ +--- im-client/Makefile.orig 2009-12-12 19:28:49.000000000 +0800 ++++ im-client/Makefile 2010-11-20 18:09:18.000000000 +0800 +@@ -20,7 +20,7 @@ + $(CC) -x c -c $(CFLAGS) $< + + $(SOFILEVER): $(OBJS) +- $(CC) $(SO_FLAGS) -Wl,-soname,libgcin-im-client.so.1 $(OBJS) -lX11 -o $@ ++ $(CC) $(SO_FLAGS) -Wl,-soname,libgcin-im-client.so.1 $(OBJS) -o $@ + ln -sf $(SOFILEVER) $(SOFILE) + ln -sf $(SOFILEVER) $(SOFILE).1 + $(MAKE) -C ../gtk-im diff -ruN --exclude=CVS /usr/ports/chinese/gcin/files/patch-menu /usr/home/chinsan/projects/gcin/files/patch-menu --- /usr/ports/chinese/gcin/files/patch-menu 2006-10-31 14:02:23.000000000 +0800 +++ /usr/home/chinsan/projects/gcin/files/patch-menu 2010-11-21 10:13:29.000000000 +0800 @@ -1,11 +1,8 @@ ---- menu/Makefile.bak Mon Oct 30 12:44:59 2006 -+++ menu/Makefile Mon Oct 30 12:43:10 2006 -@@ -10,14 +10,10 @@ - install gcin-setup.desktop /usr/share/applications; \ - install -d /usr/lib/menu; \ +--- menu/Makefile.bak 2010-11-19 04:16:50.000000000 +0800 ++++ menu/Makefile 2010-11-19 04:18:35.000000000 +0800 +@@ -12,12 +12,8 @@ install -m 644 $(MENUS) /usr/lib/menu; \ -- which update-menus >& /dev/null && update-menus || exit 0; \ -+ which update-menus > /dev/null 2>&1 && update-menus || exit 0; \ + which update-menus > /dev/null 2>&1 && update-menus || exit 0; \ else \ - install -d $(libdir)/menu; \ - install -m 644 $(MENUS) $(libdir)/menu; \ diff -ruN --exclude=CVS /usr/ports/chinese/gcin/files/patch-qt4-im-Makefile /usr/home/chinsan/projects/gcin/files/patch-qt4-im-Makefile --- /usr/ports/chinese/gcin/files/patch-qt4-im-Makefile 2009-02-01 09:10:45.000000000 +0800 +++ /usr/home/chinsan/projects/gcin/files/patch-qt4-im-Makefile 2010-11-21 10:13:29.000000000 +0800 @@ -1,33 +1,21 @@ ---- qt4-im/Makefile.orig 2009-02-01 08:50:10.000000000 +0800 -+++ qt4-im/Makefile 2009-02-01 08:55:39.000000000 +0800 -@@ -1,29 +1,29 @@ +--- qt4-im/Makefile.orig 2009-12-10 07:09:17.000000000 +0800 ++++ qt4-im/Makefile 2010-11-20 18:06:12.000000000 +0800 +@@ -1,21 +1,22 @@ include ../config.mak QT=qt4 --QTIM=$(QT)/plugins/lib/inputmethods + QTIM=$(QT)/plugins/inputmethods -IMMODULES=$(libdir)/$(QTIM) -+QTIM=$(QT)/plugins/inputmethods +IMMODULES=/usr/local/lib/$(QTIM) - ifeq ($(LIB), lib64) -- IMMODULES_LOCAL=/usr/$(LIB)/qt4/plugins/lib64/inputmethods -+ IMMODULES_LOCAL=/usr/local/lib/qt4/plugins/lib64/inputmethods - else -- IMMODULES_LOCAL=/usr/$(LIB)/$(QTIM) -+ IMMODULES_LOCAL=$(IMMODULES) - endif --QTINC=/usr/lib/$(QT)/include -+QTINC=/usr/local/include/$(QT) --INCS=-I../im-client -I$(QTINC) -I/usr/include/X11 -I$(QTINC)/QtGui -I$(QTINC)/QtCore -+INCS=-I../im-client -I$(QTINC) -I/usr/local/include -I$(QTINC)/QtGui -I$(QTINC)/QtCore +-INCS=-I../im-client -I/usr/include/X11 `pkg-config QtCore QtGui --cflags` ++INCS=-I../im-client -I/usr/local/include `pkg-config QtCore QtGui --cflags` CXXFLAGS=$(OPTFLAGS) $(INCS) -Wall -D_REENTRANT -fPIC -DQT4 -DQT_SHARED \ -DQT_IMMODULE -DPIC OBJS= moc_gcin-qt.o gcin-qt.o im-gcin-qt.o gcin-imcontext-qt.o .SUFFIXES: .c .cpp .a .so .E .h --LDFLAGS=-L/usr/lib/$(QT)/$(LIB) -L/usr/X11R6/$(LIB) -L../im-client -lQtGui -lQtCore -lmng -ljpeg -lpng -lz \ -+LDFLAGS=-L/usr/local/lib/$(QT) -L/usr/local/lib -L../im-client -lQtGui -lQtCore -lmng -ljpeg -lpng -lz \ - -lXrender -lXrandr -lXft -lfontconfig -lgcin-im-client \ ---lXext -lX11 -lm -lSM -lICE -ldl -lpthread -+-lXext -lX11 -lm -lSM -lICE -lpthread +-LDFLAGS=-L../im-client -lgcin-im-client -Wl,-rpath,$(gcinlibdir) ++LDFLAGS=-L../im-client -lgcin-im-client -lXext -lX11 -lm -lSM -lICE \ ++ -lpthread -Wl,-rpath,$(gcinlibdir) all: im-gcin.so .cpp.E: diff -ruN --exclude=CVS /usr/ports/chinese/gcin/pkg-plist /usr/home/chinsan/projects/gcin/pkg-plist --- /usr/ports/chinese/gcin/pkg-plist 2009-05-18 06:06:16.000000000 +0800 +++ /usr/home/chinsan/projects/gcin/pkg-plist 2010-11-21 10:13:29.000000000 +0800 @@ -14,6 +14,7 @@ bin/tsa2d32 bin/tsd2a bin/tsd2a32 +bin/tsin2gtab-phrase bin/tslearn include/gcin-im-client.h lib/gtk-2.0/immodules/im-gcin.so @@ -22,19 +23,22 @@ lib/gcin2.so lib/gtk_bug_fix.so lib/libgcin-im-client.so -lib/libgcin-im-client.so.1.2.0 +lib/libgcin-im-client.so.1.2.1 lib/libgcin-im-client.so.1 %%DATADIR%%/script/gcin-user-setup %%DATADIR%%/script/gtab.append_prepare %%DATADIR%%/script/html-browser %%BOSHIAMY%%%%DATADIR%%/script/noseeadd.rb %%DATADIR%%/script/noseeing-inst +%%DATADIR%%/script/tsin-gtab-import +%%DATADIR%%/script/tsin-gtab-edit %%DATADIR%%/script/utf8-edit %%DATADIR%%/table/ar30.gtab %%DATADIR%%/table/ar30-big.gtab %%DATADIR%%/table/cj-punc.gtab %%DATADIR%%/table/cj.gtab %%DATADIR%%/table/cj5.gtab +%%DATADIR%%/table/cj543.gtab %%DATADIR%%/table/dayi3.gtab %%DATADIR%%/table/dvorak.kbm %%DATADIR%%/table/et-asdf.kbm @@ -57,6 +61,7 @@ %%DATADIR%%/table/pinyin.kbm %%DATADIR%%/table/pinyin-asdf.kbm %%DATADIR%%/table/pin-juyin.xlt +%%DATADIR%%/table/russian.gtab %%DATADIR%%/table/s2t.dat %%DATADIR%%/table/simplex.gtab %%DATADIR%%/table/symbol-table @@ -79,15 +84,21 @@ share/icons/gcin/cj.png share/icons/gcin/cj5.png share/icons/gcin/dayi3.png +share/icons/gcin/en-kana-nippon.png +share/icons/gcin/en-tsin.png share/icons/gcin/erbi.png share/icons/gcin/ez.png share/icons/gcin/fcitx-qxm.png share/icons/gcin/fcitx-wanfeng.png +share/icons/gcin/full-simp.png +share/icons/gcin/full-trad.png share/icons/gcin/gcb.png share/icons/gcin/gcin-tray.png share/icons/gcin/gdayi3.png share/icons/gcin/greek.png share/icons/gcin/hakka.png +share/icons/gcin/half-simp.png +share/icons/gcin/half-trad.png share/icons/gcin/halfwidth-kana.png share/icons/gcin/intcode.png share/icons/gcin/jtcj_gb.png --- gcin-1.5.1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110124032733.E09E7B81C>