summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlesi <lesi@FreeBSD.org>2006-03-01 13:36:46 +0000
committerlesi <lesi@FreeBSD.org>2006-03-01 13:36:46 +0000
commit0e3506786f8ae69f659931aeb91732963339ea9c (patch)
tree09c13fddaefc6a1e9876b031a4b3eda8661b2ebc
parentd75675a053321c0b40852e8762393de3ea4d0d57 (diff)
downloadFreeBSD-ports-0e3506786f8ae69f659931aeb91732963339ea9c.zip
FreeBSD-ports-0e3506786f8ae69f659931aeb91732963339ea9c.tar.gz
Since fontconfig by default generates font cache files in directories where
this port installs charmaps, try to remove them upon uninstallation, so removing of directories has a chance to succeed. Just in case some user has for some reason put fonts under these directories, be nice and try to regenerate cache file and remove it again only if it is empty. Pointed out by: pointyhat via kris Approved by: portmgr (kris)
-rw-r--r--x11/xorg-clients/Makefile2
-rw-r--r--x11/xorg-clients/pkg-plist5
2 files changed, 5 insertions, 2 deletions
diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile
index 567cea8..08c67a0 100644
--- a/x11/xorg-clients/Makefile
+++ b/x11/xorg-clients/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xorg-clients
PORTVERSION= 6.9.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG}
MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src
diff --git a/x11/xorg-clients/pkg-plist b/x11/xorg-clients/pkg-plist
index 123c207..bfe4416 100644
--- a/x11/xorg-clients/pkg-plist
+++ b/x11/xorg-clients/pkg-plist
@@ -808,4 +808,7 @@ lib/X11/xsm/system.xsm
@dirrm lib/X11/icons/handhelds
@dirrm lib/X11/icons
@dirrm lib/X11/xinit
-@dirrmtry lib/X11/fonts/util
+@unexec rm %D/lib/X11/fonts/util/fonts.cache-1 2>/dev/null || true
+@unexec command fc-cache -v %D/lib/X11/fonts/util 2>/dev/null || true
+@unexec if [ -e %D/lib/X11/fonts/util/fonts.cache-1 -a ! -s %D/lib/X11/fonts/util/fonts.cache-1 ]; then rm %D/lib/X11/fonts/util/fonts.cache-1; fi
+@dirrm lib/X11/fonts/util
OpenPOWER on IntegriCloud