IIIMF-related ports:

    - drop maintainership
    - update to r12.2
    - some bug fixes

PR:		81184
Submitted by:	Masanori OZAWA <ozawa@ongs.co.jp>
Approved by:	maintainer

18 files changed, 226 insertions, 228 deletions

diff --git a/textproc/iiimf-server/Makefile b/textproc/iiimf-server/Makefile
index 4c372a952c09..ee3aca7841a5 100644
--- a/textproc/iiimf-server/Makefile
+++ b/textproc/iiimf-server/Makefile
@@ -6,44 +6,39 @@
 #
 
 PORTNAME=	server
-PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
-PORTREVISION=	1
+PORTVERSION=	12.2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
-DISTNAME=	im-sdk-src-${IIIMF_VER}
+DISTNAME=	iiimf-src-${PORTVERSION}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	kcwu@csie.org
+MAINTAINER=	ozawa@ongs.co.jp
 COMMENT=	Internet/Intranet Input Method Server Framework
 
-LIB_DEPENDS=    iiimp.0:${PORTSDIR}/textproc/iiimf-protocol-lib
+LIB_DEPENDS=    iiimp.1:${PORTSDIR}/textproc/iiimf-protocol-lib
 
-IIIMF_VER=	r12_1-svn2002
-USE_RC_SUBR=	htt.sh
+ONLY_FOR_ARCHS=	i386
+
+INSTALLS_SHLIB=	yes
+USE_RC_SUBR=	iiimd.sh
 USE_BZIP2=	yes
 USE_REINPLACE=  yes
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig libxml2
 USE_OPENSSL=    yes
-USE_AUTOCONF_VER=	259
-USE_AUTOHEADER_VER=	259
-USE_AUTOMAKE_VER=	19
+WANT_AUTOCONF_VER=	259
+WANT_AUTOHEADER_VER=	259
+WANT_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-//}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
+BUILDDIR=	${WRKSRC}/iiimsf
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 503000
-IGNORE=         "It is supported on FreeBSD 5.3 and later"
-.endif
-
-.if ${ARCH} != "i386"
-IGNORE=	"${ARCH} is not support."
+IGNORE=	It is supported on FreeBSD 5.3 and later.
 .endif
 
 .if defined(WITH_DEBUG)
@@ -51,33 +46,25 @@ CFLAGS+=	-g -ggdb -DDEBUG
 .endif
 
 CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+CXXFLAGS+=	-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} \
-		ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
 
 post-patch:
-	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
-		${WRKSRC}/../acfiles/im_common.m4 \
-		${WRKSRC}/src/le.xml.conf
-	${MV} ${WRKSRC}/htt.xml.conf ${WRKSRC}/htt.xml.conf.sample
-	${MV} ${WRKSRC}/src/le.xml.conf ${WRKSRC}/src/le.xml.conf.sample
+	${REINPLACE_CMD} \
+		-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
+		-e "s,%%PREFIX%%,${PREFIX},g" \
+		${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am
+	${REINPLACE_CMD} -e "s,/usr/lib/iiim,${PREFIX}/lib/iiim,g" \
+		${BUILDDIR}/src/le.xml.conf
+	${MV} ${BUILDDIR}/iiimd.xml.conf ${BUILDDIR}/iiimd.xml.conf.sample
+	${MV} ${BUILDDIR}/src/le.xml.conf ${BUILDDIR}/src/le.xml.conf.sample
 
-pre-configure:
-	@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}
+do-configure:
+	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
+	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
 
-post-configure:
-	${REINPLACE_CMD} -e "s,\$${prefix}/var,/var,g" \
-		${WRKSRC}/src/Makefile
+post-install:
+	${INSTALL_DATA} ${BUILDDIR}/src/le.xml.conf.sample ${PREFIX}/etc/iiim/
 
 .include <bsd.port.post.mk>
diff --git a/textproc/iiimf-server/distinfo b/textproc/iiimf-server/distinfo
index 440e49d16220..4416cce728d0 100644
--- a/textproc/iiimf-server/distinfo
+++ b/textproc/iiimf-server/distinfo
@@ -1,2 +1,2 @@
-MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
-SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292
+MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
+SIZE (iiimf-src-12.2.tar.bz2) = 11452670
diff --git a/textproc/iiimf-server/files/htt.sh.in b/textproc/iiimf-server/files/iiimd.sh.in
index 27e47629c743..e34b5f2a7ffd 100644
--- a/textproc/iiimf-server/files/htt.sh.in
+++ b/textproc/iiimf-server/files/iiimd.sh.in
@@ -2,19 +2,19 @@
 
 # $FreeBSD$
 
-# PROVIDE: htt
+# PROVIDE: iiimd
 # REQUIRE: DAEMON
 # KEYWORD: FreeBSD shutdown
 
 prefix=%%PREFIX%%
 
-htt_enable=${htt_enable:-"NO"}
+iiimd_enable=${iiimd_enable:-"NO"}
 
 . %%RC_SUBR%%
 
-name="htt"
+name="iiimd"
 rcvar=`set_rcvar`
-command="${prefix}/lib/im/htt"
+command="${prefix}/bin/iiimd"
 
 load_rc_config $name
 command_args="> /dev/null 2>&1 &"
diff --git a/textproc/iiimf-server/files/patch-Makefile b/textproc/iiimf-server/files/patch-Makefile
index bcc2cb24a1c8..3976fd7ed181 100644
--- a/textproc/iiimf-server/files/patch-Makefile
+++ b/textproc/iiimf-server/files/patch-Makefile
@@ -1,19 +1,47 @@
---- Makefile	Thu Apr  8 03:28:00 2004
-+++ Makefile	Wed Feb 16 14:09:34 2005
-@@ -2,6 +2,7 @@
- AUTOMAKE = automake
- AUTOHEADER = autoheader
- AUTOCONF = autoconf
-+LIBTOOLIZE = libtoolize
+--- Makefile.orig	Mon May  9 15:32:45 2005
++++ Makefile	Mon May  9 15:35:03 2005
+@@ -1,29 +1,31 @@
+ ## deprecated in favour of AUTORECONF
+-#ACLOCAL = aclocal
+-#AUTOMAKE = automake --add-missing --copy
+-#LIBTOOLIZE = libtoolize --force --copy
+-#AUTOHEADER = autoheader
+-#AUTOCONF = autoconf
++ACLOCAL = aclocal19
++AUTOMAKE = automake19 --add-missing --copy
++LIBTOOLIZE = libtoolize15 --force --copy
++AUTOHEADER = autoheader259
++AUTOCONF = autoconf259
+ #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
+ #             $(LIBTOOLIZE) && \
+ #             $(AUTOHEADER) && \
+ #             $(AUTOMAKE) && \
+ #             $(AUTOCONF)
  
- CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
-              $(AUTOHEADER) && \
-@@ -21,7 +22,7 @@
+-AUTORECONF = autoreconf
++AUTORECONF = autoreconf259
+ BOOTSTRAP = $(AUTORECONF) --install --force
+ INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
  
- update-acfiles:
- 	cd acfiles && \
--        $(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_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
++CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%LOCALBASE%%/etc --localstatedir=/var
+ 
+-INTLDIRS = iiimgcf gnome-im-switcher
++#INTLDIRS = iiimgcf gnome-im-switcher
+ 
+-BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
+-            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
+-            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
+-            iiimgcf gnome-im-switcher doc
++BUILDDIRS = iiimsf
++#BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
++#            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
++#            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
++#            iiimgcf gnome-im-switcher doc
+ 
+-CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
++CONFIGDIRS = $(BUILDDIRS)
++#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
+ 
+ all: compile
  
- config:
diff --git a/textproc/iiimf-server/files/patch-acfiles_check_sys.m4 b/textproc/iiimf-server/files/patch-acfiles_check_sys.m4
index 8626eeae1fd1..44ee86c035bc 100644
--- a/textproc/iiimf-server/files/patch-acfiles_check_sys.m4
+++ b/textproc/iiimf-server/files/patch-acfiles_check_sys.m4
@@ -1,10 +1,12 @@
---- 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 @@
+--- acfiles/check_sys.m4.orig	Mon May  9 15:28:20 2005
++++ acfiles/check_sys.m4	Mon May  9 15:32:07 2005
+@@ -203,6 +203,13 @@
  		    CXX=${CC}
  		fi
  		;;
 +	    cc*:*)
++		DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
++		DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
 +		COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
 +		SHLIBCFLAGS='-fpic'
 +		SHLIBLDFLAGS='-shared'
@@ -12,7 +14,7 @@
  	    *)
  		DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
  		;;
-@@ -249,8 +254,8 @@
+@@ -249,8 +256,8 @@
  		COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
  		;;
  	    *freebsd*)
@@ -23,7 +25,7 @@
  		;;
  	esac
  
-@@ -288,9 +293,9 @@
+@@ -288,9 +295,9 @@
  		THREAD_CXX_CFLAGS="-mt"
  		HAVE_THREAD="uithread"
  		;;
diff --git a/textproc/iiimf-server/files/patch-iiimsf_Makefile.am b/textproc/iiimf-server/files/patch-iiimsf_Makefile.am
index a1398d6ca0e5..b0cba93b5afa 100644
--- a/textproc/iiimf-server/files/patch-iiimsf_Makefile.am
+++ b/textproc/iiimf-server/files/patch-iiimsf_Makefile.am
@@ -1,8 +1,11 @@
---- iiimsf/Makefile.am.orig	Sat Feb 19 03:33:28 2005
-+++ iiimsf/Makefile.am	Sat Feb 19 03:33:48 2005
-@@ -2,4 +2,4 @@
+--- iiimsf/Makefile.am.orig	Fri Mar 18 04:26:28 2005
++++ iiimsf/Makefile.am	Mon May  9 19:00:14 2005
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = foreign
+-ACLOCAL_AMFLAGS = -I ../acfiles
++ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../acfiles
  SUBDIRS = lib src
  
  confdir = $(XMLCONFDIR)
--conf_DATA = htt.xml.conf
-+conf_DATA = htt.xml.conf.sample src/le.xml.conf.sample
+-conf_DATA = iiimd.xml.conf
++conf_DATA = iiimd.xml.conf.sample
diff --git a/textproc/iiimf-server/files/patch-iiimsf_configure.ac b/textproc/iiimf-server/files/patch-iiimsf_configure.ac
deleted file mode 100644
index 2993c93bca78..000000000000
--- a/textproc/iiimf-server/files/patch-iiimsf_configure.ac
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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_IMAuth.cpp b/textproc/iiimf-server/files/patch-iiimsf_src_IMAuth.cpp
index 85dbd9e5252a..74ca709db074 100644
--- a/textproc/iiimf-server/files/patch-iiimsf_src_IMAuth.cpp
+++ b/textproc/iiimf-server/files/patch-iiimsf_src_IMAuth.cpp
@@ -1,5 +1,5 @@
---- iiimsf/src/IMAuth.cpp	Sun Jun 20 06:46:28 2004
-+++ iiimsf/src/IMAuth.cpp	Wed Feb 16 16:21:47 2005
+--- iiimsf/src/IMAuth.cpp.orig	Mon May  9 18:08:19 2005
++++ iiimsf/src/IMAuth.cpp	Mon May  9 18:08:53 2005
 @@ -47,7 +47,9 @@
  #include <stdlib.h>
  #include <string.h>
@@ -7,6 +7,6 @@
 +#ifdef HAVE_ALLOCA_H
  #include <alloca.h>
 +#endif
+ #include <sys/types.h>
  #include <sys/socket.h>
  #include <netinet/in.h>
- #include <arpa/inet.h>
diff --git a/textproc/iiimf-server/files/patch-iiimsf_src_IMSignal.cpp b/textproc/iiimf-server/files/patch-iiimsf_src_IMSignal.cpp
index 3073025f3c2c..bae379d11a8a 100644
--- a/textproc/iiimf-server/files/patch-iiimsf_src_IMSignal.cpp
+++ b/textproc/iiimf-server/files/patch-iiimsf_src_IMSignal.cpp
@@ -1,23 +1,12 @@
---- iiimsf/src/IMSignal.cpp.orig	Sat Oct 16 10:28:13 2004
-+++ iiimsf/src/IMSignal.cpp	Sun Feb 20 18:43:18 2005
-@@ -1,7 +1,11 @@
- #include <config.h>
- #include <sstream>
- #include <sys/types.h>
-+#ifdef __FreeBSD__
-+#include <sys/wait.h>
-+#else
- #include <wait.h>
-+#endif
- #include <unistd.h>
- #ifdef HAVE_SIGNAL
- #include <signal.h>
-@@ -67,10 +71,8 @@
+--- iiimsf/src/IMSignal.cpp.orig	Mon May  9 18:00:02 2005
++++ iiimsf/src/IMSignal.cpp	Mon May  9 18:00:45 2005
+@@ -66,11 +66,8 @@
      stringstream s;
      string spid, signum;
  
 -    s << getpid();
 -    spid = s.str();
+-    s.str("");
 -    s << num;
 -    signum = s.str();
 +    s << getpid() << " " << num;
diff --git a/textproc/iiimf-server/files/patch-iiimsf_src_IMSvrCfg.cpp b/textproc/iiimf-server/files/patch-iiimsf_src_IMSvrCfg.cpp
deleted file mode 100644
index 6e598be003d4..000000000000
--- a/textproc/iiimf-server/files/patch-iiimsf_src_IMSvrCfg.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- iiimsf/src/IMSvrCfg.cpp	Mon Oct  4 18:07:05 2004
-+++ iiimsf/src/IMSvrCfg.cpp	Wed Feb 16 20:38:05 2005
-@@ -90,14 +90,14 @@
- void
- IMSvrCfg::initialize()
- {
--    initstr(IMDIR, "IM main directory.", "/usr/lib/im");
-+    initstr(IMDIR, "IM main directory.", IM_DIRECTORY);
-     initstr(BASICLOCALE, "Locale used by default", "C");
- #ifdef WIN32
-     initstr(IFPATHNAME, "Language Engine module directory",
- 	   "D:\\WINNT\\System32\\iiimf");
- #else
-     initstr(IFPATHNAME, "Language Engine module directory",
--	   "/usr/lib/im/leif");
-+	   (IM_DIRECTORY "/leif"));
- #endif
-     initstr(IFNAME, "Language Engine name", "");
-     initstr(PORT, "Port or service name", "9010");
diff --git a/textproc/iiimf-server/files/patch-iiimsf_src_IMXMLUtil.cpp b/textproc/iiimf-server/files/patch-iiimsf_src_IMXMLUtil.cpp
deleted file mode 100644
index cf28bc34cfd1..000000000000
--- a/textproc/iiimf-server/files/patch-iiimsf_src_IMXMLUtil.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- iiimsf/src/IMXMLUtil.cpp	Mon Oct  4 18:07:05 2004
-+++ iiimsf/src/IMXMLUtil.cpp	Wed Feb 16 20:38:34 2005
-@@ -78,7 +78,7 @@
- {
-     IMXMLModifier xml((const char *)argv[1]);
-     IMModuleInfoVec *lev;
--    string mod("/usr/lib/im/leif/freewnnle.so");
-+    string mod(IM_DIRECTORY "/leif/freewnnle.so");
-     string lang("ja");
-     string out("foo.conf");
- 
-@@ -101,7 +101,7 @@
-       }
-     */
-     printf("\n\n*** remove\n");
--    mod = "/usr/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 b64512cc3310..1547a96b5970 100644
--- a/textproc/iiimf-server/files/patch-iiimsf_src_Makefile.am
+++ b/textproc/iiimf-server/files/patch-iiimsf_src_Makefile.am
@@ -1,44 +1,39 @@
---- iiimsf/src/Makefile.am.orig	Fri Oct 15 03:39:38 2004
-+++ 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)		\
-+	-liiimp			\
- 	$(NULL)
+--- iiimsf/src/Makefile.am.orig	Thu Apr 21 16:04:56 2005
++++ iiimsf/src/Makefile.am	Mon May  9 18:33:14 2005
+@@ -97,7 +97,7 @@
  
- sbindir = $(IMBINDIR)
-@@ -56,7 +56,6 @@
- 
- htt_server_LDADD =			\
+ iiimd_LDADD =			\
  	$(LIB_DIR)/iml/libiml.la	\
 -	$(IM_LIBDIR)/iiimp/libiiimp.la	\
++	-liiimp	\
  	$(SOCKET_LIBS)			\
  	$(LIBCRYPT_FLAGS)		\
  	$(LIBPAM_FLAGS)			\
-@@ -72,7 +71,6 @@
+@@ -112,7 +112,6 @@
  	$(NULL)
  iiimf_le_tools_LDADD =		\
  	$(XML_LIBS)		\
 -	-ldl			\
- 	libiiimsf.la		\
+ 	libiiimutils.la		\
  	$(NULL)
  
-@@ -82,7 +80,7 @@
+@@ -122,6 +121,7 @@
  iiimf_segv_logger_CFLAGS =				\
  	-DLOGDIR="\"$(localstatedir)/log/iiim\""	\
  	-DDATADIR="\"$(gdbcmddir)\""			\
--	-g						\
-+	-DIMBINDIR="\"$(IMBINDIR)\""			\
++	-DPREFIX="\"$(prefix)\""			\
+ 	-g						\
  	$(NULL)
  gdbcmddir = $(datadir)/iiim
- gdbcmd_DATA =		\
+@@ -129,9 +129,9 @@
+ 	gdbcmd		\
+ 	$(NULL)
+ 
+-logdir = $(localstatedir)/log/iiim
++logdir = /var/log/iiim
+ log_DATA = $(NULL)
+-socketdir = $(localstatedir)/run/iiim
++socketdir = /var/run/iiim
+ socket_DATA = $(NULL)
+ 
+ iiimlibdir = $(libdir)/iiim
diff --git a/textproc/iiimf-server/files/patch-iiimsf_src_iwrap.c b/textproc/iiimf-server/files/patch-iiimsf_src_iwrap.c
index c309e37a03f1..5fbc2ca89dff 100644
--- a/textproc/iiimf-server/files/patch-iiimsf_src_iwrap.c
+++ b/textproc/iiimf-server/files/patch-iiimsf_src_iwrap.c
@@ -1,8 +1,6 @@
-Index: iiimsf/src/iwrap.c
-diff -u -p iiimsf/src/iwrap.c.orig iiimsf/src/iwrap.c
---- iiimsf/src/iwrap.c.orig	Thu Sep  9 06:17:09 2004
-+++ iiimsf/src/iwrap.c	Tue Feb 22 15:22:41 2005
-@@ -72,6 +72,15 @@ int permit_access(
+--- iiimsf/src/iwrap.c.orig	Wed Apr 13 01:51:55 2005
++++ iiimsf/src/iwrap.c	Mon May  9 18:02:18 2005
+@@ -72,6 +72,15 @@
  {
  #ifdef HAVE_LIBWRAP
      struct request_info req;
@@ -12,13 +10,13 @@ diff -u -p iiimsf/src/iwrap.c.orig iiimsf/src/iwrap.c
 +
 +    size = sizeof(ss);
 +    if (getpeername(h, pname, &size) < 0)
-+	return 0;
++       return 0;
 +    if (pname->sa_family == AF_UNIX)
-+    	return 1;
++       return 1;
  
      request_init(&req, RQ_DAEMON, cmdname, RQ_FILE, h, 0);
      fromhost(&req);
-@@ -177,6 +186,14 @@ authenticate_with_unix(
+@@ -177,6 +186,14 @@
  #ifdef HAVE_GETPEEREID
      /* OpenBSD */
      git_t gid;
diff --git a/textproc/iiimf-server/files/patch-iiimsf_src_lexmlconf.cpp b/textproc/iiimf-server/files/patch-iiimsf_src_lexmlconf.cpp
new file mode 100644
index 000000000000..ad0fb280089c
--- /dev/null
+++ b/textproc/iiimf-server/files/patch-iiimsf_src_lexmlconf.cpp
@@ -0,0 +1,66 @@
+--- iiimsf/src/lexmlconf.cpp.orig	Fri Apr 22 16:53:03 2005
++++ iiimsf/src/lexmlconf.cpp	Mon May 16 19:00:55 2005
+@@ -114,6 +114,7 @@
+ 	list = (IIIMLEInfoList *)malloc(sizeof (IIIMLEInfoList) * 1);
+ 	list->data = leinfo;
+ 	list->next = NULL;
++	list->prev = NULL;
+ 
+ 	return list;
+ }
+@@ -128,6 +129,7 @@
+ 	if (list != NULL) {
+ 		for (ll = list; ll->next != NULL; ll = ll->next);
+ 		ll->next = l;
++		l->prev = ll;
+ 		ll = list;
+ 	} else {
+ 		ll = l;
+@@ -144,7 +146,12 @@
+ 
+ 	l = iiim_le_info_list_new(leinfo);
+ 	if (list != NULL) {
++                if (list->prev != NULL) {
++                        list->prev->next = l;
++                }
+ 		l->next = list;
++		l->prev = list->prev;
++		list->prev = l;
+ 	}
+ 
+ 	return l;
+@@ -154,22 +161,19 @@
+ iiim_le_info_list_remove(IIIMLEInfoList *list,
+ 			 IIIMLEInfo     *leinfo)
+ {
+-	IIIMLEInfoList *tmp, *prev = NULL;
++	IIIMLEInfoList *prev, *next;
+ 
+-	tmp = list;
+-	while (tmp) {
+-		if (tmp->data == leinfo) {
+-			if (prev)
+-				prev->next = tmp->next;
+-			else
+-				list = tmp->next;
+-			iiim_le_info_free(tmp->data);
+-			free(tmp);
+-
+-			break;
+-		}
+-		prev = tmp;
+-		tmp = prev->next;
++	for (; list && list->data != leinfo; list = list->next);
++
++	if (NULL != list) {
++	  prev = list->prev;
++	  next = list->next;
++
++	  if (NULL != prev) prev->next = next;
++	  if (NULL != next) next->prev = prev;
++
++	  if (list->data) iiim_le_info_free(list->data);
++	  free(list);
+ 	}
+ 
+ 	return list;
diff --git a/textproc/iiimf-server/files/patch-iiimsf_src_lexmlconf.h b/textproc/iiimf-server/files/patch-iiimsf_src_lexmlconf.h
new file mode 100644
index 000000000000..dde5d312ff95
--- /dev/null
+++ b/textproc/iiimf-server/files/patch-iiimsf_src_lexmlconf.h
@@ -0,0 +1,10 @@
+--- iiimsf/src/lexmlconf.h.orig	Fri Apr 22 16:53:03 2005
++++ iiimsf/src/lexmlconf.h	Mon May 16 19:00:59 2005
+@@ -63,6 +63,7 @@
+ struct _IIIMLEInfoList {
+ 	IIIMLEInfo     *data;
+ 	IIIMLEInfoList *next;
++	IIIMLEInfoList *prev;
+ };
+ struct _IIIMLEInfo {
+ 	char       *language;
diff --git a/textproc/iiimf-server/files/patch-iiimsf_src_segvlogger.c b/textproc/iiimf-server/files/patch-iiimsf_src_segvlogger.c
index 0f6f42dcc947..a761c47e40cf 100644
--- a/textproc/iiimf-server/files/patch-iiimsf_src_segvlogger.c
+++ b/textproc/iiimf-server/files/patch-iiimsf_src_segvlogger.c
@@ -1,24 +1,16 @@
---- iiimsf/src/segvlogger.c.orig	Sat Oct 16 10:28:13 2004
-+++ iiimsf/src/segvlogger.c	Sun Feb 20 19:43:06 2005
-@@ -19,6 +19,10 @@
- #include <time.h>
- #include <dirent.h>
- 
-+#ifdef __FreeBSD__
-+#include <sys/syslimits.h>
-+#endif
-+
- int
- main(int argc, char **argv)
- {
-@@ -43,8 +47,8 @@
+--- iiimsf/src/segvlogger.c.orig	Mon May  9 17:50:07 2005
++++ iiimsf/src/segvlogger.c	Mon May  9 17:52:09 2005
+@@ -63,8 +63,13 @@
+ 	}
  	exit(1);
      }
- 
--    snprintf(buffer, 1024, "gdb --batch --quiet --command %s/gdbcmd --pid %d",
--	     DATADIR, ppid);
-+    snprintf(buffer, 1024, "gdb -batch -q -x %s/gdbcmd %s/htt_server %d",
-+	     DATADIR, IMBINDIR, ppid);
++#ifndef __FreeBSD__
+     snprintf(buffer, 1024, "gdb --batch --quiet --command %s/gdbcmd --pid %d",
+ 	     DATADIR, ppid);
++#else
++    snprintf(buffer, 1024, "gdb -batch -q -x %s/gdbcmd %s/bin/iiimd %d",
++	     DATADIR, PREFIX, ppid);
++#endif
  
      if ((fpr = popen(buffer, "r")) != NULL) {
  	char logfile[PATH_MAX];
diff --git a/textproc/iiimf-server/files/patch-iiimsf_src_watchdog.c b/textproc/iiimf-server/files/patch-iiimsf_src_watchdog.c
deleted file mode 100644
index 9124497e6753..000000000000
--- a/textproc/iiimf-server/files/patch-iiimsf_src_watchdog.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- iiimsf/src/watchdog.c	Thu Oct 14 23:07:37 2004
-+++ iiimsf/src/watchdog.c	Wed Feb 16 19:03:59 2005
-@@ -220,7 +220,7 @@
-     int		argc;
-     char	**argv;
- {
--    const char *httpath="/usr/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;
-@@ -361,6 +361,8 @@
-     if ((pid_t)(-1) == pgrp)
-       fprintf (stderr,"cannot set session id");
- 
-+#elif defined(__FreeBSD__)
-+    pgrp = setsid();
- #else /* !SunOS */
-     pgrp = setpgrp(); 
- #endif /* !SunOS */
diff --git a/textproc/iiimf-server/pkg-plist b/textproc/iiimf-server/pkg-plist
index 67408775f54c..a6a3bb8e50a8 100644
--- a/textproc/iiimf-server/pkg-plist
+++ b/textproc/iiimf-server/pkg-plist
@@ -1,13 +1,19 @@
 bin/iiimf-le-tools
-etc/iiim/htt.xml.conf.sample
+bin/iiimd
+etc/iiim/iiimd.xml.conf.sample
 etc/iiim/le.xml.conf.sample
-lib/im/htt
-lib/im/htt_server
+lib/libiiimutils.a
+lib/libiiimutils.la
+lib/libiiimutils.so
+lib/libiiimutils.so.0
+lib/iiim/iiimd-watchdog
 libexec/iiimf-segv-logger
+include/iiim/lexmlconf.h
 share/iiim/gdbcmd
 @dirrm etc/iiim
 @dirrm share/iiim
-@unexec rmdir %D/lib/im > /dev/null 2>&1 || true
+@unexec rmdir %D/lib/iiim > /dev/null 2>&1 || true
+@unexec rmdir %D/include/iiim > /dev/null 2>&1 || true
 @exec mkdir -p /var/log/iiim
 @unexec rm -f /var/log/iiim/*.log
 @unexec rmdir /var/log/iiim > /dev/null 2>&1 || true