Solaris fix... Now that gettext-lib's buildlink.mk makes it required on Solaris

fix build and PLIST:
- obey PKGLOCALEDIR
- fix libtool's install mode invocation.

3 files changed, 38 insertions, 16 deletions

diff --git a/devel/gettext/patches/patch-aa b/devel/gettext/patches/patch-aa
index dc527e97766..2eb0197f563 100644
--- a/devel/gettext/patches/patch-aa
+++ b/devel/gettext/patches/patch-aa
@@ -1,10 +1,19 @@
-$NetBSD: patch-aa,v 1.7 2000/06/30 17:07:36 danw Exp $
+$NetBSD: patch-aa,v 1.8 2002/08/19 19:20:32 seb Exp $
 
-Build shared libintl
+Build shared libintl. And force directory for locale date.
 
---- configure.orig	Fri Jun 23 04:15:24 2000
-+++ configure	Fri Jun 23 04:15:36 2000
-@@ -3958,7 +3958,7 @@
+--- configure.orig	Fri May  1 07:48:25 1998
++++ configure
+@@ -3690,7 +3690,7 @@ fi
+ 		 USE_INCLUDED_LIBINTL=yes
+ 		 CATOBJEXT=.cat
+ 		 INSTOBJEXT=.cat
+-		 DATADIRNAME=lib
++		 DATADIRNAME=${PKGLOCALEDIR}
+ 		 INTLDEPS='$(top_builddir)/intl/libintl.a'
+ 		 INTLLIBS=$INTLDEPS
+ 		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+@@ -3958,7 +3958,7 @@ fi
     fi
     
  
diff --git a/devel/gettext/patches/patch-ac b/devel/gettext/patches/patch-ac
index a98280b519a..ea4848e55d9 100644
--- a/devel/gettext/patches/patch-ac
+++ b/devel/gettext/patches/patch-ac
@@ -1,14 +1,18 @@
-$NetBSD: patch-ac,v 1.2 2000/11/29 05:05:29 itojun Exp $
+$NetBSD: patch-ac,v 1.3 2002/08/19 19:20:32 seb Exp $
 
---- intl/Makefile.in.orig	Mon Apr 27 14:53:18 1998
-+++ intl/Makefile.in	Tue Nov 28 21:02:03 2000
-@@ -121,3 +121,3 @@
+--- intl/Makefile.in.orig	Mon Apr 27 23:53:18 1998
++++ intl/Makefile.in
+@@ -119,11 +119,11 @@ install-exec: all
+ 	    $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \
+ 	  fi; \
  	  $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
 -	  $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \
-+	  $(LIBTOOL) install -c libintl.la $(libdir); \
++	  $(LIBTOOL) --mode=install ${INSTALL_DATA} libintl.la $(libdir); \
  	else \
-@@ -125,3 +125,3 @@
+ 	  : ; \
  	fi
 -install-data: all
 +install-data:
  	if test "$(PACKAGE)" = "gettext"; then \
+ 	  if test -r $(MKINSTALLDIRS); then \
+ 	    $(MKINSTALLDIRS) $(gettextsrcdir); \
diff --git a/devel/gettext/patches/patch-ak b/devel/gettext/patches/patch-ak
index a148709a9f4..fd605336be6 100644
--- a/devel/gettext/patches/patch-ak
+++ b/devel/gettext/patches/patch-ak
@@ -1,10 +1,19 @@
-$NetBSD: patch-ak,v 1.1 2000/10/31 17:06:19 itojun Exp $
+$NetBSD: patch-ak,v 1.2 2002/08/19 19:20:33 seb Exp $
 
-use locally-built msgfmt.
+Use locally-built msgfmt. And fix locale directory.
 
---- po/Makefile.in.in-	Wed Nov  1 01:46:43 2000
-+++ po/Makefile.in.in	Wed Nov  1 01:47:00 2000
-@@ -30,9 +30,9 @@
+--- po/Makefile.in.in.orig	Wed Apr 29 03:53:09 1998
++++ po/Makefile.in.in
+@@ -20,7 +20,7 @@ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = $(prefix)/@DATADIRNAME@
+ localedir = $(datadir)/locale
+-gnulocaledir = $(prefix)/share/locale
++gnulocaledir = $(prefix)/$(PKGLOCALEDIR)/locale
+ gettextsrcdir = $(prefix)/share/gettext/po
+ subdir = po
+ 
+@@ -30,9 +30,9 @@ MKINSTALLDIRS = $(top_srcdir)/@MKINSTALL
  
  CC = @CC@
  GENCAT = @GENCAT@