Date: Thu, 10 Nov 2005 00:43:00 +0300 (MSK) From: "Boris B. Samorodov" <bsam@ipt.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/88752: [patch] x11-fonts/linux-fontconfig: introduce fixed pkg-plist, unbreak package deletion Message-ID: <200511092143.jA9Lh0Qc089205@mi.ipt.ru> Resent-Message-ID: <200511092150.jA9LoCaY030054@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 88752 >Category: ports >Synopsis: [patch] x11-fonts/linux-fontconfig: introduce fixed pkg-plist, unbreak package deletion >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Nov 09 21:50:12 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Boris B. Samorodov >Release: FreeBSD 6.0-STABLE i386 >Organization: InPharmTech, Co. http://www.ipt.ru >Environment: System: FreeBSD mi.ipt.ru 6.0-STABLE FreeBSD 6.0-STABLE #0: Wed Nov 2 17:58:38 MSK 2005 bsam@mi.ipt.ru:/usr/obj/usr/src/sys/PROBA1 i386 >Description: The package deletion is broken for this port: # pkg_add linux_base-8-8.0_9.tbz linux-expat-1.95.5_3.tbz # pkg_add /usr/ports/packages/All/linux-fontconfig-2.2.3.tbz # pkg_delete linux-fontconfig-2.2.3 pkg_delete: file '/compat/linux/usr/share/fonts' doesn't exist pkg_delete: unable to completely remove directory '/compat/linux/usr/share/fonts' pkg_delete: couldn't entirely delete package (perhaps the packing list is incorrectly specified?) One empty directory is not created when pkg_adding. The patch introduces fixed pkg-plist file with creating needed directory. >How-To-Repeat: >Fix: Note: this patch was tested after applying patches from: http://www.freebsd.org/cgi/query-pr.cgi?pr=88731 The patch is relative to the port itself: # cd /usr/ports/x11-fonts # patch -p0 < _the_patch_ <delete linux-fontconfig/*.orig files> One new file is created: linux-fontconfig/pkg-plist --- linux-fontconfig.patch begins here --- diff -ruN linux-fontconfig.orig/Makefile linux-fontconfig/Makefile --- linux-fontconfig.orig/Makefile Wed Nov 9 23:00:56 2005 +++ linux-fontconfig/Makefile Thu Nov 10 00:04:51 2005 @@ -7,7 +7,7 @@ PORTNAME= fontconfig PORTVERSION= 2.2.3 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11-fonts linux MASTER_SITES= ftp://rpmfind.net/linux/fedora/core/3/x86_64/os/Fedora/RPMS/ @@ -20,7 +20,7 @@ USE_REINPLACE= yes BASEVERSION= 9 ONLY_FOR_ARCHS= i386 amd64 -PLIST= ${WRKDIR}/plist +PLIST= pkg-plist RPM_SET= fontconfig-2.2.3-5.i386.rpm #PKGINSTALL= ${WRKDIR}/pkg-install @@ -35,12 +35,6 @@ @${REINPLACE_CMD} -i "" -e 's:/usr/share/fonts:${X11BASE}/lib/X11/fonts:g ; \ s:/usr/X11R6/lib/X11/fonts/OTF:${X11BASE}/lib/X11/fonts/bitstream-vera:g' \ ${WRKSRC}/tmp/etc/fonts/fonts.conf - -pre-install: - @cd ${WRKSRC}/tmp; \ - ${FIND} * -type f -o -type l > ${PLIST}; \ - ${FIND} -d * -type d | ${GREP} font | \ - ${SED} -e 's:^:@dirrm :' >> ${PLIST} post-install: @${INSTALL_DATA} ${WRKSRC}/tmp/etc/fonts/fonts.conf ${PREFIX}/etc/fonts/ diff -ruN linux-fontconfig.orig/pkg-plist linux-fontconfig/pkg-plist --- linux-fontconfig.orig/pkg-plist Thu Jan 1 03:00:00 1970 +++ linux-fontconfig/pkg-plist Wed Nov 9 23:45:36 2005 @@ -0,0 +1,19 @@ +etc/fonts/fonts.conf +etc/fonts/fonts.dtd +etc/fonts/local.conf +usr/bin/fc-cache +usr/bin/fc-list +usr/lib/libfontconfig.so.1 +usr/lib/libfontconfig.so.1.0.4 +usr/share/doc/fontconfig-2.2.3/AUTHORS +usr/share/doc/fontconfig-2.2.3/COPYING +usr/share/doc/fontconfig-2.2.3/README +usr/share/doc/fontconfig-2.2.3/fontconfig-user.html +usr/share/doc/fontconfig-2.2.3/fontconfig-user.txt +usr/share/man/man1/fc-cache.1.gz +usr/share/man/man1/fc-list.1.gz +usr/share/man/man5/fonts-conf.5.gz +@dirrm etc/fonts +@dirrm usr/share/doc/fontconfig-2.2.3 +@exec /bin/mkdir -p %D/usr/share/fonts +@dirrm usr/share/fonts --- linux-fontconfig.patch ends here --- WBR -- bsam >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200511092143.jA9Lh0Qc089205>