- update to 0.5.1

- utilize DATADIR
- cosmetic fixes

6 files changed, 56 insertions, 54 deletions

diff --git a/chinese/gcin-devel/Makefile b/chinese/gcin-devel/Makefile
index 6c32c2eea554..0d26e553dcd7 100644
--- a/chinese/gcin-devel/Makefile
+++ b/chinese/gcin-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	0.5.0
+PORTVERSION=	0.5.1
 CATEGORIES=	chinese
 MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/
 
@@ -14,14 +14,13 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A triditional chinese input utility in X
 
 USE_BZIP2=	YES
-HAS_CONFIGURE=	YES
-CONFIGURE_ARGS=	--prefix=${PREFIX}
+GNU_CONFIGURE=	YES
 USE_GNOME=	gtk20
 USE_GMAKE=	YES
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500041
+.if ${OSVERSION} <= 500034
 USE_GCC=	3.4
 .endif
 
diff --git a/chinese/gcin-devel/distinfo b/chinese/gcin-devel/distinfo
index 0190d5d3a74f..48cafbbe210a 100644
--- a/chinese/gcin-devel/distinfo
+++ b/chinese/gcin-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gcin-0.5.0.tar.bz2) = 3c233de8ab1ae705556c82188241e948
-SIZE (gcin-0.5.0.tar.bz2) = 542406
+MD5 (gcin-0.5.1.tar.bz2) = f0f898be491c7ffc8a963a95dbcf9ef0
+SIZE (gcin-0.5.1.tar.bz2) = 543578
diff --git a/chinese/gcin-devel/pkg-plist b/chinese/gcin-devel/pkg-plist
index e5f0cfd7e853..8a9b13fdd826 100644
--- a/chinese/gcin-devel/pkg-plist
+++ b/chinese/gcin-devel/pkg-plist
@@ -7,31 +7,33 @@ bin/tsa2d
 bin/tsd2a
 bin/tslearn
 lib/menu/gcin
+lib/menu/gcin.in
 lib/menu/gcin-setup
-share/gcin/script/gcin-user-setup
-share/gcin/script/gcin-utf8-setup
-share/gcin/table/ar30.gtab
-share/gcin/table/cj.gtab
-share/gcin/table/et.kbm
-share/gcin/table/et-asdf.kbm
-share/gcin/table/et26.kbm
-share/gcin/table/et26-asdf.kbm
-share/gcin/table/gtab.list
-share/gcin/table/hsu.kbm
-share/gcin/table/ibm.kbm
-share/gcin/table/phrase.table
-share/gcin/table/pho.tab
-share/gcin/table/symbol-table
-share/gcin/table/tsin
-share/gcin/table/tsin.idx
-share/gcin/table/zo.kbm
-share/gcin/table/zo-asdf.kbm
+lib/menu/gcin-setup.in
+%%DATADIR%%/script/gcin-user-setup
+%%DATADIR%%/script/gcin-utf8-setup
+%%DATADIR%%/table/ar30.gtab
+%%DATADIR%%/table/cj.gtab
+%%DATADIR%%/table/et.kbm
+%%DATADIR%%/table/et-asdf.kbm
+%%DATADIR%%/table/et26.kbm
+%%DATADIR%%/table/et26-asdf.kbm
+%%DATADIR%%/table/gtab.list
+%%DATADIR%%/table/hsu.kbm
+%%DATADIR%%/table/ibm.kbm
+%%DATADIR%%/table/phrase.table
+%%DATADIR%%/table/pho.tab
+%%DATADIR%%/table/symbol-table
+%%DATADIR%%/table/tsin
+%%DATADIR%%/table/tsin.idx
+%%DATADIR%%/table/zo.kbm
+%%DATADIR%%/table/zo-asdf.kbm
 share/icons/gcin.png
 share/icons/gcin/pin-fixed24.png
 share/icons/gcin/pin-float16.png
 @dirrm lib/menu
 @dirrm share/icons/gcin
 @unexec rmdir %D/share/icons 2>/dev/null || true
-@dirrm share/gcin/table
-@dirrm share/gcin/script
-@dirrm share/gcin
+@dirrm %%DATADIR%%/table
+@dirrm %%DATADIR%%/script
+@dirrm %%DATADIR%%
diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index 6c32c2eea554..0d26e553dcd7 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	0.5.0
+PORTVERSION=	0.5.1
 CATEGORIES=	chinese
 MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/
 
@@ -14,14 +14,13 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A triditional chinese input utility in X
 
 USE_BZIP2=	YES
-HAS_CONFIGURE=	YES
-CONFIGURE_ARGS=	--prefix=${PREFIX}
+GNU_CONFIGURE=	YES
 USE_GNOME=	gtk20
 USE_GMAKE=	YES
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500041
+.if ${OSVERSION} <= 500034
 USE_GCC=	3.4
 .endif
 
diff --git a/chinese/gcin/distinfo b/chinese/gcin/distinfo
index 0190d5d3a74f..48cafbbe210a 100644
--- a/chinese/gcin/distinfo
+++ b/chinese/gcin/distinfo
@@ -1,2 +1,2 @@
-MD5 (gcin-0.5.0.tar.bz2) = 3c233de8ab1ae705556c82188241e948
-SIZE (gcin-0.5.0.tar.bz2) = 542406
+MD5 (gcin-0.5.1.tar.bz2) = f0f898be491c7ffc8a963a95dbcf9ef0
+SIZE (gcin-0.5.1.tar.bz2) = 543578
diff --git a/chinese/gcin/pkg-plist b/chinese/gcin/pkg-plist
index e5f0cfd7e853..8a9b13fdd826 100644
--- a/chinese/gcin/pkg-plist
+++ b/chinese/gcin/pkg-plist
@@ -7,31 +7,33 @@ bin/tsa2d
 bin/tsd2a
 bin/tslearn
 lib/menu/gcin
+lib/menu/gcin.in
 lib/menu/gcin-setup
-share/gcin/script/gcin-user-setup
-share/gcin/script/gcin-utf8-setup
-share/gcin/table/ar30.gtab
-share/gcin/table/cj.gtab
-share/gcin/table/et.kbm
-share/gcin/table/et-asdf.kbm
-share/gcin/table/et26.kbm
-share/gcin/table/et26-asdf.kbm
-share/gcin/table/gtab.list
-share/gcin/table/hsu.kbm
-share/gcin/table/ibm.kbm
-share/gcin/table/phrase.table
-share/gcin/table/pho.tab
-share/gcin/table/symbol-table
-share/gcin/table/tsin
-share/gcin/table/tsin.idx
-share/gcin/table/zo.kbm
-share/gcin/table/zo-asdf.kbm
+lib/menu/gcin-setup.in
+%%DATADIR%%/script/gcin-user-setup
+%%DATADIR%%/script/gcin-utf8-setup
+%%DATADIR%%/table/ar30.gtab
+%%DATADIR%%/table/cj.gtab
+%%DATADIR%%/table/et.kbm
+%%DATADIR%%/table/et-asdf.kbm
+%%DATADIR%%/table/et26.kbm
+%%DATADIR%%/table/et26-asdf.kbm
+%%DATADIR%%/table/gtab.list
+%%DATADIR%%/table/hsu.kbm
+%%DATADIR%%/table/ibm.kbm
+%%DATADIR%%/table/phrase.table
+%%DATADIR%%/table/pho.tab
+%%DATADIR%%/table/symbol-table
+%%DATADIR%%/table/tsin
+%%DATADIR%%/table/tsin.idx
+%%DATADIR%%/table/zo.kbm
+%%DATADIR%%/table/zo-asdf.kbm
 share/icons/gcin.png
 share/icons/gcin/pin-fixed24.png
 share/icons/gcin/pin-float16.png
 @dirrm lib/menu
 @dirrm share/icons/gcin
 @unexec rmdir %D/share/icons 2>/dev/null || true
-@dirrm share/gcin/table
-@dirrm share/gcin/script
-@dirrm share/gcin
+@dirrm %%DATADIR%%/table
+@dirrm %%DATADIR%%/script
+@dirrm %%DATADIR%%