summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2005-01-12 11:20:20 +0000
committerjmmv <jmmv@pkgsrc.org>2005-01-12 11:20:20 +0000
commitff02f27b8b97b5766e92dee144f08e7825d61bb8 (patch)
tree15d8d2f05268239f3dbf7b660a4e058f9583b6e7
parent8097e0e4f4ca751a018ed2c069ed6ece1597b104 (diff)
downloadpkgsrc-ff02f27b8b97b5766e92dee144f08e7825d61bb8.tar.gz
Remove another XDG-specific hardcoded path. Bump PKGREVISION to 1.
-rw-r--r--x11/gtk2/Makefile5
-rw-r--r--x11/gtk2/distinfo3
-rw-r--r--x11/gtk2/patches/patch-ad13
3 files changed, 19 insertions, 2 deletions
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 774f92e1b85..376d02a3ad9 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -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 @@ MAKE_DIRS+= ${PREFIX}/libdata/gtk-2.0
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 --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index fdff5d445a4..be1f099ca1e 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -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 --git a/x11/gtk2/patches/patch-ad b/x11/gtk2/patches/patch-ad
new file mode 100644
index 00000000000..34045852b93
--- /dev/null
+++ b/x11/gtk2/patches/patch-ad
@@ -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;
+