>Number:         18648
>Category:       pkg
>Synopsis:       devel/gettext installs locale.alias in wrong directory (patch included)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Oct 13 19:36:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Lubomir Sedlacik
>Release:        SunOS 5.9
>Organization:
>Environment:
>Description:

devel/gettext doesn't use PKGLOCALEDIR for installation of locale.alias and
put it in a hardcoded directory (share/locale).  also patches for PKGLOCALEDIR
are not complete so fix them too while we are here.

>How-To-Repeat:

install devel/gettext on Solaris, see locale.alias installed in ${PREFIX}/share/locale

>Fix:

Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gettext/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- PLIST	18 Feb 2002 15:14:10 -0000	1.2
+++ PLIST	14 Oct 2002 02:29:23 -0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:10 seb Exp $
+@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:23:39 zuntum Exp $
 bin/gettext
 bin/gettextize
 bin/msgcmp
@@ -40,7 +40,7 @@
 share/gettext/intl/textdomain.c
 share/gettext/intl/xopen-msg.sed
 share/gettext/po/Makefile.in.in
-share/locale/locale.alias
+${PKGLOCALEDIR}/locale/locale.alias
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gettext.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gettext.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gettext.mo
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gettext/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo	19 Aug 2002 19:20:31 -0000	1.5
+++ distinfo	14 Oct 2002 02:29:23 -0000
@@ -3,13 +3,13 @@
 SHA1 (gettext-0.10.35.tar.gz) = fcf5aedd794b45f9a63cb30deba96e842cc2d77c
 Size (gettext-0.10.35.tar.gz) = 713694 bytes
 SHA1 (patch-aa) = 059c972c3a1de3801b7369715c18183f483a4b03
-SHA1 (patch-ab) = aa7e3c08b3b598d48c768bea0d7afe9e375c4174
-SHA1 (patch-ac) = 78ddaf89f7f069751097c6a692a04dbaf9a3914f
+SHA1 (patch-ab) = a2c61e9a55be5e29191fb09abb8e1503bfcaf202
+SHA1 (patch-ac) = 5cae9528f7297f773e02665077c0773cd9b4b06e
 SHA1 (patch-ad) = c30246c62ad2a3809f092d4e83747a781437fc8c
 SHA1 (patch-ae) = a5b82ab8b98c34a8889d60fd9cb224bc1ccdd4d0
 SHA1 (patch-af) = 1e93d62e848f3dd6d902c0c91b32bb593f3afc43
 SHA1 (patch-ag) = 72e94b26e72ff9d3a7af01304e1854fe48b1b5de
 SHA1 (patch-ah) = 2822c9d3a6e9f2a9ae0d4b5ed5c25525e3d4f34d
-SHA1 (patch-ai) = dd77fb17fae639152ae1deca233f3a56629ecaea
+SHA1 (patch-ai) = 1de601b3472e1fd8c87aa93f6a822126df9da16b
 SHA1 (patch-aj) = d0f2f662d895c015f85df0eedd4cc7d2e4170122
-SHA1 (patch-ak) = ab2ecc0805258b029782f51a357e0b8c8abd02fa
+SHA1 (patch-ak) = e16a58d38f6b22669868e6105f8ab5e8fa6dd9ca
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gettext/patches/patch-ab,v
retrieving revision 1.4
diff -u -r1.4 patch-ab
--- patches/patch-ab	28 Dec 1998 20:18:13 -0000	1.4
+++ patches/patch-ab	14 Oct 2002 02:29:23 -0000
@@ -1,7 +1,16 @@
-$NetBSD: patch-ab,v 1.4 1998/12/28 20:18:13 tron Exp $
+$NetBSD: patch-ab,v 1.3 1998/12/23 00:14:16 tron Exp $
 
 --- misc/Makefile.in.orig	Fri May  1 08:47:40 1998
-+++ misc/Makefile.in	Tue Dec 22 23:49:22 1998
++++ misc/Makefile.in	Mon Oct 14 03:54:40 2002
+@@ -97,7 +97,7 @@
+ 
+ AUTOMAKE_OPTIONS = 1.2 gnits
+ 
+-localedir = $(datadir)/locale
++localedir = $(prefix)/$(PKGLOCALEDIR)/locale
+ 
+ EXTRA_DIST = combine-sh gettext.perl gettext-sh magic.add tcl_gettext.c \
+ README-Tcl po-mode.el locale.alias
 @@ -232,7 +232,7 @@
  install-exec: install-binSCRIPTS
  	@$(NORMAL_INSTALL)
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gettext/patches/patch-ac,v
retrieving revision 1.3
diff -u -r1.3 patch-ac
--- patches/patch-ac	19 Aug 2002 19:20:32 -0000	1.3
+++ patches/patch-ac	14 Oct 2002 02:29:23 -0000
@@ -1,8 +1,19 @@
 $NetBSD: patch-ac,v 1.3 2002/08/19 19:20:32 seb Exp $
 
 --- intl/Makefile.in.orig	Mon Apr 27 23:53:18 1998
-+++ intl/Makefile.in
-@@ -119,11 +119,11 @@ install-exec: all
++++ intl/Makefile.in	Mon Oct 14 04:04:47 2002
+@@ -31,8 +31,8 @@
+ libdir = $(exec_prefix)/lib
+ includedir = $(prefix)/include
+ datadir = $(prefix)/@DATADIRNAME@
+-localedir = $(datadir)/locale
+-gnulocaledir = $(prefix)/share/locale
++localedir = $(prefix)/$(PKGLOCALEDIR)/locale
++gnulocaledir = $(prefix)/$(PKGLOCALEDIR)/locale
+ gettextsrcdir = @datadir@/gettext/intl
+ aliaspath = $(localedir):.
+ subdir = intl
+@@ -119,11 +119,11 @@
  	    $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \
  	  fi; \
  	  $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
Index: patches/patch-ai
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gettext/patches/patch-ai,v
retrieving revision 1.1
diff -u -r1.1 patch-ai
--- patches/patch-ai	31 Oct 2000 17:06:18 -0000	1.1
+++ patches/patch-ai	14 Oct 2002 02:29:23 -0000
@@ -2,9 +2,16 @@
 
 use already-installed libintl, not in-tree libintl
 
---- src/Makefile.in.orig	Fri May  1 15:47:25 1998
-+++ src/Makefile.in	Wed Nov  1 01:25:11 2000
-@@ -108,7 +108,7 @@
+--- src/Makefile.in.orig	Fri May  1 08:47:25 1998
++++ src/Makefile.in	Mon Oct 14 04:08:51 2002
+@@ -102,13 +102,13 @@
+ EXTRA_DIST = po-gram.y po-hash.y
+ 
+ datadir = $(prefix)/@DATADIRNAME@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/$(PKGLOCALEDIR)/locale
+ 
+ l = @l@
  
  INCLUDES = -I$(srcdir) -I.. -I$(top_srcdir)/lib -I../intl -I$(top_srcdir)/intl
  DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
Index: patches/patch-ak
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gettext/patches/patch-ak,v
retrieving revision 1.2
diff -u -r1.2 patch-ak
--- patches/patch-ak	19 Aug 2002 19:20:33 -0000	1.2
+++ patches/patch-ak	14 Oct 2002 02:29:23 -0000
@@ -3,17 +3,19 @@
 Use locally-built msgfmt. And fix locale directory.
 
 --- po/Makefile.in.in.orig	Wed Apr 29 03:53:09 1998
-+++ po/Makefile.in.in
-@@ -20,7 +20,7 @@ prefix = @prefix@
++++ po/Makefile.in.in	Mon Oct 14 04:12:54 2002
+@@ -19,8 +19,8 @@
+ prefix = @prefix@
  exec_prefix = @exec_prefix@
  datadir = $(prefix)/@DATADIRNAME@
- localedir = $(datadir)/locale
+-localedir = $(datadir)/locale
 -gnulocaledir = $(prefix)/share/locale
++localedir = $(prefix)/$(PKGLOCALEDIR)/locale
 +gnulocaledir = $(prefix)/$(PKGLOCALEDIR)/locale
  gettextsrcdir = $(prefix)/share/gettext/po
  subdir = po
  
-@@ -30,9 +30,9 @@ MKINSTALLDIRS = $(top_srcdir)/@MKINSTALL
+@@ -30,9 +30,9 @@
  
  CC = @CC@
  GENCAT = @GENCAT@
>Release-Note:
>Audit-Trail:
>Unformatted: