diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2007-05-19 22:01:13 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2007-05-19 22:01:13 +0000 |
| commit | 90774037f4cc76516784395d95af396005e33103 (patch) | |
| tree | 35fc1b521c191fcaee97cff250a56a76e3e958a6 /misc/shared-mime-info | |
| parent | fd84d6227dddbfa34de86b2b1b820065708986a6 (diff) | |
| download | ports-90774037f4cc76516784395d95af396005e33103.tar.gz ports-90774037f4cc76516784395d95af396005e33103.zip | |
Remove support for a separate X11BASE.
Approved by: portmgr (implicit)
Notes
Notes:
svn path=/head/; revision=191551
Diffstat (limited to 'misc/shared-mime-info')
| -rw-r--r-- | misc/shared-mime-info/Makefile | 14 | ||||
| -rw-r--r-- | misc/shared-mime-info/files/patch-update-mime-database.c | 2 |
2 files changed, 4 insertions, 12 deletions
diff --git a/misc/shared-mime-info/Makefile b/misc/shared-mime-info/Makefile index ef2025c421d0..299dbb6baf0a 100644 --- a/misc/shared-mime-info/Makefile +++ b/misc/shared-mime-info/Makefile @@ -6,7 +6,7 @@ PORTNAME= shared-mime-info PORTVERSION= 0.21 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc gnome MASTER_SITES= http://people.freedesktop.org/~hadess/ @@ -26,9 +26,7 @@ MAN1= update-mime-database.1 PKGINSTALL= ${WRKDIR}/pkg-install -MIMEDIRS= ${X11BASE}/share/gnome/mime \ - ${LOCALBASE}/share/gnome/mime \ - ${X11BASE}/share/mime \ +MIMEDIRS= ${LOCALBASE}/share/gnome/mime \ ${LOCALBASE}/share/mime \ ${PREFIX}/share/mime \ /usr/share/mime @@ -38,15 +36,9 @@ MIMESUBDIRS= application audio image inode message model multipart \ post-patch: @${REINPLACE_CMD} -e 's|%%MIMEDIRS%%|${MIMEDIRS}|g' \ ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/update-mime-database.c -pre-su-install: -.for subdir in ${MIMESUBDIRS} - ${MKDIR} ${X11BASE}/share/mime/${subdir} -.endfor - post-install: @${SED} -e 's|%%PREFIX%%|${PREFIX}| ; \ s|%%MIMEDIRS%%|${MIMEDIRS}|' \ 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 a9837e64314c..0af2d2a1fd86 100644 --- a/misc/shared-mime-info/files/patch-update-mime-database.c +++ b/misc/shared-mime-info/files/patch-update-mime-database.c @@ -15,7 +15,7 @@ env = getenv("XDG_DATA_DIRS"); if (!env) - env = "/usr/local/share/:/usr/share/"; -+ env = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"; ++ env = "/usr/local/share/gnome/:/usr/local/share/:/usr/share/"; dirs = g_strsplit(env, ":", 0); g_return_if_fail(dirs != NULL); for (n = 0; dirs[n]; n++) |