summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmcneill <jmcneill>2008-05-10 17:13:11 +0000
committerjmcneill <jmcneill>2008-05-10 17:13:11 +0000
commit85e6538a18ed33bda72fdab37e65e5272a6e448a (patch)
treef4fbf80b137286613cb7da79939d071bd4ff33da
parent03775b303888272bec5852e7aa6cf85f21a3cb09 (diff)
downloadpkgsrc-85e6538a18ed33bda72fdab37e65e5272a6e448a.tar.gz
Use PREFIX to determine xdg share directory location, fixes mime type
detection with gvfs.
-rw-r--r--devel/glib2/Makefile4
-rw-r--r--devel/glib2/distinfo3
-rw-r--r--devel/glib2/patches/patch-cb13
3 files changed, 17 insertions, 3 deletions
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 6d79851e5ee..668f061ee4a 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.135 2008/04/29 18:58:40 drochner Exp $
+# $NetBSD: Makefile,v 1.136 2008/05/10 17:13:11 jmcneill Exp $
# When updating glib2, please apply patch-ak to configure.in
# Then run a matching version of autoconf to regen patch-aa.
DISTNAME= glib-2.16.3
PKGNAME= ${DISTNAME:S/glib/glib2/}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ftp://ftp.gtk.org/pub/glib/2.16/ \
ftp://ftp.cs.umn.edu/pub/gimp/pub/glib/2.16/ \
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index 3ccf1d62a69..c4b922f64a1 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.95 2008/04/29 18:58:40 drochner Exp $
+$NetBSD: distinfo,v 1.96 2008/05/10 17:13:11 jmcneill Exp $
SHA1 (glib-2.16.3.tar.bz2) = f73fd53130a46f21ff4ee9faa69b9956787c571e
RMD160 (glib-2.16.3.tar.bz2) = 72260f5f9022ee3f97b79b5705ad6117adc279fd
@@ -17,3 +17,4 @@ SHA1 (patch-ak) = 4eee3ce549ba0972ab5d5d8166d37d2b61320e68
SHA1 (patch-al) = aa2dbd63d53298aab3a30ec6d27e836717c960e3
SHA1 (patch-ba) = 43dda2f4d89a82e645ef8f24d62f13ca9e4ddd9d
SHA1 (patch-ca) = 8cfc2903cfb4faf42ec79da0acdc66446e0fb091
+SHA1 (patch-cb) = 0a58d38bc6361f9d5f6f66f83f2f000e812f0507
diff --git a/devel/glib2/patches/patch-cb b/devel/glib2/patches/patch-cb
new file mode 100644
index 00000000000..534081faa87
--- /dev/null
+++ b/devel/glib2/patches/patch-cb
@@ -0,0 +1,13 @@
+$NetBSD: patch-cb,v 1.1 2008/05/10 17:13:12 jmcneill Exp $
+
+--- gio/xdgmime/xdgmime.c.orig 2008-05-10 13:00:48.000000000 -0400
++++ gio/xdgmime/xdgmime.c 2008-05-10 13:01:28.000000000 -0400
+@@ -236,7 +236,7 @@
+
+ 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;
+