12 files changed, 96 insertions, 56 deletions

diff --git a/chinese/gcin-devel/Makefile b/chinese/gcin-devel/Makefile
index 82d8e0be94d4..f485d98984a4 100644
--- a/chinese/gcin-devel/Makefile
+++ b/chinese/gcin-devel/Makefile
@@ -6,9 +6,14 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	0.9.5
+PORTVERSION=	0.9.6
 CATEGORIES=	chinese
-MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/
+MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/ \
+		http://edt1023.sayya.org/misc/
+.if defined(WITH_BOSHIAMY)
+DISTFILES=	${GCINFILE} ${BOSHIAMYFILE}
+EXTRACT_ONLY=	${GCINFILE}
+.endif
 
 MAINTAINER=	statue@freebsd.netlab.cse.yzu.edu.tw
 COMMENT=	A traditional chinese input utility in X
@@ -18,13 +23,34 @@ USE_BZIP2=	YES
 GNU_CONFIGURE=	YES
 USE_GNOME=	gtk20
 USE_GMAKE=	YES
+PLIST_SUB+=	BOSHIAMY="@comment "
 
 .include <bsd.port.pre.mk>
 
+pre-everything::
+	@${ECHO_MSG} ''
+	@${ECHO_MSG} 'gcin has the following tunable option:'
+	@${ECHO_MSG} '    WITH_BOSHIAMY  - enable Boshiamy support'
+	@${ECHO_MSG} ''
+	@${ECHO_MSG} 'Example:  "make WITH_BOSHIAMY=yes install clean" '
+	@${ECHO_MSG} ''
+
 .if ${OSVERSION} <= 500034
 USE_GCC=	3.4
 .endif
 
+.if defined(WITH_BOSHIAMY)
+GCINFILE=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
+BOSHIAMYFILE=	noseeing-${BOSHIAMYVER}.tar.gz
+BOSHIAMYVER=	3
+post-extract:
+	@cd ${WRKSRC}/data/ \
+		&& ${TAR} -zxf ${DISTDIR}/${BOSHIAMYFILE}
+post-patch:
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-data-Makefile
+PLIST_SUB+=	BOSHIAMY=""
+.endif
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/chinese/gcin-devel/distinfo b/chinese/gcin-devel/distinfo
index 0906a74231c9..31092a61c1c2 100644
--- a/chinese/gcin-devel/distinfo
+++ b/chinese/gcin-devel/distinfo
@@ -1,2 +1,4 @@
-MD5 (gcin-0.9.5.tar.bz2) = b3d5be7313894957fc49b0593197e553
-SIZE (gcin-0.9.5.tar.bz2) = 1166960
+MD5 (gcin-0.9.6.tar.bz2) = ce72ffd4eaf7c031fc1818e44f2229c7
+SIZE (gcin-0.9.6.tar.bz2) = 1167858
+MD5 (noseeing-3.tar.gz) = ca699328fc8e280d970498c3c0e9b34b
+SIZE (noseeing-3.tar.gz) = 391948
diff --git a/chinese/gcin-devel/files/extra-patch-data-Makefile b/chinese/gcin-devel/files/extra-patch-data-Makefile
new file mode 100644
index 000000000000..05c262113829
--- /dev/null
+++ b/chinese/gcin-devel/files/extra-patch-data-Makefile
@@ -0,0 +1,11 @@
+--- data/Makefile.orig	Wed May 18 11:49:00 2005
++++ data/Makefile	Wed May 18 11:49:00 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
++     ibm.kbm tsin hsu.kbm pho-huge.tab simplex.gtab noseeing.gtab
+ DATAKEEP=symbol-table gtab.list phrase.table
+ 
+ all:	$(DATA)
diff --git a/chinese/gcin-devel/files/patch-about.c b/chinese/gcin-devel/files/patch-about.c
deleted file mode 100644
index 132e8ab2b31f..000000000000
--- a/chinese/gcin-devel/files/patch-about.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- about.c.orig	Sat Feb 26 21:42:00 2005
-+++ about.c	Thu May 12 04:02:17 2005
-@@ -69,10 +69,16 @@
-     gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 3);
- 
-     GtkWidget *separator = gtk_hseparator_new ();
-+    GtkWidget *vseparator = gtk_vseparator_new ();
-     gtk_box_pack_start(GTK_BOX(vbox), separator, FALSE, FALSE, 3);
- 
--    GtkWidget *label_sf = gtk_label_new ("http://www.csie.nctu.edu.tw/~cp76/gcin");
-+    GtkWidget *label_sf = gtk_label_new ("gcin WWW:\nhttp://www.csie.nctu.edu.tw/~cp76/gcin");
-+    gtk_misc_set_alignment (GTK_MISC (label_sf), 0, 0);
-+    GtkWidget *label_FreeBSD = gtk_label_new ("Feedback:\nhttp://cle.linux.org.tw/gcin/");
-+    gtk_misc_set_alignment (GTK_MISC (label_FreeBSD), 0, 0);
-     gtk_box_pack_start(GTK_BOX(vbox), label_sf, FALSE, FALSE, 0);
-+    gtk_box_pack_start(GTK_BOX(vbox), vseparator, FALSE, FALSE, 3);
-+    gtk_box_pack_start(GTK_BOX(vbox), label_FreeBSD, FALSE, FALSE, 0);
- 
- 
-     /* Now on to the image stuff */
diff --git a/chinese/gcin-devel/pkg-message b/chinese/gcin-devel/pkg-message
index ff739a5be5c3..d3729acee040 100644
--- a/chinese/gcin-devel/pkg-message
+++ b/chinese/gcin-devel/pkg-message
@@ -21,5 +21,5 @@ Finally, to start the GCIN input method daemon, use command:
   exec gcin &
 
 If you get problem with gcin, please visit http://cle.linux.org.tw/gcin/
-Happy Gcining...:-)
+Happy gcining...:-)
 --------------------------------------------------------------------
diff --git a/chinese/gcin-devel/pkg-plist b/chinese/gcin-devel/pkg-plist
index 34cf1dad6341..e5a81e8dc2fd 100644
--- a/chinese/gcin-devel/pkg-plist
+++ b/chinese/gcin-devel/pkg-plist
@@ -25,6 +25,7 @@ lib/libgcin-im-client.so
 %%DATADIR%%/table/hsu.kbm
 %%DATADIR%%/table/ibm.kbm
 %%DATADIR%%/table/jyutping.gtab
+%%BOSHIAMY%%%%DATADIR%%/table/noseeing.gtab
 %%DATADIR%%/table/pho-huge.tab
 %%DATADIR%%/table/pho.tab
 %%DATADIR%%/table/phrase.table
@@ -35,14 +36,14 @@ lib/libgcin-im-client.so
 %%DATADIR%%/table/tsin.idx
 %%DATADIR%%/table/zo.kbm
 %%DATADIR%%/table/zo-asdf.kbm
-%%DOCSDIR%%/Changelog
-%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/Changelog
+%%PORTDOCS%%%%DOCSDIR%%/README
 share/applications/gcin.desktop
 share/applications/gcin-setup.desktop
 share/icons/gcin.png
 share/icons/gcin/pin-fixed24.png
 share/icons/gcin/pin-float16.png
-@unexec rmdir %D/%%DOCSDIR%%  2>/dev/null || true
+%%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
diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index 82d8e0be94d4..f485d98984a4 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -6,9 +6,14 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	0.9.5
+PORTVERSION=	0.9.6
 CATEGORIES=	chinese
-MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/
+MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/ \
+		http://edt1023.sayya.org/misc/
+.if defined(WITH_BOSHIAMY)
+DISTFILES=	${GCINFILE} ${BOSHIAMYFILE}
+EXTRACT_ONLY=	${GCINFILE}
+.endif
 
 MAINTAINER=	statue@freebsd.netlab.cse.yzu.edu.tw
 COMMENT=	A traditional chinese input utility in X
@@ -18,13 +23,34 @@ USE_BZIP2=	YES
 GNU_CONFIGURE=	YES
 USE_GNOME=	gtk20
 USE_GMAKE=	YES
+PLIST_SUB+=	BOSHIAMY="@comment "
 
 .include <bsd.port.pre.mk>
 
+pre-everything::
+	@${ECHO_MSG} ''
+	@${ECHO_MSG} 'gcin has the following tunable option:'
+	@${ECHO_MSG} '    WITH_BOSHIAMY  - enable Boshiamy support'
+	@${ECHO_MSG} ''
+	@${ECHO_MSG} 'Example:  "make WITH_BOSHIAMY=yes install clean" '
+	@${ECHO_MSG} ''
+
 .if ${OSVERSION} <= 500034
 USE_GCC=	3.4
 .endif
 
+.if defined(WITH_BOSHIAMY)
+GCINFILE=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
+BOSHIAMYFILE=	noseeing-${BOSHIAMYVER}.tar.gz
+BOSHIAMYVER=	3
+post-extract:
+	@cd ${WRKSRC}/data/ \
+		&& ${TAR} -zxf ${DISTDIR}/${BOSHIAMYFILE}
+post-patch:
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-data-Makefile
+PLIST_SUB+=	BOSHIAMY=""
+.endif
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/chinese/gcin/distinfo b/chinese/gcin/distinfo
index 0906a74231c9..31092a61c1c2 100644
--- a/chinese/gcin/distinfo
+++ b/chinese/gcin/distinfo
@@ -1,2 +1,4 @@
-MD5 (gcin-0.9.5.tar.bz2) = b3d5be7313894957fc49b0593197e553
-SIZE (gcin-0.9.5.tar.bz2) = 1166960
+MD5 (gcin-0.9.6.tar.bz2) = ce72ffd4eaf7c031fc1818e44f2229c7
+SIZE (gcin-0.9.6.tar.bz2) = 1167858
+MD5 (noseeing-3.tar.gz) = ca699328fc8e280d970498c3c0e9b34b
+SIZE (noseeing-3.tar.gz) = 391948
diff --git a/chinese/gcin/files/extra-patch-data-Makefile b/chinese/gcin/files/extra-patch-data-Makefile
new file mode 100644
index 000000000000..05c262113829
--- /dev/null
+++ b/chinese/gcin/files/extra-patch-data-Makefile
@@ -0,0 +1,11 @@
+--- data/Makefile.orig	Wed May 18 11:49:00 2005
++++ data/Makefile	Wed May 18 11:49:00 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
++     ibm.kbm tsin hsu.kbm pho-huge.tab simplex.gtab noseeing.gtab
+ DATAKEEP=symbol-table gtab.list phrase.table
+ 
+ all:	$(DATA)
diff --git a/chinese/gcin/files/patch-about.c b/chinese/gcin/files/patch-about.c
deleted file mode 100644
index 132e8ab2b31f..000000000000
--- a/chinese/gcin/files/patch-about.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- about.c.orig	Sat Feb 26 21:42:00 2005
-+++ about.c	Thu May 12 04:02:17 2005
-@@ -69,10 +69,16 @@
-     gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 3);
- 
-     GtkWidget *separator = gtk_hseparator_new ();
-+    GtkWidget *vseparator = gtk_vseparator_new ();
-     gtk_box_pack_start(GTK_BOX(vbox), separator, FALSE, FALSE, 3);
- 
--    GtkWidget *label_sf = gtk_label_new ("http://www.csie.nctu.edu.tw/~cp76/gcin");
-+    GtkWidget *label_sf = gtk_label_new ("gcin WWW:\nhttp://www.csie.nctu.edu.tw/~cp76/gcin");
-+    gtk_misc_set_alignment (GTK_MISC (label_sf), 0, 0);
-+    GtkWidget *label_FreeBSD = gtk_label_new ("Feedback:\nhttp://cle.linux.org.tw/gcin/");
-+    gtk_misc_set_alignment (GTK_MISC (label_FreeBSD), 0, 0);
-     gtk_box_pack_start(GTK_BOX(vbox), label_sf, FALSE, FALSE, 0);
-+    gtk_box_pack_start(GTK_BOX(vbox), vseparator, FALSE, FALSE, 3);
-+    gtk_box_pack_start(GTK_BOX(vbox), label_FreeBSD, FALSE, FALSE, 0);
- 
- 
-     /* Now on to the image stuff */
diff --git a/chinese/gcin/pkg-message b/chinese/gcin/pkg-message
index ff739a5be5c3..d3729acee040 100644
--- a/chinese/gcin/pkg-message
+++ b/chinese/gcin/pkg-message
@@ -21,5 +21,5 @@ Finally, to start the GCIN input method daemon, use command:
   exec gcin &
 
 If you get problem with gcin, please visit http://cle.linux.org.tw/gcin/
-Happy Gcining...:-)
+Happy gcining...:-)
 --------------------------------------------------------------------
diff --git a/chinese/gcin/pkg-plist b/chinese/gcin/pkg-plist
index 34cf1dad6341..e5a81e8dc2fd 100644
--- a/chinese/gcin/pkg-plist
+++ b/chinese/gcin/pkg-plist
@@ -25,6 +25,7 @@ lib/libgcin-im-client.so
 %%DATADIR%%/table/hsu.kbm
 %%DATADIR%%/table/ibm.kbm
 %%DATADIR%%/table/jyutping.gtab
+%%BOSHIAMY%%%%DATADIR%%/table/noseeing.gtab
 %%DATADIR%%/table/pho-huge.tab
 %%DATADIR%%/table/pho.tab
 %%DATADIR%%/table/phrase.table
@@ -35,14 +36,14 @@ lib/libgcin-im-client.so
 %%DATADIR%%/table/tsin.idx
 %%DATADIR%%/table/zo.kbm
 %%DATADIR%%/table/zo-asdf.kbm
-%%DOCSDIR%%/Changelog
-%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/Changelog
+%%PORTDOCS%%%%DOCSDIR%%/README
 share/applications/gcin.desktop
 share/applications/gcin-setup.desktop
 share/icons/gcin.png
 share/icons/gcin/pin-fixed24.png
 share/icons/gcin/pin-float16.png
-@unexec rmdir %D/%%DOCSDIR%%  2>/dev/null || true
+%%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