From 87d1195fa333d17d4d2a6a435cf022eb0e5979d9 Mon Sep 17 00:00:00 2001 From: marcus Date: Sat, 24 Jul 2004 07:12:37 +0000 Subject: 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 --- devel/gnome-vfs/Makefile | 4 +++- devel/gnome-vfs/files/patch-libgnomevfs_eggdirfuncs.c | 11 +++++++++++ devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c | 2 +- devel/gnomevfs2/Makefile | 4 +++- devel/gnomevfs2/files/patch-libgnomevfs_eggdirfuncs.c | 11 +++++++++++ devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c | 2 +- 6 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 devel/gnome-vfs/files/patch-libgnomevfs_eggdirfuncs.c create mode 100644 devel/gnomevfs2/files/patch-libgnomevfs_eggdirfuncs.c diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index 01dce7a28..53ef14b8e 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/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/gnome-vfs/files/patch-libgnomevfs_eggdirfuncs.c b/devel/gnome-vfs/files/patch-libgnomevfs_eggdirfuncs.c new file mode 100644 index 000000000..82e0e5f61 --- /dev/null +++ b/devel/gnome-vfs/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/gnome-vfs/files/patch-libgnomevfs_xdgmime.c b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c index 1a5401560..873c86d22 100644 --- a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c +++ b/devel/gnome-vfs/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; 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; -- cgit v1.2.3