diff options
author | Dejan Lesjak <lesi@FreeBSD.org> | 2005-03-17 23:22:13 +0000 |
---|---|---|
committer | Dejan Lesjak <lesi@FreeBSD.org> | 2005-03-17 23:22:13 +0000 |
commit | ac39221672c3c391a6c127d2fcc67a1fe3d4512e (patch) | |
tree | de7ec01912bcb217296d86bd4fad9fd5b211f0cf /x11-fonts/intlfonts | |
parent | 7534bc4462725b61b62a62d09f6b0c18686624b9 (diff) |
Notes
Diffstat (limited to 'x11-fonts/intlfonts')
-rw-r--r-- | x11-fonts/intlfonts/Makefile | 1 | ||||
-rw-r--r-- | x11-fonts/intlfonts/files/DEINSTALL.tmpl | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/x11-fonts/intlfonts/Makefile b/x11-fonts/intlfonts/Makefile index c7a6dc9d7bbc..4dca71e2adf0 100644 --- a/x11-fonts/intlfonts/Makefile +++ b/x11-fonts/intlfonts/Makefile @@ -55,6 +55,7 @@ do-build: -e 's,%%T1_FONTSDIR%%,${T1_FONTSDIR},g' \ -e 's,%%TT_FONTSDIR%%,${TT_FONTSDIR},g' \ -e 's,%%LOCALBASE%%,${LOCALBASE},g' \ + -e 's,%%XWINSYS%%,${X_WINDOW_SYSTEM:L},g' \ < ${FILESDIR}/$${file}.tmpl > ${WRKDIR}/$${file}; \ done diff --git a/x11-fonts/intlfonts/files/DEINSTALL.tmpl b/x11-fonts/intlfonts/files/DEINSTALL.tmpl index e4eae17628cb..b6e1d96284d7 100644 --- a/x11-fonts/intlfonts/files/DEINSTALL.tmpl +++ b/x11-fonts/intlfonts/files/DEINSTALL.tmpl @@ -15,4 +15,6 @@ if [ "x$2" = "xPOST-DEINSTALL" ]; then [ `wc -c ${PKG_PREFIX}/%%T1_FONTSDIR%%/fonts.scale | awk '{print $1}'` = 2 ] && rm -f ${PKG_PREFIX}/%%T1_FONTSDIR%%/fonts.scale # Remove a backup file made by type1inst rm -f ${PKG_PREFIX}/%%T1_FONTSDIR%%/fonts.scale.bak + [ "%%XWINSYS%%" = "xorg" ] && \ + (rmdir ${PKG_PREFIX}/%%T1_FONTSDIR%% 2>/dev/null || true) fi |