Subject: pkg/18616: devel/gtexinfo incorrectly uses $PKGLOCALEDIR (+additional patch to make Solaris happy)
To: None <gnats-bugs@gnats.netbsd.org>
From: Lubomir Sedlacik <salo@Xtrmntr.org>
List: netbsd-bugs
Date: 10/11/2002 06:46:38
>Number:         18616
>Category:       pkg
>Synopsis:       devel/gtexinfo incorrectly uses $PKGLOCALEDIR (+additional patch to make Solaris happy)
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu Oct 10 21:47:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Lubomir Sedlacik
>Release:        NetBSD 1.6
>Organization:
>Environment:
>Description:

devel/gtexinfo/patches/patch-?? use $PKGLOCALEDIR incorrectly.  $PKGLOCALEDIR
contains only either "share" or "lib" but they assume that it contains
absolute path to the locale directories.

one more file needs to be patched to use $PKGLOCALEDIR and install cleanly on
Solaris.  this left unnoticed since only Solaris uses "lib" as $PKGLOCALEDIR.

>How-To-Repeat:

try to build and install recent devel/gtexinfo package on Solaris

>Fix:

Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gtexinfo/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo	3 Oct 2002 02:06:31 -0000	1.7
+++ distinfo	11 Oct 2002 04:08:34 -0000
@@ -2,12 +2,13 @@
 
 SHA1 (texinfo-4.2.tar.gz) = 58666acc8bcf21fe9d546c1ab08adb36a7505a17
 Size (texinfo-4.2.tar.gz) = 1666333 bytes
-SHA1 (patch-aa) = ea0bd5159fe20c0f0cd5b2f98bbaca55e008a854
-SHA1 (patch-ab) = da79ca95ce12ebb31e7bf47a74ef2b000bbe1285
+SHA1 (patch-aa) = 83676785d0728f4fc0881aaac3c7d07a40295bf1
+SHA1 (patch-ab) = e881e3822713b13afebbe5b13bef65a756252bab
 SHA1 (patch-ac) = bf22fe2b8920c88a357ce9c1202690ed291c5b92
 SHA1 (patch-ad) = 1c998cdb8b0831e15eef7df6c4f8ef108455619e
-SHA1 (patch-ae) = bbbad93c955a9ec4ec007cf8748f63087c164ce1
-SHA1 (patch-af) = 3dbe7d2b5cbe5927be56b318ea87da920536a8d2
-SHA1 (patch-ag) = ae916185ffe264030a958e5bb4d4ed693b36aa74
-SHA1 (patch-ah) = 412510ca940ed4234a0290455e5358a68974442f
+SHA1 (patch-ae) = 3dfc7bfd103a55165d88831043b6fa06253f30e7
+SHA1 (patch-af) = 5f29901d5a96c499a70a70706861b4ed0a84ed32
+SHA1 (patch-ag) = c64e2c27526aa35684ee402800a400b7b79e5eef
+SHA1 (patch-ah) = 0cc7303fb1244a9bf9f30404d815c4002cec3e20
 SHA1 (patch-ai) = 8a1e92497d3a6cd5dec50ec9e9cf35046d214c8c
+SHA1 (patch-aj) = d2f63f990b078c263dedbb9bb1a7267e9dbbeded
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gtexinfo/patches/patch-aa,v
retrieving revision 1.7
diff -u -r1.7 patch-aa
--- patches/patch-aa	3 Oct 2002 02:06:32 -0000	1.7
+++ patches/patch-aa	11 Oct 2002 04:08:34 -0000
@@ -7,7 +7,7 @@
  transform = s/ginfo/info/; @program_transform_name@
  
 -localedir = $(datadir)/locale
-+localedir = $(PKGLOCALEDIR)
++localedir = $(prefix)/$(PKGLOCALEDIR)/locale
  
  # -I. for funs.h.
  # Automake puts -I.. and -I$(srcdir) into DEFS by default, but
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gtexinfo/patches/patch-ab,v
retrieving revision 1.5
diff -u -r1.5 patch-ab
--- patches/patch-ab	3 Oct 2002 02:06:32 -0000	1.5
+++ patches/patch-ab	11 Oct 2002 04:08:34 -0000
@@ -7,7 +7,7 @@
  bin_PROGRAMS = ginfo infokey
  
 -localedir = $(datadir)/locale
-+localedir = $(PKGLOCALEDIR)
++localedir = $(prefix)/$(PKGLOCALEDIR)/locale
  
  # -I. for funs.h.
  # Automake puts -I.. and -I$(srcdir) into DEFS by default, but
Index: patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gtexinfo/patches/patch-ae,v
retrieving revision 1.7
diff -u -r1.7 patch-ae
--- patches/patch-ae	3 Oct 2002 02:06:32 -0000	1.7
+++ patches/patch-ae	11 Oct 2002 04:08:34 -0000
@@ -7,7 +7,7 @@
  bin_PROGRAMS = makeinfo
  
 -localedir = $(datadir)/locale
-+localedir = $(PKGLOCALEDIR)
++localedir = $(prefix)/$(PKGLOCALEDIR)/locale
  INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
  LDADD = ../lib/libtxi.a @LIBINTL@
  
Index: patches/patch-af
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gtexinfo/patches/patch-af,v
retrieving revision 1.3
diff -u -r1.3 patch-af
--- patches/patch-af	3 Oct 2002 02:06:32 -0000	1.3
+++ patches/patch-af	11 Oct 2002 04:08:34 -0000
@@ -7,7 +7,7 @@
  bin_PROGRAMS = makeinfo
  
 -localedir = $(datadir)/locale
-+localedir = $(PKGLOCALEDIR)
++localedir = $(prefix)/$(PKGLOCALEDIR)/locale
  INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
  LDADD = ../lib/libtxi.a @LIBINTL@
  
Index: patches/patch-ag
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gtexinfo/patches/patch-ag,v
retrieving revision 1.7
diff -u -r1.7 patch-ag
--- patches/patch-ag	3 Oct 2002 02:06:32 -0000	1.7
+++ patches/patch-ag	11 Oct 2002 04:08:34 -0000
@@ -7,7 +7,7 @@
  bin_SCRIPTS = texi2dvi
  
 -localedir = $(datadir)/locale
-+localedir = $(PKGLOCALEDIR)
++localedir = $(prefix)/$(PKGLOCALEDIR)/locale
  INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
  LDADD = ../lib/libtxi.a @LIBINTL@
  
Index: patches/patch-ah
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gtexinfo/patches/patch-ah,v
retrieving revision 1.2
diff -u -r1.2 patch-ah
--- patches/patch-ah	3 Oct 2002 02:06:32 -0000	1.2
+++ patches/patch-ah	11 Oct 2002 04:08:34 -0000
@@ -7,7 +7,7 @@
  bin_SCRIPTS = texi2dvi
  
 -localedir = $(datadir)/locale
-+localedir = $(PKGLOCALEDIR)
++localedir = $(prefix)/$(PKGLOCALEDIR)/locale
  INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
  LDADD = ../lib/libtxi.a @LIBINTL@
  

new file, patches/patch-aj:

--- /dev/null	Fri Oct 11 06:41:49 2002
+++ patches/patch-aj	Fri Oct 11 03:59:32 2002
@@ -1,0 +1,13 @@
+$NetBSD$
+
+--- po/Makefile.in.in.orig	Thu Mar 14 15:41:37 2002
++++ po/Makefile.in.in	Fri Oct 11 03:33:58 2002
+@@ -21,7 +21,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/$(PKGLOCALEDIR)/locale
+ gettextsrcdir = $(datadir)/gettext/po
+ 
+ INSTALL = @INSTALL@
>Release-Note:
>Audit-Trail:
>Unformatted: