- Update to 1.2.1

PR:		ports/100192
Submitted by:	maintainer (chinsan)

6 files changed, 32 insertions, 56 deletions

diff --git a/chinese/gcin-devel/Makefile b/chinese/gcin-devel/Makefile
index ba01d8c189f9..c8ac4bfd0d66 100644
--- a/chinese/gcin-devel/Makefile
+++ b/chinese/gcin-devel/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.1
 CATEGORIES=	chinese textproc gnome
-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
+MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/:main \
+		http://edt1023.sayya.org/misc/:boshiamy
+DISTFILES=	gcin-1.2.1.tar.bz2:main \
+		noseeing.tar.gz:boshiamy
+EXTRACT_ONLY=	gcin-1.2.1.tar.bz2
 
 MAINTAINER=	chinsan.tw@gmail.com
 COMMENT=	A traditional chinese input utility in X
@@ -23,7 +22,11 @@ USE_BZIP2=	YES
 GNU_CONFIGURE=	YES
 USE_GNOME=	gtk20
 USE_GMAKE=	YES
-INSTALLS_SHLIB=	yes
+USE_GCC=	3.4+
+INSTALLS_ICONS=	YES
+INSTALLS_SHLIB=	YES
+OPTIONS=	BOSHIAMY	"enable Boshiamy Input Method"	off
+IGNOREFILES=	noseeing.tar.gz
 
 CONFIGURE_ENV+=	"--new_gtk_im=Y"
 
@@ -31,24 +34,9 @@ MAN1=		gcin.1 gcin2tab.1
 
 .include <bsd.port.pre.mk>
 
-pre-extract:
-	@${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)
-IGNOREFILES=	${BOSHIAMYFILE}
-GCINFILE=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
-BOSHIAMYFILE=	noseeing.tar.gz
 post-extract:
-	@${TAR} -C ${WRKSRC}/data/ -zxf ${DISTDIR}/${BOSHIAMYFILE} \
+	@${TAR} -C ${WRKSRC}/data/ -zxf ${DISTDIR}/noseeing.tar.gz \
 		noseeing.cin
 	@${REINPLACE_CMD} -e 's,cj.gtab,cj.gtab noseeing.gtab,' \
 		${WRKSRC}/data/Makefile
diff --git a/chinese/gcin-devel/distinfo b/chinese/gcin-devel/distinfo
index 5662ee7432de..122121ce2567 100644
--- a/chinese/gcin-devel/distinfo
+++ b/chinese/gcin-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (gcin-1.2.0.tar.bz2) = abb8c6d69b3d29c180de7252f1f8b205
-SHA256 (gcin-1.2.0.tar.bz2) = 54a7da70448f18e7357017a126eba0f7557ebc062f870f54e16cd8dc11f9e1bd
-SIZE (gcin-1.2.0.tar.bz2) = 1402928
+MD5 (gcin-1.2.1.tar.bz2) = aa028e3c136f1b80e38ef6fd33024385
+SHA256 (gcin-1.2.1.tar.bz2) = e6497011d3f160de898c656e7c1cf7eb72841ff8061bef2ab55fe1c512c57fbd
+SIZE (gcin-1.2.1.tar.bz2) = 1425757
 MD5 (noseeing.tar.gz) = IGNORE
 SHA256 (noseeing.tar.gz) = IGNORE
diff --git a/chinese/gcin-devel/pkg-plist b/chinese/gcin-devel/pkg-plist
index a6fef275f92d..ef5126beda05 100644
--- a/chinese/gcin-devel/pkg-plist
+++ b/chinese/gcin-devel/pkg-plist
@@ -48,7 +48,7 @@ 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%%@dirrmtry %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/icons/gcin
 @dirrmtry share/icons
 @dirrmtry share/gnome/control-center-2.0/capplets
diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index ba01d8c189f9..c8ac4bfd0d66 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.1
 CATEGORIES=	chinese textproc gnome
-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
+MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/:main \
+		http://edt1023.sayya.org/misc/:boshiamy
+DISTFILES=	gcin-1.2.1.tar.bz2:main \
+		noseeing.tar.gz:boshiamy
+EXTRACT_ONLY=	gcin-1.2.1.tar.bz2
 
 MAINTAINER=	chinsan.tw@gmail.com
 COMMENT=	A traditional chinese input utility in X
@@ -23,7 +22,11 @@ USE_BZIP2=	YES
 GNU_CONFIGURE=	YES
 USE_GNOME=	gtk20
 USE_GMAKE=	YES
-INSTALLS_SHLIB=	yes
+USE_GCC=	3.4+
+INSTALLS_ICONS=	YES
+INSTALLS_SHLIB=	YES
+OPTIONS=	BOSHIAMY	"enable Boshiamy Input Method"	off
+IGNOREFILES=	noseeing.tar.gz
 
 CONFIGURE_ENV+=	"--new_gtk_im=Y"
 
@@ -31,24 +34,9 @@ MAN1=		gcin.1 gcin2tab.1
 
 .include <bsd.port.pre.mk>
 
-pre-extract:
-	@${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)
-IGNOREFILES=	${BOSHIAMYFILE}
-GCINFILE=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
-BOSHIAMYFILE=	noseeing.tar.gz
 post-extract:
-	@${TAR} -C ${WRKSRC}/data/ -zxf ${DISTDIR}/${BOSHIAMYFILE} \
+	@${TAR} -C ${WRKSRC}/data/ -zxf ${DISTDIR}/noseeing.tar.gz \
 		noseeing.cin
 	@${REINPLACE_CMD} -e 's,cj.gtab,cj.gtab noseeing.gtab,' \
 		${WRKSRC}/data/Makefile
diff --git a/chinese/gcin/distinfo b/chinese/gcin/distinfo
index 5662ee7432de..122121ce2567 100644
--- a/chinese/gcin/distinfo
+++ b/chinese/gcin/distinfo
@@ -1,5 +1,5 @@
-MD5 (gcin-1.2.0.tar.bz2) = abb8c6d69b3d29c180de7252f1f8b205
-SHA256 (gcin-1.2.0.tar.bz2) = 54a7da70448f18e7357017a126eba0f7557ebc062f870f54e16cd8dc11f9e1bd
-SIZE (gcin-1.2.0.tar.bz2) = 1402928
+MD5 (gcin-1.2.1.tar.bz2) = aa028e3c136f1b80e38ef6fd33024385
+SHA256 (gcin-1.2.1.tar.bz2) = e6497011d3f160de898c656e7c1cf7eb72841ff8061bef2ab55fe1c512c57fbd
+SIZE (gcin-1.2.1.tar.bz2) = 1425757
 MD5 (noseeing.tar.gz) = IGNORE
 SHA256 (noseeing.tar.gz) = IGNORE
diff --git a/chinese/gcin/pkg-plist b/chinese/gcin/pkg-plist
index a6fef275f92d..ef5126beda05 100644
--- a/chinese/gcin/pkg-plist
+++ b/chinese/gcin/pkg-plist
@@ -48,7 +48,7 @@ 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%%@dirrmtry %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/icons/gcin
 @dirrmtry share/icons
 @dirrmtry share/gnome/control-center-2.0/capplets