From 951266b100658f1e788c9e984fff2dee0173e76e Mon Sep 17 00:00:00 2001
From: rillig <rillig@pkgsrc.org>
Date: Sat, 23 Dec 2006 13:59:57 +0000
Subject: Fixed unresolved shell variable reference found by CHECK_HEADERS=yes.
 PKGREVISION++.

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

(limited to 'misc')

diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile
index 156fa3924d4..41b3624c6d3 100644
--- a/misc/yelp/Makefile
+++ b/misc/yelp/Makefile
@@ -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_LIBTOOL=		yes
 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 --git a/misc/yelp/distinfo b/misc/yelp/distinfo
index 5fc90c9457a..3bd922a3c22 100644
--- a/misc/yelp/distinfo
+++ b/misc/yelp/distinfo
@@ -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 --git a/misc/yelp/patches/patch-ab b/misc/yelp/patches/patch-ab
new file mode 100644
index 00000000000..c034e19af5f
--- /dev/null
+++ b/misc/yelp/patches/patch-ab
@@ -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"
+ 
-- 
cgit v1.2.3