From owner-cvs-all@FreeBSD.ORG Tue Feb 7 09:56:52 2006 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7129416A420; Tue, 7 Feb 2006 09:56:52 +0000 (GMT) (envelope-from lesi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C0C743D49; Tue, 7 Feb 2006 09:56:52 +0000 (GMT) (envelope-from lesi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k179upj9059957; Tue, 7 Feb 2006 09:56:51 GMT (envelope-from lesi@repoman.freebsd.org) Received: (from lesi@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k179upAo059956; Tue, 7 Feb 2006 09:56:51 GMT (envelope-from lesi) Message-Id: <200602070956.k179upAo059956@repoman.freebsd.org> From: Dejan Lesjak Date: Tue, 7 Feb 2006 09:56:51 +0000 (UTC) To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: ports/x11-fonts/XFree86-4-font100dpi Makefile pkg-plist ports/x11-fonts/XFree86-4-font75dpi Makefile pkg-plist ports/x11-fonts/XFree86-4-fontCyrillic Makefile pkg-plist ports/x11-fonts/XFree86-4-fontDefaultBitmaps Makefile pkg-plist ... X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Feb 2006 09:56:52 -0000 lesi 2006-02-07 09:56:51 UTC FreeBSD ports repository Modified files: x11-fonts/XFree86-4-font100dpi Makefile pkg-plist x11-fonts/XFree86-4-font75dpi Makefile pkg-plist x11-fonts/XFree86-4-fontCyrillic Makefile pkg-plist x11-fonts/XFree86-4-fontDefaultBitmaps Makefile pkg-plist x11-fonts/XFree86-4-fontScalable Makefile pkg-plist Log: Take care of font cache files on installation and uninstallation of port: On installation try running fc-cache for directory where fonts from this port are installed and don't complain if fc-cache (from fontconfig) is missing. Do a bit more dancing on uninstall, just in case users have their own fonts installed in same directory: - first remove fonts.cache-1 if it is there since it won't be accurate after fonts from this port are gone anyway, - next try to regenerate cache with fc-cache for this directory - if previous step generates empty cache file, remove it If directory contained only fonts from this port, it should get properly removed at the end. If there were other fonts there and fontconfig is installed, this will leave proper cache file for remaining fonts behind after uninstall of this port. Revision Changes Path 1.18 +4 -0 ports/x11-fonts/XFree86-4-font100dpi/Makefile 1.7 +4 -0 ports/x11-fonts/XFree86-4-font100dpi/pkg-plist 1.17 +4 -0 ports/x11-fonts/XFree86-4-font75dpi/Makefile 1.7 +4 -0 ports/x11-fonts/XFree86-4-font75dpi/pkg-plist 1.22 +4 -0 ports/x11-fonts/XFree86-4-fontCyrillic/Makefile 1.7 +4 -0 ports/x11-fonts/XFree86-4-fontCyrillic/pkg-plist 1.17 +4 -0 ports/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile 1.10 +4 -0 ports/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist 1.19 +7 -0 ports/x11-fonts/XFree86-4-fontScalable/Makefile 1.11 +14 -0 ports/x11-fonts/XFree86-4-fontScalable/pkg-plist