diff options
Diffstat (limited to 'x11-fonts/intlfonts')
| -rw-r--r-- | x11-fonts/intlfonts/Makefile | 1 | ||||
| -rw-r--r-- | x11-fonts/intlfonts/files/DEINSTALL.tmpl | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/x11-fonts/intlfonts/Makefile b/x11-fonts/intlfonts/Makefile index 4dca71e2adf0..c7a6dc9d7bbc 100644 --- a/x11-fonts/intlfonts/Makefile +++ b/x11-fonts/intlfonts/Makefile @@ -55,7 +55,6 @@ 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 b6e1d96284d7..3b66be76ac2c 100644 --- a/x11-fonts/intlfonts/files/DEINSTALL.tmpl +++ b/x11-fonts/intlfonts/files/DEINSTALL.tmpl @@ -15,6 +15,5 @@ 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) + rmdir ${PKG_PREFIX}/%%T1_FONTSDIR%% 2>/dev/null || true fi |