- Use LIBTOOLFILES and USE_LIBTOOL_VER=15 instead gnu configure and

  patch-config_ltmain.sh.
- No need to hack for BUILDCSHARP=no, --disable-csharp works perfect.

BTW: I haven't test this with mono stuff yet, I need to sleep and I hope this
change is fine with one of you.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3248 df743ca5-7f9a-e211-a948-0013205c9059

2 files changed, 6 insertions, 56 deletions

diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 6c2678859..22a395477 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -14,9 +14,11 @@ MASTER_SITE_SUBDIR=	gettext
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNU gettext package
 
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 USE_ICONV=	yes
+LIBTOOLFILES=	autoconf-lib-link/configure gettext-runtime/configure \
+		gettext-runtime/libasprintf/configure gettext-tools/configure
+USE_LIBTOOL_VER=15
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	ACLOCAL="${TRUE}" \
 		AUTOCONF="${TRUE}" \
 		AUTOMAKE="${TRUE}" \
@@ -24,7 +26,8 @@ CONFIGURE_ENV=	ACLOCAL="${TRUE}" \
 		MAKEINFO="makeinfo --no-split" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man
+CONFIGURE_ARGS=	--disable-csharp \
+		--mandir=${PREFIX}/man
 INSTALLS_SHLIB=	yes
 
 .if !defined(WITHOUT_GETTEXT_OPTIONS)
diff --git a/devel/gettext/files/patch-config_ltmain.sh b/devel/gettext/files/patch-config_ltmain.sh
deleted file mode 100644
index c3dcb4723..000000000
--- a/devel/gettext/files/patch-config_ltmain.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-$FreeBSD: ports/devel/gettext/files/patch-config_ltmain.sh,v 1.2 2004/01/23 18:12:16 trevor Exp $
-
---- config/ltmain.sh.orig	Tue Apr 15 19:22:56 2003
-+++ config/ltmain.sh	Wed Jun 11 14:15:07 2003
-@@ -1279,7 +1279,7 @@
- 	  esac
- 	elif test "X$arg" = "X-lc_r"; then
- 	 case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
-@@ -1289,8 +1289,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+      compile_command="$compile_command -pthread"
-+      finalize_command="$finalize_command -pthread"
-+      compiler_flags="$compiler_flags -pthread"
-+      continue
-+      ;;
-+
-       -module)
- 	module=yes
-+	build_old_libs=no
- 	continue
- 	;;
- 
-@@ -3001,6 +3009,9 @@
- 	    # problems, so we reset it completely
- 	    verstring=
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    verstring="0.0"
- 	    ;;
-@@ -5429,10 +5440,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"