diff options
| author | marcus <marcus@FreeBSD.org> | 2004-06-26 11:28:37 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2004-06-26 11:28:37 +0800 |
| commit | d16c96bd099c7c2ebba94d296660659798ef8a50 (patch) | |
| tree | 2a76b49dcafc6264be1162f63fadc95d46c94b0a /misc | |
| parent | ec42cd092e6b11dd74e12bef81f9e08f113a31d7 (diff) | |
| download | freebsd-ports-gnome-d16c96bd099c7c2ebba94d296660659798ef8a50.tar.gz freebsd-ports-gnome-d16c96bd099c7c2ebba94d296660659798ef8a50.tar.zst freebsd-ports-gnome-d16c96bd099c7c2ebba94d296660659798ef8a50.zip | |
Add support for a mime database in ${X11BASE} as well as ${LOCALBASE}.
Requested by: pav
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/shared-mime-info/Makefile | 5 | ||||
| -rw-r--r-- | misc/shared-mime-info/files/patch-update-mime-database.c | 13 | ||||
| -rw-r--r-- | misc/shared-mime-info/pkg-plist | 11 |
3 files changed, 25 insertions, 4 deletions
diff --git a/misc/shared-mime-info/Makefile b/misc/shared-mime-info/Makefile index 8048738638bf..bfed1195e114 100644 --- a/misc/shared-mime-info/Makefile +++ b/misc/shared-mime-info/Makefile @@ -6,7 +6,7 @@ PORTNAME= shared-mime-info PORTVERSION= 0.14 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc gnome MASTER_SITES= http://www.freedesktop.org/software/shared-mime-info/ DISTNAME= shared-mime-info-${PORTVERSION} @@ -21,7 +21,8 @@ USE_GNOME= glib20 libxml2 intltool gnomehack MAN1= update-mime-database.1 post-patch: - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ + s|%%X11BASE%%|${X11BASE}|g' \ ${WRKSRC}/update-mime-database.c .include <bsd.port.mk> diff --git a/misc/shared-mime-info/files/patch-update-mime-database.c b/misc/shared-mime-info/files/patch-update-mime-database.c index 31465c2972e8..b7f0459abec4 100644 --- a/misc/shared-mime-info/files/patch-update-mime-database.c +++ b/misc/shared-mime-info/files/patch-update-mime-database.c @@ -1,5 +1,5 @@ ---- update-mime-database.c.orig Mon Oct 13 11:43:38 2003 -+++ update-mime-database.c Mon Apr 12 22:45:01 2004 +--- update-mime-database.c.orig Mon Oct 13 05:43:38 2003 ++++ update-mime-database.c Wed Jun 23 20:13:10 2004 @@ -377,7 +377,8 @@ } } @@ -10,3 +10,12 @@ } /* 'node' is a <mime-type> node from a source file, whose type is 'type'. +@@ -1330,7 +1331,7 @@ + + env = getenv("XDG_DATA_DIRS"); + if (!env) +- env = "/usr/local/share/:/usr/share/"; ++ env = "/usr/local/share/:%%X11BASE%%/share/:/usr/share/"; + dirs = g_strsplit(env, ":", 0); + g_return_if_fail(dirs != NULL); + for (n = 0; dirs[n]; n++) diff --git a/misc/shared-mime-info/pkg-plist b/misc/shared-mime-info/pkg-plist index e14b41d062fe..0307200c3ae6 100644 --- a/misc/shared-mime-info/pkg-plist +++ b/misc/shared-mime-info/pkg-plist @@ -397,3 +397,14 @@ share/mime/video/x-sgi-movie.xml @unexec rmdir %D/share/mime/audio 2>/dev/null || true @unexec rmdir %D/share/mime/application 2>/dev/null || true @unexec rmdir %D/share/mime 2>/dev/null || true +@unexec rmdir %%X11BASE%%/share/mime/video 2>/dev/null || true +@unexec rmdir %%X11BASE%%/share/mime/text 2>/dev/null || true +@unexec rmdir %%X11BASE%%/share/mime/packages 2>/dev/null || true +@unexec rmdir %%X11BASE%%/share/mime/multipart 2>/dev/null || true +@unexec rmdir %%X11BASE%%/share/mime/model 2>/dev/null || true +@unexec rmdir %%X11BASE%%/share/mime/message 2>/dev/null || true +@unexec rmdir %%X11BASE%%/share/mime/inode 2>/dev/null || true +@unexec rmdir %%X11BASE%%/share/mime/image 2>/dev/null || true +@unexec rmdir %%X11BASE%%/share/mime/audio 2>/dev/null || true +@unexec rmdir %%X11BASE%%/share/mime/application 2>/dev/null || true +@unexec rmdir %%X11BASE%%/share/mime 2>/dev/null || true |