summaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2004-08-05 01:48:05 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2004-08-05 01:48:05 +0800
commit650838dd6479fd92109701a74c4aaf40af4a08f0 (patch)
tree8f0ee206380644b7c9ebcc8a2fbd1e20ca5ce89d /devel
parent6b2fae13dfb46404a5baf85c9f9b97b582ff0ed4 (diff)
downloadmarcuscom-ports-650838dd6479fd92109701a74c4aaf40af4a08f0.tar
marcuscom-ports-650838dd6479fd92109701a74c4aaf40af4a08f0.tar.gz
marcuscom-ports-650838dd6479fd92109701a74c4aaf40af4a08f0.tar.bz2
marcuscom-ports-650838dd6479fd92109701a74c4aaf40af4a08f0.tar.lz
marcuscom-ports-650838dd6479fd92109701a74c4aaf40af4a08f0.tar.xz
marcuscom-ports-650838dd6479fd92109701a74c4aaf40af4a08f0.tar.zst
marcuscom-ports-650838dd6479fd92109701a74c4aaf40af4a08f0.zip
Make sure the new MIME system searches X11BASE.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2615 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel')
-rw-r--r--devel/gnome-vfs/Makefile4
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime-info.c11
-rw-r--r--devel/gnomevfs2/Makefile4
-rw-r--r--devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime-info.c11
4 files changed, 28 insertions, 2 deletions
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 6df7aecd4..f211ee558 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnomevfs2
PORTVERSION= 2.7.90
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-vfs/2.7
@@ -100,7 +101,8 @@ post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
s|%%X11BASE%%|${X11BASE}|g' \
${WRKSRC}/libgnomevfs/xdgmime.c \
- ${WRKSRC}/libgnomevfs/eggdirfuncs.c
+ ${WRKSRC}/libgnomevfs/eggdirfuncs.c \
+ ${WRKSRC}/libgnomevfs/gnome-vfs-mime-info.c
.if !defined(WITHOUT_KDE_MENUS)
@${SED} -e 's|/usr/local|${LOCALBASE}|g' \
< ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime-info.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime-info.c
new file mode 100644
index 000000000..1106f419c
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime-info.c
@@ -0,0 +1,11 @@
+--- libgnomevfs/gnome-vfs-mime-info.c.orig Wed Aug 4 13:41:52 2004
++++ libgnomevfs/gnome-vfs-mime-info.c Wed Aug 4 13:42:10 2004
+@@ -149,7 +149,7 @@
+
+ xdg_data_dirs = g_getenv ("XDG_DATA_DIRS");
+ if (!xdg_data_dirs) {
+- xdg_data_dirs = "/usr/local/share/:/usr/share/";
++ xdg_data_dirs = "/usr/local/share/:%%X11BASE%%/share/:/usr/share/:/usr/local/share/gnome:%%X11BASE%%/share/gnome/:/usr/share/gnome/";
+ }
+
+ split_data_dirs = g_strsplit (xdg_data_dirs, ":", 0);
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 6df7aecd4..f211ee558 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnomevfs2
PORTVERSION= 2.7.90
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-vfs/2.7
@@ -100,7 +101,8 @@ post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
s|%%X11BASE%%|${X11BASE}|g' \
${WRKSRC}/libgnomevfs/xdgmime.c \
- ${WRKSRC}/libgnomevfs/eggdirfuncs.c
+ ${WRKSRC}/libgnomevfs/eggdirfuncs.c \
+ ${WRKSRC}/libgnomevfs/gnome-vfs-mime-info.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_gnome-vfs-mime-info.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime-info.c
new file mode 100644
index 000000000..1106f419c
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime-info.c
@@ -0,0 +1,11 @@
+--- libgnomevfs/gnome-vfs-mime-info.c.orig Wed Aug 4 13:41:52 2004
++++ libgnomevfs/gnome-vfs-mime-info.c Wed Aug 4 13:42:10 2004
+@@ -149,7 +149,7 @@
+
+ xdg_data_dirs = g_getenv ("XDG_DATA_DIRS");
+ if (!xdg_data_dirs) {
+- xdg_data_dirs = "/usr/local/share/:/usr/share/";
++ xdg_data_dirs = "/usr/local/share/:%%X11BASE%%/share/:/usr/share/:/usr/local/share/gnome:%%X11BASE%%/share/gnome/:/usr/share/gnome/";
+ }
+
+ split_data_dirs = g_strsplit (xdg_data_dirs, ":", 0);