- Update to r12.0.1

PR:		ports/72611
Submitted by:	Kuang-che Wu <kcwu@csie.org> (maintainer)

5 files changed, 50 insertions, 36 deletions

diff --git a/textproc/iiimf-protocol-lib/Makefile b/textproc/iiimf-protocol-lib/Makefile
index e8cea2eea1fc..848070740b90 100644
--- a/textproc/iiimf-protocol-lib/Makefile
+++ b/textproc/iiimf-protocol-lib/Makefile
@@ -5,33 +5,36 @@
 # $FreeBSD$
 #
 
-PORTNAME=	iiimf-protocol-lib
-PORTVERSION=	${IIIMF_VER:S/_/./:C/-.*//}
-PORTREVISION=	1
+PORTNAME=	protocol-lib
+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 Framework protocol library
 
-IIIMF_VER=	r11_4-1467
+IIIMF_VER=	r12_0_1-svn1891
 WRKSRC=		${WRKDIR}/${DISTNAME}-${IIIMF_VER}/lib/iiimp
-PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}-${IIIMF_VER}
-USE_BZIP2=	yes
-USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX} \
-		--includedir=${PREFIX}/include/iiimf/iiimp
+USE_OPENSSL=	yes
+USE_AUTOCONF_VER=	259
+USE_AUTOHEADER_VER=	259
+USE_AUTOMAKE_VER=	19
+USE_LIBTOOL_VER=	15
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS=	--includedir=${PREFIX}/include/iiimf/iiimp
 
 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" \
-		${WRKSRC}/configure
+	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
+		${WRKSRC}/../../acfiles/im_common.m4 \
+		${WRKSRC}/configure.ac
+
+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-protocol-lib/distinfo b/textproc/iiimf-protocol-lib/distinfo
index 69d32b06e569..29d049a782bc 100644
--- a/textproc/iiimf-protocol-lib/distinfo
+++ b/textproc/iiimf-protocol-lib/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-protocol-lib/files/patch-include_iiimp_iiimp-data.h b/textproc/iiimf-protocol-lib/files/patch-include_iiimp_iiimp-data.h
deleted file mode 100644
index ed6d5e70cb79..000000000000
--- a/textproc/iiimf-protocol-lib/files/patch-include_iiimp_iiimp-data.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- include/iiimp/iiimp-data.h.orig	Wed Apr 21 16:01:34 2004
-+++ include/iiimp/iiimp-data.h	Wed Apr 21 16:01:45 2004
-@@ -7,11 +7,8 @@
- #include <stdio.h>
- #include <sys/types.h>
- 
--#if defined(linux)
--#include <stdint.h>
- typedef unsigned char	uchar_t;
- typedef unsigned int	uint_t;
--#endif /* linux */
- 
- #include <iiimp-opcode.h>
- 
diff --git a/textproc/iiimf-protocol-lib/files/patch-lib-iiimp-data-iiimp-dataP.h b/textproc/iiimf-protocol-lib/files/patch-lib-iiimp-data-iiimp-dataP.h
new file mode 100644
index 000000000000..d530110adcc2
--- /dev/null
+++ b/textproc/iiimf-protocol-lib/files/patch-lib-iiimp-data-iiimp-dataP.h
@@ -0,0 +1,26 @@
+--- data/iiimp-dataP.h.orig	Tue Aug 24 13:38:12 2004
++++ data/iiimp-dataP.h	Wed Sep  8 23:04:47 2004
+@@ -14,8 +14,13 @@
+ extern "C" {
+ #endif
+ 
++#if defined(BIG_ENDIAN) && defined(BYTE_ORDER) && (BIG_ENDIAN==BYTE_ORDER)
++#define _IT_IS_BIG_ENDIAN_LALALA_
++#elif defined(_BIG_ENDIAN) && defined(_BYTE_ORDER) && (_BIG_ENDIAN==_BYTE_ORDER)
++#define _IT_IS_BIG_ENDIAN_LALALA_
++#endif
+ 
+-#if defined(_BIG_ENDIAN) || defined(WORDS_BIGENDIAN)
++#if defined(_IT_IS_BIG_ENDIAN_LALALA_)
+ 
+ #define	GETU16(n, r, p, b)	(((n) = ((0 == (b)) ? \
+ 					 (((*((uchar_t *)(p + 0))) << 8) + \
+@@ -113,7 +118,7 @@
+ 
+ #else /* !(_BIG_ENDIAN || WORDS_BIGENDIAN) */
+ 
+-#define	GET_SCOPE_FOR_HOTKEY(n, p, b) \	
++#define	GET_SCOPE_FOR_HOTKEY(n, p, b) \
+                                    if (0 == (b)) { \
+                                      if ((*((uchar_t *)(p + 1)) & 0x80)) \
+                                        (n) = 1; \
diff --git a/textproc/iiimf-protocol-lib/pkg-plist b/textproc/iiimf-protocol-lib/pkg-plist
index 183e7e775e5c..dd8f11c828b6 100644
--- a/textproc/iiimf-protocol-lib/pkg-plist
+++ b/textproc/iiimf-protocol-lib/pkg-plist
@@ -3,9 +3,8 @@ include/iiimf/iiimp/iiimp-opcode.h
 include/iiimf/iiimp/iiimp-keycode.h
 include/iiimf/iiimp/iiimp-data.h
 include/iiimf/iiimp/iiimp-character-subsets.h
-@dirrm include/iiimf/iiimp
-@dirrm include/iiimf
 lib/libiiimp.so.0
 lib/libiiimp.so
-lib/libiiimp.la
 lib/libiiimp.a
+@dirrm include/iiimf/iiimp
+@unexec rmdir %D/include/iiimf 2>/dev/null || true