diff options
author | jmmv <jmmv> | 2005-01-11 12:32:53 +0000 |
---|---|---|
committer | jmmv <jmmv> | 2005-01-11 12:32:53 +0000 |
commit | 0c24cb723efd53c11e9a5238bc3abf6a6489957e (patch) | |
tree | 18942887db922cd46207a0ccf378b9afcd7574cb | |
parent | 4f763dd2bd757f1924d04c6c2cd816eee63c1e48 (diff) | |
download | pkgsrc-0c24cb723efd53c11e9a5238bc3abf6a6489957e.tar.gz |
Use sane paths instead of relying on the XDG_{CONFIG,DATA}_DIRS variables
beeing set in the environment, which have a very big chance on producing
misbehavior at runtime. Should have done this a long time ago.
Bump PKGREVISION to 1.
-rw-r--r-- | sysutils/gnome-vfs2/Makefile | 4 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/Makefile.common | 4 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/distinfo | 6 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/patches/patch-aa | 4 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/patches/patch-as | 22 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/patches/patch-at | 13 |
6 files changed, 46 insertions, 7 deletions
diff --git a/sysutils/gnome-vfs2/Makefile b/sysutils/gnome-vfs2/Makefile index dccd91ad6c7..b9ada7f72b2 100644 --- a/sysutils/gnome-vfs2/Makefile +++ b/sysutils/gnome-vfs2/Makefile @@ -1,6 +1,8 @@ -# $NetBSD: Makefile,v 1.42 2004/12/05 23:48:41 recht Exp $ +# $NetBSD: Makefile,v 1.43 2005/01/11 12:32:53 jmmv Exp $ # +PKGREVISION= 1 + PKGCONFIG_OVERRIDE= gnome-vfs-2.0.pc.in PKGCONFIG_OVERRIDE+= gnome-vfs-module-2.0.pc.in diff --git a/sysutils/gnome-vfs2/Makefile.common b/sysutils/gnome-vfs2/Makefile.common index 2f0b5ad4b3d..d941cfaee76 100644 --- a/sysutils/gnome-vfs2/Makefile.common +++ b/sysutils/gnome-vfs2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2004/12/03 15:15:10 wiz Exp $ +# $NetBSD: Makefile.common,v 1.8 2005/01/11 12:32:53 jmmv Exp $ # DISTNAME= gnome-vfs-2.8.3 @@ -34,7 +34,7 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc CPPFLAGS+= -DPREFIX=\"\\\"${PREFIX}\\\"\" -CPPFLAGS+= -DPKGLOCALEDIR=\"\\\"${PKGLOCALEDIR}\\\"\" +CPPFLAGS+= -DPKG_SYSCONFDIR=\"\\\"${PKG_SYSCONFDIR}\\\"\" PKG_SYSCONFSUBDIR= gnome-vfs-2.0 diff --git a/sysutils/gnome-vfs2/distinfo b/sysutils/gnome-vfs2/distinfo index fc5412cd760..a73e0421172 100644 --- a/sysutils/gnome-vfs2/distinfo +++ b/sysutils/gnome-vfs2/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.28 2004/11/28 13:00:17 recht Exp $ +$NetBSD: distinfo,v 1.29 2005/01/11 12:32:53 jmmv Exp $ SHA1 (gnome-vfs-2.8.3.tar.bz2) = 263dc88bfb18ac5bb917124bbc8278b3f5352688 Size (gnome-vfs-2.8.3.tar.bz2) = 1907154 bytes -SHA1 (patch-aa) = 5bddba16ab0d57c48234ca427417ebf2cd563aab +SHA1 (patch-aa) = a5a3ac6be3e2a888eaaab108807d2aff651e62db SHA1 (patch-ab) = 6320180870f234a150dfe40f8f990deec7a2a0b5 SHA1 (patch-ad) = 326e835c7fd1d2e25ac2ae4736347d38ffe8ea06 SHA1 (patch-ae) = 32fe1a4e82d96bf80f3364704e7369a4ee778e0f @@ -15,3 +15,5 @@ SHA1 (patch-ao) = 38bd5859bff41642c2d1a26c16d90d780387b2d0 SHA1 (patch-ap) = f13b6a4e0740a211e87bd820a266b2ce038f932c SHA1 (patch-aq) = 1d5ed4d6c1b3a282e68bedf6892fa8a9678ea39b SHA1 (patch-ar) = 99c99d0d90ed7a0d804b349f532d3a17c780d506 +SHA1 (patch-as) = 1ac0cc66541c1e7ce62d205a05cc6cb446cec39d +SHA1 (patch-at) = b75ad2f2accb0ca8986f8c4e2771028fceca41b4 diff --git a/sysutils/gnome-vfs2/patches/patch-aa b/sysutils/gnome-vfs2/patches/patch-aa index c2804f85e6c..669a423a05a 100644 --- a/sysutils/gnome-vfs2/patches/patch-aa +++ b/sysutils/gnome-vfs2/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.10 2004/09/21 16:45:47 jmmv Exp $ +$NetBSD: patch-aa,v 1.11 2005/01/11 12:32:53 jmmv Exp $ --- libgnomevfs/xdgmime.c.orig 2004-07-24 16:39:43.000000000 +0200 +++ libgnomevfs/xdgmime.c @@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.10 2004/09/21 16:45:47 jmmv Exp $ 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/:/usr/local/share/:/usr/share/"; ++ xdg_data_dirs = PREFIX "/share/"; ptr = xdg_data_dirs; diff --git a/sysutils/gnome-vfs2/patches/patch-as b/sysutils/gnome-vfs2/patches/patch-as new file mode 100644 index 00000000000..f844e909c9e --- /dev/null +++ b/sysutils/gnome-vfs2/patches/patch-as @@ -0,0 +1,22 @@ +$NetBSD: patch-as,v 1.1 2005/01/11 12:32:53 jmmv Exp $ + +--- libgnomevfs/eggdirfuncs.c.orig 2004-07-22 05:54:52.000000000 +0200 ++++ libgnomevfs/eggdirfuncs.c +@@ -106,7 +106,7 @@ egg_get_secondary_data_dirs (void) + data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS"); + + if (!data_dirs || !data_dirs[0]) +- data_dirs = "/usr/local/share/:/usr/share/"; ++ data_dirs = PREFIX "/share/"; + + data_dir_vector = g_strsplit (data_dirs, ":", 0); + +@@ -132,7 +132,7 @@ egg_get_secondary_configuration_dirs (vo + conf_dirs = (gchar *) g_getenv ("XDG_CONFIG_DIRS"); + + if (!conf_dirs || !conf_dirs[0]) +- conf_dirs = "/etc/xdg"; ++ conf_dirs = PKG_SYSCONFDIR "/xdg"; + + conf_dir_vector = g_strsplit (conf_dirs, ":", 0); + diff --git a/sysutils/gnome-vfs2/patches/patch-at b/sysutils/gnome-vfs2/patches/patch-at new file mode 100644 index 00000000000..59dc6e527f1 --- /dev/null +++ b/sysutils/gnome-vfs2/patches/patch-at @@ -0,0 +1,13 @@ +$NetBSD: patch-at,v 1.1 2005/01/11 12:32:53 jmmv Exp $ + +--- libgnomevfs/gnome-vfs-mime-info.c.orig 2004-10-18 09:13:03.000000000 +0200 ++++ libgnomevfs/gnome-vfs-mime-info.c +@@ -149,7 +149,7 @@ gnome_vfs_mime_init (void) + + xdg_data_dirs = g_getenv ("XDG_DATA_DIRS"); + if (!xdg_data_dirs) { +- xdg_data_dirs = "/usr/local/share/:/usr/share/"; ++ xdg_data_dirs = PREFIX "/share/"; + } + + split_data_dirs = g_strsplit (xdg_data_dirs, ":", 0); |