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>

6 files changed, 145 insertions, 92 deletions

diff --git a/textproc/iiimf-gnome-im-switcher/Makefile b/textproc/iiimf-gnome-im-switcher/Makefile
index 1e677cd5164..be9f099d23e 100644
--- a/textproc/iiimf-gnome-im-switcher/Makefile
+++ b/textproc/iiimf-gnome-im-switcher/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnome-im-switcher
 PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
@@ -21,13 +22,17 @@ USE_X_PREFIX=	yes
 IIIMF_VER=	r12_1-svn2002
 USE_BZIP2=	yes
 USE_REINPLACE=  yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	intltool gconf2 libglade2 libgnomeui \
 		gnomepanel gnomeprefix gnomehack
-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-//}/gnome-im-switcher
 PATCH_WRKSRC=   ${WRKDIR}/${DISTNAME:S/src-//}
@@ -42,33 +47,45 @@ IGNORE=         "It is supported on FreeBSD 5.3 and later"
 IGNORE=	"${ARCH} is not support."
 .endif
 
-GNU_CONFIGURE=	yes
-MAKE_ARGS+=	LIBTOOL="${LIBTOOL} --tag=CXX"
+CFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/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}"
+TLZ_ARGS=	--copy --force
+BNB_PATH=	bonobo/server
 
 post-patch:
-	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
+	${REINPLACE_CMD} -e "s,/usr/lib/im,${LOCALBASE}/lib/im,g" \
 		${WRKSRC}/../acfiles/im_common.m4
 	${REINPLACE_CMD} -e "/GNOMECC_DATA_DIR/s,/share/,&gnome/,g" \
 		${WRKSRC}/configure.in
 
 pre-configure:
-	(cd ${WRKSRC}/.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
-	(cd ${WRKSRC}/../acfiles/ && ${TOUCH} ltconfig)
-	(cd ${WRKSRC} && ${TOUCH} ltconfig)
-	(cd ${WRKSRC} && ${LOCALBASE}/bin/intltoolize --copy --force --automake)
-	(cd ${WRKSRC} && ${LIBTOOLIZE} --force --copy)
-	(cd ${WRKSRC} && ${ACLOCAL} -I ../acfiles -I /usr/local/share/aclocal)
-	(cd ${WRKSRC} && ${AUTOHEADER})
-	(cd ${WRKSRC} && ${AUTOMAKE} --add-missing --gnu)
-	(cd ${WRKSRC} && ${AUTOCONF})
+	@cd ${WRKSRC}/.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles
+	@cd ${WRKSRC} && glib-gettextize ${TLZ_ARGS}
+	@cd ${WRKSRC} && intltoolize ${TLZ_ARGS}
+	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} ${TLZ_ARGS}
+	@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}
 
 post-configure:
-	${REINPLACE_CMD} -e "s,[(]libdir[)]/bonobo/server,{exec_prefix}/libdata/bonobo/server,g" \
-		${WRKSRC}/src/Makefile
+	${REINPLACE_CMD} \
+	 -e "s,[(]libdir[)]/${BNB_PATH},{exec_prefix}/libdata/${BNB_PATH},g" \
+	 -e "/-D.*LOCALEDIR=/s,[(]datadir[)]/,&../,g" \
+	 ${WRKSRC}/src/Makefile
 	${REINPLACE_CMD} -e "s,[(]datadir[)]/gnome/,(datadir)/,g" \
-		${WRKSRC}/help/C/Makefile
+	 ${WRKSRC}/help/C/Makefile
+	${REINPLACE_CMD} \
+	 -e "/^datadir/s,${PREFIX}/share/gnome,${PREFIX}/share,g" \
+	 ${WRKSRC}/po/Makefile
 
 .include <bsd.port.post.mk>
diff --git a/textproc/iiimf-gnome-im-switcher/files/patch-Makefile b/textproc/iiimf-gnome-im-switcher/files/patch-Makefile
index 85df0e34503..bcc2cb24a1c 100644
--- a/textproc/iiimf-gnome-im-switcher/files/patch-Makefile
+++ b/textproc/iiimf-gnome-im-switcher/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-gnome-im-switcher/files/patch-acfiles_check_sys.m4 b/textproc/iiimf-gnome-im-switcher/files/patch-acfiles_check_sys.m4
new file mode 100644
index 00000000000..8626eeae1fd
--- /dev/null
+++ b/textproc/iiimf-gnome-im-switcher/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-gnome-im-switcher/files/patch-gnome_autogen.sh b/textproc/iiimf-gnome-im-switcher/files/patch-gnome_autogen.sh
deleted file mode 100644
index 217dda90ef8..00000000000
--- a/textproc/iiimf-gnome-im-switcher/files/patch-gnome_autogen.sh
+++ /dev/null
@@ -1,71 +0,0 @@
---- gnome-im-switcher/autogen.sh	Fri Dec  5 12:25:06 2003
-+++ gnome-im-switcher/autogen.sh	Wed Feb 16 16:50:27 2005
-@@ -13,15 +13,20 @@
- 
- DIE=0
- 
--AUTOMAKE=automake-1.4
--ACLOCAL=aclocal-1.4
-+LIBTOOL=libtool15
-+INTLTOOLIZE=intltoolize
-+LIBTOOLIZE=libtoolize15
-+ACLOCAL=aclocal15
-+AUTOHEADER=autoheader253
-+AUTOMAKE=automake15
-+AUTOCONF=autoconf253
- 
- ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
-         AUTOMAKE=automake
-         ACLOCAL=aclocal
- }
- 
--(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 "Download the appropriate package for your distribution,"
-@@ -38,7 +43,7 @@
- }
- 
- (grep "^AM_PROG_LIBTOOL" configure.in >/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 to compile $PROJECT."
-     echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz"
-@@ -57,7 +62,7 @@
- }
- 
- (grep "^AC_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && {
--  (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
-+  ($INTLTOOLIZE --version) < /dev/null > /dev/null 2>&1 || {
-     echo
-     echo "**Error**: You must have \`intltoolize' installed to compile $PKG_NAME."
-     echo "Get ftp://ftp.gnome.org/pub/GNOME/stable/sources/intltool/intltool-0.10.tar.gz"
-@@ -115,22 +120,22 @@
-       fi
-       if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then
-         echo "Running intltoolize..."
--	intltoolize --copy --force --automake
-+	$INTLTOOLIZE --copy --force --automake
-       fi
-       if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
- 	echo "Running libtoolize..."
--	libtoolize --force --copy
-+	$LIBTOOLIZE --force --copy
-       fi
-       echo "Running $ACLOCAL $aclocalinclude ..."
-       $ACLOCAL $aclocalinclude
-       if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
- 	echo "Running autoheader..."
--	autoheader
-+	$AUTOHEADER
-       fi
-       echo "Running $AUTOMAKE --gnu $am_opt ..."
-       $AUTOMAKE --add-missing --gnu $am_opt
-       echo "Running autoconf ..."
--      autoconf
-+      $AUTOCONF
-     )
-   fi
- done
diff --git a/textproc/iiimf-gnome-im-switcher/files/patch-gnome_configure.in b/textproc/iiimf-gnome-im-switcher/files/patch-gnome_configure.in
new file mode 100644
index 00000000000..873ae128397
--- /dev/null
+++ b/textproc/iiimf-gnome-im-switcher/files/patch-gnome_configure.in
@@ -0,0 +1,9 @@
+--- gnome-im-switcher/configure.in.orig	Thu Oct 14 23:10:11 2004
++++ gnome-im-switcher/configure.in	Wed Mar  2 22:17:35 2005
+@@ -40,6 +40,7 @@
+ GIMLET_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $GIMLET_LIBS"
+ GIMLET_CFLAGS="$X_CFLAGS $GIMLET_CFLAGS"
+ CFLAGS="$GIMLET_CFLAGS $CFLAGS"
++LDFLAGS="${LDFLAGS}"
+ 
+ AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
diff --git a/textproc/iiimf-gnome-im-switcher/pkg-plist b/textproc/iiimf-gnome-im-switcher/pkg-plist
index 3aa22e0c0cc..b8c4fa91c1a 100644
--- a/textproc/iiimf-gnome-im-switcher/pkg-plist
+++ b/textproc/iiimf-gnome-im-switcher/pkg-plist
@@ -30,3 +30,63 @@ share/gnome/icons/hicolor/48x48/apps/gnome-settings-im.png
 @unexec rmdir %D/share/gnome/icons/hicolor/48x48 > /dev/null 2>&1 || true
 @unexec rmdir %D/share/gnome/icons/hicolor > /dev/null 2>&1 || true
 @unexec rmdir %D/share/gnome/icons > /dev/null 2>&1 || true
+share/locale/ja/LC_MESSAGES/gnome-im-switcher.mo
+@unexec rmdir %D/share/locale/ja/LC_MESSAGES > /dev/null 2>&1 || true
+@unexec rmdir %D/share/locale/ja > /dev/null 2>&1 || true
+share/locale/ko/LC_MESSAGES/gnome-im-switcher.mo
+@unexec rmdir %D/share/locale/ko/LC_MESSAGES > /dev/null 2>&1 || true
+@unexec rmdir %D/share/locale/ko > /dev/null 2>&1 || true
+share/locale/zh_CN/LC_MESSAGES/gnome-im-switcher.mo
+@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES > /dev/null 2>&1 || true
+@unexec rmdir %D/share/locale/zh_CN > /dev/null 2>&1 || true
+share/locale/zh_TW/LC_MESSAGES/gnome-im-switcher.mo
+@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES > /dev/null 2>&1 || true
+@unexec rmdir %D/share/locale/zh_TW > /dev/null 2>&1 || true
+share/locale/zh_HK/LC_MESSAGES/gnome-im-switcher.mo
+@unexec rmdir %D/share/locale/zh_HK/LC_MESSAGES > /dev/null 2>&1 || true
+@unexec rmdir %D/share/locale/zh_HK > /dev/null 2>&1 || true
+share/locale/de/LC_MESSAGES/gnome-im-switcher.mo
+@unexec rmdir %D/share/locale/de/LC_MESSAGES > /dev/null 2>&1 || true
+@unexec rmdir %D/share/locale/de > /dev/null 2>&1 || true
+share/locale/fr/LC_MESSAGES/gnome-im-switcher.mo
+@unexec rmdir %D/share/locale/fr/LC_MESSAGES > /dev/null 2>&1 || true
+@unexec rmdir %D/share/locale/fr > /dev/null 2>&1 || true
+share/locale/pl/LC_MESSAGES/gnome-im-switcher.mo
+@unexec rmdir %D/share/locale/pl/LC_MESSAGES > /dev/null 2>&1 || true
+@unexec rmdir %D/share/locale/pl > /dev/null 2>&1 || true
+share/locale/ru/LC_MESSAGES/gnome-im-switcher.mo
+@unexec rmdir %D/share/locale/ru/LC_MESSAGES > /dev/null 2>&1 || true
+@unexec rmdir %D/share/locale/ru > /dev/null 2>&1 || true
+share/locale/es/LC_MESSAGES/gnome-im-switcher.mo
+@unexec rmdir %D/share/locale/es/LC_MESSAGES > /dev/null 2>&1 || true
+@unexec rmdir %D/share/locale/es > /dev/null 2>&1 || true
+share/locale/it/LC_MESSAGES/gnome-im-switcher.mo
+@unexec rmdir %D/share/locale/it/LC_MESSAGES > /dev/null 2>&1 || true
+@unexec rmdir %D/share/locale/it > /dev/null 2>&1 || true
+share/locale/pt_BR/LC_MESSAGES/gnome-im-switcher.mo
+@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES > /dev/null 2>&1 || true
+@unexec rmdir %D/share/locale/pt_BR > /dev/null 2>&1 || true
+share/locale/sv/LC_MESSAGES/gnome-im-switcher.mo
+@unexec rmdir %D/share/locale/sv/LC_MESSAGES > /dev/null 2>&1 || true
+@unexec rmdir %D/share/locale/sv > /dev/null 2>&1 || true
+share/locale/cs/LC_MESSAGES/gnome-im-switcher.mo
+@unexec rmdir %D/share/locale/cs/LC_MESSAGES > /dev/null 2>&1 || true
+@unexec rmdir %D/share/locale/cs > /dev/null 2>&1 || true
+share/locale/hu/LC_MESSAGES/gnome-im-switcher.mo
+@unexec rmdir %D/share/locale/hu/LC_MESSAGES > /dev/null 2>&1 || true
+@unexec rmdir %D/share/locale/hu > /dev/null 2>&1 || true
+share/locale/bn/LC_MESSAGES/gnome-im-switcher.mo
+@unexec rmdir %D/share/locale/bn/LC_MESSAGES > /dev/null 2>&1 || true
+@unexec rmdir %D/share/locale/bn > /dev/null 2>&1 || true
+share/locale/gu/LC_MESSAGES/gnome-im-switcher.mo
+@unexec rmdir %D/share/locale/gu/LC_MESSAGES > /dev/null 2>&1 || true
+@unexec rmdir %D/share/locale/gu > /dev/null 2>&1 || true
+share/locale/hi/LC_MESSAGES/gnome-im-switcher.mo
+@unexec rmdir %D/share/locale/hi/LC_MESSAGES > /dev/null 2>&1 || true
+@unexec rmdir %D/share/locale/hi > /dev/null 2>&1 || true
+share/locale/pa/LC_MESSAGES/gnome-im-switcher.mo
+@unexec rmdir %D/share/locale/pa/LC_MESSAGES > /dev/null 2>&1 || true
+@unexec rmdir %D/share/locale/pa > /dev/null 2>&1 || true
+share/locale/ta/LC_MESSAGES/gnome-im-switcher.mo
+@unexec rmdir %D/share/locale/ta/LC_MESSAGES > /dev/null 2>&1 || true
+@unexec rmdir %D/share/locale/ta > /dev/null 2>&1 || true