diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-06-28 05:26:26 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-06-28 05:26:26 +0800 |
| commit | ceffeb745aa4e4a283889bd9c0cee1b57ec47fb2 (patch) | |
| tree | e6ac0924e710ff1dfed03cc29409bad8123070b6 /devel | |
| parent | b39b454ca485b6bb06996c64739011eecce528ae (diff) | |
| download | marcuscom-ports-ceffeb745aa4e4a283889bd9c0cee1b57ec47fb2.tar marcuscom-ports-ceffeb745aa4e4a283889bd9c0cee1b57ec47fb2.tar.gz marcuscom-ports-ceffeb745aa4e4a283889bd9c0cee1b57ec47fb2.tar.bz2 marcuscom-ports-ceffeb745aa4e4a283889bd9c0cee1b57ec47fb2.tar.lz marcuscom-ports-ceffeb745aa4e4a283889bd9c0cee1b57ec47fb2.tar.xz marcuscom-ports-ceffeb745aa4e4a283889bd9c0cee1b57ec47fb2.tar.zst marcuscom-ports-ceffeb745aa4e4a283889bd9c0cee1b57ec47fb2.zip | |
Merge X11BASE mime patches from the FreeBSD ports tree.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2415 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/gnome-vfs/Makefile | 5 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c | 11 | ||||
| -rw-r--r-- | devel/gnomevfs2/Makefile | 5 | ||||
| -rw-r--r-- | devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c | 11 |
4 files changed, 30 insertions, 2 deletions
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index acb9f700b..5f1b62fe5 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnomevfs2 PORTVERSION= 2.7.2 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-vfs/2.7 @@ -94,8 +95,10 @@ post-patch: 's|\@datadir\@/gnome|\@datadir\@|g' @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/libgnomevfs/Makefile.in \ - ${WRKSRC}/libgnomevfs/xdgmime.c \ ${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 .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_xdgmime.c b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c new file mode 100644 index 000000000..213ed03ec --- /dev/null +++ b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c @@ -0,0 +1,11 @@ +--- libgnomevfs/xdgmime.c.orig Wed Jun 23 20:15:25 2004 ++++ libgnomevfs/xdgmime.c Wed Jun 23 20:15:41 2004 +@@ -97,7 +97,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/"; + + ptr = xdg_data_dirs; + diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index acb9f700b..5f1b62fe5 100644 --- a/devel/gnomevfs2/Makefile +++ b/devel/gnomevfs2/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnomevfs2 PORTVERSION= 2.7.2 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-vfs/2.7 @@ -94,8 +95,10 @@ post-patch: 's|\@datadir\@/gnome|\@datadir\@|g' @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/libgnomevfs/Makefile.in \ - ${WRKSRC}/libgnomevfs/xdgmime.c \ ${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 .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_xdgmime.c b/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c new file mode 100644 index 000000000..213ed03ec --- /dev/null +++ b/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c @@ -0,0 +1,11 @@ +--- libgnomevfs/xdgmime.c.orig Wed Jun 23 20:15:25 2004 ++++ libgnomevfs/xdgmime.c Wed Jun 23 20:15:41 2004 +@@ -97,7 +97,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/"; + + ptr = xdg_data_dirs; + |