Fix PGLOCALEDIR usage. Closes pkg/18632

5 files changed, 48 insertions, 26 deletions

diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index 7e6004ed372..5c8bcc34a54 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2002/10/08 18:50:55 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2002/11/18 08:04:47 salo Exp $
 #
 
 DISTNAME=	gqview-1.0.1
@@ -16,7 +16,7 @@ USE_BUILDLINK2=	yes
 USE_X11BASE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	ac_cv_path_GNOME_CONFIG=no
-CONFIGURE_ENV+=	PKGLOCALEDIR="${PKGLOCALEDIR}"
+MAKE_ENV+=	PKGLOCALEDIR="${PKGLOCALEDIR}"
 
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../graphics/gdk-pixbuf/buildlink2.mk"
diff --git a/graphics/gqview/distinfo b/graphics/gqview/distinfo
index df3be107190..60a701e73cb 100644
--- a/graphics/gqview/distinfo
+++ b/graphics/gqview/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.10 2002/09/27 11:18:36 wiz Exp $
+$NetBSD: distinfo,v 1.11 2002/11/18 08:04:47 salo Exp $
 
 SHA1 (gqview-1.0.1.tar.gz) = 122de1c323bf06f3d45656cf02ee1bc48c5f7eac
 Size (gqview-1.0.1.tar.gz) = 607223 bytes
-SHA1 (patch-aa) = 7e0d593021a56134639817398249e60eac0cb09c
+SHA1 (patch-aa) = fb27f09b2561a05a26c49b568f9fd6c38184241d
+SHA1 (patch-ab) = 0e1bf4b38cdc6714c9ffcd06408f6b3fcb73d79d
+SHA1 (patch-ac) = 87d158f119661ff7dfa74a801ad4cc341490854c
diff --git a/graphics/gqview/patches/patch-aa b/graphics/gqview/patches/patch-aa
index 0289573af83..131f6c5dee6 100644
--- a/graphics/gqview/patches/patch-aa
+++ b/graphics/gqview/patches/patch-aa
@@ -1,23 +1,13 @@
-$NetBSD: patch-aa,v 1.13 2002/09/27 11:18:38 wiz Exp $
+$NetBSD: patch-aa,v 1.14 2002/11/18 08:04:48 salo Exp $
 
---- configure.orig	Tue Jan  1 18:28:52 2002
-+++ configure
-@@ -2229,7 +2229,6 @@ else
-   FALSE_FALSE=
- fi
- 
--localedir='${prefix}/share/locale'
- 
- 
- ALL_LINGUAS="cs da de es et fi fr hu it ja nl no pl pt_BR ru sk sl tr uk zh_CN.GB2312 zh_TW"
-@@ -4060,7 +4059,9 @@ fi
- 	< $srcdir/po/POTFILES.in > po/POTFILES
-   
- 
--
-+# Use ${PKGLOCALEDIR} for the location of installed locale files.
-+DATADIRNAME="${PKGLOCALEDIR}"
-+localedir='${prefix}/${DATADIRNAME}/locale'
- 
- 
- 
+--- src/Makefile.in.orig	Tue Jan  1 19:20:23 2002
++++ src/Makefile.in	Mon Nov 18 02:32:02 2002
+@@ -95,7 +95,7 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+ l = @l@
+-localedir = @localedir@
++localedir = $(prefix)/$(PKGLOCALEDIR)/locale
+ 
+ SUBDIRS = icons
+ DIST_SUBDIRS = icons
diff --git a/graphics/gqview/patches/patch-ab b/graphics/gqview/patches/patch-ab
new file mode 100644
index 00000000000..7bc2778b841
--- /dev/null
+++ b/graphics/gqview/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.9 2002/11/18 08:04:48 salo Exp $
+
+--- intl/Makefile.in.orig	Tue Jan  1 18:28:50 2002
++++ intl/Makefile.in	Mon Nov 18 02:30:27 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 = $(localedir)
+ gettextsrcdir = @datadir@/gettext/intl
+ aliaspath = $(localedir):.
+ subdir = intl
diff --git a/graphics/gqview/patches/patch-ac b/graphics/gqview/patches/patch-ac
new file mode 100644
index 00000000000..c197c34c00b
--- /dev/null
+++ b/graphics/gqview/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.3 2002/11/18 08:04:48 salo Exp $
+
+--- po/Makefile.in.in.orig	Tue Jan  1 18:28:50 2002
++++ po/Makefile.in.in	Mon Nov 18 02:29:46 2002
+@@ -19,8 +19,8 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = $(prefix)/@DATADIRNAME@
+-localedir = $(datadir)/locale
+-gnulocaledir = $(prefix)/share/locale
++localedir = $(prefix)/$(PKGLOCALEDIR)/locale
++gnulocaledir = $(localedir)
+ gettextsrcdir = $(prefix)/share/gettext/po
+ subdir = po
+