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>

11 files changed, 73 insertions, 82 deletions

diff --git a/textproc/iiimf-x-lib/Makefile b/textproc/iiimf-x-lib/Makefile
index 047003f3ef0c..2363398e7ba8 100644
--- a/textproc/iiimf-x-lib/Makefile
+++ b/textproc/iiimf-x-lib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	x-lib
 PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
@@ -23,14 +24,16 @@ RUN_DEPENDS=	${LOCALBASE}/lib/im/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-csc
 IIIMF_VER=	r12_1-svn2002
 USE_BZIP2=	yes
 USE_REINPLACE=  yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GNOME=	intltool
 USE_MOTIF=      yes
 USE_OPENSSL=    yes
-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
+
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 WRKSRC=         ${WRKDIR}/${DISTNAME:S/src-//}/iiimxcf/xiiimp.so
 PATCH_WRKSRC=   ${WRKDIR}/${DISTNAME:S/src-//}
@@ -45,20 +48,27 @@ 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 -lintl ${PTHREAD_LIBS}
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
 		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
-		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE}
+		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" \
 		${WRKSRC}/../../acfiles/im_common.m4
 
 pre-configure:
-	(cd ${WRKSRC}/../.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
-	(cd ${WRKSRC}/../../acfiles/ && ${TOUCH} ltconfig)
-
-do-configure:
-	(cd ${WRKSRC} && ./autogen.sh --prefix=${PREFIX})
+	@cd ${WRKSRC}/../.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles
+	@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/textproc/iiimf-x-lib/files/patch-Makefile b/textproc/iiimf-x-lib/files/patch-Makefile
index 85df0e345035..bcc2cb24a1c8 100644
--- a/textproc/iiimf-x-lib/files/patch-Makefile
+++ b/textproc/iiimf-x-lib/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/textproc/iiimf-x-lib/files/patch-acfiles_check_sys.m4 b/textproc/iiimf-x-lib/files/patch-acfiles_check_sys.m4
new file mode 100644
index 000000000000..8626eeae1fd1
--- /dev/null
+++ b/textproc/iiimf-x-lib/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/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_autogen.sh b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_autogen.sh
deleted file mode 100644
index b0e62e6664b6..000000000000
--- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_autogen.sh
+++ /dev/null
@@ -1,57 +0,0 @@
---- iiimxcf/xiiimp.so/autogen.sh	Wed Mar 24 10:15:03 2004
-+++ iiimxcf/xiiimp.so/autogen.sh	Wed Feb 16 16:29:24 2005
-@@ -12,7 +12,15 @@
- 
- DIE=0
- 
--(libtool --version) < /dev/null > /dev/null 2>&1 || {
-+LIBTOOL=libtool15
-+INTLTOOLIZE=intltoolize15
-+LIBTOOLIZE=libtoolize15
-+ACLOCAL=aclocal15
-+AUTOHEADER=autoheader253
-+AUTOMAKE=automake15
-+AUTOCONF=autoconf253
-+
-+(${LIBTOOL} --version) < /dev/null > /dev/null 2>&1 || {
- 	echo
- 	echo "You must have libtool installed to compile $PROJECT."
- 	echo "Install the appropriate package for your distribution,"
-@@ -20,7 +28,7 @@
- 	DIE=1
- }
- 
--(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-+(${AUTOCONF} --version) < /dev/null > /dev/null 2>&1 || {
- 	echo
- 	echo "You must have autoconf installed to compile $PROJECT."
- 	echo "libtool the appropriate package for your distribution,"
-@@ -29,8 +37,8 @@
- }
- 
- have_automake=false
--if automake --version < /dev/null > /dev/null 2>&1 ; then
--	automake_version=`automake --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
-+if ${AUTOMAKE} --version < /dev/null > /dev/null 2>&1 ; then
-+	automake_version=`${AUTOMAKE} --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
- 	case $automake_version in
- 	   1.2*|1.3*|1.4) 
- 		;;
-@@ -66,13 +74,13 @@
- # intentionally we don't call "libtoolize --force"
- # to avoid overriding ../acfiles/ltmain.h, which we don't want to happen!
- 
--aclocal -I ../../acfiles $ACLOCAL_FLAGS
-+${ACLOCAL} -I ../../acfiles $ACLOCAL_FLAGS
- 
- # optionally feature autoheader
--(autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
-+(${AUTOHEADER} --version)  < /dev/null > /dev/null 2>&1 && ${AUTOHEADER}
- 
--automake -a $am_opt
--autoconf
-+${AUTOMAKE} -a $am_opt
-+${AUTOCONF}
- cd $ORIGDIR
- 
- if test -z "$AUTOGEN_SUBDIR_MODE"; then
diff --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_configure.ac b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_configure.ac
index 457376dd7d64..33d427a3c4d0 100644
--- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_configure.ac
+++ b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_configure.ac
@@ -7,15 +7,15 @@
  CFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
          ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
 -        ${THREAD_COMMON_CXX_CFLAGS}"
-+        ${THREAD_COMMON_CXX_CFLAGS} -I/usr/local/include"
++        ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}"
  
  CXXFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
            ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
 -          ${THREAD_COMMON_CXX_CFLAGS}"
-+          ${THREAD_COMMON_CXX_CFLAGS} -I/usr/local/include"
++          ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}"
  
 -LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
-+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} -L/usr/local/lib -lintl"
++LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
  
  dnl --------------------------------------------------------------------------------
  dnl                       Section 6: compilation test
diff --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_Makefile.am b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_Makefile.am
index cbedc9d9dfef..e9f06efa8ade 100644
--- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_Makefile.am
+++ b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_Makefile.am
@@ -1,14 +1,14 @@
---- iiimxcf/xiiimp.so/iiimp/Makefile.am	Tue Mar 23 07:37:51 2004
-+++ iiimxcf/xiiimp.so/iiimp/Makefile.am	Thu Feb 17 21:32:52 2005
+--- iiimxcf/xiiimp.so/iiimp/Makefile.am.orig	Tue Mar 23 07:37:51 2004
++++ iiimxcf/xiiimp.so/iiimp/Makefile.am	Thu Mar  3 00:37:54 2005
 @@ -1,15 +1,14 @@
  moduledir = $(IMDIR)
  xiiimp_la_CFLAGS = $(X_CFLAGS) -I$(X_PRIVATEINC) \
                     $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) \
 -                   -I$(CSCONV_DIR)
-+                   -I$(CSCONV_DIR) -I/usr/local/include -DUSE_CSCONV
++                   -I$(CSCONV_DIR) -DUSE_CSCONV -DIMDIR="\"${IMDIR}\""
  xiiimp_la_LDFLAGS = -rpath $(moduledir) -version-info $(XIIIMP_SOX18N_VERSION) \
 -                    -module -export-dynamic -no-undefined
-+                    -module -export-dynamic -no-undefined -L/usr/local/include \
++                    -module -export-dynamic -no-undefined \
 +		    -liiimcf -liiimp
  # On GNU/Linux system, libtool does not take care of -no-undefined so that
  # you have to add the following by yourself to check undefined symbols.
diff --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_csconv.h b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_csconv.h
index dbac66f5ec97..660c30c0fc1a 100644
--- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_csconv.h
+++ b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_csconv.h
@@ -5,7 +5,7 @@
  #endif /* !CSC_BASE_DIR_SYSTEM */
  #if !defined(CSC_BASE_DIR_DEFAULT)
 -#    define	CSC_BASE_DIR_DEFAULT	"/usr/lib/im/csconv/"
-+#    define	CSC_BASE_DIR_DEFAULT	"/usr/local/lib/im/csconv/"
++#    define	CSC_BASE_DIR_DEFAULT	(IMDIR "/csconv/")
  #endif /* !CSC_BASE_DIR_DEFAULT */
  
  #define CSC_IS_PATH_ABS(path)	(('/' == *(path)) ||			\
diff --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpAux.c b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpAux.c
index cad0f0123107..3b08439ac146 100644
--- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpAux.c
+++ b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpAux.c
@@ -5,7 +5,7 @@
  
  
 -#define AUX_BASE_DIR		"/usr/lib/im/"
-+#define AUX_BASE_DIR		"/usr/local/lib/im/"
++#define AUX_BASE_DIR		IMDIR
  
  #if defined(__sparcv9)
  #define SPARCV9_DIR		"sparcv9/"
diff --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpConv.c b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpConv.c
index 29d74ccbad92..bfeb601a75d0 100644
--- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpConv.c
+++ b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpConv.c
@@ -5,7 +5,7 @@
  #include <dlfcn.h>
  #include "csconv.h"
 -#define CSC_PATH	"/usr/lib/im/csconv/csconv.so"
-+#define CSC_PATH	"/usr/local/lib/im/csconv/csconv.so"
++#define CSC_PATH	(IMDIR "/csconv/csconv.so")
  #define CSC_OPEN_LOCALE	"csconv_open_locale"
  #define CSC_OPEN	"csconv_open"
  #define CSC_CONV	"csconv"
diff --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpDL.c b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpDL.c
index aaf2ea2f6f0a..dbbb091828df 100644
--- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpDL.c
+++ b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpDL.c
@@ -5,7 +5,7 @@
  
  #ifndef XLOCALEDIR
 -#define XLOCALEDIR "/usr/lib/im/modules"
-+#define XLOCALEDIR "/usr/local/lib/im/modules"
++#define XLOCALEDIR (IMDIR "/modules")
  #endif
  
  static const char*
diff --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpIM.c b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpIM.c
index 7390a9f3fd88..2ba2ba2442de 100644
--- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpIM.c
+++ b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpIM.c
@@ -5,7 +5,7 @@
  
  #ifndef IMLOCALEDIR
 -#define IMLOCALEDIR "/usr/lib/im/locale"
-+#define IMLOCALEDIR "/usr/local/lib/im/locale"
++#define IMLOCALEDIR (IMDIR "/locale")
  #endif
  
  #define	iscomment(ch)	((ch) == '\0' || (ch) == '#')