aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvanilla <vanilla@FreeBSD.org>2005-03-02 03:02:27 +0800
committervanilla <vanilla@FreeBSD.org>2005-03-02 03:02:27 +0800
commitfc68f69a91d215be149d4b083c19f7058c60192f (patch)
tree8d053fed45693740cecd5cc9871d226321f91683
parent7603373178c2c14e4ec11b9852d9d30966253254 (diff)
downloadfreebsd-ports-graphics-fc68f69a91d215be149d4b083c19f7058c60192f.tar.gz
freebsd-ports-graphics-fc68f69a91d215be149d4b083c19f7058c60192f.tar.zst
freebsd-ports-graphics-fc68f69a91d215be149d4b083c19f7058c60192f.zip
Upgrade to 0.8.4.
Approved by: maintainer
-rw-r--r--chinese/gcin-devel/Makefile3
-rw-r--r--chinese/gcin-devel/distinfo4
-rw-r--r--chinese/gcin-devel/files/patch-Makefile11
-rw-r--r--chinese/gcin-devel/files/patch-configure12
-rw-r--r--chinese/gcin-devel/files/patch-gcin-im-client.c14
-rw-r--r--chinese/gcin-devel/files/patch-gcin-user-setup8
-rw-r--r--chinese/gcin-devel/files/patch-gcin-utf8-setup8
-rw-r--r--chinese/gcin-devel/files/patch-im-srv.c11
-rw-r--r--chinese/gcin-devel/pkg-plist7
-rw-r--r--chinese/gcin/Makefile3
-rw-r--r--chinese/gcin/distinfo4
-rw-r--r--chinese/gcin/files/patch-Makefile11
-rw-r--r--chinese/gcin/files/patch-configure12
-rw-r--r--chinese/gcin/files/patch-gcin-im-client.c14
-rw-r--r--chinese/gcin/files/patch-gcin-user-setup8
-rw-r--r--chinese/gcin/files/patch-gcin-utf8-setup8
-rw-r--r--chinese/gcin/files/patch-im-srv.c11
-rw-r--r--chinese/gcin/pkg-plist7
18 files changed, 118 insertions, 38 deletions
diff --git a/chinese/gcin-devel/Makefile b/chinese/gcin-devel/Makefile
index d0f94599a72..fd5191c5d06 100644
--- a/chinese/gcin-devel/Makefile
+++ b/chinese/gcin-devel/Makefile
@@ -6,13 +6,14 @@
#
PORTNAME= gcin
-PORTVERSION= 0.5.3
+PORTVERSION= 0.8.4
CATEGORIES= chinese
MASTER_SITES= http://www.csie.nctu.edu.tw/~cp76/gcin/download/
MAINTAINER= statue@freebsd.netlab.cse.yzu.edu.tw
COMMENT= A triditional chinese input utility in X
+USE_X_PREFIX= YES
USE_BZIP2= YES
GNU_CONFIGURE= YES
USE_GNOME= gtk20
diff --git a/chinese/gcin-devel/distinfo b/chinese/gcin-devel/distinfo
index a49f1d84acd..c03534690b0 100644
--- a/chinese/gcin-devel/distinfo
+++ b/chinese/gcin-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gcin-0.5.3.tar.bz2) = e00385174417b73ebd7f6f5d305d8040
-SIZE (gcin-0.5.3.tar.bz2) = 544993
+MD5 (gcin-0.8.4.tar.bz2) = 483ffa5b6b8579ba6b9776a4c9d4f874
+SIZE (gcin-0.8.4.tar.bz2) = 835825
diff --git a/chinese/gcin-devel/files/patch-Makefile b/chinese/gcin-devel/files/patch-Makefile
deleted file mode 100644
index 7ed2eaaa786..00000000000
--- a/chinese/gcin-devel/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig Tue Aug 3 13:56:59 2004
-+++ Makefile Tue Aug 17 20:21:44 2004
-@@ -68,7 +68,7 @@
- install -d $(libdir)/menu
- install -m 644 menu/* $(libdir)/menu
- $(MAKE) -C data install
-- if [ $(prefix) = /usr/local ]; then \
-+ if [ $(prefix) = /usr/local -a `uname` != FreeBSD ]; then \
- install -m 644 menu/* /usr/lib/menu; \
- which update-menus >& /dev/null && update-menus; \
- sh modify-XIM; \
diff --git a/chinese/gcin-devel/files/patch-configure b/chinese/gcin-devel/files/patch-configure
index 1ca3178f24d..9ceb4e8650e 100644
--- a/chinese/gcin-devel/files/patch-configure
+++ b/chinese/gcin-devel/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig Tue Aug 3 13:46:22 2004
-+++ configure Tue Aug 17 20:24:39 2004
-@@ -1,7 +1,7 @@
+--- configure.orig Sat Feb 26 10:40:57 2005
++++ configure Wed Mar 2 02:51:00 2005
+@@ -1,12 +1,12 @@
-#!/bin/bash
+#!/bin/sh
@@ -10,3 +10,9 @@
if [ $? = 0 ]; then
MAKE=gmake
fi
+
+-uname | grep FreeBSD >& /dev/null
++uname | grep FreeBSD > /dev/null
+ if [ $? = 0 ]; then
+ FREEBSD=1
+ else
diff --git a/chinese/gcin-devel/files/patch-gcin-im-client.c b/chinese/gcin-devel/files/patch-gcin-im-client.c
new file mode 100644
index 00000000000..55047683061
--- /dev/null
+++ b/chinese/gcin-devel/files/patch-gcin-im-client.c
@@ -0,0 +1,14 @@
+--- im-client/gcin-im-client.c.orig Sat Feb 26 10:39:12 2005
++++ im-client/gcin-im-client.c Wed Mar 2 02:54:55 2005
+@@ -68,11 +68,7 @@
+ save_old_sigaction_single(SIGCHLD, &ori_act);
+
+ if ((pid=fork())==0) {
+-#if FREEBSD
+ setgrp();
+-#else
+- setpgrp();
+-#endif
+ execl(execbin, "gcin", NULL);
+ } else {
+ sleep(1);
diff --git a/chinese/gcin-devel/files/patch-gcin-user-setup b/chinese/gcin-devel/files/patch-gcin-user-setup
new file mode 100644
index 00000000000..0f6915e341d
--- /dev/null
+++ b/chinese/gcin-devel/files/patch-gcin-user-setup
@@ -0,0 +1,8 @@
+--- scripts/gcin-user-setup.orig Thu Dec 23 11:20:56 2004
++++ scripts/gcin-user-setup Mon Jan 31 23:36:59 2005
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+
+ if [ -z "$1" ]; then
+ echo "please specify gcin table dir"
diff --git a/chinese/gcin-devel/files/patch-gcin-utf8-setup b/chinese/gcin-devel/files/patch-gcin-utf8-setup
new file mode 100644
index 00000000000..b04fc32f2ad
--- /dev/null
+++ b/chinese/gcin-devel/files/patch-gcin-utf8-setup
@@ -0,0 +1,8 @@
+--- scripts/gcin-utf8-setup.orig Tue Sep 28 09:19:26 2004
++++ scripts/gcin-utf8-setup Mon Jan 31 23:37:11 2005
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+
+ cd
+
diff --git a/chinese/gcin-devel/files/patch-im-srv.c b/chinese/gcin-devel/files/patch-im-srv.c
new file mode 100644
index 00000000000..f30f10b28bf
--- /dev/null
+++ b/chinese/gcin-devel/files/patch-im-srv.c
@@ -0,0 +1,11 @@
+--- im-srv/im-srv.c.orig Mon Feb 14 10:18:04 2005
++++ im-srv/im-srv.c Wed Mar 2 02:49:58 2005
+@@ -121,7 +121,7 @@
+ char sock_path[128];
+ get_gcin_im_srv_sock_path(sock_path, sizeof(sock_path));
+ strcpy(serv_addr.sun_path, sock_path);
+- servlen = strlen(serv_addr.sun_path) + sizeof(serv_addr.sun_family);
++ servlen = strlen(serv_addr.sun_path) + sizeof(serv_addr.sun_family) + 1;
+
+ dbg("-- %s\n",serv_addr.sun_path);
+ struct stat st;
diff --git a/chinese/gcin-devel/pkg-plist b/chinese/gcin-devel/pkg-plist
index 8a9b13fdd82..d268d94f818 100644
--- a/chinese/gcin-devel/pkg-plist
+++ b/chinese/gcin-devel/pkg-plist
@@ -6,14 +6,15 @@ bin/phod2a
bin/tsa2d
bin/tsd2a
bin/tslearn
+lib/gtk-2.0/immodules/im-gcin.so
lib/menu/gcin
-lib/menu/gcin.in
lib/menu/gcin-setup
-lib/menu/gcin-setup.in
%%DATADIR%%/script/gcin-user-setup
%%DATADIR%%/script/gcin-utf8-setup
+%%DATADIR%%/script/modify-XIM
%%DATADIR%%/table/ar30.gtab
%%DATADIR%%/table/cj.gtab
+%%DATADIR%%/table/dayi3.gtab
%%DATADIR%%/table/et.kbm
%%DATADIR%%/table/et-asdf.kbm
%%DATADIR%%/table/et26.kbm
@@ -21,8 +22,10 @@ lib/menu/gcin-setup.in
%%DATADIR%%/table/gtab.list
%%DATADIR%%/table/hsu.kbm
%%DATADIR%%/table/ibm.kbm
+%%DATADIR%%/table/jyutping.gtab
%%DATADIR%%/table/phrase.table
%%DATADIR%%/table/pho.tab
+%%DATADIR%%/table/pinyin.gtab
%%DATADIR%%/table/symbol-table
%%DATADIR%%/table/tsin
%%DATADIR%%/table/tsin.idx
diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index d0f94599a72..fd5191c5d06 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -6,13 +6,14 @@
#
PORTNAME= gcin
-PORTVERSION= 0.5.3
+PORTVERSION= 0.8.4
CATEGORIES= chinese
MASTER_SITES= http://www.csie.nctu.edu.tw/~cp76/gcin/download/
MAINTAINER= statue@freebsd.netlab.cse.yzu.edu.tw
COMMENT= A triditional chinese input utility in X
+USE_X_PREFIX= YES
USE_BZIP2= YES
GNU_CONFIGURE= YES
USE_GNOME= gtk20
diff --git a/chinese/gcin/distinfo b/chinese/gcin/distinfo
index a49f1d84acd..c03534690b0 100644
--- a/chinese/gcin/distinfo
+++ b/chinese/gcin/distinfo
@@ -1,2 +1,2 @@
-MD5 (gcin-0.5.3.tar.bz2) = e00385174417b73ebd7f6f5d305d8040
-SIZE (gcin-0.5.3.tar.bz2) = 544993
+MD5 (gcin-0.8.4.tar.bz2) = 483ffa5b6b8579ba6b9776a4c9d4f874
+SIZE (gcin-0.8.4.tar.bz2) = 835825
diff --git a/chinese/gcin/files/patch-Makefile b/chinese/gcin/files/patch-Makefile
deleted file mode 100644
index 7ed2eaaa786..00000000000
--- a/chinese/gcin/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig Tue Aug 3 13:56:59 2004
-+++ Makefile Tue Aug 17 20:21:44 2004
-@@ -68,7 +68,7 @@
- install -d $(libdir)/menu
- install -m 644 menu/* $(libdir)/menu
- $(MAKE) -C data install
-- if [ $(prefix) = /usr/local ]; then \
-+ if [ $(prefix) = /usr/local -a `uname` != FreeBSD ]; then \
- install -m 644 menu/* /usr/lib/menu; \
- which update-menus >& /dev/null && update-menus; \
- sh modify-XIM; \
diff --git a/chinese/gcin/files/patch-configure b/chinese/gcin/files/patch-configure
index 1ca3178f24d..9ceb4e8650e 100644
--- a/chinese/gcin/files/patch-configure
+++ b/chinese/gcin/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig Tue Aug 3 13:46:22 2004
-+++ configure Tue Aug 17 20:24:39 2004
-@@ -1,7 +1,7 @@
+--- configure.orig Sat Feb 26 10:40:57 2005
++++ configure Wed Mar 2 02:51:00 2005
+@@ -1,12 +1,12 @@
-#!/bin/bash
+#!/bin/sh
@@ -10,3 +10,9 @@
if [ $? = 0 ]; then
MAKE=gmake
fi
+
+-uname | grep FreeBSD >& /dev/null
++uname | grep FreeBSD > /dev/null
+ if [ $? = 0 ]; then
+ FREEBSD=1
+ else
diff --git a/chinese/gcin/files/patch-gcin-im-client.c b/chinese/gcin/files/patch-gcin-im-client.c
new file mode 100644
index 00000000000..55047683061
--- /dev/null
+++ b/chinese/gcin/files/patch-gcin-im-client.c
@@ -0,0 +1,14 @@
+--- im-client/gcin-im-client.c.orig Sat Feb 26 10:39:12 2005
++++ im-client/gcin-im-client.c Wed Mar 2 02:54:55 2005
+@@ -68,11 +68,7 @@
+ save_old_sigaction_single(SIGCHLD, &ori_act);
+
+ if ((pid=fork())==0) {
+-#if FREEBSD
+ setgrp();
+-#else
+- setpgrp();
+-#endif
+ execl(execbin, "gcin", NULL);
+ } else {
+ sleep(1);
diff --git a/chinese/gcin/files/patch-gcin-user-setup b/chinese/gcin/files/patch-gcin-user-setup
new file mode 100644
index 00000000000..0f6915e341d
--- /dev/null
+++ b/chinese/gcin/files/patch-gcin-user-setup
@@ -0,0 +1,8 @@
+--- scripts/gcin-user-setup.orig Thu Dec 23 11:20:56 2004
++++ scripts/gcin-user-setup Mon Jan 31 23:36:59 2005
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+
+ if [ -z "$1" ]; then
+ echo "please specify gcin table dir"
diff --git a/chinese/gcin/files/patch-gcin-utf8-setup b/chinese/gcin/files/patch-gcin-utf8-setup
new file mode 100644
index 00000000000..b04fc32f2ad
--- /dev/null
+++ b/chinese/gcin/files/patch-gcin-utf8-setup
@@ -0,0 +1,8 @@
+--- scripts/gcin-utf8-setup.orig Tue Sep 28 09:19:26 2004
++++ scripts/gcin-utf8-setup Mon Jan 31 23:37:11 2005
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+
+ cd
+
diff --git a/chinese/gcin/files/patch-im-srv.c b/chinese/gcin/files/patch-im-srv.c
new file mode 100644
index 00000000000..f30f10b28bf
--- /dev/null
+++ b/chinese/gcin/files/patch-im-srv.c
@@ -0,0 +1,11 @@
+--- im-srv/im-srv.c.orig Mon Feb 14 10:18:04 2005
++++ im-srv/im-srv.c Wed Mar 2 02:49:58 2005
+@@ -121,7 +121,7 @@
+ char sock_path[128];
+ get_gcin_im_srv_sock_path(sock_path, sizeof(sock_path));
+ strcpy(serv_addr.sun_path, sock_path);
+- servlen = strlen(serv_addr.sun_path) + sizeof(serv_addr.sun_family);
++ servlen = strlen(serv_addr.sun_path) + sizeof(serv_addr.sun_family) + 1;
+
+ dbg("-- %s\n",serv_addr.sun_path);
+ struct stat st;
diff --git a/chinese/gcin/pkg-plist b/chinese/gcin/pkg-plist
index 8a9b13fdd82..d268d94f818 100644
--- a/chinese/gcin/pkg-plist
+++ b/chinese/gcin/pkg-plist
@@ -6,14 +6,15 @@ bin/phod2a
bin/tsa2d
bin/tsd2a
bin/tslearn
+lib/gtk-2.0/immodules/im-gcin.so
lib/menu/gcin
-lib/menu/gcin.in
lib/menu/gcin-setup
-lib/menu/gcin-setup.in
%%DATADIR%%/script/gcin-user-setup
%%DATADIR%%/script/gcin-utf8-setup
+%%DATADIR%%/script/modify-XIM
%%DATADIR%%/table/ar30.gtab
%%DATADIR%%/table/cj.gtab
+%%DATADIR%%/table/dayi3.gtab
%%DATADIR%%/table/et.kbm
%%DATADIR%%/table/et-asdf.kbm
%%DATADIR%%/table/et26.kbm
@@ -21,8 +22,10 @@ lib/menu/gcin-setup.in
%%DATADIR%%/table/gtab.list
%%DATADIR%%/table/hsu.kbm
%%DATADIR%%/table/ibm.kbm
+%%DATADIR%%/table/jyutping.gtab
%%DATADIR%%/table/phrase.table
%%DATADIR%%/table/pho.tab
+%%DATADIR%%/table/pinyin.gtab
%%DATADIR%%/table/symbol-table
%%DATADIR%%/table/tsin
%%DATADIR%%/table/tsin.idx