Presenting GNOME 2.12 for FreeBSD. The release is chock full of bug fixes

and new features.  Don't believe me?  Then see for yourself at
http://www.gnome.org/start/2.12/notes/en/.

DO NOT USE portupgrade by itself to upgrade to GNOME 2.12.  Instead, use
the gnome_upgrade.sh script from
http://www.marcuscom.com/downloads/gnome_upgrade212.sh.  This script will
circumvent some potential pitfalls users can see if they use portupgrade
by itself.

In keeping with tradition, GNOME 2.12 for FreeBSD comes with a special
splash screen.  The winner of this release's contest is
Dominique Goncalves <dominique.goncalves@gmail.com>.  His splash screen
was inspired by http://art.gnome.org/contests/2.12-splash/83.

The FreeBSD GNOME Team would lank to thank the following users for
their contributions to this release:

Matthew Luckie <mjl@luckie.org.nz>
ade
sajd on #freebsd-gnome
Caelian on #freebsd-gnome
mnag
Yasuda Keisuke <kysd@po.harenet.ne.jp>
Mark Hobden <markhobden@gmail.com>
Sergey Akifyev <asa@agava.com>
Andreas Kohn

For more information on GNOME on FreeBSD, checkout
http://www.FreeBSD.org/gnome/.  The 2.12 documentation will be
posted shortly.

6 files changed, 180 insertions, 153 deletions

diff --git a/x11-fonts/bitstream-vera/Makefile b/x11-fonts/bitstream-vera/Makefile
index 98890ad29fe7..ca2970ad61ac 100644
--- a/x11-fonts/bitstream-vera/Makefile
+++ b/x11-fonts/bitstream-vera/Makefile
@@ -3,11 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/x11-fonts/bitstream-vera/Makefile,v 1.2 2005/10/14 20:39:59 adamw Exp $
 #
 
 PORTNAME=	bitstream-vera
 PORTVERSION=	1.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/ttf-${PORTNAME}/1.10
@@ -56,12 +57,9 @@ install-fonts:
 	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT.TXT ${FONTSDIR}
 
 install-conf:
-	${MKDIR} ${PREFIX}/etc/fonts
-	if [ ! -f ${PREFIX}/etc/fonts/local.conf ]; then \
-	    ${INSTALL_DATA} ${WRKSRC}/local.conf ${PREFIX}/etc/fonts ; \
-	fi
+	${MKDIR} ${PREFIX}/etc/fonts/conf.d
 	${INSTALL_DATA} ${WRKSRC}/local.conf \
-		${PREFIX}/etc/fonts/local.conf-vera
+		${PREFIX}/etc/fonts/conf.d/0.vera.conf
 
 install-docs:
 .if !defined(NOPORTDOCS)
diff --git a/x11-fonts/bitstream-vera/pkg-plist b/x11-fonts/bitstream-vera/pkg-plist
index defc5ac3d58f..30445c503b4f 100644
--- a/x11-fonts/bitstream-vera/pkg-plist
+++ b/x11-fonts/bitstream-vera/pkg-plist
@@ -1,6 +1,4 @@
-@unexec if cmp -s %D/etc/fonts/local.conf %D/etc/fonts/local.conf-vera; then rm -f %D/etc/fonts/local.conf; fi
-etc/fonts/local.conf-vera
-@exec [ ! -f %B/local.conf ] && cp %B/%f %B/local.conf
+etc/fonts/conf.d/0.vera.conf
 %%FONTSDIR%%/COPYRIGHT.TXT
 %%FONTSDIR%%/fonts.dir
 %%FONTSDIR%%/Vera.ttf
diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile
index 66128af202f9..62eb9e170104 100644
--- a/x11-fonts/fontconfig/Makefile
+++ b/x11-fonts/fontconfig/Makefile
@@ -3,10 +3,11 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/x11-fonts/fontconfig/Makefile,v 1.3 2005/08/26 04:03:55 marcus Exp $
 #
 
 PORTNAME=	fontconfig
-PORTVERSION=	2.2.3
+PORTVERSION=	2.3.2
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://fontconfig.org/release/
@@ -20,7 +21,7 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 USE_GMAKE=	yes
 PREFIX?=	${X11BASE}
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack gnometarget pkgconfig
 CONFIGURE_ARGS=	--with-confdir=${PREFIX}/etc/fonts \
 		--with-expat-includes=${LOCALBASE}/include \
@@ -31,7 +32,7 @@ PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${PKGINSTALL}
 USE_REINPLACE=	yes
 
-MAN1=		fc-cache.1 fc-list.1
+MAN1=		fc-match.1
 MAN3=		FcAtomicCreate.3  \
 		FcAtomicDeleteNew.3  \
 		FcAtomicDestroy.3  \
@@ -85,6 +86,7 @@ MAN3=		FcAtomicCreate.3  \
 		FcDirSave.3  \
 		FcDirScan.3  \
 		FcFileScan.3  \
+		FcFini.3  \
 		FcFontList.3  \
 		FcFontMatch.3  \
 		FcFontRenderPrepare.3  \
@@ -134,11 +136,13 @@ MAN3=		FcAtomicCreate.3  \
 		FcPatternGet.3  \
 		FcPatternHash.3  \
 		FcPatternPrint.3  \
+		FcPatternRemove.3  \
 		FcStrBasename.3  \
 		FcStrCmpIgnoreCase.3  \
 		FcStrCopy.3  \
 		FcStrCopyFilename.3  \
 		FcStrDirname.3  \
+		FcStrDowncase.3  \
 		FcStrListCreate.3  \
 		FcStrListDone.3  \
 		FcStrListNext.3  \
@@ -148,6 +152,8 @@ MAN3=		FcAtomicCreate.3  \
 		FcStrSetDel.3  \
 		FcStrSetDestroy.3  \
 		FcStrSetMember.3  \
+		FcStrStr.3  \
+		FcStrStrIgnoreCase.3  \
 		FcUcs4ToUtf8.3  \
 		FcUtf16Len.3  \
 		FcUtf16ToUcs4.3  \
@@ -159,12 +165,12 @@ MAN5=		fonts-conf.5
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_CJK)
-PATCH_SITES+=	ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/ \
-		http://bsdchat.com/dist/firefly-cjk-patchset/
-PATCHFILES+=	cjk-fontconfig-2.2.3-20050315.patch.gz
-PATCH_DIST_STRIP+=	-p1
-.endif
+#.if defined(WITH_CJK)
+#PATCH_SITES+=	ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/ \
+#		http://bsdchat.com/dist/firefly-cjk-patchset/
+#PATCHFILES+=	cjk-fontconfig-2.2.3-20050315.patch.gz
+#PATCH_DIST_STRIP+=	-p1
+#.endif
 
 .if defined(NOPORTDOCS)
 post-patch:
@@ -173,6 +179,12 @@ post-patch:
 .endif
 
 post-install:
+	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; \
+	else \
+		${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf.default; \
+	fi
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|' < ${FILESDIR}/pkg-install.in \
 		> ${PKGINSTALL}
 .if !defined(PACKAGE_BUILDING)
diff --git a/x11-fonts/fontconfig/distinfo b/x11-fonts/fontconfig/distinfo
index 42133084149a..1126a25fe5fd 100644
--- a/x11-fonts/fontconfig/distinfo
+++ b/x11-fonts/fontconfig/distinfo
@@ -1,4 +1,2 @@
-MD5 (fontconfig-2.2.3.tar.gz) = 2466a797d645cda5eb466080fdaec416
-SIZE (fontconfig-2.2.3.tar.gz) = 750035
-MD5 (cjk-fontconfig-2.2.3-20050315.patch.gz) = f796ba6ba54c3a211a218bb686e993d4
-SIZE (cjk-fontconfig-2.2.3-20050315.patch.gz) = 307843
+MD5 (fontconfig-2.3.2.tar.gz) = 7354f9f125ea78a8f2851cb9c31d4866
+SIZE (fontconfig-2.3.2.tar.gz) = 964045
diff --git a/x11-fonts/fontconfig/files/patch-Makefile.in b/x11-fonts/fontconfig/files/patch-Makefile.in
index f8f2f6dfa127..1a310350fade 100644
--- a/x11-fonts/fontconfig/files/patch-Makefile.in
+++ b/x11-fonts/fontconfig/files/patch-Makefile.in
@@ -1,28 +1,32 @@
---- Makefile.in.orig	Tue Mar 16 15:15:47 2004
-+++ Makefile.in	Tue Mar 16 15:16:18 2004
-@@ -192,7 +192,6 @@
-         fontconfig.pc.in \
-         fonts.conf.in \
- 	fonts.dtd \
--	local.conf \
-         fontconfig.spec.in \
-         fontconfig.spec \
- 	fontconfig-zip.in
-@@ -671,16 +670,7 @@
+--- Makefile.in.orig	Wed Jul 27 02:23:03 2005
++++ Makefile.in	Wed Jul 27 02:25:27 2005
+@@ -721,28 +721,7 @@
  
  
  install-data-local:
--	if [ -f $(DESTDIR)$(configdir)/local.conf ]; then \
--	  echo "not overwriting existing $(DESTDIR)$(configdir)/local.conf"; \
--	else if [ -f $(srcdir)/local.conf ]; then \
--	  echo " $(INSTALL_DATA) $(srcdir)/local.conf $(DESTDIR)$(configdir)/local.conf"; \
--	  $(INSTALL_DATA) $(srcdir)/local.conf $(DESTDIR)$(configdir)/local.conf; \
--	else if [ -f local.conf ]; then \
--	  echo " $(INSTALL_DATA) local.conf $(DESTDIR)$(configdir)/local.conf"; \
--	  $(INSTALL_DATA) local.conf $(DESTDIR)$(configdir)/local.conf; \
--	fi; fi; fi
--	if [ x$(DESTDIR) = x ]; then fc-cache/fc-cache -f -v; fi
-+#	if [ x$(DESTDIR) = x ]; then fc-cache/fc-cache -f -v; fi
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
+-	$(mkinstalldirs) $(DESTDIR)$(configdir)
+-	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 " fc-cache/fc-cache -f -v"; \
+-	    fc-cache/fc-cache -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 \
diff --git a/x11-fonts/fontconfig/pkg-plist b/x11-fonts/fontconfig/pkg-plist
index d5c26dcfdf24..9787a747ec40 100644
--- a/x11-fonts/fontconfig/pkg-plist
+++ b/x11-fonts/fontconfig/pkg-plist
@@ -1,6 +1,15 @@
 bin/fc-cache
 bin/fc-list
-etc/fonts/fonts.conf
+bin/fc-match
+etc/fonts/conf.d/autohint.conf
+etc/fonts/conf.d/no-bitmaps.conf
+etc/fonts/conf.d/no-sub-pixel.conf
+etc/fonts/conf.d/sub-pixel.conf
+etc/fonts/conf.d/unhinted.conf
+etc/fonts/conf.d/yes-bitmaps.conf
+@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
 etc/fonts/fonts.dtd
 include/fontconfig/fcfreetype.h
 include/fontconfig/fcprivate.h
@@ -9,137 +18,145 @@ lib/libfontconfig.a
 lib/libfontconfig.so
 lib/libfontconfig.so.1
 libdata/pkgconfig/fontconfig.pc
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel.pdf
 %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel.txt
 %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/index.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1016.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1011.html
 %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1042.html
 %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1064.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1087.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1111.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1134.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1090.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1112.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1135.html
 %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1159.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1184.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1182.html
 %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r120.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1209.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1234.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1259.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1281.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1306.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1331.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1356.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1383.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1207.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1232.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1257.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1282.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1307.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1329.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1354.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1379.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1404.html
 %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r141.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1414.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1437.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1460.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1486.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1515.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1545.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1575.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1608.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1431.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1462.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1485.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1508.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1534.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1563.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1593.html
 %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r162.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1629.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1650.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1672.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1693.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1715.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1736.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1758.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1780.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1802.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1823.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1623.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1656.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1677.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1698.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1720.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1741.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1763.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1784.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1806.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1828.html
 %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r183.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1847.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1868.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1890.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1913.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1936.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1959.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1980.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2009.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2034.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1850.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1871.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1895.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1916.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1938.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1961.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1984.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2007.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2028.html
 %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r204.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2062.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2099.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2130.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2157.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2181.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2207.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2231.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2057.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2082.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2110.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2147.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2178.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2205.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2229.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r225.html
 %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2255.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r228.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2280.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2304.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2279.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2303.html
 %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2328.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2350.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2378.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2399.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2420.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2443.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2469.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2352.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2376.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2398.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2426.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2447.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2468.html
 %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r249.html
 %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2491.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2513.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2535.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2557.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2579.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2600.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2621.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2646.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2682.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2517.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2539.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2561.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2583.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2605.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2627.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2648.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2669.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2694.html
 %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r270.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2717.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2745.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2770.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2791.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2816.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2841.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2866.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2892.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2730.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2765.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2793.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2818.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2839.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2864.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2889.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r291.html
 %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2914.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2936.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r295.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2958.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2983.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3012.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3037.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3069.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3102.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3138.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3161.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3184.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2940.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2962.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2984.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3006.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3031.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3060.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3085.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3117.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3150.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r316.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3186.html
 %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3209.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r323.html
 %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3231.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3254.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3279.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3306.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3333.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3355.html
 %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r344.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r372.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r401.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r476.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r504.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r591.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r632.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r365.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r393.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r422.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r497.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r527.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r614.html
 %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r655.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r676.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r704.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r726.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r750.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r771.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r792.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r818.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r839.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r862.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r883.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r917.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r940.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r963.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r678.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r703.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r724.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r752.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r774.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r798.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r819.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r840.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r866.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r887.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r910.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r931.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r965.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r988.html
 %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r99.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r994.html
 %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/x19.html
 %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/x31.html
 %%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/x93.html
 %%PORTDOCS%%%%DOCSDIR%%/fontconfig-user.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-user.pdf
 %%PORTDOCS%%%%DOCSDIR%%/fontconfig-user.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/fontconfig-devel
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/fontconfig
-@dirrm etc/fonts
+@unexec rmdir %D/etc/fonts/conf.d 2> /dev/null || true
+@unexec rmdir %D/etc/fonts 2> /dev/null || true