From f4d74460a099742e986ab90113cb2bc681d9cd8b Mon Sep 17 00:00:00 2001
From: jmmv <jmmv@pkgsrc.org>
Date: Mon, 28 Aug 2006 10:02:33 +0000
Subject: Fix paths to installed files to solve, at least, Sticky Notes
 crashes.  I'm sure this fixes many other problems in other applets.  Bump
 PKGREVISION to 1.

---
 x11/gnome2-applets/Makefile         |  3 +-
 x11/gnome2-applets/distinfo         |  4 +-
 x11/gnome2-applets/patches/patch-ac | 78 +++++++++++++++++++++++++++++++++++--
 3 files changed, 79 insertions(+), 6 deletions(-)

(limited to 'x11')

diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile
index b04e28b0ba3..e090c26f7ec 100644
--- a/x11/gnome2-applets/Makefile
+++ b/x11/gnome2-applets/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.68 2006/08/03 20:08:10 drochner Exp $
+# $NetBSD: Makefile,v 1.69 2006/08/28 10:02:33 jmmv Exp $
 #
 
 DISTNAME=		gnome-applets-2.14.3
+PKGREVISION=		1
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-applets/2.14/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome2-applets/distinfo b/x11/gnome2-applets/distinfo
index 1d4000b0098..d931a3a6ca9 100644
--- a/x11/gnome2-applets/distinfo
+++ b/x11/gnome2-applets/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.17 2006/08/03 20:08:10 drochner Exp $
+$NetBSD: distinfo,v 1.18 2006/08/28 10:02:33 jmmv Exp $
 
 SHA1 (gnome-applets-2.14.3.tar.bz2) = b48d12a267ca209a7446e7b9c5e5f1afaf3468dd
 RMD160 (gnome-applets-2.14.3.tar.bz2) = cdeb4ecc9b373e5bacbe2b1840a8d01eb007e9bc
 Size (gnome-applets-2.14.3.tar.bz2) = 6541527 bytes
 SHA1 (patch-aa) = d4683f2d1273c4202ee336be436b9fd237610b7b
 SHA1 (patch-ab) = f880abec6df2254b6541d4e5a894559763ef674b
-SHA1 (patch-ac) = 35a3be3be12828e5cf80b2012cd41d779b30e69e
+SHA1 (patch-ac) = 561a296f21f54d8193d64dfef8f7d789353f6dff
 SHA1 (patch-ad) = 42fb64b30a031a1ea8f57f47cabdf63475b7987e
diff --git a/x11/gnome2-applets/patches/patch-ac b/x11/gnome2-applets/patches/patch-ac
index 59efac72cf1..db90cc4f5ea 100644
--- a/x11/gnome2-applets/patches/patch-ac
+++ b/x11/gnome2-applets/patches/patch-ac
@@ -1,8 +1,17 @@
-$NetBSD: patch-ac,v 1.3 2006/03/30 21:16:53 jmmv Exp $
+$NetBSD: patch-ac,v 1.4 2006/08/28 10:02:33 jmmv Exp $
 
---- configure.orig	2006-03-19 23:21:47.000000000 +0100
+--- configure.orig	2006-07-31 16:55:31.000000000 +0200
 +++ configure
-@@ -26469,7 +26469,7 @@ else
+@@ -23363,7 +23363,7 @@ _ACEOF
+ 
+   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+-  ac_define_dir=`eval echo $"${datadir}/locale"`
++  ac_define_dir=`eval echo "${datadir}/locale"`
+   ac_define_dir=`eval echo $ac_define_dir`
+   GNOMELOCALEDIR="$ac_define_dir"
+ 
+@@ -26471,7 +26471,7 @@ else
  fi
  
  
@@ -11,3 +20,66 @@ $NetBSD: patch-ac,v 1.3 2006/03/30 21:16:53 jmmv Exp $
    { echo "$as_me:$LINENO: WARNING: *** modemlights applet will not be built ***" >&5
  echo "$as_me: WARNING: *** modemlights applet will not be built ***" >&2;}
  else
+@@ -27125,7 +27125,7 @@ gladedir="${pkgdatadir}/glade"
+ 
+   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+-  ac_define_dir=`eval echo $"${iconsdir}"`
++  ac_define_dir=`eval echo "${iconsdir}"`
+   ac_define_dir=`eval echo $ac_define_dir`
+   GNOME_ICONDIR="$ac_define_dir"
+ 
+@@ -27138,7 +27138,7 @@ _ACEOF
+ 
+   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+-  ac_define_dir=`eval echo $"${pixmapsdir}"`
++  ac_define_dir=`eval echo "${pixmapsdir}"`
+   ac_define_dir=`eval echo $ac_define_dir`
+   GNOME_PIXMAPSDIR="$ac_define_dir"
+ 
+@@ -27151,7 +27151,7 @@ _ACEOF
+ 
+   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+-  ac_define_dir=`eval echo $"${gladedir}"`
++  ac_define_dir=`eval echo "${gladedir}"`
+   ac_define_dir=`eval echo $ac_define_dir`
+   GNOME_GLADEDIR="$ac_define_dir"
+ 
+@@ -27164,7 +27164,7 @@ _ACEOF
+ 
+   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+-  ac_define_dir=`eval echo $"${datadir}"`
++  ac_define_dir=`eval echo "${datadir}"`
+   ac_define_dir=`eval echo $ac_define_dir`
+   DATADIR="$ac_define_dir"
+ 
+@@ -27177,7 +27177,7 @@ _ACEOF
+ 
+   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+-  ac_define_dir=`eval echo $"${sysconfdir}"`
++  ac_define_dir=`eval echo "${sysconfdir}"`
+   ac_define_dir=`eval echo $ac_define_dir`
+   SYSCONFDIR="$ac_define_dir"
+ 
+@@ -27190,7 +27190,7 @@ _ACEOF
+ 
+   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+-  ac_define_dir=`eval echo $"${libdir}"`
++  ac_define_dir=`eval echo "${libdir}"`
+   ac_define_dir=`eval echo $ac_define_dir`
+   LIBDIR="$ac_define_dir"
+ 
+@@ -27203,7 +27203,7 @@ _ACEOF
+ 
+   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+-  ac_define_dir=`eval echo $"$prefix"`
++  ac_define_dir=`eval echo "$prefix"`
+   ac_define_dir=`eval echo $ac_define_dir`
+   PREFIX="$ac_define_dir"
+ 
-- 
cgit v1.2.3