Upgrade to 1.0.4.

PR:		ports/84803
Submitted by:	chinsan at gmail dot com

10 files changed, 85 insertions, 120 deletions

diff --git a/chinese/gcin-devel/Makefile b/chinese/gcin-devel/Makefile
index 636876a4a932..6f443916bb71 100644
--- a/chinese/gcin-devel/Makefile
+++ b/chinese/gcin-devel/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTVERSION=	1.0.4
+PORTREVISION=	0
 CATEGORIES=	chinese
 MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/ \
 		http://edt1023.sayya.org/gcin/source/ \
@@ -26,12 +26,13 @@ USE_BZIP2=	YES
 GNU_CONFIGURE=	YES
 USE_GNOME=	gtk20
 USE_GMAKE=	YES
+USE_REINPLACE=	YES
 
 MAN1=		gcin.1 gcin2tab.1
 
 .include <bsd.port.pre.mk>
 
-pre-everything::
+pre-extract:
 	@${ECHO_MSG} ''
 	@${ECHO_MSG} 'gcin has the following tunable option:'
 	@${ECHO_MSG} '    WITH_BOSHIAMY  - enable Boshiamy support'
@@ -48,9 +49,10 @@ IGNOREFILES=	${BOSHIAMYFILE}
 GCINFILE=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 BOSHIAMYFILE=	noseeing.tar.gz
 post-extract:
-	@cd ${WRKSRC}/data/ \
-		&& ${TAR} -zxf ${DISTDIR}/${BOSHIAMYFILE} \
-		&& ${RM} -f noseeing.gtab
+	@${TAR} -C ${WRKSRC}/data/ -zxf ${DISTDIR}/${BOSHIAMYFILE} \
+		noseeing.cin
+	@${REINPLACE_CMD} -e 's,cj.gtab,cj.gtab noseeing.gtab,' \
+		${WRKSRC}/data/Makefile
 post-patch:
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-data-Makefile
 PLIST_SUB+=	BOSHIAMY=""
@@ -58,6 +60,10 @@ PLIST_SUB+=	BOSHIAMY=""
 PLIST_SUB+=	BOSHIAMY="@comment "
 .endif
 
+pre-configure:
+	@${REINPLACE_CMD} -e 's,gcin.png,${PREFIX}/share/icons/gcin.png,' \
+		${WRKSRC}/menu/gcin-setup.desktop
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/chinese/gcin-devel/distinfo b/chinese/gcin-devel/distinfo
index 91e4c04cf7ea..c3acb786af03 100644
--- a/chinese/gcin-devel/distinfo
+++ b/chinese/gcin-devel/distinfo
@@ -1,3 +1,2 @@
-MD5 (gcin-1.0.1.tar.bz2) = 373deb6d7a96870da78f885f1866434e
-SIZE (gcin-1.0.1.tar.bz2) = 1302491
-MD5 (noseeing.tar.gz) = IGNORE
+MD5 (gcin-1.0.4.tar.bz2) = e0ed93c70222427fd1b1c722e3f57b99
+SIZE (gcin-1.0.4.tar.bz2) = 1286644
diff --git a/chinese/gcin-devel/files/extra-patch-data-Makefile b/chinese/gcin-devel/files/extra-patch-data-Makefile
deleted file mode 100644
index ce1c12f477cb..000000000000
--- a/chinese/gcin-devel/files/extra-patch-data-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/Makefile.orig	Tue Jul 12 09:56:10 2005
-+++ data/Makefile	Tue Jul 12 09:56:10 2005
-@@ -5,7 +5,7 @@
- DATA=pho.tab tsin.idx \
-      cj.gtab ar30.gtab dayi3.gtab pinyin.gtab jyutping.gtab cj5.gtab \
-      et.kbm et-asdf.kbm et26.kbm et26-asdf.kbm zo.kbm zo-asdf.kbm \
--     ibm.kbm tsin hsu.kbm pho-huge.tab simplex.gtab kana-nippon.gtab greek.gtab
-+     ibm.kbm tsin hsu.kbm pho-huge.tab simplex.gtab kana-nippon.gtab greek.gtab noseeing.gtab
- DATAKEEP=symbol-table gtab.list phrase.table
- 
- all:	$(DATA)
diff --git a/chinese/gcin-devel/files/patch-gcin-user-setup b/chinese/gcin-devel/files/patch-gcin-user-setup
deleted file mode 100644
index 0f6915e341db..000000000000
--- a/chinese/gcin-devel/files/patch-gcin-user-setup
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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
deleted file mode 100644
index b04fc32f2adc..000000000000
--- a/chinese/gcin-devel/files/patch-gcin-utf8-setup
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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-menu b/chinese/gcin-devel/files/patch-menu
index 6a6a1f4b692d..2acd2a1f3036 100644
--- a/chinese/gcin-devel/files/patch-menu
+++ b/chinese/gcin-devel/files/patch-menu
@@ -1,74 +1,21 @@
-diff -ruN menu.orig/Makefile menu/Makefile
---- menu.orig/Makefile	Wed Feb  9 15:55:03 2005
-+++ menu/Makefile	Mon Apr 18 07:56:45 2005
-@@ -1,4 +1,4 @@
--MENUS = gcin gcin-setup
-+MENUS = gcin.desktop gcin-setup.desktop
- 
- include ../config.mak
- 
-@@ -10,8 +10,8 @@
+--- menu/Makefile.orig	Mon Aug 29 09:40:32 2005
++++ menu/Makefile	Thu Sep 15 11:53:49 2005
+@@ -12,12 +12,12 @@
  	   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; \
 +	   install -d $(prefix)/share/applications; \
 +	   install -m 644 $(MENUS) $(prefix)/share/applications; \
++	   echo "install Gnome's control center panel ..."; \
++	   install -d $(datadir)/gnome/control-center-2.0/capplets; \
++	   install -m 644 gcin-setup.desktop $(datadir)/gnome/control-center-2.0/capplets; \
++	   echo "installing Other common wm(ie:xfce4)'s menu panel ..."; \
  	fi
  clean:
  	rm -f $(MENUS) *~
-diff -ruN menu.orig/gcin menu/gcin
---- menu.orig/gcin	Fri Apr 15 09:12:37 2005
-+++ menu/gcin	Thu Jan  1 08:00:00 1970
-@@ -1 +0,0 @@
--?package(gcin): icon="gcin.png" title="gcin" longtitle="gcin chinese input method" needs="x11" section="Chinese" command="/usr/local/bin/gcin"
-diff -ruN menu.orig/gcin-setup menu/gcin-setup
---- menu.orig/gcin-setup	Fri Apr 15 09:12:37 2005
-+++ menu/gcin-setup	Thu Jan  1 08:00:00 1970
-@@ -1 +0,0 @@
--?package(gcin): icon="gcin.png" title="gcin-setup 設定" longtitle="gcin-setup 設定" needs="x11" section="Chinese" command="/usr/local/bin/gcin-setup"
-diff -ruN menu.orig/gcin-setup.desktop.in menu/gcin-setup.desktop.in
---- menu.orig/gcin-setup.desktop.in	Thu Jan  1 08:00:00 1970
-+++ menu/gcin-setup.desktop.in	Mon Apr 18 07:56:45 2005
-@@ -0,0 +1,13 @@
-+[Desktop Entry]
-+Categories=Application;Settings;
-+Encoding=UTF-8
-+Type=Application
-+Name=gcin-setup
-+Exec=gcin-setup -caption "%c" %i %m %u
-+GenericName=gcin-setup
-+GenericName[zh_CN]=gcin-setup 設定 gcin
-+GenericName[zh_TW]=gcin-setup 設定 gcin
-+Comment=gcin-setup 設定 gcin
-+MimeTypes=
-+Terminal=false
-+Icon=/usr/X11R6/share/icons/gcin.png
-diff -ruN menu.orig/gcin-setup.in menu/gcin-setup.in
---- menu.orig/gcin-setup.in	Thu Nov 11 15:54:50 2004
-+++ menu/gcin-setup.in	Thu Jan  1 08:00:00 1970
-@@ -1 +0,0 @@
--?package(gcin): icon="gcin.png" title="gcin-setup 設定" longtitle="gcin-setup 設定" needs="x11" section="Chinese" command="/usr/local/bin/gcin-setup"
-diff -ruN menu.orig/gcin.desktop.in menu/gcin.desktop.in
---- menu.orig/gcin.desktop.in	Thu Jan  1 08:00:00 1970
-+++ menu/gcin.desktop.in	Mon Apr 18 07:56:45 2005
-@@ -0,0 +1,13 @@
-+[Desktop Entry]
-+Categories=Application;System;Utility;
-+Encoding=UTF-8
-+Type=Application
-+Name=gcin
-+Exec=gcin -caption "%c" %i %m %u
-+GenericName=gcin chinese input method
-+GenericName[zh_CN]=gcin 輸入法
-+GenericName[zh_TW]=gcin 輸入法
-+Comment=A triditional chinese input utility in X
-+MimeTypes=
-+Terminal=false
-+Icon=/usr/X11R6/share/icons/gcin.png
-diff -ruN menu.orig/gcin.in menu/gcin.in
---- menu.orig/gcin.in	Thu Nov 11 15:53:01 2004
-+++ menu/gcin.in	Thu Jan  1 08:00:00 1970
-@@ -1 +0,0 @@
--?package(gcin): icon="gcin.png" title="gcin" longtitle="gcin chinese input method" needs="x11" section="Chinese" command="/usr/local/bin/gcin"
diff --git a/chinese/gcin-devel/files/patch-script b/chinese/gcin-devel/files/patch-script
new file mode 100644
index 000000000000..952b1d1c7836
--- /dev/null
+++ b/chinese/gcin-devel/files/patch-script
@@ -0,0 +1,53 @@
+diff -ruN scripts.orig/Makefile scripts/Makefile
+--- scripts.orig/Makefile	Thu Aug 11 22:03:33 2005
++++ scripts/Makefile	Thu Aug 11 22:04:10 2005
+@@ -1,13 +1,10 @@
+ include ../config.mak
+ 
+-SCRIPTS=gcin-user-setup gcin-utf8-setup modify-XIM utf8-edit
++SCRIPTS=gcin-user-setup gcin-utf8-setup utf8-edit
+ 
+ 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 -ruN scripts.orig/gcin-user-setup scripts/gcin-user-setup
+--- scripts.orig/gcin-user-setup	Thu Aug 11 22:03:33 2005
++++ scripts/gcin-user-setup	Thu Aug 11 22:03:40 2005
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ if [ -z "$1" -o -z "$2" ]; then
+   echo "please specify gcin_table_dir gcin_bin_dir"
+diff -ruN scripts.orig/gcin-utf8-setup scripts/gcin-utf8-setup
+--- scripts.orig/gcin-utf8-setup	Thu Aug 11 22:03:33 2005
++++ scripts/gcin-utf8-setup	Thu Aug 11 22:03:40 2005
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ cd
+ 
+diff -ruN scripts.orig/utf8-edit scripts/utf8-edit
+--- scripts.orig/utf8-edit	Thu Aug 11 22:03:33 2005
++++ scripts/utf8-edit	Thu Aug 11 22:15:12 2005
+@@ -1,10 +1,10 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ PATH=$PATH:/opt/gnome/bin:/usr/local/bin
+ 
+-for i in gedit kedit kate
++for i in gedit leafpad kedit kate gvim vim jedit
+ do
+-  which $i >& /dev/null
++  which $i > /dev/null
+   if [ $? = 0 ]; then
+     UTF8ED=$i
+     break
diff --git a/chinese/gcin-devel/files/patch-utf8-edit b/chinese/gcin-devel/files/patch-utf8-edit
deleted file mode 100644
index bd55dbb484d3..000000000000
--- a/chinese/gcin-devel/files/patch-utf8-edit
+++ /dev/null
@@ -1,15 +0,0 @@
---- scripts/utf8-edit.orig	Tue Mar  8 01:06:46 2005
-+++ scripts/utf8-edit	Tue Mar  8 01:07:08 2005
-@@ -1,10 +1,10 @@
--#!/bin/bash
-+#!/bin/sh
- 
- PATH=$PATH:/opt/gnome/bin:/usr/local/bin
- 
- for i in gedit kedit kate
- do
--  which $i >& /dev/null
-+  which $i > /dev/null
-   if [ $? = 0 ]; then
-     UTF8ED=$i
-     break
diff --git a/chinese/gcin-devel/pkg-message b/chinese/gcin-devel/pkg-message
index 942cd58a0e5d..92fe31db5589 100644
--- a/chinese/gcin-devel/pkg-message
+++ b/chinese/gcin-devel/pkg-message
@@ -4,7 +4,6 @@ Remember to set environment varible:
   (csh/tcsh) 				(sh/bash)
   setenv XMODIFIERS @im=xcin		export XMODIFIERS='@im=xcin'
   setenv GTK_IM_MODULE xim		export GTK_IM_MODULE=xim
-  setenv QT_IM_SWITCHER imsw-multi	export QT_IM_SWITCHER=imsw-multi
   setenv QT_IM_MODULE xim		export QT_IM_MODULE=xim
 
 and set LANG, LC_CTYPE to one of zh_TW.UTF-8, zh_TW.Big5 value:
diff --git a/chinese/gcin-devel/pkg-plist b/chinese/gcin-devel/pkg-plist
index ec5949249dba..5c32f15e6ac1 100644
--- a/chinese/gcin-devel/pkg-plist
+++ b/chinese/gcin-devel/pkg-plist
@@ -11,7 +11,6 @@ lib/gtk-2.0/immodules/im-gcin.so
 lib/libgcin-im-client.so
 %%DATADIR%%/script/gcin-user-setup
 %%DATADIR%%/script/gcin-utf8-setup
-%%DATADIR%%/script/modify-XIM
 %%DATADIR%%/script/utf8-edit
 %%DATADIR%%/table/ar30.gtab
 %%DATADIR%%/table/cj.gtab
@@ -40,15 +39,19 @@ lib/libgcin-im-client.so
 %%DATADIR%%/table/zo-asdf.kbm
 %%PORTDOCS%%%%DOCSDIR%%/Changelog
 %%PORTDOCS%%%%DOCSDIR%%/README
-share/applications/gcin.desktop
-share/applications/gcin-setup.desktop
+share/applications/gcin
+share/applications/gcin-setup
+share/gnome/control-center-2.0/capplets/gcin-setup.desktop
 share/icons/gcin.png
 share/icons/gcin/pin-fixed24.png
 share/icons/gcin/pin-float16.png
 %%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%%  2>/dev/null || true
 @unexec rmdir %D/share/icons/gcin  2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
 @unexec rmdir %D/share/icons 2>/dev/null || true
+@unexec rmdir %D/share/gnome/control-center-2.0/capplets 2>/dev/null || true
+@unexec rmdir %D/share/gnome/control-center-2.0 2>/dev/null || true
+@unexec rmdir %D/share/gnome 2>/dev/null || true
+@unexec rmdir %D/share/applications 2>/dev/null || true
 @unexec rmdir %D/%%DATADIR%%/table 2>/dev/null || true
 @unexec rmdir %D/%%DATADIR%%/script 2>/dev/null || true
 @unexec rmdir %D/%%DATADIR%% 2>/dev/null || true