- Use USE_LIBTOOL;

- don't explicitly link libc into the gettext shared library, because
  potentially it can screw up threaded programs linked against libintl.so.

6 files changed, 99 insertions, 46 deletions

diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index e1dc6ead959d..2d1a900a79af 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_BISON=	yes
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/devel/gettext/files/patch-ae b/devel/gettext/files/patch-ae
index bed0ca9ec2b2..dde01c42aefe 100644
--- a/devel/gettext/files/patch-ae
+++ b/devel/gettext/files/patch-ae
@@ -1,7 +1,22 @@
---- configure.orig	Tue Mar 12 13:03:57 2002
-+++ configure	Fri Mar 15 18:15:51 2002
-@@ -11776,3 +11775,3 @@
+
+$FreeBSD$
+
+--- configure.orig	Tue Mar 12 21:03:57 2002
++++ configure	Mon Apr 29 23:49:41 2002
+@@ -6094,6 +6094,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -11774,7 +11775,7 @@
+   IFS="$ac_save_ifs"
+ fi
  fi
 -EMACS="$ac_cv_prog_EMACS"
 +EMACS=no
  if test -n "$EMACS"; then
+   echo "$ac_t""$EMACS" 1>&6
+ else
diff --git a/devel/gettext/files/patch-intl::Makefile.in b/devel/gettext/files/patch-intl::Makefile.in
index dbed9761270e..9f84c7ece670 100644
--- a/devel/gettext/files/patch-intl::Makefile.in
+++ b/devel/gettext/files/patch-intl::Makefile.in
@@ -1,11 +1,29 @@
---- intl/Makefile.in.orig	Thu Jan 31 08:11:48 2002
-+++ intl/Makefile.in	Fri Mar 15 17:38:20 2002
-@@ -54,3 +54,3 @@
+
+$FreeBSD$
+
+--- intl/Makefile.in.orig	Thu Jan 31 16:11:48 2002
++++ intl/Makefile.in	Tue Apr 30 00:00:15 2002
+@@ -52,7 +52,7 @@
+ YFLAGS = --name-prefix=__gettext
+ 
  DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
 --DLIBDIR=\"$(libdir)\" -DIN_LIBINTL @DEFS@
 +-DLIBDIR=\"$(prefix)/libdata\" -DIN_LIBINTL @DEFS@
  CPPFLAGS = @CPPFLAGS@
-@@ -155,7 +155,7 @@
+ CFLAGS = @CFLAGS@
+ LDFLAGS = @LDFLAGS@
+@@ -119,7 +119,7 @@
+ libintl.la libgnuintl.la: $(OBJECTS)
+ 	$(LIBTOOL) --mode=link \
+ 	  $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
+-	  $(OBJECTS) @LTLIBICONV@ -lc \
++	  $(OBJECTS) @LTLIBICONV@ \
+ 	  -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
+ 	  -rpath $(libdir) \
+ 	  -no-undefined
+@@ -153,11 +153,11 @@
+ 	  : ; \
+ 	fi
  	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
 -	  test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
 -	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
@@ -18,7 +36,11 @@
 +	  if test -f $(DESTDIR)$(prefix)/libdata/charset.alias; then \
 +	    orig=$(DESTDIR)$(prefix)/libdata/charset.alias; \
  	    sed -f ref-add.sed $$orig > $$temp; \
-@@ -242,5 +242,5 @@
+ 	    $(INSTALL_DATA) $$temp $$dest; \
+ 	    rm -f $$temp; \
+@@ -240,9 +240,9 @@
+ 	  : ; \
+ 	fi
  	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
 -	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
 -	    temp=$(DESTDIR)$(libdir)/t-charset.alias; \
@@ -27,3 +49,5 @@
 +	    temp=$(DESTDIR)$(prefix)/libdata/t-charset.alias; \
 +	    dest=$(DESTDIR)$(prefix)/libdata/charset.alias; \
  	    sed -f ref-del.sed $$dest > $$temp; \
+ 	    if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
+ 	      rm -f $$dest; \
diff --git a/devel/gettext/files/patch-lib::Makefile.in b/devel/gettext/files/patch-lib::Makefile.in
index c67503a4e96a..d1b8e08de435 100644
--- a/devel/gettext/files/patch-lib::Makefile.in
+++ b/devel/gettext/files/patch-lib::Makefile.in
@@ -1,19 +1,41 @@
---- lib/Makefile.in.orig	Tue Mar 12 13:04:16 2002
-+++ lib/Makefile.in	Fri Mar 15 17:41:01 2002
-@@ -240,3 +240,3 @@
+
+$FreeBSD$
+
+--- lib/Makefile.in.orig	Tue Mar 12 21:04:16 2002
++++ lib/Makefile.in	Tue Apr 30 00:01:20 2002
+@@ -220,7 +220,7 @@
+ # Need @LTLIBICONV@ because linebreak.c uses iconv().
+ libgettextlib_la_LDFLAGS = \
+   -release @VERSION@ \
+-  @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined
++  @LTLIBINTL@ @LTLIBICONV@ -no-undefined
+ 
+ 
+ 
+@@ -238,14 +238,14 @@
+ gen-lbrkprop.c 3level.h Combining.txt
+ 
  
 -DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@
 +DEFS = -DLIBDIR=\"$(prefix)/libdata\" @DEFS@
  INCLUDES = -I. -I$(srcdir) -I.. -I../intl -I$(top_srcdir)/intl
-@@ -246,4 +246,4 @@
+ 
+ DISTCLEANFILES = fnmatch.h
+ MOSTLYCLEANFILES = @STDBOOL_H@
  
 -charset_alias = $(DESTDIR)$(libdir)/charset.alias
 -charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
 +charset_alias = $(DESTDIR)$(prefix)/libdata/charset.alias
 +charset_tmp = $(DESTDIR)$(prefix)/libdata/charset.tmp
  
-@@ -524,3 +524,3 @@
+ SUFFIXES = .sed .sin
+ 
+@@ -522,7 +522,7 @@
+ 
+ all-local: charset.alias ref-add.sed ref-del.sed
  install-exec-local: all-local
 -	$(mkinstalldirs) $(DESTDIR)$(libdir)
 +	$(mkinstalldirs) $(DESTDIR)$(prefix)/libdata
  	if test -f $(charset_alias); then \
+ 	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
+ 	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
diff --git a/devel/gettext/files/patch-ltmain.sh b/devel/gettext/files/patch-ltmain.sh
deleted file mode 100644
index 90e76b8f2b14..000000000000
--- a/devel/gettext/files/patch-ltmain.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD: /tmp/pcvs/ports/devel/gettext/files/Attic/patch-ltmain.sh,v 1.1 2002-03-15 19:43:48 ade Exp $
-
---- 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/files/patch-src::Makefile.in b/devel/gettext/files/patch-src::Makefile.in
index 7e3c14dfd733..dc1aba86367d 100644
--- a/devel/gettext/files/patch-src::Makefile.in
+++ b/devel/gettext/files/patch-src::Makefile.in
@@ -1,11 +1,29 @@
---- src/Makefile.in.orig	Tue Mar 12 13:04:19 2002
-+++ src/Makefile.in	Fri Mar 15 19:04:22 2002
-@@ -175,3 +175,3 @@
+
+$FreeBSD$
+
+--- src/Makefile.in.orig	Tue Mar 12 21:04:19 2002
++++ src/Makefile.in	Tue Apr 30 00:01:24 2002
+@@ -173,7 +173,7 @@
+ -I../lib -I$(top_srcdir)/lib -I../intl -I$(top_srcdir)/intl
+ 
  DEFS = -DLOCALEDIR=\"$(localedir)\" -DGETTEXTJAR=\"$(jardir)/gettext.jar\" \
 --DLIBDIR=\"$(libdir)\" -DGETTEXTDATADIR=\"$(pkgdatadir)\" \
 +-DLIBDIR=\"$(prefix)/libdata\" -DGETTEXTDATADIR=\"$(pkgdatadir)\" \
  -DPROJECTSDIR=\"$(projectsdir)\" @DEFS@
-@@ -728,7 +728,7 @@
+ 
+ LDADD = ../lib/libgettextlib.la @LTLIBINTL@
+@@ -240,7 +240,7 @@
+ # use iconv().
+ libgettextsrc_la_LDFLAGS = \
+   -release @VERSION@ \
+-  ../lib/libgettextlib.la @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined
++  ../lib/libgettextlib.la @LTLIBINTL@ @LTLIBICONV@ -no-undefined
+ 
+ 
+ # Link dependencies.
+@@ -726,11 +726,11 @@
+ # Special rules for installation of auxiliary programs.
+ 
  install-exec-local:
 -	$(mkinstalldirs) $(DESTDIR)$(libdir)/$(PACKAGE)
 -	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) hostname$(EXEEXT) $(DESTDIR)$(libdir)/$(PACKAGE)/hostname$(EXEEXT)
@@ -18,3 +36,5 @@
 +	$(INSTALL_SCRIPT) user-email $(DESTDIR)$(prefix)/libdata/$(PACKAGE)/user-email
 +	$(INSTALL_SCRIPT) $(srcdir)/project-id $(DESTDIR)$(prefix)/libdata/$(PACKAGE)/project-id
  
+ installdirs-local:
+ 	$(mkinstalldirs) $(DESTDIR)$(libdir)/$(PACKAGE)