8 files changed, 30 insertions, 44 deletions

diff --git a/chinese/gcin-devel/Makefile b/chinese/gcin-devel/Makefile
index 95657446d9da..ae04e55b91d4 100644
--- a/chinese/gcin-devel/Makefile
+++ b/chinese/gcin-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	1.2.7
+PORTVERSION=	1.2.8
 PORTREVISION=	3
 CATEGORIES=	chinese textproc gnome
 MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/:main \
@@ -20,7 +20,7 @@ COMMENT=	A traditional chinese input utility in X
 
 USE_BZIP2=	YES
 GNU_CONFIGURE=	YES
-USE_GNOME=	gtk20 gnomecontrolcenter2 gnomehier
+USE_GNOME=	gtk20
 USE_GMAKE=	YES
 USE_GCC=	3.4+
 INSTALLS_ICONS=	YES
@@ -44,24 +44,20 @@ post-extract:
 .endif
 
 pre-patch:
-	@${REINPLACE_CMD} -e 's,gcin.png,${PREFIX}/share/icons/gcin.png,' \
-		${WRKSRC}/menu/gcin-setup.desktop
 	@${REINPLACE_CMD} -e 's/&//; s/bash/sh/; \
 		s/QT_IM_DIR=\/usr/QT_IM_DIR=$$prefix/; \
 		s/mandir=$$datadir/mandir=$$prefix/; \
-		s/\/usr\/share/$$prefix\/share/; \
+		s/\/usr\/share/$$prefix\/share/; 151 s,/gcin,,; \
 		123,124 s/control-center-2\.0/gnome\/control-center-2\.0/g; \
 		s/gcc/$$CC/; s/gcin-$$GCIN_VERSION/gcin/' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's,\/usr\/share,$$(prefix)\/share,' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's/qsort/mergesort/' ${WRKSRC}/gcin2tab.c
+	@${REINPLACE_CMD} -e 's,qsort,mergesort,' ${WRKSRC}/gcin2tab.c
 	@${REINPLACE_CMD} -e 's|/usr/local|/usr|g' \
-	    	${WRKSRC}/gtk-im/Makefile \
-		${WRKSRC}/menu/Makefile
-	@${REINPLACE_CMD} -e '28,29 d' ${WRKSRC}/im-client/Makefile
+	    	${WRKSRC}/gtk-im/Makefile ${WRKSRC}/menu/Makefile
 	@${REINPLACE_CMD} -e 's/modify-XIM //; 8,10 d' ${WRKSRC}/scripts/Makefile
-	@${REINPLACE_CMD} -e 's/bash/sh/; s/&//;' ${WRKSRC}/scripts/gcin-user-setup
 	@${REINPLACE_CMD} -e 's/bash/sh/; s/&//; s/opt\/gnome/usr\/X11R6/;' \
-		${WRKSRC}/scripts/utf8-edit
+		${WRKSRC}/scripts/utf8-edit ${WRKSRC}/scripts/gcin-user-setup
+	@${REINPLACE_CMD} -e 's,wget,fetch,' ${WRKSRC}/scripts/noseeing-inst
 	@${REINPLACE_CMD} -e 's,gcin-im-client.h,im-client/gcin-im-client.h,' \
 		${WRKSRC}/gtk-im/gtkimcontextgcin.c
 
diff --git a/chinese/gcin-devel/distinfo b/chinese/gcin-devel/distinfo
index f3a2530b90a5..c546fcb9ad79 100644
--- a/chinese/gcin-devel/distinfo
+++ b/chinese/gcin-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (gcin-1.2.7.tar.bz2) = ccd064960c5eba861020ed7efc640f7e
-SHA256 (gcin-1.2.7.tar.bz2) = 45d7852a76d8b3aee64744013d0ae44e940e85033b79f00d8b0890db77150a13
-SIZE (gcin-1.2.7.tar.bz2) = 1541388
+MD5 (gcin-1.2.8.tar.bz2) = d4940efa38b3b3206f4d936104e2b37c
+SHA256 (gcin-1.2.8.tar.bz2) = 9b6702084d125fbdbc68a8d2bbb17938242dd855c25b3163514fd5e9331149de
+SIZE (gcin-1.2.8.tar.bz2) = 1542707
 MD5 (noseeing-6.tar.gz) = c67e5c85b2805f12bb2f092dfa1814b7
 SHA256 (noseeing-6.tar.gz) = 2f240c8dbb15c2249dff74102842bbccfe307a721cf2c092c75dc6234e470f9b
 SIZE (noseeing-6.tar.gz) = 400429
diff --git a/chinese/gcin-devel/files/patch-menu b/chinese/gcin-devel/files/patch-menu
index acda831cfa80..ffe2df8dd9f4 100644
--- a/chinese/gcin-devel/files/patch-menu
+++ b/chinese/gcin-devel/files/patch-menu
@@ -1,6 +1,6 @@
---- menu/Makefile.orig	Sun Aug 28 21:40:32 2005
-+++ menu/Makefile	Fri Oct 13 14:43:28 2006
-@@ -10,14 +10,14 @@ install:
+--- 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; \
  	   install -m 644 $(MENUS) /usr/lib/menu; \
@@ -15,10 +15,6 @@
 -	   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 --git a/chinese/gcin-devel/pkg-plist b/chinese/gcin-devel/pkg-plist
index 35f354e7ce63..2f6cc8741bac 100644
--- a/chinese/gcin-devel/pkg-plist
+++ b/chinese/gcin-devel/pkg-plist
@@ -14,8 +14,10 @@ bin/tsd2a32
 bin/tslearn
 include/gcin-im-client.h
 lib/gtk-2.0/immodules/im-gcin.so
+lib/gcin1.so
 lib/libgcin-im-client.so
 %%DATADIR%%/script/gcin-user-setup
+%%DATADIR%%/script/noseeing-inst
 %%DATADIR%%/script/utf8-edit
 %%DATADIR%%/table/ar30.gtab
 %%DATADIR%%/table/cj-punc.gtab
@@ -52,7 +54,6 @@ lib/libgcin-im-client.so
 %%PORTDOCS%%%%DOCSDIR%%/README
 share/applications/gcin
 share/applications/gcin-setup
-share/gnome/control-center-2.0/capplets/gcin-setup.desktop
 share/icons/gcin/gcin-tray.png
 share/icons/gcin/greek.png
 share/icons/gcin/tsin.png
diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index 95657446d9da..ae04e55b91d4 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	1.2.7
+PORTVERSION=	1.2.8
 PORTREVISION=	3
 CATEGORIES=	chinese textproc gnome
 MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/:main \
@@ -20,7 +20,7 @@ COMMENT=	A traditional chinese input utility in X
 
 USE_BZIP2=	YES
 GNU_CONFIGURE=	YES
-USE_GNOME=	gtk20 gnomecontrolcenter2 gnomehier
+USE_GNOME=	gtk20
 USE_GMAKE=	YES
 USE_GCC=	3.4+
 INSTALLS_ICONS=	YES
@@ -44,24 +44,20 @@ post-extract:
 .endif
 
 pre-patch:
-	@${REINPLACE_CMD} -e 's,gcin.png,${PREFIX}/share/icons/gcin.png,' \
-		${WRKSRC}/menu/gcin-setup.desktop
 	@${REINPLACE_CMD} -e 's/&//; s/bash/sh/; \
 		s/QT_IM_DIR=\/usr/QT_IM_DIR=$$prefix/; \
 		s/mandir=$$datadir/mandir=$$prefix/; \
-		s/\/usr\/share/$$prefix\/share/; \
+		s/\/usr\/share/$$prefix\/share/; 151 s,/gcin,,; \
 		123,124 s/control-center-2\.0/gnome\/control-center-2\.0/g; \
 		s/gcc/$$CC/; s/gcin-$$GCIN_VERSION/gcin/' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's,\/usr\/share,$$(prefix)\/share,' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's/qsort/mergesort/' ${WRKSRC}/gcin2tab.c
+	@${REINPLACE_CMD} -e 's,qsort,mergesort,' ${WRKSRC}/gcin2tab.c
 	@${REINPLACE_CMD} -e 's|/usr/local|/usr|g' \
-	    	${WRKSRC}/gtk-im/Makefile \
-		${WRKSRC}/menu/Makefile
-	@${REINPLACE_CMD} -e '28,29 d' ${WRKSRC}/im-client/Makefile
+	    	${WRKSRC}/gtk-im/Makefile ${WRKSRC}/menu/Makefile
 	@${REINPLACE_CMD} -e 's/modify-XIM //; 8,10 d' ${WRKSRC}/scripts/Makefile
-	@${REINPLACE_CMD} -e 's/bash/sh/; s/&//;' ${WRKSRC}/scripts/gcin-user-setup
 	@${REINPLACE_CMD} -e 's/bash/sh/; s/&//; s/opt\/gnome/usr\/X11R6/;' \
-		${WRKSRC}/scripts/utf8-edit
+		${WRKSRC}/scripts/utf8-edit ${WRKSRC}/scripts/gcin-user-setup
+	@${REINPLACE_CMD} -e 's,wget,fetch,' ${WRKSRC}/scripts/noseeing-inst
 	@${REINPLACE_CMD} -e 's,gcin-im-client.h,im-client/gcin-im-client.h,' \
 		${WRKSRC}/gtk-im/gtkimcontextgcin.c
 
diff --git a/chinese/gcin/distinfo b/chinese/gcin/distinfo
index f3a2530b90a5..c546fcb9ad79 100644
--- a/chinese/gcin/distinfo
+++ b/chinese/gcin/distinfo
@@ -1,6 +1,6 @@
-MD5 (gcin-1.2.7.tar.bz2) = ccd064960c5eba861020ed7efc640f7e
-SHA256 (gcin-1.2.7.tar.bz2) = 45d7852a76d8b3aee64744013d0ae44e940e85033b79f00d8b0890db77150a13
-SIZE (gcin-1.2.7.tar.bz2) = 1541388
+MD5 (gcin-1.2.8.tar.bz2) = d4940efa38b3b3206f4d936104e2b37c
+SHA256 (gcin-1.2.8.tar.bz2) = 9b6702084d125fbdbc68a8d2bbb17938242dd855c25b3163514fd5e9331149de
+SIZE (gcin-1.2.8.tar.bz2) = 1542707
 MD5 (noseeing-6.tar.gz) = c67e5c85b2805f12bb2f092dfa1814b7
 SHA256 (noseeing-6.tar.gz) = 2f240c8dbb15c2249dff74102842bbccfe307a721cf2c092c75dc6234e470f9b
 SIZE (noseeing-6.tar.gz) = 400429
diff --git a/chinese/gcin/files/patch-menu b/chinese/gcin/files/patch-menu
index acda831cfa80..ffe2df8dd9f4 100644
--- a/chinese/gcin/files/patch-menu
+++ b/chinese/gcin/files/patch-menu
@@ -1,6 +1,6 @@
---- menu/Makefile.orig	Sun Aug 28 21:40:32 2005
-+++ menu/Makefile	Fri Oct 13 14:43:28 2006
-@@ -10,14 +10,14 @@ install:
+--- 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; \
  	   install -m 644 $(MENUS) /usr/lib/menu; \
@@ -15,10 +15,6 @@
 -	   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 --git a/chinese/gcin/pkg-plist b/chinese/gcin/pkg-plist
index 35f354e7ce63..2f6cc8741bac 100644
--- a/chinese/gcin/pkg-plist
+++ b/chinese/gcin/pkg-plist
@@ -14,8 +14,10 @@ bin/tsd2a32
 bin/tslearn
 include/gcin-im-client.h
 lib/gtk-2.0/immodules/im-gcin.so
+lib/gcin1.so
 lib/libgcin-im-client.so
 %%DATADIR%%/script/gcin-user-setup
+%%DATADIR%%/script/noseeing-inst
 %%DATADIR%%/script/utf8-edit
 %%DATADIR%%/table/ar30.gtab
 %%DATADIR%%/table/cj-punc.gtab
@@ -52,7 +54,6 @@ lib/libgcin-im-client.so
 %%PORTDOCS%%%%DOCSDIR%%/README
 share/applications/gcin
 share/applications/gcin-setup
-share/gnome/control-center-2.0/capplets/gcin-setup.desktop
 share/icons/gcin/gcin-tray.png
 share/icons/gcin/greek.png
 share/icons/gcin/tsin.png