- Reduce depenency on japanese/anthy

- Bump PORTREVISION

Suggested by:	kevlo@
Source from:	caleb

2 files changed, 171 insertions, 2 deletions

diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index 6c5aad0765f4..59f523f3021e 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gcin
 PORTVERSION=	1.4.4
+PORTREVISION=	1
 CATEGORIES=	chinese textproc gnome
 MASTER_SITES=	http://cle.linux.org.tw/gcin/download/:main \
 		http://ftp.twaren.net/local-distfiles/gcin/:main \
@@ -17,8 +18,6 @@ EXTRACT_ONLY=	gcin-${PORTVERSION}.tar.bz2
 MAINTAINER=	chinsan@FreeBSD.org
 COMMENT=	A traditional chinese input utility in X
 
-BUILD_DEPENDS+=	${LOCALBASE}/include/anthy/anthy.h:${PORTSDIR}/japanese/anthy
-
 CONFLICTS=	zh-gcin-devel-[0-9]*
 LATEST_LINK=	yes
 
@@ -44,6 +43,7 @@ BROKEN=		does not compile
 .endif
 
 .if defined(WITH_ANTHY)
+BUILD_DEPENDS+=	${LOCALBASE}/include/anthy/anthy.h:${PORTSDIR}/japanese/anthy
 RUN_DEPENDS+=	${LOCALBASE}/include/anthy/anthy.h:${PORTSDIR}/japanese/anthy
 .endif
 
diff --git a/chinese/gcin/files/patch-auto-detect_anthy.diff b/chinese/gcin/files/patch-auto-detect_anthy.diff
new file mode 100644
index 000000000000..a3b697b092d6
--- /dev/null
+++ b/chinese/gcin/files/patch-auto-detect_anthy.diff
@@ -0,0 +1,169 @@
+--- Makefile.gcin.orig	2009-01-12 22:48:43.000000000 +0800
++++ Makefile.gcin	2009-03-24 03:41:44.000000000 +0800
+@@ -72,6 +72,10 @@
+ OBJS += $(gcin_tsin_o)
+ endif
+ 
++ifeq ($(USE_ANTHY),Y)
++CFLAGS += -DUSE_ANTHY=1
++endif
++
+ im-srv = im-srv/im-srv.a
+ 
+ .c.E:
+@@ -168,8 +172,12 @@
+ #	$(CC) -o $@ $(OBJS_ANTHY) $(LDFLAGS)
+ 
+ gcin1_so= intcode.pico win-int.pico win-message.pico win-sym.pico \
+-win-inmd-switch.pico pinyin.pico win-pho-near.pico win-kbm.pico tsin-char.pico \
+-anthy.pico
++win-inmd-switch.pico pinyin.pico win-pho-near.pico win-kbm.pico tsin-char.pico
++
++ifeq ($(USE_ANTHY),Y)
++gcin1_so += anthy.pico
++endif
++
+ gcin1.so: $(gcin1_so)
+ 	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
+ 
+--- configure.orig	2008-11-28 20:26:55.000000000 +0800
++++ configure	2009-03-24 03:41:44.000000000 +0800
+@@ -106,6 +106,18 @@
+   echo " found."
+ fi
+ 
++echo -n ".... Testing anthy    :  "
++
++USE_ANTHY=`pkg-config --libs anthy`
++
++if [ $? != 0 ]; then
++  USE_ANTHY=N
++  echo "It's ok if you don't want anthy support."
++else
++  USE_ANTHY=Y
++  echo "found."
++fi
++
+ LIB='lib'
+ if [ -d /lib64 ]; then
+ LIB='lib64'
+@@ -218,6 +230,7 @@
+ echo "USE_TRAY=$use_tray" >> config.mak
+ echo "USE_I18N=$use_i18n" >> config.mak
+ echo "USE_TSIN=$use_tsin" >> config.mak
++echo "USE_ANTHY=$USE_ANTHY" >> config.mak
+ 
+ 
+ cd menu
+--- eve.c.orig	2009-01-28 04:57:42.000000000 +0800
++++ eve.c	2009-03-24 03:41:44.000000000 +0800
+@@ -246,9 +246,11 @@
+     case 10:
+       hide_win_int();
+       break;
++#if USE_ANTHY
+     case 12:
+       hide_win_anthy();
+       break;
++#endif
+     default:
+       hide_win_gtab();
+   }
+@@ -287,9 +289,11 @@
+     case 10:
+       show_win_int();
+       break;
++#if USE_ANTHY
+     case 12:
+       show_win_anthy();
+       break;
++#endif
+     default:
+       show_win_gtab();
+   }
+@@ -339,9 +343,11 @@
+     case 10:
+       move_win_int(x, y);
+       break;
++#if USE_ANTHY
+     case 12:
+       move_win_anthy(x, y);
+       break;
++#endif
+     default:
+       if (!cs->in_method)
+         return;
+@@ -588,8 +594,10 @@
+ #endif
+     case 10:
+       break;
++#if USE_ANTHY
+     case 12:
+       return anthy_visible();
++#endif
+     default:
+       if (!gwin_gtab)
+         return FALSE;
+@@ -697,6 +705,7 @@
+       current_CS->in_method = in_no;
+       init_inter_code();
+       break;
++#if USE_ANTHY
+     case 12:
+       if (init_win_anthy()) {
+         current_CS->in_method = in_no;
+@@ -705,6 +714,7 @@
+         return FALSE;
+       }
+       break;
++#endif
+     default:
+       init_gtab(in_no);
+       if (!inmd[in_no].DefChars)
+@@ -914,8 +924,10 @@
+ #endif
+     case 10:
+       return feedkey_intcode(keysym);
++#if USE_ANTHY
+     case 12:
+       return feedkey_anthy(keysym, kev_state);
++#endif
+     default:
+       return feedkey_gtab(keysym, kev_state);
+   }
+@@ -955,8 +967,10 @@
+   switch(current_CS->in_method) {
+     case 6:
+       return feedkey_pp_release(keysym, kev_state);
++#if USE_ANTHY
+     case 12:
+       return feedkey_anthy_release(keysym, kev_state);
++#endif
+   }
+ #endif
+ 
+--- win-kbm.c.orig	2009-01-27 21:19:29.000000000 +0800
++++ win-kbm.c	2009-03-24 03:46:10.000000000 +0800
+@@ -272,7 +272,9 @@
+       }
+       break;
+     case 10:
++#if USE_ANTHY
+     case 12:
++#endif
+       break;
+     default:
+       if (!cur_inmd || !cur_inmd->DefChars)
+--- win-sym.c.orig	2009-01-28 05:00:53.000000000 +0800
++++ win-sym.c	2009-03-24 03:46:10.000000000 +0800
+@@ -181,8 +181,10 @@
+        tsin_reset_in_pho();
+        break;
+ #endif
++#if USE_ANTHY
+     case 12:
+        break;
++#endif
+     default:
+        reset_gtab_all();
+        break;