IIIMF-related ports some changes:

  - support CFLAGS of /etc/make.conf
  - replace absolute path with ${LOCALBASE}, ${PREFIX} and others
  - replace -pthread flags with ${THREAD*}
  - m17n fixed of gnome-im-swither
  - fixed vid krisbot

Submitted by:	Masanori OZAWA <ozawa@ongs.co.jp>

10 files changed, 93 insertions, 117 deletions

diff --git a/chinese/iiimf-le-newpy/Makefile b/chinese/iiimf-le-newpy/Makefile
index 5193ab6de30c..5e8fd6e4502f 100644
--- a/chinese/iiimf-le-newpy/Makefile
+++ b/chinese/iiimf-le-newpy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	le-newpy
 PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
+PORTREVISION=	1
 CATEGORIES=	chinese textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
@@ -22,17 +23,21 @@ IIIMF_VER=	r12_1-svn2002
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	intltool
-WANT_AUTOCONF_VER=253
-WANT_AUTOHEADER_VER=253
-WANT_AUTOMAKE_VER=15
-WANT_LIBTOOL_VER=15
+USE_AUTOCONF_VER=	259
+USE_AUTOHEADER_VER=	259
+USE_AUTOMAKE_VER=	19
+WANT_LIBTOOL_VER=	15
+
+AUTOMAKE_ARGS+=		--add-missing
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}/leif
 PATCH_WRKSRC=	${WRKDIR}/${DISTNAME:S/src-//}
 
 .if !defined(WITHOUT_XAUX)
 USE_MOTIF=	yes
+CFLAGS+=	-I${X11BASE}/include
+LDFLAGS+=	-L${X11BASE}/lib
 PLIST_SUB+=	WANT_XAUX=""
 RUN_DEPENDS+=	${LOCALBASE}/lib/im/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-csconv
 .else
@@ -50,14 +55,13 @@ IGNORE=		"It is supported on FreeBSD 5.3 and later"
 IGNORE=	"${ARCH} is not support."
 .endif
 
-MAKE_ARGS+=	LIBTOOL="${LIBTOOL} --tag=CXX"
+CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
 UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
 		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
-		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE}
-AUTOGEN_ARGS+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
-		--prefix=${PREFIX} ${CONFIGURE_ARGS}
+		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
+		ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
 
 post-patch:
 	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
@@ -65,11 +69,15 @@ post-patch:
 		${WRKSRC}/../lib/CSConv/csconv.h
 
 pre-configure:
-	(cd ${WRKSRC}/../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
-	(cd ${WRKSRC}/../acfiles/ && ${TOUCH} ltconfig)
-	(cd ${WRKSRC}/ && ${TOUCH} ltconfig)
-
-do-configure:
-	(cd ${WRKSRC}/ && ./autogen.sh ${AUTOGEN_ARGS})
+	@cd ${WRKSRC}/../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles
+	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --force --copy
+	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
+	 -I ../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}
+	@cd ${WRKSRC} && ${REINPLACE_CMD} \
+	 -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \
+	 -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
+	 -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \
+	 ${LIBTOOLFILES}
+	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER}
 
 .include <bsd.port.post.mk>
diff --git a/chinese/iiimf-le-newpy/files/patch-Makefile b/chinese/iiimf-le-newpy/files/patch-Makefile
index 85df0e345035..bcc2cb24a1c8 100644
--- a/chinese/iiimf-le-newpy/files/patch-Makefile
+++ b/chinese/iiimf-le-newpy/files/patch-Makefile
@@ -13,7 +13,7 @@
  update-acfiles:
  	cd acfiles && \
 -        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
-+        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
++        $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
          rm -f Makefile.in aclocal.m4
  
  config:
diff --git a/chinese/iiimf-le-newpy/files/patch-acfiles_check_sys.m4 b/chinese/iiimf-le-newpy/files/patch-acfiles_check_sys.m4
new file mode 100644
index 000000000000..8626eeae1fd1
--- /dev/null
+++ b/chinese/iiimf-le-newpy/files/patch-acfiles_check_sys.m4
@@ -0,0 +1,38 @@
+--- acfiles/check_sys.m4.orig	Tue Sep 14 13:31:27 2004
++++ acfiles/check_sys.m4	Wed Mar  2 08:39:25 2005
+@@ -203,6 +203,11 @@
+ 		    CXX=${CC}
+ 		fi
+ 		;;
++	    cc*:*)
++		COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
++		SHLIBCFLAGS='-fpic'
++		SHLIBLDFLAGS='-shared'
++		;;
+ 	    *)
+ 		DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
+ 		;;
+@@ -249,8 +254,8 @@
+ 		COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
+ 		;;
+ 	    *freebsd*)
+-		THREAD_LDFLAGS="-pthread"
+-		PTHREAD_LIBS=""
++		THREAD_LDFLAGS=""
++		PTHREAD_LIBS="${PTHREAD_LIBS}"
+ 		;;
+ 	esac
+ 
+@@ -288,9 +293,9 @@
+ 		THREAD_CXX_CFLAGS="-mt"
+ 		HAVE_THREAD="uithread"
+ 		;;
+-	    *freebsd*@gcc:*)
+-		THREAD_LDFLAGS="-pthread"
+-		THREAD_LIBS=""
++	    *freebsd*@cc:*|*freebsd*@gcc:*)
++		THREAD_LDFLAGS=""
++		THREAD_LIBS="${PTHREAD_LIBS}"
+ 		HAVE_THREAD="freebsd-pthread"
+ 		;;
+ 	    *linux*)
diff --git a/chinese/iiimf-le-newpy/files/patch-leif_autogen.sh b/chinese/iiimf-le-newpy/files/patch-leif_autogen.sh
deleted file mode 100644
index d38d31e628c7..000000000000
--- a/chinese/iiimf-le-newpy/files/patch-leif_autogen.sh
+++ /dev/null
@@ -1,93 +0,0 @@
---- leif/autogen.sh	Thu Dec 11 15:29:55 2003
-+++ leif/autogen.sh	Wed Feb 16 16:53:53 2005
-@@ -6,6 +6,14 @@
- 
- DIE=0
- 
-+LIBTOOL=libtool15
-+INTLTOOLIZE=intltoolize
-+LIBTOOLIZE=libtoolize15
-+ACLOCAL=aclocal15
-+AUTOHEADER=autoheader253
-+AUTOMAKE=automake15
-+AUTOCONF=autoconf253
-+
- ACLOCAL_FLAGS="-I ../acfiles $ACLOCAL_FLAGS"
- 
- if [ -n "$GNOME2_DIR" ]; then
-@@ -22,7 +30,7 @@
-     exit 1
- }
- 
--(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-+(${AUTOCONF} --version) < /dev/null > /dev/null 2>&1 || {
-   echo
-   echo "**Error**: You must have \`autoconf' installed."
-   echo "Download the appropriate package for your distribution,"
-@@ -31,7 +39,7 @@
- }
- 
- (grep "^AC_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && {
--  (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
-+  (${INTLTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || {
-     echo 
-     echo "**Error**: You must have \`intltool' installed."
-     echo "You can get it from:"
-@@ -41,7 +49,7 @@
- }
- 
- (grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
--  (libtool --version) < /dev/null > /dev/null 2>&1 || {
-+  (${LIBTOOL} --version) < /dev/null > /dev/null 2>&1 || {
-     echo
-     echo "**Error**: You must have \`libtool' installed."
-     echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
-@@ -59,7 +67,7 @@
-   }
- }
- 
--(automake --version) < /dev/null > /dev/null 2>&1 || {
-+(${AUTOMAKE} --version) < /dev/null > /dev/null 2>&1 || {
-   echo
-   echo "**Error**: You must have \`automake' installed."
-   echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
-@@ -69,7 +77,7 @@
- 
- 
- # if no automake, don't bother testing for aclocal
--test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
-+test -n "$NO_AUTOMAKE" || (${ACLOCAL} --version) < /dev/null > /dev/null 2>&1 || {
-   echo
-   echo "**Error**: Missing \`aclocal'.  The version of \`automake'"
-   echo "installed doesn't appear recent enough."
-@@ -114,24 +122,24 @@
-       fi
-       if grep "^AC_PROG_INTLTOOL" configure.ac >/dev/null; then
-         echo "Running intltoolize..."
--	intltoolize --copy --force --automake
-+	${INTLTOOLIZE} --copy --force --automake
-       fi
-       if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
- 	if test -z "$NO_LIBTOOLIZE" ; then 
- 	  echo "Running libtoolize..."
--	  libtoolize --force --copy
-+	  ${LIBTOOLIZE} --force --copy
- 	fi
-       fi
-       echo "Running aclocal $aclocalinclude ..."
--      aclocal $aclocalinclude
-+      ${ACLOCAL} $aclocalinclude
-       if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
- 	echo "Running autoheader..."
--	autoheader
-+	${AUTOHEADER}
-       fi
-       echo "Running automake --gnu $am_opt ..."
--      automake --add-missing --copy --gnu $am_opt
-+      ${AUTOMAKE} --add-missing --copy --gnu $am_opt
-       echo "Running autoconf ..."
--      autoconf
-+      ${AUTOCONF}
-     )
-   fi
- done
diff --git a/chinese/iiimf-le-newpy/files/patch-leif_configure.ac b/chinese/iiimf-le-newpy/files/patch-leif_configure.ac
index 902678e911b0..36a755b64b14 100644
--- a/chinese/iiimf-le-newpy/files/patch-leif_configure.ac
+++ b/chinese/iiimf-le-newpy/files/patch-leif_configure.ac
@@ -7,15 +7,15 @@
  CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
          ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
 -        ${THREAD_COMMON_CXX_CFLAGS}"
-+        ${THREAD_COMMON_CXX_CFLAGS} -I/usr/local/include -I/usr/X11R6/include"
++        ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}"
  
  CXXFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
            ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
 -          ${THREAD_COMMON_CXX_CFLAGS}"
-+          ${THREAD_COMMON_CXX_CFLAGS} -I/usr/local/include -I/usr/X11R6/include"
++          ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}"
  
 -LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
-+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} -L/usr/local/lib -L/usr/X11R6/lib"
++LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
  
 -LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul chewing"
 +LE_TARGETS="newpy"
diff --git a/chinese/iiimf-le-newpy/files/patch-leif_newpy_Makefile.am b/chinese/iiimf-le-newpy/files/patch-leif_newpy_Makefile.am
new file mode 100644
index 000000000000..11207f269a2f
--- /dev/null
+++ b/chinese/iiimf-le-newpy/files/patch-leif_newpy_Makefile.am
@@ -0,0 +1,12 @@
+--- leif/newpy/Makefile.am.orig	Wed Mar  2 23:57:32 2005
++++ leif/newpy/Makefile.am	Wed Mar  2 23:57:57 2005
+@@ -3,7 +3,8 @@
+ datadir = $(IM_LOCALEDIR)/zh_CN/newpy/data
+ newpy_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) \
+                   -DCompByNewPinyin -DNO_COLOR_FEEDBACK -DNO_CARET_NEGO \
+-                  -I$(IM_INCLUDEDIR)/iml
++                  -I$(IM_INCLUDEDIR)/iml \
++		  -DIMDIR="\"${IMDIR}\""
+ newpy_la_LDFLAGS = -module -rpath $(IM_LEIFDIR) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS)
+ newpy_la_LIBADD = $(THREAD_LIBS)
+ newpy_la_SOURCES = NewPY.c NewPYLE.c KeysymType.c OnKeySym.c CikuOper.c \
diff --git a/chinese/iiimf-le-newpy/files/patch-leif_newpy_NewPY.c b/chinese/iiimf-le-newpy/files/patch-leif_newpy_NewPY.c
index 400adf9dcd01..abb3adb1bddf 100644
--- a/chinese/iiimf-le-newpy/files/patch-leif_newpy_NewPY.c
+++ b/chinese/iiimf-le-newpy/files/patch-leif_newpy_NewPY.c
@@ -5,7 +5,7 @@
      l->path = "d:\\newpy_obj.jar";  
  #else
 -    l->path = "/usr/lib/im/locale/zh_CN/newpy/newpy_obj.jar";  /* path */
-+    l->path = "/usr/local/lib/im/locale/zh_CN/newpy/newpy_obj.jar";  /* path */
++    l->path = (IMDIR "/locale/zh_CN/newpy/newpy_obj.jar");  /* path */
  #endif
  
      l->signature = "";
diff --git a/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_Makefile.am b/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_Makefile.am
new file mode 100644
index 000000000000..14ed8d141bbc
--- /dev/null
+++ b/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_Makefile.am
@@ -0,0 +1,11 @@
+--- leif/newpy/xaux/Makefile.am.orig	Thu Mar  3 00:00:36 2005
++++ leif/newpy/xaux/Makefile.am	Thu Mar  3 00:01:03 2005
+@@ -3,7 +3,7 @@
+ datadir = $(IM_LOCALEDIR)/zh_CN/newpy
+ COMMONCFLAGS = $(X_CFLAGS) $(THREAD_CXX_CFLAGS) \
+                -DNO_COLOR_FEEDBACK -DNO_CARET_NEGO -DUSE_CSCONV \
+-               -I$(CSCONV_DIR)
++               -I$(CSCONV_DIR) -DIMDIR="\"${IMDIR}\""
+ COMMONLDFLAGS = -module $(THREAD_LDFLAGS)
+ aux_la_CFLAGS = $(COMMONCFLAGS)
+ aux_win_CFLAGS = $(COMMONCFLAGS)
diff --git a/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_aux_so.c b/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_aux_so.c
index 1b9a1af61503..e9d2299d8bcb 100644
--- a/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_aux_so.c
+++ b/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_aux_so.c
@@ -5,7 +5,7 @@
  #define HASH_SIZE 137
  #define ME			"aux_so"
 -#define	AUX_EXT			"/usr/lib/im/locale/zh_CN/newpy/aux_win"
-+#define	AUX_EXT			"/usr/local/lib/im/locale/zh_CN/newpy/aux_win"
++#define	AUX_EXT			(IMDIR "/locale/zh_CN/newpy/aux_win")
  
  typedef struct _aux_icid {
          aux_t *                 aux;
diff --git a/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_aux_win.c b/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_aux_win.c
index 838f54411388..de604ccf0d31 100644
--- a/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_aux_win.c
+++ b/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_aux_win.c
@@ -5,7 +5,7 @@
  #include "getarg.h"
  
 -#define IMAGE_PATH "/usr/lib/im/locale/zh_CN/newpy/"
-+#define IMAGE_PATH "/usr/local/lib/im/locale/zh_CN/newpy/"
++#define IMAGE_PATH (IMDIR "/locale/zh_CN/newpy/")
  
  Pixmap LoadGIFFile(char * filename);
  static void AllocateColors1(void);