[pkgsrc/trunk]: pkgsrc/misc/yelp Fixed unresolved shell variable reference fo...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e06685ef3ac5
branches:  trunk
changeset: 522813:e06685ef3ac5
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Dec 23 13:59:57 2006 +0000

description:
Fixed unresolved shell variable reference found by CHECK_HEADERS=yes.
PKGREVISION++.

diffstat:

 misc/yelp/Makefile         |   5 +++--
 misc/yelp/distinfo         |   3 ++-
 misc/yelp/patches/patch-ab |  15 +++++++++++++++
 3 files changed, 20 insertions(+), 3 deletions(-)

diffs (53 lines):

diff -r 006f093d5374 -r e06685ef3ac5 misc/yelp/Makefile
--- a/misc/yelp/Makefile        Sat Dec 23 12:26:04 2006 +0000
+++ b/misc/yelp/Makefile        Sat Dec 23 13:59:57 2006 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.62 2006/11/29 22:00:49 drochner Exp $
+# $NetBSD: Makefile,v 1.63 2006/12/23 13:59:57 rillig Exp $
 #
 
 DISTNAME=              yelp-2.16.2
+PKGREVISION=           1
 CATEGORIES=            misc
 MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/yelp/2.16/}
 EXTRACT_SUFX=          .tar.bz2
@@ -20,7 +21,7 @@
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
 USE_LANGUAGES=         c c++
-
+CONFIGURE_ENV+=                PKGLOCALEDIR=${PKGLOCALEDIR}
 CONFIGURE_ARGS+=       --with-html-widget=gtkhtml2
 
 GCONF2_SCHEMAS=                yelp.schemas
diff -r 006f093d5374 -r e06685ef3ac5 misc/yelp/distinfo
--- a/misc/yelp/distinfo        Sat Dec 23 12:26:04 2006 +0000
+++ b/misc/yelp/distinfo        Sat Dec 23 13:59:57 2006 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.19 2006/11/29 22:00:49 drochner Exp $
+$NetBSD: distinfo,v 1.20 2006/12/23 13:59:57 rillig Exp $
 
 SHA1 (yelp-2.16.2.tar.bz2) = d165a6a31eed3f6f2c251b9217299cd5e04ac6e0
 RMD160 (yelp-2.16.2.tar.bz2) = 5c33700f40c6f533406d99f06731f2ffcb31d448
 Size (yelp-2.16.2.tar.bz2) = 858693 bytes
 SHA1 (patch-aa) = 06d5f0a6d6e34db1cfff7d65c74cfd3b0d6fe51c
+SHA1 (patch-ab) = 37177f28f66552716e9cb41b537dc6bc0d9fe915
diff -r 006f093d5374 -r e06685ef3ac5 misc/yelp/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/yelp/patches/patch-ab        Sat Dec 23 13:59:57 2006 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2006/12/23 13:59:58 rillig Exp $
+
+AM_GLIB_DEFINE_LOCALEDIR is buggy. It does not expand enough variable
+references in $localedir.
+
+--- configure.orig     2006-12-23 14:01:10.000000000 +0100
++++ configure  2006-12-23 14:47:55.000000000 +0100
+@@ -23598,6 +23598,7 @@ if test "x$CATOBJEXT" = "x.mo" ; then
+ else
+   localedir=`eval echo "${datadir}/locale"`
+ fi
++localedir="$prefix/$PKGLOCALEDIR/locale"
+ prefix="$glib_save_prefix"
+ exec_prefix="$glib_save_exec_prefix"
+