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>

9 files changed, 105 insertions, 126 deletions

diff --git a/textproc/iiimf-server/Makefile b/textproc/iiimf-server/Makefile
index 122b2e35ebc6..4c372a952c09 100644
--- a/textproc/iiimf-server/Makefile
+++ b/textproc/iiimf-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	server
 PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
@@ -23,12 +24,14 @@ USE_RC_SUBR=	htt.sh
 USE_BZIP2=	yes
 USE_REINPLACE=  yes
 USE_GMAKE=	yes
-USE_GNOME=	intltool pkgconfig libxml2
+USE_GNOME=	pkgconfig libxml2
 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-//}/iiimsf
 PATCH_WRKSRC=   ${WRKDIR}/${DISTNAME:S/src-//}
@@ -43,10 +46,17 @@ IGNORE=         "It is supported on FreeBSD 5.3 and later"
 IGNORE=	"${ARCH} is not support."
 .endif
 
-MAKE_ARGS+=	LIBTOOL="${LIBTOOL} --tag=CXX"
+.if defined(WITH_DEBUG)
+CFLAGS+=	-g -ggdb -DDEBUG
+.endif
+
+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}
+		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" \
@@ -56,11 +66,15 @@ post-patch:
 	${MV} ${WRKSRC}/src/le.xml.conf ${WRKSRC}/src/le.xml.conf.sample
 
 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}
 
 post-configure:
 	${REINPLACE_CMD} -e "s,\$${prefix}/var,/var,g" \
diff --git a/textproc/iiimf-server/files/patch-Makefile b/textproc/iiimf-server/files/patch-Makefile
index 85df0e345035..bcc2cb24a1c8 100644
--- a/textproc/iiimf-server/files/patch-Makefile
+++ b/textproc/iiimf-server/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-server/files/patch-acfiles_check_sys.m4 b/textproc/iiimf-server/files/patch-acfiles_check_sys.m4
new file mode 100644
index 000000000000..8626eeae1fd1
--- /dev/null
+++ b/textproc/iiimf-server/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-server/files/patch-iiimsf_autogen.sh b/textproc/iiimf-server/files/patch-iiimsf_autogen.sh
deleted file mode 100644
index fe4fb7cc2707..000000000000
--- a/textproc/iiimf-server/files/patch-iiimsf_autogen.sh
+++ /dev/null
@@ -1,93 +0,0 @@
---- iiimsf/autogen.sh	Wed Mar 24 06:05:08 2004
-+++ iiimsf/autogen.sh	Wed Feb 16 16:17:26 2005
-@@ -6,6 +6,14 @@
- 
- DIE=0
- 
-+LIBTOOL=libtool15
-+INTLTOOLIZE=intltoolize15
-+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/textproc/iiimf-server/files/patch-iiimsf_configure.ac b/textproc/iiimf-server/files/patch-iiimsf_configure.ac
new file mode 100644
index 000000000000..2993c93bca78
--- /dev/null
+++ b/textproc/iiimf-server/files/patch-iiimsf_configure.ac
@@ -0,0 +1,19 @@
+--- iiimsf/configure.ac.orig	Wed Mar  2 21:00:09 2005
++++ iiimsf/configure.ac	Wed Mar  2 21:00:37 2005
+@@ -236,13 +236,13 @@
+ 
+ CFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
+         ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
+-        ${THREAD_CXX_CFLAGS}"
++        ${THREAD_CXX_CFLAGS} ${CFLAGS}"
+ 
+ CXXFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
+           ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
+-          ${THREAD_CXX_CFLAGS}"
++          ${THREAD_CXX_CFLAGS} ${CXXFLAGS}"
+ 
+-LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
++LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
+ 
+ if test $HAVE_LIBCRYPT = "yes"; then
+     LIBCRYPT_FLAGS="-lcrypt"
diff --git a/textproc/iiimf-server/files/patch-iiimsf_src_IMSvrCfg.cpp b/textproc/iiimf-server/files/patch-iiimsf_src_IMSvrCfg.cpp
index c7b0457f8673..6e598be003d4 100644
--- a/textproc/iiimf-server/files/patch-iiimsf_src_IMSvrCfg.cpp
+++ b/textproc/iiimf-server/files/patch-iiimsf_src_IMSvrCfg.cpp
@@ -5,7 +5,7 @@
  IMSvrCfg::initialize()
  {
 -    initstr(IMDIR, "IM main directory.", "/usr/lib/im");
-+    initstr(IMDIR, "IM main directory.", "/usr/local/lib/im");
++    initstr(IMDIR, "IM main directory.", IM_DIRECTORY);
      initstr(BASICLOCALE, "Locale used by default", "C");
  #ifdef WIN32
      initstr(IFPATHNAME, "Language Engine module directory",
@@ -13,16 +13,7 @@
  #else
      initstr(IFPATHNAME, "Language Engine module directory",
 -	   "/usr/lib/im/leif");
-+	   "/usr/local/lib/im/leif");
++	   (IM_DIRECTORY "/leif"));
  #endif
      initstr(IFNAME, "Language Engine name", "");
      initstr(PORT, "Port or service name", "9010");
-@@ -115,7 +115,7 @@
-     initstr(CONVERSIONKEYS, "Conversion ON keys", "<Ctrl>space");
-     initstr(LABEL, "Label type", "numeric");
-     initbool(SETTRIGGEROFFKEYS, "set trigger off keys", false);
--    // initstr(IMCONFIG, "/usr/lib/im/etc/im.config");
-+    // initstr(IMCONFIG, "/usr/local/lib/im/etc/im.config");
-     // initbool(DIRECT_XSUNIM, true);
-     initstr(LOG_FACILITY, "syslog facility", "USER");
-     initstr(LOG_LEVEL, "log level", "NORMAL");
diff --git a/textproc/iiimf-server/files/patch-iiimsf_src_IMXMLUtil.cpp b/textproc/iiimf-server/files/patch-iiimsf_src_IMXMLUtil.cpp
index 3df7e74e17a2..cf28bc34cfd1 100644
--- a/textproc/iiimf-server/files/patch-iiimsf_src_IMXMLUtil.cpp
+++ b/textproc/iiimf-server/files/patch-iiimsf_src_IMXMLUtil.cpp
@@ -5,7 +5,7 @@
      IMXMLModifier xml((const char *)argv[1]);
      IMModuleInfoVec *lev;
 -    string mod("/usr/lib/im/leif/freewnnle.so");
-+    string mod("/usr/local/lib/im/leif/freewnnle.so");
++    string mod(IM_DIRECTORY "/leif/freewnnle.so");
      string lang("ja");
      string out("foo.conf");
  
@@ -14,7 +14,7 @@
      */
      printf("\n\n*** remove\n");
 -    mod = "/usr/lib/im/leif/CannaLE.so";
-+    mod = "/usr/local/lib/im/leif/CannaLE.so";
++    mod = IM_DIRECTORY "/leif/CannaLE.so";
      xml.removemodule(mod, lang);
      /*
        for (IMModuleInfoVec::iterator i = lev->begin (); i != lev->end (); i++) {
diff --git a/textproc/iiimf-server/files/patch-iiimsf_src_Makefile.am b/textproc/iiimf-server/files/patch-iiimsf_src_Makefile.am
index eab0bfc200bc..b64512cc3310 100644
--- a/textproc/iiimf-server/files/patch-iiimsf_src_Makefile.am
+++ b/textproc/iiimf-server/files/patch-iiimsf_src_Makefile.am
@@ -1,6 +1,15 @@
 --- iiimsf/src/Makefile.am.orig	Fri Oct 15 03:39:38 2004
-+++ iiimsf/src/Makefile.am	Sun Feb 20 19:42:40 2005
-@@ -22,6 +22,7 @@
++++ iiimsf/src/Makefile.am	Wed Mar  2 21:18:10 2005
+@@ -4,7 +4,7 @@
+ 	-DXMLCONFDIR="\"$(XMLCONFDIR)\""			\
+ 	-DSOCKETDIR="\"$(SOCKETDIR)\""				\
+ 	-DSEGVLOGGER="\"$(libexecdir)/iiimf-segv-logger\""	\
+-	-g							\
++	-DIM_DIRECTORY="\"${IMDIR}\"" \
+ 	$(NULL)
+ 
+ libiiimsf_la_SOURCES =		\
+@@ -22,6 +21,7 @@
  libiiimsf_la_LIBADD =		\
  	$(TLS_LIBS)		\
  	$(XML_LIBS)		\
@@ -8,7 +17,7 @@
  	$(NULL)
  
  sbindir = $(IMBINDIR)
-@@ -56,7 +57,6 @@
+@@ -56,7 +56,6 @@
  
  htt_server_LDADD =			\
  	$(LIB_DIR)/iml/libiml.la	\
@@ -16,7 +25,7 @@
  	$(SOCKET_LIBS)			\
  	$(LIBCRYPT_FLAGS)		\
  	$(LIBPAM_FLAGS)			\
-@@ -72,7 +72,6 @@
+@@ -72,7 +71,6 @@
  	$(NULL)
  iiimf_le_tools_LDADD =		\
  	$(XML_LIBS)		\
@@ -24,11 +33,12 @@
  	libiiimsf.la		\
  	$(NULL)
  
-@@ -82,6 +81,7 @@
+@@ -82,7 +80,7 @@
  iiimf_segv_logger_CFLAGS =				\
  	-DLOGDIR="\"$(localstatedir)/log/iiim\""	\
  	-DDATADIR="\"$(gdbcmddir)\""			\
+-	-g						\
 +	-DIMBINDIR="\"$(IMBINDIR)\""			\
- 	-g						\
  	$(NULL)
  gdbcmddir = $(datadir)/iiim
+ gdbcmd_DATA =		\
diff --git a/textproc/iiimf-server/files/patch-iiimsf_src_watchdog.c b/textproc/iiimf-server/files/patch-iiimsf_src_watchdog.c
index 9ba4519fd547..9124497e6753 100644
--- a/textproc/iiimf-server/files/patch-iiimsf_src_watchdog.c
+++ b/textproc/iiimf-server/files/patch-iiimsf_src_watchdog.c
@@ -5,7 +5,7 @@
      char	**argv;
  {
 -    const char *httpath="/usr/lib/im/htt_server" ; /* SUNWiiimf Only */
-+    const char *httpath="/usr/local/lib/im/htt_server" ; /* SUNWiiimf Only */
++    const char *httpath=IM_DIRECTORY "/htt_server" ; /* SUNWiiimf Only */
      pid_t pgrp;
      void (*disp)(int);
      char **new_argv, **pp;