summaryrefslogtreecommitdiffstats
path: root/devel/gnomevfs2
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2004-07-24 15:12:37 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2004-07-24 15:12:37 +0800
commit87d1195fa333d17d4d2a6a435cf022eb0e5979d9 (patch)
treee1ce27e048cac585e1a19c52c37adc7542800ce7 /devel/gnomevfs2
parent8895ea7293df15e46e7fff9d2553fbd36d8165ed (diff)
downloadmarcuscom-ports-87d1195fa333d17d4d2a6a435cf022eb0e5979d9.tar
marcuscom-ports-87d1195fa333d17d4d2a6a435cf022eb0e5979d9.tar.gz
marcuscom-ports-87d1195fa333d17d4d2a6a435cf022eb0e5979d9.tar.bz2
marcuscom-ports-87d1195fa333d17d4d2a6a435cf022eb0e5979d9.tar.lz
marcuscom-ports-87d1195fa333d17d4d2a6a435cf022eb0e5979d9.tar.xz
marcuscom-ports-87d1195fa333d17d4d2a6a435cf022eb0e5979d9.tar.zst
marcuscom-ports-87d1195fa333d17d4d2a6a435cf022eb0e5979d9.zip
Make sure to check the GNOME datadirs for application and MIME entries.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2546 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/gnomevfs2')
-rw-r--r--devel/gnomevfs2/Makefile4
-rw-r--r--devel/gnomevfs2/files/patch-libgnomevfs_eggdirfuncs.c11
-rw-r--r--devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c2
3 files changed, 15 insertions, 2 deletions
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 01dce7a28..53ef14b8e 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnomevfs2
PORTVERSION= 2.7.4
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-vfs/2.7
@@ -99,7 +100,8 @@ post-patch:
${WRKSRC}/modules/vfolder/applications-all-users.vfolder-info.in
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
s|%%X11BASE%%|${X11BASE}|g' \
- ${WRKSRC}/libgnomevfs/xdgmime.c
+ ${WRKSRC}/libgnomevfs/xdgmime.c \
+ ${WRKSRC}/libgnomevfs/eggdirfuncs.c
.if !defined(WITHOUT_KDE_MENUS)
@${SED} -e 's|/usr/local|${LOCALBASE}|g' \
< ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_eggdirfuncs.c b/devel/gnomevfs2/files/patch-libgnomevfs_eggdirfuncs.c
new file mode 100644
index 000000000..82e0e5f61
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-libgnomevfs_eggdirfuncs.c
@@ -0,0 +1,11 @@
+--- libgnomevfs/eggdirfuncs.c.orig Sat Jul 24 03:08:10 2004
++++ libgnomevfs/eggdirfuncs.c Sat Jul 24 03:08:50 2004
+@@ -106,7 +106,7 @@
+ data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
+
+ if (!data_dirs || !data_dirs[0])
+- data_dirs = "/usr/local/share/:/usr/share/";
++ data_dirs = "/usr/local/share/:%%X11BASE%%/share/:/usr/share/:/usr/local/share/gnome/:%%X11BASE%%/share/gnome/:/usr/share/gnome/";
+
+ data_dir_vector = g_strsplit (data_dirs, ":", 0);
+
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c b/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c
index 1a5401560..873c86d22 100644
--- a/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c
+++ b/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c
@@ -5,7 +5,7 @@
xdg_data_dirs = getenv ("XDG_DATA_DIRS");
if (xdg_data_dirs == NULL)
- xdg_data_dirs = "/usr/local/share/:/usr/share/";
-+ xdg_data_dirs = "/usr/local/share/:%%X11BASE%%/share/:/usr/share/";
++ xdg_data_dirs = "/usr/local/share/:%%X11BASE%%/share/:/usr/share/:/usr/local/share/gnome:%%X11BASE%%/share/gnome/:/usr/share/gnome/";
ptr = xdg_data_dirs;