-USE_X_PREFIX -> USE_XLIB, chase gtk20's new home.

-Use a new GTK2_VERSION macro.
-Bump the PORTREVISION.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7400 df743ca5-7f9a-e211-a948-0013205c9059

9 files changed, 145 insertions, 0 deletions

diff --git a/chinese/wenju/Makefile b/chinese/wenju/Makefile
new file mode 100644
index 000000000..e8f38b379
--- /dev/null
+++ b/chinese/wenju/Makefile
@@ -0,0 +1,44 @@
+# New ports collection makefile for:   wenju
+# Date created:                18 Oct 2003
+# Whom:                        Shen Chuan-Hsing <statue@freebsd.sinica.edu.tw>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	wenju
+PORTVERSION=	1.3
+PORTREVISION=	7
+CATEGORIES=	chinese
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	wenju
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Collection of writing tools in Chinese
+
+USE_AUTOTOOLS=	libtool:15
+USE_GETOPT_LONG=yes
+USE_GNOME=	gtk20
+USE_LDCONFIG=	yes
+USE_XLIB=	yes
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
+
+post-install:
+		gtk-query-immodules-2.0 > ${TARGETDIR}/etc/gtk-2.0/gtk.immodules
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500041
+EXTRA_PATCHES+=	${FILESDIR}/configure-getopt.patch
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/chinese/wenju/distinfo b/chinese/wenju/distinfo
new file mode 100644
index 000000000..83520ce03
--- /dev/null
+++ b/chinese/wenju/distinfo
@@ -0,0 +1,3 @@
+MD5 (wenju-1.3.tar.gz) = f4813a0ab6c2a0a7804c723e15ae058a
+SHA256 (wenju-1.3.tar.gz) = 870bb257efb1736c5bc2bd1cf98bedc6b19732289581f2a8cea2cfdfc2b785c5
+SIZE (wenju-1.3.tar.gz) = 1784560
diff --git a/chinese/wenju/files/configure-getopt.patch b/chinese/wenju/files/configure-getopt.patch
new file mode 100644
index 000000000..0c53f78ab
--- /dev/null
+++ b/chinese/wenju/files/configure-getopt.patch
@@ -0,0 +1,11 @@
+--- configure.orig	Sat Oct 18 04:38:19 2003
++++ configure	Sat Oct 18 04:38:42 2003
+@@ -7889,7 +7889,7 @@
+ 
+ 
+ GTK2_CFLAGS="`pkg-config --cflags gtk+-2.0`"
+-GTK2_LIBS="`pkg-config --libs gtk+-2.0`"
++GTK2_LIBS="`pkg-config --libs gtk+-2.0` -lgnugetopt"
+ GTK2_BINARY_VERSION="`pkg-config --variable=gtk_binary_version gtk+-2.0`"
+ 
+ 
diff --git a/chinese/wenju/files/patch-src::tim::timtable.c b/chinese/wenju/files/patch-src::tim::timtable.c
new file mode 100644
index 000000000..285b36d18
--- /dev/null
+++ b/chinese/wenju/files/patch-src::tim::timtable.c
@@ -0,0 +1,20 @@
+--- src/tim/timtable.c.orig	Sat Oct 18 05:34:57 2003
++++ src/tim/timtable.c	Sat Oct 18 05:35:14 2003
+@@ -86,7 +86,7 @@
+ 
+         line = (char *)malloc(n*sizeof(char));;
+         /* getline() is a GNU externsion */
+-        while ((l = getline(&line, &n, fp)) > 0) {
++        while ((l = fgets(line, n, fp)) > 0) {
+             l = preprocess_line(line, l);
+             if (l > 0) {
+                 char *p;
+@@ -189,7 +189,7 @@
+ 
+         line = (char *)malloc(n*sizeof(char));;
+         /* getline() is a GNU externsion */
+-        while ((l = getline(&line, &n, fp)) > 0) {
++        while ((l = fgets(line, n, fp)) > 0) {
+             l = preprocess_line(line, l);
+             if (l > 0) {
+                 char *p;
diff --git a/chinese/wenju/files/patch-src::wrap::wrap.c b/chinese/wenju/files/patch-src::wrap::wrap.c
new file mode 100644
index 000000000..5d3136d2d
--- /dev/null
+++ b/chinese/wenju/files/patch-src::wrap::wrap.c
@@ -0,0 +1,11 @@
+--- src/wrap/wrap.c.orig	Sat Oct 18 05:37:16 2003
++++ src/wrap/wrap.c	Sat Oct 18 05:36:19 2003
+@@ -293,7 +293,7 @@
+         size = 0;
+         p = NULL;
+         /* Read in an input line. */
+-        while ((length = getline(&p, &size, fp)) > 0) {
++        while ((length = fgets(p, size, fp)) > 0) {
+             if (p[0] == '\n') {
+                 /* An empty line signals the end of the paragraph. */
+                 if (strcmp(text->str, "\n") == 0) {
diff --git a/chinese/wenju/files/patch-tests::Makefile.in b/chinese/wenju/files/patch-tests::Makefile.in
new file mode 100644
index 000000000..f6623e302
--- /dev/null
+++ b/chinese/wenju/files/patch-tests::Makefile.in
@@ -0,0 +1,20 @@
+--- tests/Makefile.in.orig	Fri Feb  6 04:19:16 2004
++++ tests/Makefile.in	Wed Mar 24 15:29:28 2004
+@@ -76,7 +76,7 @@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INTLLIBS = @INTLLIBS@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ ${INTLLIBS}
+ LIBICONV = @LIBICONV@
+ LIBINTL = @LIBINTL@
+ LIBOBJS = @LIBOBJS@
+@@ -151,7 +151,7 @@
+ noinst_PROGRAMS = wenju
+ 
+ wenju_SOURCES = wenju.c
+-wenju_LDADD = -lrt
++wenju_LDADD = #-lrt
+ subdir = tests
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/chinese/wenju/files/patch-tests::wenju.c b/chinese/wenju/files/patch-tests::wenju.c
new file mode 100644
index 000000000..edaf845c0
--- /dev/null
+++ b/chinese/wenju/files/patch-tests::wenju.c
@@ -0,0 +1,12 @@
+--- tests/wenju.c.orig	Sat Oct 18 05:17:33 2003
++++ tests/wenju.c	Sat Oct 18 05:17:44 2003
+@@ -23,8 +23,8 @@
+ 
+ int main(int argc, char *argv[])
+ {
+-    setlocale(LC_ALL, "");
+ #ifdef ENABLE_NLS
++    setlocale(LC_ALL, "");
+     bindtextdomain(PACKAGE, LOCALEDIR);
+ #ifdef HAVE_BIND_TEXTDOMAIN_CODESET
+     bind_textdomain_codeset(PACKAGE, "UTF-8");
diff --git a/chinese/wenju/pkg-descr b/chinese/wenju/pkg-descr
new file mode 100644
index 000000000..5974822fc
--- /dev/null
+++ b/chinese/wenju/pkg-descr
@@ -0,0 +1,4 @@
+A collection of writing tools (wenju in Chinese pinyin) such as input
+method, text file formatter, etc. All the tools are based on Unicode.
+
+WWW: http://sourceforge.net/projects/wenju/
diff --git a/chinese/wenju/pkg-plist b/chinese/wenju/pkg-plist
new file mode 100644
index 000000000..18330c5d9
--- /dev/null
+++ b/chinese/wenju/pkg-plist
@@ -0,0 +1,20 @@
+@comment $FreeBSD$
+bin/tim-config
+bin/wrap
+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
+%%DATADIR%%/erbi.tim
+%%DATADIR%%/liu.tim
+%%DATADIR%%/phone.tim
+%%DATADIR%%/pinyin-p.tim
+%%DATADIR%%/pinyin.tim
+%%DATADIR%%/qfrench.tim
+%%DATADIR%%/wubi.tim
+%%DATADIR%%/wubihua-n.tim
+@dirrm %%DATADIR%%
+@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