Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the

new freetype2 where needed.

Submitted by:	mezz, ahze, pav, and many others
Approved by:	portmgr (implicit, kris)

20 files changed, 112 insertions, 43 deletions

diff --git a/chinese/chinput3/Makefile b/chinese/chinput3/Makefile
index 7f0b532..9adfad2 100644
--- a/chinese/chinput3/Makefile
+++ b/chinese/chinput3/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Shen Chuan-Hsing <statue@freebsd.sinica.edu.tw>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/chinese/chinput3/Makefile,v 1.1 2006/10/04 13:15:20 ahze Exp $
 
 PORTNAME=	chinput
 PORTVERSION=	3.0.2.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	chinese x11
 MASTER_SITES=	ftp://freebsd.sinica.edu.tw/pub/statue/chinput3/
 
@@ -36,7 +36,10 @@ post-patch:
 
 pre-build:
 	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} \
-		-e 's|-lc_r|${PTHREAD_CFLAGS} ${PTHREAD_LIBS}|'
+		-e 's|-lc_r|${PTHREAD_CFLAGS} ${PTHREAD_LIBS}|; \
+		    s|-I/usr/include|-I${LOCALBASE}/include|; \
+		    s|-L/usr/lib|-L${LOCALBASE}/lib|; \
+		    s|-L/usr/X11R6|-L${LOCALBASE}/lib -L/usr/X11R6|'
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/chinese/chinput3/pkg-plist b/chinese/chinput3/pkg-plist
index 780ac2a..23dc738 100644
--- a/chinese/chinput3/pkg-plist
+++ b/chinese/chinput3/pkg-plist
@@ -29,3 +29,5 @@ share/locale/zh_CN/LC_MESSAGES/zwincontrol.mo
 @dirrm lib/Chinput/im/bin
 @dirrm lib/Chinput/im
 @dirrm lib/Chinput
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
diff --git a/chinese/gcin-devel/Makefile b/chinese/gcin-devel/Makefile
index 0b33377..1ed2f6d 100644
--- a/chinese/gcin-devel/Makefile
+++ b/chinese/gcin-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gcin
 PORTVERSION=	1.2.7
+PORTREVISION=	2
 CATEGORIES=	chinese textproc gnome
 MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/:main
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:main
@@ -15,10 +16,9 @@ EXTRACT_ONLY=	gcin-${PORTVERSION}.tar.bz2
 MAINTAINER=	chinsan@FreeBSD.org
 COMMENT=	A traditional chinese input utility in X
 
-USE_X_PREFIX=	YES
 USE_BZIP2=	YES
 GNU_CONFIGURE=	YES
-USE_GNOME=	gtk20
+USE_GNOME=	gtk20 gnomecontrolcenter2 gnomehier
 USE_GMAKE=	YES
 USE_GCC=	3.4+
 INSTALLS_ICONS=	YES
@@ -48,9 +48,12 @@ pre-patch:
 		s/QT_IM_DIR=\/usr/QT_IM_DIR=$$prefix/; \
 		s/mandir=$$datadir/mandir=$$prefix/; \
 		s/\/usr\/share/$$prefix\/share/; \
-		109,110 s/control-center-2\.0/gnome\/control-center-2\.0/; \
+		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/qsort/mergesort/' ${WRKSRC}/gcin2tab.c
+	@${REINPLACE_CMD} -e 's|/usr/local|/usr|g' \
+	    	${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/;' \
diff --git a/chinese/gcin-devel/files/patch-menu b/chinese/gcin-devel/files/patch-menu
index 2acd2a1..acda831 100644
--- a/chinese/gcin-devel/files/patch-menu
+++ b/chinese/gcin-devel/files/patch-menu
@@ -1,8 +1,11 @@
---- menu/Makefile.orig	Mon Aug 29 09:40:32 2005
-+++ menu/Makefile	Thu Sep 15 11:53:49 2005
-@@ -12,12 +12,12 @@
+--- menu/Makefile.orig	Sun Aug 28 21:40:32 2005
++++ menu/Makefile	Fri Oct 13 14:43:28 2006
+@@ -10,14 +10,14 @@ install:
+ 	   install gcin-setup.desktop /usr/share/applications; \
+ 	   install -d /usr/lib/menu; \
  	   install -m 644 $(MENUS) /usr/lib/menu; \
- 	   which update-menus >& /dev/null && update-menus || exit 0; \
+-	   which update-menus >& /dev/null && update-menus || exit 0; \
++	   which update-menus > /dev/null 2>&1 && update-menus || exit 0; \
  	else \
 -	   install -d $(libdir)/menu; \
 -	   install -m 644 $(MENUS) $(libdir)/menu; \
diff --git a/chinese/gcin-devel/pkg-plist b/chinese/gcin-devel/pkg-plist
index 2a8fd9b..048f136 100644
--- a/chinese/gcin-devel/pkg-plist
+++ b/chinese/gcin-devel/pkg-plist
@@ -62,13 +62,9 @@ share/icons/gcin/pin-float16.png
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/icons/gcin
 @dirrmtry share/icons
-@dirrmtry share/gnome/control-center-2.0/capplets
-@dirrmtry share/gnome/control-center-2.0
-@dirrmtry share/gnome
 @dirrmtry share/applications
 @dirrmtry %%DATADIR%%/table
 @dirrmtry %%DATADIR%%/script
 @dirrmtry %%DATADIR%%
-@dirrmtry lib/gtk-2.0/immodules
 @exec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
 @unexec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index 0b33377..1ed2f6d 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gcin
 PORTVERSION=	1.2.7
+PORTREVISION=	2
 CATEGORIES=	chinese textproc gnome
 MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/:main
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:main
@@ -15,10 +16,9 @@ EXTRACT_ONLY=	gcin-${PORTVERSION}.tar.bz2
 MAINTAINER=	chinsan@FreeBSD.org
 COMMENT=	A traditional chinese input utility in X
 
-USE_X_PREFIX=	YES
 USE_BZIP2=	YES
 GNU_CONFIGURE=	YES
-USE_GNOME=	gtk20
+USE_GNOME=	gtk20 gnomecontrolcenter2 gnomehier
 USE_GMAKE=	YES
 USE_GCC=	3.4+
 INSTALLS_ICONS=	YES
@@ -48,9 +48,12 @@ pre-patch:
 		s/QT_IM_DIR=\/usr/QT_IM_DIR=$$prefix/; \
 		s/mandir=$$datadir/mandir=$$prefix/; \
 		s/\/usr\/share/$$prefix\/share/; \
-		109,110 s/control-center-2\.0/gnome\/control-center-2\.0/; \
+		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/qsort/mergesort/' ${WRKSRC}/gcin2tab.c
+	@${REINPLACE_CMD} -e 's|/usr/local|/usr|g' \
+	    	${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/;' \
diff --git a/chinese/gcin/files/patch-menu b/chinese/gcin/files/patch-menu
index 2acd2a1..acda831 100644
--- a/chinese/gcin/files/patch-menu
+++ b/chinese/gcin/files/patch-menu
@@ -1,8 +1,11 @@
---- menu/Makefile.orig	Mon Aug 29 09:40:32 2005
-+++ menu/Makefile	Thu Sep 15 11:53:49 2005
-@@ -12,12 +12,12 @@
+--- menu/Makefile.orig	Sun Aug 28 21:40:32 2005
++++ menu/Makefile	Fri Oct 13 14:43:28 2006
+@@ -10,14 +10,14 @@ install:
+ 	   install gcin-setup.desktop /usr/share/applications; \
+ 	   install -d /usr/lib/menu; \
  	   install -m 644 $(MENUS) /usr/lib/menu; \
- 	   which update-menus >& /dev/null && update-menus || exit 0; \
+-	   which update-menus >& /dev/null && update-menus || exit 0; \
++	   which update-menus > /dev/null 2>&1 && update-menus || exit 0; \
  	else \
 -	   install -d $(libdir)/menu; \
 -	   install -m 644 $(MENUS) $(libdir)/menu; \
diff --git a/chinese/gcin/pkg-plist b/chinese/gcin/pkg-plist
index 2a8fd9b..048f136 100644
--- a/chinese/gcin/pkg-plist
+++ b/chinese/gcin/pkg-plist
@@ -62,13 +62,9 @@ share/icons/gcin/pin-float16.png
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/icons/gcin
 @dirrmtry share/icons
-@dirrmtry share/gnome/control-center-2.0/capplets
-@dirrmtry share/gnome/control-center-2.0
-@dirrmtry share/gnome
 @dirrmtry share/applications
 @dirrmtry %%DATADIR%%/table
 @dirrmtry %%DATADIR%%/script
 @dirrmtry %%DATADIR%%
-@dirrmtry lib/gtk-2.0/immodules
 @exec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
 @unexec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
diff --git a/chinese/oxim/Makefile b/chinese/oxim/Makefile
index dbc3524..e68a71d 100644
--- a/chinese/oxim/Makefile
+++ b/chinese/oxim/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	oxim
 PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese textproc
 MASTER_SITES=	ftp://ftp.opendesktop.org.tw/odp/OXIM/Source/ \
 		ftp://apt.nc.hcc.edu.tw/pub/mirror/opendesktop.org.tw/OXIM/Source/ \
@@ -28,7 +28,7 @@ OPTIONS=	GTK2 "Enable GTK2 input method module" On \
 
 USE_GCC=	3.2+
 USE_ICONV=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GNOME=
 
 GNU_CONFIGURE=	yes
diff --git a/chinese/scim-chewing/Makefile b/chinese/scim-chewing/Makefile
index c1bfaf9..dbd256e 100644
--- a/chinese/scim-chewing/Makefile
+++ b/chinese/scim-chewing/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scim-chewing
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	chinese
 MASTER_SITES=	http://chewing.csie.net/download/scim/
 
@@ -18,7 +19,6 @@ LIB_DEPENDS=	chewing.3:${PORTSDIR}/chinese/libchewing
 BUILD_DEPENDS=	${RUN_DEPENDS} \
 		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/chinese/scim-chewing/pkg-plist b/chinese/scim-chewing/pkg-plist
index d43187c..739d4ce 100644
--- a/chinese/scim-chewing/pkg-plist
+++ b/chinese/scim-chewing/pkg-plist
@@ -9,3 +9,5 @@ share/scim/icons/scim-chewing-swap-colors.png
 share/scim/icons/scim-chewing.png
 @dirrmtry lib/scim-1.0/IMEngine
 @dirrmtry lib/scim-1.0/SetupUI
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
diff --git a/chinese/scim-pinyin/Makefile b/chinese/scim-pinyin/Makefile
index d11caff..ce2a1b4 100644
--- a/chinese/scim-pinyin/Makefile
+++ b/chinese/scim-pinyin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-pinyin
 PORTVERSION=	0.5.91
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=scim
@@ -19,7 +19,6 @@ BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_GNOME=	gnomehack lthack
-USE_X_PREFIX=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
diff --git a/chinese/scim-pinyin/pkg-plist b/chinese/scim-pinyin/pkg-plist
index 7191777..c55fc53 100644
--- a/chinese/scim-pinyin/pkg-plist
+++ b/chinese/scim-pinyin/pkg-plist
@@ -35,3 +35,9 @@ share/scim/icons/smart-pinyin.png
 @dirrmtry lib/scim-1.0/IMEngine
 @dirrmtry lib/scim-1.0/SetupUI
 @dirrm share/scim/pinyin
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
diff --git a/chinese/scim-tables/Makefile b/chinese/scim-tables/Makefile
index c29dfe5..95bc05b 100644
--- a/chinese/scim-tables/Makefile
+++ b/chinese/scim-tables/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-tables
 PORTVERSION=	0.5.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	chinese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=scim
@@ -18,7 +18,6 @@ COMMENT=	SCIM table based Chinese input methods
 BUILD_DEPENDS=	scim-make-table:${PORTSDIR}/textproc/scim-table-imengine
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/chinese/stardict-dict-zh_CN/Makefile b/chinese/stardict-dict-zh_CN/Makefile
index 7cd7cad..1703846 100644
--- a/chinese/stardict-dict-zh_CN/Makefile
+++ b/chinese/stardict-dict-zh_CN/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	stardict2-dict-zh_CN
 PORTVERSION=	2.4.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	chinese textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	stardict
@@ -24,7 +24,6 @@ COMMENT=	English-Chinese(S)/Chinese(S)-English dictionaries for StarDict
 RUN_DEPENDS=	stardict:${PORTSDIR}/textproc/stardict2
 
 NO_BUILD=	yes
-USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 
 do-install:
diff --git a/chinese/stardict2-dict-zh_CN/Makefile b/chinese/stardict2-dict-zh_CN/Makefile
index 7cd7cad..1703846 100644
--- a/chinese/stardict2-dict-zh_CN/Makefile
+++ b/chinese/stardict2-dict-zh_CN/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	stardict2-dict-zh_CN
 PORTVERSION=	2.4.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	chinese textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	stardict
@@ -24,7 +24,6 @@ COMMENT=	English-Chinese(S)/Chinese(S)-English dictionaries for StarDict
 RUN_DEPENDS=	stardict:${PORTSDIR}/textproc/stardict2
 
 NO_BUILD=	yes
-USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 
 do-install:
diff --git a/chinese/stardict2-dict-zh_TW/Makefile b/chinese/stardict2-dict-zh_TW/Makefile
index 0b023b4..ed16c3b 100644
--- a/chinese/stardict2-dict-zh_TW/Makefile
+++ b/chinese/stardict2-dict-zh_TW/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	stardict2-dict-zh_TW
 PORTVERSION=	2.4.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	chinese textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	stardict
@@ -25,7 +25,6 @@ COMMENT=	English-Chinese(T)/Chinese(T)-English dictionaries for StarDict
 RUN_DEPENDS=	stardict:${PORTSDIR}/textproc/stardict2
 
 NO_BUILD=	yes
-USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 
 do-install:
diff --git a/chinese/wenju/Makefile b/chinese/wenju/Makefile
index cd0ddd8..e8f38b3 100644
--- a/chinese/wenju/Makefile
+++ b/chinese/wenju/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wenju
 PORTVERSION=	1.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	chinese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wenju
@@ -19,7 +19,7 @@ USE_AUTOTOOLS=	libtool:15
 USE_GETOPT_LONG=yes
 USE_GNOME=	gtk20
 USE_LDCONFIG=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
diff --git a/chinese/wenju/pkg-plist b/chinese/wenju/pkg-plist
index ccc4924b..18330c5 100644
--- a/chinese/wenju/pkg-plist
+++ b/chinese/wenju/pkg-plist
@@ -1,9 +1,9 @@
 @comment $FreeBSD$
 bin/tim-config
 bin/wrap
-lib/gtk-2.0/2.4.0/immodules/im-tim.a
-lib/gtk-2.0/2.4.0/immodules/im-tim.la
-lib/gtk-2.0/2.4.0/immodules/im-tim.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-tim.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-tim.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-tim.so
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/wenju.mo
 %%DATADIR%%/bxm.tim
 %%DATADIR%%/cj.tim
diff --git a/chinese/xttmgr/files/patch-xttmgr.c b/chinese/xttmgr/files/patch-xttmgr.c
new file mode 100644
index 0000000..a44e6b2
--- /dev/null
+++ b/chinese/xttmgr/files/patch-xttmgr.c
@@ -0,0 +1,57 @@
+--- xttmgr.c.orig	Sat Oct  7 11:34:31 2006
++++ xttmgr.c	Sat Oct  7 11:34:10 2006
+@@ -7,7 +7,6 @@
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
+ #include FT_MODULE_H
+-#include FT_INTERNAL_OBJECTS_H
+ #include FT_TRUETYPE_IDS_H
+ #include FT_TRUETYPE_TABLES_H
+ #include FT_SFNT_NAMES_H
+@@ -269,7 +268,7 @@ int main( int argc, char *argv[] )
+ static int Check_Font_Face( char *filename )
+ {
+        FT_Face face;
+-       FT_ModuleRec*  module;
++       int is_sfnt = 0;
+ 
+        num_faces = 0; /* 先將 face 總數設為 0 */
+ 
+@@ -278,16 +277,12 @@ static int Check_Font_Face( char *filena
+           return 1;
+        }
+ 
+-       module = &face->driver->root;
+        num_faces = face->num_faces; /* 紀錄共有多少個 faces */
++       is_sfnt = FT_IS_SFNT( face );
+        FT_Done_Face( face );
+ 
+        /* 檢查該檔案是否是 TrueType 檔 */
+-       if ( strncasecmp( module->clazz->module_name, "TrueType", 8 ) ) {
+-          return 1;
+-       }
+-
+-       return 0;
++       return is_sfnt;
+ 
+ }
+ 
+@@ -1305,7 +1300,6 @@ static int Font_Info( char *filename )
+     FT_ULong   face_idx;
+     FT_Int     pos, num_encodings;
+     FT_CharMap charmap;
+-    FT_ModuleRec*  module;
+     TT_OS2     *os2;
+     FT_UShort  platform_id, encoding_id;
+     char       *platform_name=NULL;
+@@ -1366,8 +1360,8 @@ static int Font_Info( char *filename )
+ 	printf( "Number of glyphs : %ld\n", face->num_glyphs ); 
+ 	printf( "..........................................\n\n" );
+ 
+-	module = &face->driver->root;
+-	printf( "模組名稱 : %s\n", module->clazz->module_name );
++	/*module = &face->driver->root;
++	printf( "模組名稱 : %s\n", module->clazz->module_name );*/
+ 
+ 	printf( "\nFace flags :\n" );
+