[Midnightbsd-cvs] mports: x11-fonts/fontconfig: Update to 2.6.0

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Mar 13 20:09:42 EDT 2009 

Log Message:
-----------
Update to 2.6.0

Modified Files:
--------------
    mports/x11-fonts/fontconfig:
        Makefile (r1.7 -> r1.8)
        distinfo (r1.4 -> r1.5)
        pkg-plist (r1.3 -> r1.4)
    mports/x11-fonts/fontconfig/files:
        fc-cache.1 (r1.1 -> r1.2)
        fc-cat.1 (r1.1 -> r1.2)
        fc-list.1 (r1.1 -> r1.2)
        fc-match.1 (r1.1 -> r1.2)
        patch-Makefile.in (r1.2 -> r1.3)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/x11-fonts/fontconfig/pkg-plist,v
retrieving revision 1.3
retrieving revision 1.4
diff -L x11-fonts/fontconfig/pkg-plist -L x11-fonts/fontconfig/pkg-plist -u -r1.3 -r1.4
--- x11-fonts/fontconfig/pkg-plist
+++ x11-fonts/fontconfig/pkg-plist
@@ -21,13 +21,13 @@
 etc/fonts/conf.avail/51-local.conf
 etc/fonts/conf.avail/60-latin.conf
 etc/fonts/conf.avail/65-fonts-persian.conf
+etc/fonts/conf.avail/65-khmer.conf
 etc/fonts/conf.avail/65-nonlatin.conf
 etc/fonts/conf.avail/69-unifont.conf
 etc/fonts/conf.avail/70-no-bitmaps.conf
 etc/fonts/conf.avail/70-yes-bitmaps.conf
 etc/fonts/conf.avail/80-delicious.conf
 etc/fonts/conf.avail/90-synthetic.conf
-etc/fonts/conf.avail/README
 etc/fonts/conf.d/20-fix-globaladvance.conf
 etc/fonts/conf.d/20-unhint-small-vera.conf
 etc/fonts/conf.d/30-metric-aliases.conf
@@ -43,6 +43,7 @@
 etc/fonts/conf.d/69-unifont.conf
 etc/fonts/conf.d/80-delicious.conf
 etc/fonts/conf.d/90-synthetic.conf
+etc/fonts/conf.d/README
 @unexec if cmp -s %D/etc/fonts/fonts.conf %D/etc/fonts/fonts.conf.default; then rm -f %D/etc/fonts/fonts.conf; fi
 etc/fonts/fonts.conf.default
 @exec [ -f %B/fonts.conf ] || cp %B/%f %B/fonts.conf
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11-fonts/fontconfig/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -L x11-fonts/fontconfig/Makefile -L x11-fonts/fontconfig/Makefile -u -r1.7 -r1.8
--- x11-fonts/fontconfig/Makefile
+++ x11-fonts/fontconfig/Makefile
@@ -1,14 +1,7 @@
-# New ports collection makefile for:	fontconfig
-# Date created:		06 October 2002
-# Whom:			Joe Marcus Clarke <marcus at FreeBSD.org>
-#
-# $FreeBSD: ports/x11-fonts/fontconfig/Makefile,v 1.69 2007/07/28 18:19:09 marcus Exp $
 # $MidnightBSD$
-#   $MCom: ports/x11-fonts/fontconfig/Makefile,v 1.12 2007/02/02 19:49:43 mezz Exp $
-#
 
 PORTNAME=	fontconfig
-PORTVERSION=	2.5.0
+PORTVERSION=	2.6.0
 PORTEPOCH?=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://fontconfig.org/release/
@@ -43,22 +36,15 @@
 
 .include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/bin/docbook2man)
-USE_DOCBOOK2MAN=	yes
-BUILD_DEPENDS+=		${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-410
-.endif
-
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR}
 .endif
 	${INSTALL_MAN} ${MAN5:S|^|${WRKSRC}/doc/|} ${PREFIX}/man/man5
-.if !defined(USE_DOCBOOK2MAN)
 .for manpage in ${MAN1}
 	${INSTALL_MAN} ${FILESDIR}/${manpage} ${PREFIX}/man/man1
 .endfor
-.endif
 	if [ ! -f ${PREFIX}/etc/fonts/fonts.conf ]; then \
 		${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf; \
 		${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf.default; \
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/x11-fonts/fontconfig/distinfo,v
retrieving revision 1.4
retrieving revision 1.5
diff -L x11-fonts/fontconfig/distinfo -L x11-fonts/fontconfig/distinfo -u -r1.4 -r1.5
--- x11-fonts/fontconfig/distinfo
+++ x11-fonts/fontconfig/distinfo
@@ -1,3 +1,3 @@
-MD5 (fontconfig-2.5.0.tar.gz) = 21d14af8ecf645ef76211c782cdd7aeb
-SHA256 (fontconfig-2.5.0.tar.gz) = 34c6badb4cb7eb496779d30616903de400fa244838ea39c2a7f63eaa5fdf0efe
-SIZE (fontconfig-2.5.0.tar.gz) = 1385058
+MD5 (fontconfig-2.6.0.tar.gz) = ab54ec1d4ddd836313fdbc0cd5299d6d
+SHA256 (fontconfig-2.6.0.tar.gz) = a9a639eaa0e5666606a4657cc1494eb6df820fac7e5a2aa0c3f7e703b7c8d8a5
+SIZE (fontconfig-2.6.0.tar.gz) = 1403857
Index: fc-cat.1
===================================================================
RCS file: /home/cvs/mports/x11-fonts/fontconfig/files/fc-cat.1,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11-fonts/fontconfig/files/fc-cat.1 -L x11-fonts/fontconfig/files/fc-cat.1 -u -r1.1 -r1.2
--- x11-fonts/fontconfig/files/fc-cat.1
+++ x11-fonts/fontconfig/files/fc-cat.1
@@ -3,17 +3,18 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve at ggi-project.org>.
-.TH "FC-CAT" "1" "12 November 2006" "" ""
+.TH "FC-CAT" "1" "05 May 2008" "" ""
 
 .SH NAME
 fc-cat \- read font information cache files
 .SH SYNOPSIS
 
-\fBfc-cat < fonts-cache-2-file >\fR [ \fB-V?\fR ] [ \fB--version\fR ] [ \fB--help\fR ] [ \fB\fIdirs\fB\fR ]
+\fBfc-cat\fR [ \fB-rvV?\fR ] [ \fB--recurse\fR ] [ \fB--verbose\fR ] [ \fB--version\fR ] [ \fB--help\fR ] [ \fB\fIfonts-cache-2-files\fB\fR ] [ \fB\fIdirs\fB\fR ]
 
 .SH "DESCRIPTION"
 .PP
-\fBfc-cat\fR reads a font information cache file
+\fBfc-cat\fR reads the font information from
+cache files or related to font directories
 and emits it in ASCII form.
 .SH "OPTIONS"
 .PP
@@ -21,6 +22,12 @@
 with long options starting with two dashes (`-').  A summary of
 options is included below.
 .TP
+\fB-r --recurse \fR
+Recurse into subdirectories.
+.TP
+\fB-v --verbose \fR
+Be verbose.
+.TP
 \fB-? --help \fR
 Show summary of options.
 .TP
Index: fc-cache.1
===================================================================
RCS file: /home/cvs/mports/x11-fonts/fontconfig/files/fc-cache.1,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11-fonts/fontconfig/files/fc-cache.1 -L x11-fonts/fontconfig/files/fc-cache.1 -u -r1.1 -r1.2
--- x11-fonts/fontconfig/files/fc-cache.1
+++ x11-fonts/fontconfig/files/fc-cache.1
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve at ggi-project.org>.
-.TH "FC-CACHE" "1" "12 November 2006" "" ""
+.TH "FC-CACHE" "1" "05 May 2008" "" ""
 
 .SH NAME
 fc-cache \- build font information cache files
Index: patch-Makefile.in
===================================================================
RCS file: /home/cvs/mports/x11-fonts/fontconfig/files/patch-Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -L x11-fonts/fontconfig/files/patch-Makefile.in -L x11-fonts/fontconfig/files/patch-Makefile.in -u -r1.2 -r1.3
--- x11-fonts/fontconfig/files/patch-Makefile.in
+++ x11-fonts/fontconfig/files/patch-Makefile.in
@@ -1,7 +1,7 @@
---- Makefile.in.orig	Sat Nov  4 14:54:15 2006
-+++ Makefile.in	Sat Nov  4 14:54:46 2006
-@@ -785,28 +785,6 @@ $(srcdir)/ChangeLog:
- .PHONY: ChangeLog $(srcdir)/ChangeLog
+--- Makefile.in.orig	2008-07-03 03:20:43.000000000 -0400
++++ Makefile.in	2008-07-03 03:21:18.000000000 -0400
+@@ -789,28 +789,28 @@ ChangeLog:
+ .PHONY: ChangeLog
  
  install-data-local:
 -	$(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir)
@@ -17,8 +17,8 @@
 -	  $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
 -	fi; fi
 -	@(if $(RUN_FC_CACHE_TEST); then \
--	    echo " fc-cache/fc-cache -s -f -v"; \
--	    fc-cache/fc-cache -s -f -v; \
+-	    echo " $(bindir)/fc-cache -s -f -v"; \
+-	    $(bindir)/fc-cache -s -f -v; \
 -	else \
 -	    echo "***"; \
 -	    echo "*** Warning: fonts.cache not built"; \
@@ -26,6 +26,28 @@
 -	    echo "*** Generate this file manually on host system using fc-cache"; \
 -	    echo "***"; \
 -	fi)
++#	$(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir)
++#	if [ -f $(DESTDIR)$(configdir)/fonts.conf ]; then \
++#	  echo "backing up existing $(DESTDIR)$(configdir)/fonts.conf"; \
++#	  mv $(DESTDIR)$(configdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf.bak; \
++#	fi
++#	if [ -f $(srcdir)/fonts.conf ]; then \
++#	  echo " $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \
++#	  $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
++#	else if [ -f fonts.conf ]; then \
++#	  echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \
++#	  $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
++#	fi; fi
++#	@(if $(RUN_FC_CACHE_TEST); then \
++#	    echo " $(bindir)/fc-cache -s -f -v"; \
++#	    $(bindir)/fc-cache -s -f -v; \
++#	else \
++#	    echo "***"; \
++#	    echo "*** Warning: fonts.cache not built"; \
++#	    echo "***"; \
++#	    echo "*** Generate this file manually on host system using fc-cache"; \
++#	    echo "***"; \
++#	fi)
  
  uninstall-local:
  	if [ -f $(srcdir)/fonts.conf ]; then \
Index: fc-list.1
===================================================================
RCS file: /home/cvs/mports/x11-fonts/fontconfig/files/fc-list.1,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11-fonts/fontconfig/files/fc-list.1 -L x11-fonts/fontconfig/files/fc-list.1 -u -r1.1 -r1.2
--- x11-fonts/fontconfig/files/fc-list.1
+++ x11-fonts/fontconfig/files/fc-list.1
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve at ggi-project.org>.
-.TH "FC-LIST" "1" "12 November 2006" "" ""
+.TH "FC-LIST" "1" "05 May 2008" "" ""
 
 .SH NAME
 fc-list \- list available fonts
Index: fc-match.1
===================================================================
RCS file: /home/cvs/mports/x11-fonts/fontconfig/files/fc-match.1,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11-fonts/fontconfig/files/fc-match.1 -L x11-fonts/fontconfig/files/fc-match.1 -u -r1.1 -r1.2
--- x11-fonts/fontconfig/files/fc-match.1
+++ x11-fonts/fontconfig/files/fc-match.1
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve at ggi-project.org>.
-.TH "FC-MATCH" "1" "12 November 2006" "" ""
+.TH "FC-MATCH" "1" "05 May 2008" "" ""
 
 .SH NAME
 fc-match \- match available fonts

More information about the Midnightbsd-cvs mailing list