Fixed iiimf-related ports build fail

Submitted by:	Masanori OZAWA <ozawa@ongs.net>
Approved by:	portmgr(krion)
Pointed out by:	pointyhat via kris

4 files changed, 57 insertions, 15 deletions

diff --git a/chinese/iiimf-le-newpy/Makefile b/chinese/iiimf-le-newpy/Makefile
index 5e8fd6e4502f..a598a48db4a2 100644
--- a/chinese/iiimf-le-newpy/Makefile
+++ b/chinese/iiimf-le-newpy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	le-newpy
 PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
diff --git a/chinese/iiimf-le-newpy/files/patch-leif_configure.ac b/chinese/iiimf-le-newpy/files/patch-leif_configure.ac
index 36a755b64b14..184e6f1835cd 100644
--- a/chinese/iiimf-le-newpy/files/patch-leif_configure.ac
+++ b/chinese/iiimf-le-newpy/files/patch-leif_configure.ac
@@ -1,8 +1,28 @@
---- leif/configure.ac	Wed Oct  6 23:00:36 2004
-+++ leif/configure.ac	Thu Feb 17 23:32:54 2005
-@@ -61,25 +61,19 @@
- IM_CONSTRUCT_FLAGS
- IM_CONSTRUCT_THREAD_FLAGS
+--- leif/configure.ac.orig	Wed Oct  6 23:00:36 2004
++++ leif/configure.ac	Thu Mar 24 17:50:52 2005
+@@ -44,15 +44,15 @@
+ 
+ IM_CHECK_SYSTEM
+ IM_CHECK_DLOPEN
+-IM_CHECK_CANNA
+-IM_CHECK_FREEWNN
++dnl IM_CHECK_CANNA
++dnl IM_CHECK_FREEWNN
+ 
+ IM_CHECK_X
+-IM_CHECK_GTK
++dnl IM_CHECK_GTK
+ IM_CHECK_MOTIF
+-PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
+-AC_SUBST(GTK2_CFLAGS)
+-AC_SUBST(GTK2_LIBS)
++dnl PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
++dnl AC_SUBST(GTK2_CFLAGS)
++dnl AC_SUBST(GTK2_LIBS)
+ 
+ dnl --------------------------------------------------------------------------------
+ dnl                      Section 5: compilation options
+@@ -63,23 +63,17 @@
  
  CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
          ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
diff --git a/chinese/iiimf-le-ude/Makefile b/chinese/iiimf-le-ude/Makefile
index db9bbf0e08c6..97a73d62a9d8 100644
--- a/chinese/iiimf-le-ude/Makefile
+++ b/chinese/iiimf-le-ude/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	le-ude
 PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
diff --git a/chinese/iiimf-le-ude/files/patch-leif_configure.ac b/chinese/iiimf-le-ude/files/patch-leif_configure.ac
index 43849b6bf537..cfce1eedb62a 100644
--- a/chinese/iiimf-le-ude/files/patch-leif_configure.ac
+++ b/chinese/iiimf-le-ude/files/patch-leif_configure.ac
@@ -1,8 +1,30 @@
---- leif/configure.ac	Wed Oct  6 23:00:36 2004
-+++ leif/configure.ac	Thu Feb 17 23:32:54 2005
-@@ -61,25 +61,19 @@
- IM_CONSTRUCT_FLAGS
- IM_CONSTRUCT_THREAD_FLAGS
+--- leif/configure.ac.orig	Wed Oct  6 23:00:36 2004
++++ leif/configure.ac	Thu Mar 24 17:44:36 2005
+@@ -44,15 +44,15 @@
+ 
+ IM_CHECK_SYSTEM
+ IM_CHECK_DLOPEN
+-IM_CHECK_CANNA
+-IM_CHECK_FREEWNN
++dnl IM_CHECK_CANNA
++dnl IM_CHECK_FREEWNN
+ 
+-IM_CHECK_X
+-IM_CHECK_GTK
+-IM_CHECK_MOTIF
+-PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
+-AC_SUBST(GTK2_CFLAGS)
+-AC_SUBST(GTK2_LIBS)
++dnl IM_CHECK_X
++dnl IM_CHECK_GTK
++dnl IM_CHECK_MOTIF
++dnl PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
++dnl AC_SUBST(GTK2_CFLAGS)
++dnl AC_SUBST(GTK2_LIBS)
+ 
+ dnl --------------------------------------------------------------------------------
+ dnl                      Section 5: compilation options
+@@ -63,23 +63,15 @@
  
  CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
          ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
@@ -18,15 +40,15 @@
 +LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
  
 -LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul chewing"
-+LE_TARGETS="udt"
- 
+-
 -IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
- IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
+-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
++LE_TARGETS="udt"
  
  dnl --------------------------------------------------------------------------------
  dnl                       Section 6: compilation test