- Update to r12.0.1

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

5 files changed, 34 insertions, 43 deletions

diff --git a/textproc/iiimf-gtk/Makefile b/textproc/iiimf-gtk/Makefile
index 5ac4fe4bcafc..69e5a3d96036 100644
--- a/textproc/iiimf-gtk/Makefile
+++ b/textproc/iiimf-gtk/Makefile
@@ -5,13 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	iiimf-gtk
-PORTVERSION=	${IIIMF_VER:S/_/./:C/-.*//}
-PORTREVISION=	2
+PORTNAME=	gtk
+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 Gtk Client Framework
@@ -22,21 +22,24 @@ LIB_DEPENDS=	iiimp.0:${PORTSDIR}/textproc/iiimf-protocol-lib \
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
 
-IIIMF_VER=	r11_4-1467
+IIIMF_VER=	r12_0_1-svn1891
 WRKSRC=		${WRKDIR}/${DISTNAME}-${IIIMF_VER}/iiimgcf
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX}
+USE_AUTOCONF_VER=	259
+USE_AUTOHEADER_VER=	259
+USE_AUTOMAKE_VER=	19
+USE_LIBTOOL_VER=	15
 
 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,${LOCALBASE}/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}/imaux.c
+
+pre-configure:
+	cd ${WRKSRC} && glib-gettextize --force --copy
+	cd ${WRKSRC} && intltoolize --copy --force --automake
+	cd ${WRKSRC} && ${ACLOCAL} -I ${LOCALBASE}/share/aclocal -I ../acfiles
+	${TOUCH} ${WRKSRC}/config.h.in
 
 .include <bsd.port.mk>
diff --git a/textproc/iiimf-gtk/distinfo b/textproc/iiimf-gtk/distinfo
index 69d32b06e569..29d049a782bc 100644
--- a/textproc/iiimf-gtk/distinfo
+++ b/textproc/iiimf-gtk/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-gtk/files/patch-iiimgcf_Makefile.am b/textproc/iiimf-gtk/files/patch-iiimgcf_Makefile.am
new file mode 100644
index 000000000000..1662f6f2d89e
--- /dev/null
+++ b/textproc/iiimf-gtk/files/patch-iiimgcf_Makefile.am
@@ -0,0 +1,12 @@
+--- Makefile.am.orig	Tue Sep  7 22:44:25 2004
++++ Makefile.am	Tue Sep  7 22:45:11 2004
+@@ -15,8 +15,7 @@
+                      gtkimcontextiiim.c gtkimcontextiiim.h \
+                      imiiim.c imswitcher.c imaux.c
+ im_iiim_la_LIBADD = $(X_LIBS) $(GTK_LIBS) \
+-                    $(IM_LIBDIR)/iiimcf/libiiimcf.la \
+-                    $(IM_LIBDIR)/iiimp/libiiimp.la
++		    -L$(prefix)/lib -liiimcf -liiimp
+ 
+ module_LTLIBRARIES = im-iiim.la
+ 
diff --git a/textproc/iiimf-gtk/files/patch-iiimgcf_Makefile.in b/textproc/iiimf-gtk/files/patch-iiimgcf_Makefile.in
deleted file mode 100644
index dd2e1e68b400..000000000000
--- a/textproc/iiimf-gtk/files/patch-iiimgcf_Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.in.orig	Sun Dec  7 19:17:54 2003
-+++ Makefile.in	Sun Dec  7 19:18:40 2003
-@@ -140,8 +140,7 @@
-                      imiiim.c
- 
- im_iiim_la_LIBADD = $(GTK_LIBS) \
--                    $(IM_LIBDIR)/iiimcf/libiiimcf.la \
--                    $(IM_LIBDIR)/iiimp/libiiimp.la
-+		    -L$(prefix)/lib -liiimcf -liiimp
- 
- 
- module_LTLIBRARIES = im-iiim.la
-@@ -152,8 +151,7 @@
- CONFIG_CLEAN_FILES =
- LTLIBRARIES = $(module_LTLIBRARIES)
- 
--im_iiim_la_DEPENDENCIES = $(IM_LIBDIR)/iiimcf/libiiimcf.la \
--	$(IM_LIBDIR)/iiimp/libiiimp.la
-+im_iiim_la_DEPENDENCIES =
- am_im_iiim_la_OBJECTS = im_iiim_la-IIIMGdkEventKey.lo \
- 	im_iiim_la-gtkimcontextiiim.lo im_iiim_la-imiiim.lo
- im_iiim_la_OBJECTS = $(am_im_iiim_la_OBJECTS)
diff --git a/textproc/iiimf-gtk/pkg-plist b/textproc/iiimf-gtk/pkg-plist
index 5eac6fb026d1..3fb81367074f 100644
--- a/textproc/iiimf-gtk/pkg-plist
+++ b/textproc/iiimf-gtk/pkg-plist
@@ -1,3 +1 @@
 lib/gtk-2.0/2.4.0/immodules/im-iiim.so
-lib/gtk-2.0/2.4.0/immodules/im-iiim.la
-lib/gtk-2.0/2.4.0/immodules/im-iiim.a