1 files changed, 25 insertions, 17 deletions

diff --git a/japanese/iiimf-le-canna/Makefile b/japanese/iiimf-le-canna/Makefile
index 0f9caca8a7ef..eded6f7a6218 100644
--- a/japanese/iiimf-le-canna/Makefile
+++ b/japanese/iiimf-le-canna/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	le-canna
 PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
+PORTREVISION=	1
 CATEGORIES=	japanese textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
@@ -24,17 +25,21 @@ USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_REINPLACE=  yes
 USE_GMAKE=	yes
-USE_GNOME=	intltool
-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
+
+AUTOMAKE_ARGS+=		--add-missing
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 WRKSRC=         ${WRKDIR}/${DISTNAME:S/src-//}/leif
 PATCH_WRKSRC=   ${WRKDIR}/${DISTNAME:S/src-//}
 
 .if !defined(WITHOUT_XAUX)
 USE_XLIB=	yes
+CFLAGS+=	-I${X11BASE}/include
+LDFLAGS+=	-L${X11BASE}/lib
 PLIST_SUB+=	WANT_XAUX=""
 RUN_DEPENDS+=	${LOCALBASE}/lib/im/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-csconv
 .else
@@ -52,14 +57,13 @@ IGNORE=         "It is supported on FreeBSD 5.3 and later"
 IGNORE=	"${ARCH} is not support."
 .endif
 
-MAKE_ARGS+=	LIBTOOL="${LIBTOOL} --tag=CXX"
+CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
 		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
-		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE}
-AUTOGEN_ARGS+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
-		--prefix=${PREFIX} ${CONFIGURE_ARGS}
+		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" \
@@ -67,11 +71,15 @@ post-patch:
 		${WRKSRC}/../lib/CSConv/csconv.h
 
 pre-configure:
-	(cd ${WRKSRC}/../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
-	(cd ${WRKSRC}/../acfiles/ && ${TOUCH} ltconfig)
-	(cd ${WRKSRC}/ && ${TOUCH} ltconfig)
-
-do-configure:
-	(cd ${WRKSRC}/ && ./autogen.sh ${AUTOGEN_ARGS})
+	@cd ${WRKSRC}/../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles
+	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --force --copy
+	@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}
 
 .include <bsd.port.post.mk>