6 files changed, 93 insertions, 38 deletions

diff --git a/textproc/iiimf-csconv/Makefile b/textproc/iiimf-csconv/Makefile
index 43c16910b154..8313328bbdd9 100644
--- a/textproc/iiimf-csconv/Makefile
+++ b/textproc/iiimf-csconv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	csconv
 PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
@@ -22,10 +23,12 @@ USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_GNOME=	intltool
 USE_REINPLACE=	yes
-WANT_AUTOCONF_VER=253
-WANT_AUTOHEADER_VER=253
-WANT_AUTOMAKE_VER=15
-WANT_LIBTOOL_VER=15
+USE_AUTOCONF_VER=	259
+#USE_AUTOHEADER_VER=	259
+WANT_AUTOMAKE_VER=	19
+WANT_LIBTOOL_VER=	15
+
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}/lib/CSConv
 PATCH_WRKSRC=	${WRKDIR}/${DISTNAME:S/src-//}
@@ -40,12 +43,13 @@ IGNORE=         "It is supported on FreeBSD 5.3 and later"
 IGNORE=	"${ARCH} is not support."
 .endif
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=CC=gcc CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv"
+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}
+		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" \
@@ -58,11 +62,19 @@ post-patch:
 		${WRKSRC}/converterPI/icuconv/common/config.h
 	${REINPLACE_CMD} -e "s,ELIBBAD,ENOEXEC," \
 		${WRKSRC}/converterPI/icuconv/common/icuconv.c
+	for MKFLIN in `find ${WRKSRC} -name "Makefile.in"`; do \
+		${REINPLACE_CMD} -e "/(CC)/s,-lc,,g" $${MKFLIN}; \
+		${REINPLACE_CMD} -e "/(CC)/s,-ldl,,g" $${MKFLIN}; \
+		${REINPLACE_CMD} -e '/(CC)/s,(LIBS),(LDFLAGS),g' $${MKFLIN}; \
+		${REINPLACE_CMD} -e '/(CC)/s,{LIBS},{LDFLAGS},g' $${MKFLIN}; \
+		${REINPLACE_CMD} -e "s,LIBS = @LIBS@,LDFLAGS = @LDFLAGS@,g" $${MKFLIN}; \
+	done
 
 pre-configure:
-	(cd ${WRKSRC}/../../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
-	(cd ${WRKSRC} && ${ACLOCAL} -I ../../acfiles && ${AUTOCONF})
-	(cd ${WRKSRC}/converterPI/ && ${AUTOCONF})
+	@cd ${WRKSRC}/../../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles
+	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
+	 -I ../../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}
+	@cd ${WRKSRC}/converterPI/ && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF}
 
 post-configure:
 	${REINPLACE_CMD} \
diff --git a/textproc/iiimf-csconv/files/patch-Makefile b/textproc/iiimf-csconv/files/patch-Makefile
index 85df0e345035..bcc2cb24a1c8 100644
--- a/textproc/iiimf-csconv/files/patch-Makefile
+++ b/textproc/iiimf-csconv/files/patch-Makefile
@@ -13,7 +13,7 @@
  update-acfiles:
  	cd acfiles && \
 -        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
-+        $(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:
diff --git a/textproc/iiimf-csconv/files/patch-acfiles_check_sys.m4 b/textproc/iiimf-csconv/files/patch-acfiles_check_sys.m4
new file mode 100644
index 000000000000..8626eeae1fd1
--- /dev/null
+++ b/textproc/iiimf-csconv/files/patch-acfiles_check_sys.m4
@@ -0,0 +1,38 @@
+--- 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 @@
+ 		    CXX=${CC}
+ 		fi
+ 		;;
++	    cc*:*)
++		COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
++		SHLIBCFLAGS='-fpic'
++		SHLIBLDFLAGS='-shared'
++		;;
+ 	    *)
+ 		DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
+ 		;;
+@@ -249,8 +254,8 @@
+ 		COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
+ 		;;
+ 	    *freebsd*)
+-		THREAD_LDFLAGS="-pthread"
+-		PTHREAD_LIBS=""
++		THREAD_LDFLAGS=""
++		PTHREAD_LIBS="${PTHREAD_LIBS}"
+ 		;;
+ 	esac
+ 
+@@ -288,9 +293,9 @@
+ 		THREAD_CXX_CFLAGS="-mt"
+ 		HAVE_THREAD="uithread"
+ 		;;
+-	    *freebsd*@gcc:*)
+-		THREAD_LDFLAGS="-pthread"
+-		THREAD_LIBS=""
++	    *freebsd*@cc:*|*freebsd*@gcc:*)
++		THREAD_LDFLAGS=""
++		THREAD_LIBS="${PTHREAD_LIBS}"
+ 		HAVE_THREAD="freebsd-pthread"
+ 		;;
+ 	    *linux*)
diff --git a/textproc/iiimf-csconv/files/patch-lib_CSConv_PI_icu_common_Makefile.in b/textproc/iiimf-csconv/files/patch-lib_CSConv_PI_icu_common_Makefile.in
deleted file mode 100644
index 7fbe7d1d7ab4..000000000000
--- a/textproc/iiimf-csconv/files/patch-lib_CSConv_PI_icu_common_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/CSConv/converterPI/icuconv/common/Makefile.in	Fri Jun 13 01:27:08 2003
-+++ lib/CSConv/converterPI/icuconv/common/Makefile.in	Wed Feb 16 14:46:02 2005
-@@ -168,7 +168,7 @@
- 
- $(TARGET) : $(OBJECTS)
- 	@$(RM) $@
--	$(CC) -o $@ $(CDEBUGFLAGS) $(SHLIBLDFLAGS) $^ $(REQUIREDLIBS) -ldl -lpthread -lm -lc
-+	$(CC) -o $@ $(CDEBUGFLAGS) $(SHLIBLDFLAGS) $^ $(REQUIREDLIBS) -lpthread -lm -lc
- 	@$(AR) $(ARFLAGS) $(CSC_ARCHIVE) $@
- 
- #	$(SHLIB.cc) -o $@ $^ $(LIBS)
diff --git a/textproc/iiimf-csconv/files/patch-lib_CSConv_PI_icu_tools_Makefile.in b/textproc/iiimf-csconv/files/patch-lib_CSConv_PI_icu_tools_Makefile.in
deleted file mode 100644
index 0b1c98616e55..000000000000
--- a/textproc/iiimf-csconv/files/patch-lib_CSConv_PI_icu_tools_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/CSConv/converterPI/icuconv/tools/toolutil/Makefile.in	Fri Jun 13 01:27:08 2003
-+++ lib/CSConv/converterPI/icuconv/tools/toolutil/Makefile.in	Wed Feb 16 14:45:29 2005
-@@ -138,7 +138,7 @@
- 
- 
- $(TARGET) : $(OBJECTS)
--	$(CC) -o $@ $(CDEBUGFLAGS) $(SHLIBLDFLAGS) $^ $(LIBICUCONV) -ldl -lpthread -lm -lc
-+	$(CC) -o $@ $(CDEBUGFLAGS) $(SHLIBLDFLAGS) $^ $(LIBICUCONV) -lpthread -lm -lc
- 
- 
- 
diff --git a/textproc/iiimf-csconv/files/patch-lib_CSConv_configure.ac b/textproc/iiimf-csconv/files/patch-lib_CSConv_configure.ac
index 95a9a5a0d247..01fe3194d24a 100644
--- a/textproc/iiimf-csconv/files/patch-lib_CSConv_configure.ac
+++ b/textproc/iiimf-csconv/files/patch-lib_CSConv_configure.ac
@@ -1,6 +1,25 @@
---- lib/CSConv/configure.ac	Fri Jun 13 01:27:08 2003
-+++ lib/CSConv/configure.ac	Wed Feb 16 14:41:13 2005
-@@ -314,6 +314,7 @@
+--- lib/CSConv/configure.ac.orig	Fri Jun 13 01:27:08 2003
++++ lib/CSConv/configure.ac	Wed Mar  2 08:43:13 2005
+@@ -28,7 +28,7 @@
+ AC_INIT(csconv.h)
+ 
+ AC_CONFIG_AUX_DIR(../../acfiles)
+-AC_PREFIX_DEFAULT(/usr/lib/im)
++AC_PREFIX_DEFAULT(${LOCALBASE}/lib/im)
+ IM_INIT(../..)
+ 
+ AC_CONFIG_HEADER(config.h)
+@@ -297,6 +297,9 @@
+ 	if test x"${CC}" = x"gcc" ; then
+ 		SHLIBCFLAGS='-fpic'
+ 		SHLIBLDFLAGS='-shared'
++	elif test x"${CC}" = x"cc" ; then
++		SHLIBCFLAGS='-fpic'
++		SHLIBLDFLAGS='-shared'
+ 	else
+ 		SHLIBCFLAGS=
+ 		SHLIBLDFLAGS=
+@@ -314,6 +317,7 @@
  case "${host}" in
  	*solaris*) 	platform=SOLARIS ;;
  	*linux*) 	platform=LINUX ;;
@@ -8,7 +27,7 @@
  esac
  AC_SUBST(platform)
  
-@@ -337,6 +338,12 @@
+@@ -337,6 +341,12 @@
  		## Shared object suffix
  		SO=so
  	;;
@@ -21,3 +40,11 @@
  esac
  
  
+@@ -400,6 +410,7 @@
+ AC_SUBST(ARFLAGS)
+ AC_SUBST(SHLIBCFLAGS)
+ AC_SUBST(SHLIBLDFLAGS)
++AC_SUBST(LDFLAGS)
+ AC_SUBST(SUBDIR)
+ AC_SUBST(ICONV_INCLUDES)
+ AC_SUBST(OBJS_ICONV)