6 files changed, 58 insertions, 35 deletions

diff --git a/devel/gettext-devel/Makefile b/devel/gettext-devel/Makefile
index 1615372b757c..64fbcb2cab12 100644
--- a/devel/gettext-devel/Makefile
+++ b/devel/gettext-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gettext
-PORTVERSION=	0.10.38
-PORTREVISION=	1
+PORTVERSION=	0.10.40
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gettext
@@ -19,8 +18,8 @@ LIB_DEPENDS=	giconv.2:${PORTSDIR}/converters/libiconv
 NO_LATEST_LINK=	yes
 
 USE_BISON=	yes
-USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -42,7 +41,7 @@ pre-configure:
 BINFILES=	gettext msgcmp msgcomm msgfmt msgmerge msgunfmt \
 		ngettext xgettext
 PLIST=		${WRKDIR}/PLIST
-LIBTOOLFLAGS=	--disable-ltlibs --disable-shared
+CONFIGURE_ARGS=	--disable-shared
 .undef MAN3
 .undef INSTALLS_SHLIB
 
diff --git a/devel/gettext-devel/distinfo b/devel/gettext-devel/distinfo
index c05ee5fb054f..65665a4b56df 100644
--- a/devel/gettext-devel/distinfo
+++ b/devel/gettext-devel/distinfo
@@ -1 +1 @@
-MD5 (gettext-0.10.38.tar.gz) = c807f357ea5e5324adf7ad3d52c40c84
+MD5 (gettext-0.10.40.tar.gz) = 6a17767b47ffb45b4866cec9fb0a39b0
diff --git a/devel/gettext-devel/files/patch-ad b/devel/gettext-devel/files/patch-ad
index 0a8df104ad5c..be0cbd6eb450 100644
--- a/devel/gettext-devel/files/patch-ad
+++ b/devel/gettext-devel/files/patch-ad
@@ -1,13 +1,16 @@
---- misc/Makefile.in.orig	Fri May  1 14:47:40 1998
-+++ misc/Makefile.in	Thu Dec  3 20:11:52 1998
-@@ -164,10 +164,8 @@
- 	@list='$(lisp_LISP)'; for p in $$list; do \
- 	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
- 	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$p"; \
--	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$p; \
- 	  if test -f $${p}c; then \
- 	    echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${p}c"; \
--	    $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${p}c; \
- 	  else : ; fi; \
- 	done
- 
+
+$FreeBSD$
+
+--- misc/Makefile.in.orig	Sat Sep 15 03:48:07 2001
++++ misc/Makefile.in	Mon Nov 26 13:54:29 2001
+@@ -165,10 +165,8 @@
+ 	  list='$(lisp_LISP)'; for p in $$list; do \
+ 	    if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
+ 	    echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$p"; \
+-	    $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$p; \
+ 	    if test -f $${p}c; then \
+ 	      echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${p}c"; \
+-	      $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${p}c; \
+ 	    else : ; fi; \
+ 	  done; \
+ 	else : ; fi
diff --git a/devel/gettext-devel/files/patch-ae b/devel/gettext-devel/files/patch-ae
index cec678decbdf..c24ab0e425cc 100644
--- a/devel/gettext-devel/files/patch-ae
+++ b/devel/gettext-devel/files/patch-ae
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Mon Sep 24 12:40:19 2001
-+++ configure	Mon Sep 24 12:44:38 2001
-@@ -980,13 +980,13 @@
+--- configure.orig	Sat Sep 15 03:47:29 2001
++++ configure	Mon Nov 26 13:56:11 2001
+@@ -1220,13 +1220,13 @@
  # Run test in a subshell; some versions of sh will print an error if
  # an executable is not found, even if stderr is redirected.
  # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -21,8 +21,8 @@ $FreeBSD$
 +#fi
  
  echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
- echo "configure:993: checking for working autoconf" >&5
-@@ -1006,13 +1006,13 @@
+ echo "configure:1233: checking for working autoconf" >&5
+@@ -1246,13 +1246,13 @@
  # Run test in a subshell; some versions of sh will print an error if
  # an executable is not found, even if stderr is redirected.
  # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -40,17 +40,8 @@ $FreeBSD$
 +#fi
  
  echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
- echo "configure:1019: checking for working autoheader" >&5
-@@ -4736,7 +4736,7 @@
-     else
-             echo $ac_n "checking version of bison""... $ac_c" 1>&6
- echo "configure:4739: checking version of bison" >&5
--      ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-+      ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-       case $ac_prog_version in
-         '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-         1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
-@@ -4855,7 +4855,7 @@
+ echo "configure:1259: checking for working autoheader" >&5
+@@ -8375,7 +8375,7 @@
    ;;
  esac
  fi
@@ -59,7 +50,7 @@ $FreeBSD$
  if test -n "$EMACS"; then
    echo "$ac_t""$EMACS" 1>&6
  else
-@@ -5157,10 +5157,10 @@
+@@ -8677,10 +8677,10 @@
  s%@INSTALL_DATA@%$INSTALL_DATA%g
  s%@PACKAGE@%$PACKAGE%g
  s%@VERSION@%$VERSION%g
diff --git a/devel/gettext-devel/files/patch-ltmain.sh b/devel/gettext-devel/files/patch-ltmain.sh
new file mode 100644
index 000000000000..98cb05e4ddb3
--- /dev/null
+++ b/devel/gettext-devel/files/patch-ltmain.sh
@@ -0,0 +1,28 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/08/27 09:51:26	1.1
++++ ltmain.sh	2001/08/27 09:51:42
+@@ -2408,6 +2408,9 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test "$build_libtool_need_lc" = "yes"; then
+@@ -4175,10 +4178,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"
diff --git a/devel/gettext-devel/pkg-plist b/devel/gettext-devel/pkg-plist
index 25a559ef741a..42bc8b3edebb 100644
--- a/devel/gettext-devel/pkg-plist
+++ b/devel/gettext-devel/pkg-plist
@@ -45,6 +45,8 @@ share/doc/gettext/ngettext.3.html
 share/doc/gettext/textdomain.3.html
 share/emacs/site-lisp/po-mode.el
 share/gettext/ABOUT-NLS
+share/gettext/intl/COPYING.LIB-2
+share/gettext/intl/COPYING.LIB-2.1
 share/gettext/intl/ChangeLog
 share/gettext/intl/Makefile.in
 share/gettext/intl/VERSION