diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-05-20 05:53:14 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-05-20 05:53:14 +0800 |
| commit | 51bfa8b0c3d761fd5f8e379bd1e8a58ef70632fe (patch) | |
| tree | 6af98cec555b17ea6650c3132cbf1a947cb6d543 | |
| parent | e8c24a56a1bb0b75861e4b0b10bb4050c2531b52 (diff) | |
| download | marcuscom-ports-51bfa8b0c3d761fd5f8e379bd1e8a58ef70632fe.tar marcuscom-ports-51bfa8b0c3d761fd5f8e379bd1e8a58ef70632fe.tar.gz marcuscom-ports-51bfa8b0c3d761fd5f8e379bd1e8a58ef70632fe.tar.bz2 marcuscom-ports-51bfa8b0c3d761fd5f8e379bd1e8a58ef70632fe.tar.lz marcuscom-ports-51bfa8b0c3d761fd5f8e379bd1e8a58ef70632fe.tar.xz marcuscom-ports-51bfa8b0c3d761fd5f8e379bd1e8a58ef70632fe.tar.zst marcuscom-ports-51bfa8b0c3d761fd5f8e379bd1e8a58ef70632fe.zip | |
Remove support for a separate X11BASE.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8886 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | misc/shared-mime-info/Makefile | 11 | ||||
| -rw-r--r-- | misc/shared-mime-info/files/patch-update-mime-database.c | 2 |
2 files changed, 3 insertions, 10 deletions
diff --git a/misc/shared-mime-info/Makefile b/misc/shared-mime-info/Makefile index 4267f7d2f..0ea7c8185 100644 --- a/misc/shared-mime-info/Makefile +++ b/misc/shared-mime-info/Makefile @@ -3,7 +3,7 @@ # Whom: olgeni@FreeBSD.org # # $FreeBSD$ -# $MCom: ports/misc/shared-mime-info/Makefile,v 1.4 2007/04/26 19:10:20 marcus Exp $ +# $MCom: ports/misc/shared-mime-info/Makefile,v 1.5 2007/04/27 20:58:29 marcus Exp $ PORTNAME= shared-mime-info PORTVERSION= 0.21 @@ -28,7 +28,6 @@ MAN1= update-mime-database.1 PKGINSTALL= ${WRKDIR}/pkg-install MIMEDIRS= ${LOCALBASE}/share/mime \ - ${X11BASE}/share/mime \ ${PREFIX}/share/mime MIMESUBDIRS= application audio image inode message model multipart \ packages text video @@ -36,15 +35,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 cdcdf07bc..d591c7c9e 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 = "/usr/local/share/:%%X11BASE%%/share/"; ++ env = "/usr/local/share/"; dirs = g_strsplit(env, ":", 0); g_return_if_fail(dirs != NULL); for (n = 0; dirs[n]; n++) |