[pkgsrc/trunk]: pkgsrc/x11/gtk2 Remove another XDG-specific hardcoded path. ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e14a119212f3
branches:  trunk
changeset: 487275:e14a119212f3
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Wed Jan 12 11:20:20 2005 +0000

description:
Remove another XDG-specific hardcoded path.  Bump PKGREVISION to 1.

diffstat:

 x11/gtk2/Makefile         |   5 ++++-
 x11/gtk2/distinfo         |   3 ++-
 x11/gtk2/patches/patch-ad |  13 +++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diffs (53 lines):

diff -r b9dcdfea4e29 -r e14a119212f3 x11/gtk2/Makefile
--- a/x11/gtk2/Makefile Wed Jan 12 10:59:31 2005 +0000
+++ b/x11/gtk2/Makefile Wed Jan 12 11:20:20 2005 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.72 2005/01/09 17:30:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.73 2005/01/12 11:20:20 jmmv Exp $
 #
 
 DISTNAME=              gtk+-2.6.1
 PKGNAME=               ${DISTNAME:S/gtk/gtk2/}
+PKGREVISION=           1
 CATEGORIES=            x11
 MASTER_SITES=          ftp://ftp.gtk.org/pub/gtk/v2.6/ \
                        ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.6/ \
@@ -49,6 +50,8 @@
 
 BUILD_DIRS=            ${WRKSRC} ${WRKSRC}/demos/gtk-demo
 
+CPPFLAGS+=             -DPREFIX=\"\\\"${PREFIX}\\\"\"
+
 PRINT_PLIST_AWK+=      /^@dirrm share\/themes\/Default$$/ \
                                { print "@unexec $${RMDIR} %D/" $$2 \
                                  " 2>/dev/null || $${TRUE}"; next; }
diff -r b9dcdfea4e29 -r e14a119212f3 x11/gtk2/distinfo
--- a/x11/gtk2/distinfo Wed Jan 12 10:59:31 2005 +0000
+++ b/x11/gtk2/distinfo Wed Jan 12 11:20:20 2005 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.37 2005/01/09 17:30:47 jmmv Exp $
+$NetBSD: distinfo,v 1.38 2005/01/12 11:20:20 jmmv Exp $
 
 SHA1 (gtk+-2.6.1.tar.bz2) = a584abc1d43e68dc79ebfb9e5d09bd9aa1a77781
 Size (gtk+-2.6.1.tar.bz2) = 11070668 bytes
 SHA1 (patch-aa) = ab8a71ffa3b44816bb6f53ced068f80132b67c09
 SHA1 (patch-ab) = 764729f9ee7e8b66e7165c34da0863b033af9552
 SHA1 (patch-ac) = 42dff743263b141029a814d7dec9fdc5637a3cff
+SHA1 (patch-ad) = dad88a4ee8bdac6bd3ea32b16ce4e0a3d1b202ab
diff -r b9dcdfea4e29 -r e14a119212f3 x11/gtk2/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gtk2/patches/patch-ad Wed Jan 12 11:20:20 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.11 2005/01/12 11:20:20 jmmv Exp $
+
+--- gtk/xdgmime/xdgmime.c.orig 2004-12-09 18:26:52.000000000 +0100
++++ gtk/xdgmime/xdgmime.c
+@@ -207,7 +207,7 @@ xdg_run_command_on_dirs (XdgDirectoryFun
+ 
+   xdg_data_dirs = getenv ("XDG_DATA_DIRS");
+   if (xdg_data_dirs == NULL)
+-    xdg_data_dirs = "/usr/local/share/:/usr/share/";
++    xdg_data_dirs = PREFIX "/share/";
+ 
+   ptr = xdg_data_dirs;
+