8 files changed, 73 insertions, 62 deletions

diff --git a/textproc/iiimf-server/Makefile b/textproc/iiimf-server/Makefile
index 5a9661b4c53b..f081843aa944 100644
--- a/textproc/iiimf-server/Makefile
+++ b/textproc/iiimf-server/Makefile
@@ -5,44 +5,41 @@
 # $FreeBSD$
 #
 
-PORTNAME=	iiimf-server
-PORTVERSION=	${IIIMF_VER:S/_/./:C/-.*//}
-PORTREVISION=	1
+PORTNAME=	server
+PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
 CATEGORIES=	textproc
-MASTER_SITES=	http://www.openi18n.org/download/docs/im-sdk/
+MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
+PKGNAMEPREFIX=	iiimf-
 DISTNAME=	im-sdk
-DISTFILES=	${DISTNAME}.${IIIMF_VER:S/-/./}${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME}-src-${IIIMF_VER}.tgz
 
 MAINTAINER=	kcwu@csie.org
 COMMENT=	Internet/Intranet Input Method Server Framework
 
 LIB_DEPENDS=	iiimp.0:${PORTSDIR}/textproc/iiimf-protocol-lib
-BUILD_DEPENDS=	${LOCALBASE}/include/iiimf/iml/SunIM.h:${PORTSDIR}/textproc/iiimf-headers
 
-IIIMF_VER=	r11_4-1467
+IIIMF_VER=	r12_0_1-svn1891
 WRKSRC=		${WRKDIR}/${DISTNAME}-${IIIMF_VER}/iiimsf
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
+PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}-${IIIMF_VER}
+USE_OPENSSL=	yes
 USE_REINPLACE=	yes
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX}
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 502126
-BROKEN=		"Does not compile on FreeBSD >= 5.x"
-.endif
+USE_AUTOCONF_VER=	259
+USE_AUTOHEADER_VER=	259
+USE_AUTOMAKE_VER=	19
+USE_LIBTOOL_VER=	15
+LIBTOOLFILES=	${WRKSRC}/aclocal.m4
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 post-patch:
-	${REINPLACE_CMD} -e "s,-lpthread,-pthread,g" \
-		-e "s,-D_POSIX_C_SOURCE=199506L,,g" \
-		-e "s,has_xiccallback=no,has_xiccallback=yes,g" \
-		-e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
-		-e "s,-I\$$(IM_INCLUDEDIR),-I${LOCALBASE}/include/iiimf,g" \
-		${WRKSRC}/configure
 	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
+		${WRKSRC}/../acfiles/im_common.m4 \
+		${WRKSRC}/configure.ac \
 		${WRKSRC}/src/IMSvrCfg.cpp \
 		${WRKSRC}/src/watchdog.c
 
-.include <bsd.port.post.mk>
+pre-configure:
+	cd ${WRKSRC} && ${ACLOCAL} -I ${LOCALBASE}/share/aclocal -I ../acfiles
+	${TOUCH} ${WRKSRC}/config.h.in
+
+.include <bsd.port.mk>
diff --git a/textproc/iiimf-server/distinfo b/textproc/iiimf-server/distinfo
index 69d32b06e569..29d049a782bc 100644
--- a/textproc/iiimf-server/distinfo
+++ b/textproc/iiimf-server/distinfo
@@ -1,2 +1,2 @@
-MD5 (im-sdk.r11_4.1467.tar.bz2) = ca6b6ac7c41641db6eaa0fa395748f90
-SIZE (im-sdk.r11_4.1467.tar.bz2) = 7253894
+MD5 (im-sdk-src-r12_0_1-svn1891.tgz) = 4e51e4fd07391bd957622db0e89aeefe
+SIZE (im-sdk-src-r12_0_1-svn1891.tgz) = 18206118
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..974f159f9098
--- /dev/null
+++ b/textproc/iiimf-server/files/patch-acfiles_check_sys.m4
@@ -0,0 +1,36 @@
+--- acfiles/check_sys.m4.orig	Thu Aug 12 18:01:23 2004
++++ acfiles/check_sys.m4	Wed Sep  8 16:15:39 2004
+@@ -74,6 +74,11 @@
+ ## Checks for thread library.
+ 	AC_CHECK_LIB(pthread, pthread_create, [ HAVE_LIBPTHREAD="yes" ])
+ 	AC_CHECK_LIB(thread, thr_create, [ HAVE_LIBUITHREAD="yes" ])
++
++	case "${target}" in
++		*freebsd*) HAVE_LIBPTHREAD="yes";;
++	esac
++
+ 	if test "X${HAVE_LIBPTHREAD}" = "Xyes" ; then
+ 		HAVE_THREAD="pthread"
+ 	elif test "X${HAVE_LIBUITHREAD}" = "Xyes" ; then
+@@ -210,8 +215,6 @@
+ 		COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
+ 		;;
+ 	    *freebsd*)
+-		THREAD_LDFLAGS="-pthread"
+-		PTHREAD_LIBS=""
+ 		;;
+ 	esac
+ 
+@@ -249,9 +252,9 @@
+ 		THREAD_CXX_CFLAGS="-mt"
+ 		HAVE_THREAD="uithread"
+ 		;;
+-	    *freebsd*@gcc:*)
+-		THREAD_LDFLAGS="-pthread"
+-		THREAD_LIBS=""
++	    *freebsd*)
++		THREAD_CXX_CFLAGS="${PTHREAD_CFLAGS}"
++		THREAD_LIBS="${PTHREAD_LIBS}"
+ 		HAVE_THREAD="freebsd-pthread"
+ 		;;
+ 	    *linux*)
diff --git a/textproc/iiimf-server/files/patch-iiimsf-src-Makefile.am b/textproc/iiimf-server/files/patch-iiimsf-src-Makefile.am
new file mode 100644
index 000000000000..b6583826f94d
--- /dev/null
+++ b/textproc/iiimf-server/files/patch-iiimsf-src-Makefile.am
@@ -0,0 +1,9 @@
+--- iiimsf/src/Makefile.am.orig	Sun Sep  5 04:47:50 2004
++++ iiimsf/src/Makefile.am	Sun Sep  5 04:48:50 2004
+@@ -29,5 +29,5 @@
+ 
+ htt_SOURCES = watchdog.c
+ 
+-htt_server_LDADD = $(LIB_DIR)/iml/libiml.la $(IM_LIBDIR)/iiimp/libiiimp.la $(SOCKET_LIBS) $(LIBCRYPT_FLAGS) $(LIBPAM_FLAGS) $(LIBWRAP_FLAGS) $(THREAD_LIBS) $(TLS_LIBS)
++htt_server_LDADD = $(LIB_DIR)/iml/libiml.la -L$(LOCALBASE)/lib -liiimp $(SOCKET_LIBS) $(LIBCRYPT_FLAGS) $(LIBPAM_FLAGS) $(LIBWRAP_FLAGS) $(THREAD_LIBS) $(TLS_LIBS)
+ bin_PROGRAMS = htt_server htt
diff --git a/textproc/iiimf-server/files/patch-iiimsf_src_IMAuth.cpp b/textproc/iiimf-server/files/patch-iiimsf_src_IMAuth.cpp
index 2a34ac6d5450..b23769d4bed7 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 @@
---- src/IMAuth.cpp.orig	Sat Dec  6 02:39:41 2003
-+++ src/IMAuth.cpp	Sat Dec  6 02:39:50 2003
+--- iiimsf/src/IMAuth.cpp.orig	Sat Dec  6 02:39:41 2003
++++ iiimsf/src/IMAuth.cpp	Sat Dec  6 02:39:50 2003
 @@ -47,7 +47,7 @@
  #include <stdlib.h>
  #include <string.h>
diff --git a/textproc/iiimf-server/files/patch-iiimsf_src_Makefile.in b/textproc/iiimf-server/files/patch-iiimsf_src_Makefile.in
deleted file mode 100644
index 6630a5d55ceb..000000000000
--- a/textproc/iiimf-server/files/patch-iiimsf_src_Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/Makefile.in.orig	Sun Dec  7 18:11:19 2003
-+++ src/Makefile.in	Sun Dec  7 18:12:23 2003
-@@ -154,7 +154,7 @@
- 
- htt_SOURCES = watchdog.c
- 
--htt_server_LDADD = $(LIB_DIR)/iml/libiml.la $(IM_LIBDIR)/iiimp/libiiimp.la $(SOCKET_LIBS) $(LIBCRYPT_FLAGS) $(LIBPAM_FLAGS) $(LIBWRAP_FLAGS) $(THREAD_LIBS)
-+htt_server_LDADD = $(LIB_DIR)/iml/libiml.la -L$(prefix)/lib -liiimp $(SOCKET_LIBS) $(LIBCRYPT_FLAGS) $(LIBPAM_FLAGS) $(LIBWRAP_FLAGS) $(THREAD_LIBS)
- bin_PROGRAMS = htt_server htt
- subdir = src
- mkinstalldirs = $(SHELL) $(top_srcdir)/../acfiles/mkinstalldirs
-@@ -180,8 +180,7 @@
- 	IIIMP_IMState.$(OBJEXT) IIIMP_ICState.$(OBJEXT) \
- 	IIIMPUtil.$(OBJEXT) IIIMPTrans.$(OBJEXT)
- htt_server_OBJECTS = $(am_htt_server_OBJECTS)
--htt_server_DEPENDENCIES = $(LIB_DIR)/iml/libiml.la \
--	$(IM_LIBDIR)/iiimp/libiiimp.la
-+htt_server_DEPENDENCIES = $(LIB_DIR)/iml/libiml.la
- htt_server_LDFLAGS =
- 
- DEFS = @DEFS@
diff --git a/textproc/iiimf-server/files/patch-iiimsf_src_iwrap.c b/textproc/iiimf-server/files/patch-iiimsf_src_iwrap.c
deleted file mode 100644
index e31626b3b759..000000000000
--- a/textproc/iiimf-server/files/patch-iiimsf_src_iwrap.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/iwrap.c.orig	Sat Dec  6 02:44:54 2003
-+++ src/iwrap.c	Sat Dec  6 02:45:05 2003
-@@ -51,6 +51,7 @@
- #include <tcpd.h>
- #endif
- 
-+#include <sys/types.h>
- #ifdef HAVE_PAM
- #include <security/pam_appl.h>
- #endif
diff --git a/textproc/iiimf-server/files/patch-iiimsf_src_watchdog.c b/textproc/iiimf-server/files/patch-iiimsf_src_watchdog.c
index 0ea2ed146c79..76cf4b93dad1 100644
--- a/textproc/iiimf-server/files/patch-iiimsf_src_watchdog.c
+++ b/textproc/iiimf-server/files/patch-iiimsf_src_watchdog.c
@@ -1,5 +1,5 @@
---- src/watchdog.c.orig	Sat Dec  6 02:47:06 2003
-+++ src/watchdog.c	Sat Dec  6 02:47:34 2003
+--- iiimsf/src/watchdog.c.orig	Sat Dec  6 02:47:06 2003
++++ iiimsf/src/watchdog.c	Sat Dec  6 02:47:34 2003
 @@ -324,6 +324,8 @@
      if ((pid_t)(-1) == pgrp)
        fprintf (stderr,"cannot set session id");