6 files changed, 62 insertions, 19 deletions

diff --git a/japanese/ibus-anthy/Makefile b/japanese/ibus-anthy/Makefile
index d754c2cd4d48..b6a0046bc119 100644
--- a/japanese/ibus-anthy/Makefile
+++ b/japanese/ibus-anthy/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	ibus-anthy
-PORTVERSION=	1.2.0.20090917
-PORTREVISION=	1
+PORTVERSION=	1.2.0.20091127
+PORTREVISION=	0
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
@@ -19,7 +19,6 @@ LIB_DEPENDS=	anthy.1:${PORTSDIR}/japanese/anthy
 RUN_DEPENDS=	ibus-daemon:${PORTSDIR}/textproc/ibus
 
 USE_GNOME=	pygtk2
-USE_GETTEXT=	yes
 USE_PYTHON=	yes
 
 USE_GMAKE=	yes
@@ -27,19 +26,30 @@ GNU_CONFIGURE=	yes
 
 PROJECTHOST=	ibus
 
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-.else
+.if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e "s|-I/usr/include|-I${LOCALBASE}/include|" ${WRKSRC}/engine/Makefile.am
-	@${REINPLACE_CMD} -e "s|-I/usr/include|-I${LOCALBASE}/include|" ${WRKSRC}/engine/Makefile.in
+port-build:
+.if !defined(WITHOUT_NLS)
+	@cd ${WRKSRC}/po; \
+	    ${GMAKE} all-yes
+.endif
 
 post-install:
+.if !defined(WITHOUT_NLS)
+	@cd ${WRKSRC}/po; \
+	    ${GMAKE} install-data-yes
+	@${CHMOD} 444 \
+	    ${LOCALBASE}/share/locale/fr/LC_MESSAGES/ibus-anthy.mo \
+	    ${LOCALBASE}/share/locale/ja/LC_MESSAGES/ibus-anthy.mo \
+	    ${LOCALBASE}/share/locale/zh_CN/LC_MESSAGES/ibus-anthy.mo
+
+.endif
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO} To display this message again, type ${PKG_INFO} -D ${PKGNAME}
 
diff --git a/japanese/ibus-anthy/distinfo b/japanese/ibus-anthy/distinfo
index 633837a9a85a..92d6c6854b3b 100644
--- a/japanese/ibus-anthy/distinfo
+++ b/japanese/ibus-anthy/distinfo
@@ -1,3 +1,3 @@
-MD5 (ibus-anthy-1.2.0.20090917.tar.gz) = b6f1d830346e447908d670bc267391a9
-SHA256 (ibus-anthy-1.2.0.20090917.tar.gz) = f11502687459ccc329ac32a3e0050ca001f0ae6eba158ad30a6907d2af897829
-SIZE (ibus-anthy-1.2.0.20090917.tar.gz) = 437901
+MD5 (ibus-anthy-1.2.0.20091127.tar.gz) = 254af64a72c3fed326022c9683e6830f
+SHA256 (ibus-anthy-1.2.0.20091127.tar.gz) = 80a654507b7b7ef770803bb2c10bf6ab6efb7329647c9b3b4a5cc9b7515dbfc0
+SIZE (ibus-anthy-1.2.0.20091127.tar.gz) = 439433
diff --git a/japanese/ibus-anthy/files/patch-configure b/japanese/ibus-anthy/files/patch-configure
index 62c5650b476a..d5b4d63751f9 100644
--- a/japanese/ibus-anthy/files/patch-configure
+++ b/japanese/ibus-anthy/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2009-09-17 18:08:39.000000000 +0900
-+++ configure	2009-11-24 11:20:36.000000000 +0900
-@@ -17059,9 +17059,9 @@
+--- configure.orig	2009-11-28 17:33:24.000000000 +0900
++++ configure	2009-11-28 17:35:52.000000000 +0900
+@@ -17771,9 +17771,9 @@
  #define HAVE_DECL_NTH_UNCONVERTED_CANDIDATE 0
  _ACEOF
  
@@ -13,7 +13,7 @@
  fi
  { $as_echo "$as_me:$LINENO: checking whether NTH_KATAKANA_CANDIDATE is declared" >&5
  $as_echo_n "checking whether NTH_KATAKANA_CANDIDATE is declared... " >&6; }
-@@ -17129,9 +17129,9 @@
+@@ -17841,9 +17841,9 @@
  #define HAVE_DECL_NTH_KATAKANA_CANDIDATE 0
  _ACEOF
  
@@ -26,7 +26,7 @@
  fi
  { $as_echo "$as_me:$LINENO: checking whether NTH_HIRAGANA_CANDIDATE is declared" >&5
  $as_echo_n "checking whether NTH_HIRAGANA_CANDIDATE is declared... " >&6; }
-@@ -17199,9 +17199,9 @@
+@@ -17911,9 +17911,9 @@
  #define HAVE_DECL_NTH_HIRAGANA_CANDIDATE 0
  _ACEOF
  
@@ -39,7 +39,7 @@
  fi
  { $as_echo "$as_me:$LINENO: checking whether NTH_HALFKANA_CANDIDATE is declared" >&5
  $as_echo_n "checking whether NTH_HALFKANA_CANDIDATE is declared... " >&6; }
-@@ -17269,9 +17269,9 @@
+@@ -17981,9 +17981,9 @@
  #define HAVE_DECL_NTH_HALFKANA_CANDIDATE 0
  _ACEOF
  
diff --git a/japanese/ibus-anthy/files/patch-engine_Makefile.am b/japanese/ibus-anthy/files/patch-engine_Makefile.am
new file mode 100644
index 000000000000..9abdb3ce2683
--- /dev/null
+++ b/japanese/ibus-anthy/files/patch-engine_Makefile.am
@@ -0,0 +1,11 @@
+--- engine/Makefile.am.orig	2009-11-28 17:45:04.000000000 +0900
++++ engine/Makefile.am	2009-11-28 18:04:42.000000000 +0900
+@@ -61,7 +61,7 @@
+ enginedir = $(datadir)/ibus/component
+ 
+ anthy.py anthy_wrap.c: anthy.i
+-	$(SWIG) -python -I/usr/include -o anthy_wrap.c $(srcdir)/anthy.i
++	$(SWIG) -python -I/usr/include ${ANTHY_CFLAGS} -o anthy_wrap.c $(srcdir)/anthy.i
+ 
+ anthy.xml: anthy.xml.in
+ 	( \
diff --git a/japanese/ibus-anthy/files/patch-engine_Makefile.in b/japanese/ibus-anthy/files/patch-engine_Makefile.in
new file mode 100644
index 000000000000..3e83814bdd2d
--- /dev/null
+++ b/japanese/ibus-anthy/files/patch-engine_Makefile.in
@@ -0,0 +1,11 @@
+--- engine/Makefile.in.orig	2009-11-28 17:46:22.000000000 +0900
++++ engine/Makefile.in	2009-11-28 18:04:57.000000000 +0900
+@@ -714,7 +714,7 @@
+ 
+ 
+ anthy.py anthy_wrap.c: anthy.i
+-	$(SWIG) -python -I/usr/include -o anthy_wrap.c $(srcdir)/anthy.i
++	$(SWIG) -python -I/usr/include ${ANTHY_CFLAGS} -o anthy_wrap.c $(srcdir)/anthy.i
+ 
+ anthy.xml: anthy.xml.in
+ 	( \
diff --git a/japanese/ibus-anthy/files/patch-po_Makefile.in.in b/japanese/ibus-anthy/files/patch-po_Makefile.in.in
new file mode 100644
index 000000000000..f7f32d55a0ba
--- /dev/null
+++ b/japanese/ibus-anthy/files/patch-po_Makefile.in.in
@@ -0,0 +1,11 @@
+--- po/Makefile.in.in.orig	2009-11-27 15:00:00.000000000 +0900
++++ po/Makefile.in.in	2009-11-28 17:48:06.000000000 +0900
+@@ -34,7 +34,7 @@
+ datarootdir = @datarootdir@
+ libdir = @libdir@
+ DATADIRNAME = @DATADIRNAME@
+-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
++itlocaledir = @localedir@
+ subdir = po
+ install_sh = @install_sh@
+ # Automake >= 1.8 provides @mkdir_p@.