diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-02-02 19:14:21 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-02-02 19:14:21 +0000 |
| commit | 459fc050f6a1d30dfeec723309003f048367948e (patch) | |
| tree | c43e3dc5a21efd6eb5291b7ef4d44f358c8ea015 /x11-fonts | |
| parent | o Update port to version 1.1.6, we are at 1.0.22a now. (diff) | |
Since we look in X11BASE for fonts, make sure we explicitly clean up
X11BASE on deinstall.
Diffstat (limited to 'x11-fonts')
| -rw-r--r-- | x11-fonts/fontconfig/Makefile | 5 | ||||
| -rw-r--r-- | x11-fonts/fontconfig/files/pkg-install.in | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile index e9a7de736908..f37ac017168b 100644 --- a/x11-fonts/fontconfig/Makefile +++ b/x11-fonts/fontconfig/Makefile @@ -8,7 +8,7 @@ PORTNAME= fontconfig PORTVERSION= 2.3.2 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= x11-fonts MASTER_SITES= http://fontconfig.org/release/ @@ -185,7 +185,8 @@ post-install: else \ ${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf.default; \ fi - @${SED} -e 's|%%PREFIX%%|${PREFIX}|' < ${FILESDIR}/pkg-install.in \ + @${SED} -e 's|%%PREFIX%%|${PREFIX}| ; \ + s|%%X11BASE%%|${X11BASE}|' < ${FILESDIR}/pkg-install.in \ > ${PKGINSTALL} .if !defined(PACKAGE_BUILDING) @${LDCONFIG} -m ${PREFIX}/lib diff --git a/x11-fonts/fontconfig/files/pkg-install.in b/x11-fonts/fontconfig/files/pkg-install.in index 2ce9fb1c5c85..dcf6ebbe1e3d 100644 --- a/x11-fonts/fontconfig/files/pkg-install.in +++ b/x11-fonts/fontconfig/files/pkg-install.in @@ -8,4 +8,5 @@ if [ "$2" = "POST-INSTALL" ]; then fc-cache -f -v elif [ "$2" = "DEINSTALL" ]; then find %%PREFIX%%/lib/X11/fonts/ -name fonts.cache-1 -delete + find %%X11BASE%%/lib/X11/fonts/ -name fonts.cache-1 -delete fi |