Here are new Linux Fedora 8 infrastructure ports.

The recommended version of FreeBSD to use them is 8-CURRENT.
FreeBSD-7.x is not fully compatible with compat.linux.osrelease
2.6.16. Some syscalls cannot be MFCed due to native FreeBSD
ABI breakage.

Usage (and package building):
1. define compat.linux.osrelease=2.6.16;
2. add following variables to /etc/make.conf:
   . OVERRIDE_LINUX_BASE_PORT=f8;
   . OVERRIDE_LINUX_NONBASE_PORTS=f8.

Approved by:	bsam (me) ;-)

9 files changed, 75 insertions, 944 deletions

diff --git a/x11-fonts/Makefile b/x11-fonts/Makefile
index 48fc9c383b46..707b909c0dc9 100644
--- a/x11-fonts/Makefile
+++ b/x11-fonts/Makefile
@@ -93,6 +93,7 @@
     SUBDIR += libXft
     SUBDIR += liberation-fonts-ttf
     SUBDIR += libfontenc
+    SUBDIR += linux-f8-fontconfig
     SUBDIR += linux-fontconfig
     SUBDIR += linuxlibertine
     SUBDIR += manu-gothica
diff --git a/x11-fonts/linux-f10-fontconfig/Makefile b/x11-fonts/linux-f10-fontconfig/Makefile
index 3516be49859f..e8f1671c439c 100644
--- a/x11-fonts/linux-f10-fontconfig/Makefile
+++ b/x11-fonts/linux-f10-fontconfig/Makefile
@@ -1,37 +1,37 @@
-# New ports collection makefile for:	linux-fontconfig
-# Date created:				2003-11-19
-# Whom:					trevor
+# New ports collection makefile for:	x11-fonts/linux-f8-fontconfig
+# Date created:				2008-03-28
+# Whom:					bsam
 #
 # $FreeBSD$
 #
 
 PORTNAME=	fontconfig
-PORTVERSION=	2.2.3
-PORTREVISION=	7
+PORTVERSION=	2.4.2
 CATEGORIES=	x11-fonts linux
-DISTNAME=	${PORTNAME}-${PORTVERSION}-13
+PKGNAMEPREFIX=	linux-f8-
+DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
-COMMENT=	Linux/i386 binary of Fontconfig
+COMMENT=	An XML-based font configuration API for X Windows (Linux Fedora 8)
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	expat
-LINUX_DIST_VER=	4
-USE_LDCONFIG=	yes
-PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
-
+LINUX_DIST_VER=	8
+RPMVERSION=	5.fc8
 BRANDELF_DIRS=	usr/bin
+USE_LDCONFIG=	yes
 
 # We will use some other configuration file, so delete a linux one
 # Don't let the linux fc-cache mess up the native cache file
 post-extract:
-	@${RM} ${WRKSRC}/etc/fonts/fonts.conf \
-		${WRKSRC}/usr/bin/fc-cache \
-		${WRKSRC}/usr/share/man/man1/fc-cache.1.gz
+		@${RM} -r ${WRKSRC}/etc ${WRKSRC}/usr/share/fonts ${WRKSRC}/var \
+			${WRKSRC}/usr/bin/fc-cache \
+			${WRKSRC}/usr/share/man/man1/fc-cache.1.gz
+
+post-install:
+		@${LN} -s ${LOCALBASE}/etc/fonts ${PREFIX}/etc/
 
-# Here is our configuration file
-post-patch:
-	@${CAT} ${FILESDIR}/fonts.conf | ${SED} 's:/usr/X11R6:${LOCALBASE}:g' > ${WRKSRC}/etc/fonts/fonts.conf
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/linux-f10-fontconfig/distinfo.i386 b/x11-fonts/linux-f10-fontconfig/distinfo.i386
index 7814ce11feae..9dec16f42bb5 100644
--- a/x11-fonts/linux-f10-fontconfig/distinfo.i386
+++ b/x11-fonts/linux-f10-fontconfig/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/i386/fedora/4/fontconfig-2.2.3-13.i386.rpm) = bec74cb3c13774ec3bca101644598211
-SHA256 (rpm/i386/fedora/4/fontconfig-2.2.3-13.i386.rpm) = 6abada9a9d80c6d1a1edd629bf34a20a42a03ea873fbfed13adc4bbe60d4eaad
-SIZE (rpm/i386/fedora/4/fontconfig-2.2.3-13.i386.rpm) = 123276
-MD5 (rpm/i386/fedora/4/fontconfig-2.2.3-13.src.rpm) = e4931c296b82330273a8b7020a1596e6
-SHA256 (rpm/i386/fedora/4/fontconfig-2.2.3-13.src.rpm) = 3425e08912cf073cb48ce4509ec061419cea64cc4d11749c091be0664d711c25
-SIZE (rpm/i386/fedora/4/fontconfig-2.2.3-13.src.rpm) = 770587
+MD5 (rpm/i386/fedora/8/fontconfig-2.4.2-5.fc8.i386.rpm) = e7cd84ba7aee27b53c8429dc73205cba
+SHA256 (rpm/i386/fedora/8/fontconfig-2.4.2-5.fc8.i386.rpm) = ba4302361c139804e488adb07e375e4222d24bddf389c91590cf7bd4fc02d607
+SIZE (rpm/i386/fedora/8/fontconfig-2.4.2-5.fc8.i386.rpm) = 181170
+MD5 (rpm/i386/fedora/8/fontconfig-2.4.2-5.fc8.src.rpm) = 6292bf3efd898fcca13f2c505c64a505
+SHA256 (rpm/i386/fedora/8/fontconfig-2.4.2-5.fc8.src.rpm) = 8916a817e034cb45524a4a332b64d9ee1add824e3388d0ff994f53a82a4f2ea2
+SIZE (rpm/i386/fedora/8/fontconfig-2.4.2-5.fc8.src.rpm) = 1290502
diff --git a/x11-fonts/linux-f10-fontconfig/files/fonts.conf b/x11-fonts/linux-f10-fontconfig/files/fonts.conf
deleted file mode 100644
index 42770b4c0b8c..000000000000
--- a/x11-fonts/linux-f10-fontconfig/files/fonts.conf
+++ /dev/null
@@ -1,436 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/fonts.conf file to configure system font access -->
-<fontconfig>
-
-<!--
-	DO NOT EDIT THIS FILE.
-	IT WILL BE REPLACED WHEN FONTCONFIG IS UPDATED.
-	LOCAL CHANGES BELONG IN 'local.conf'.
-
-	The intent of this standard configuration file is to be adequate for
-	most environments.  If you have a reasonably normal environment and
-	have found problems with this configuration, they are probably
-	things that others will also want fixed.  Please submit any
-	problems to the fontconfig bugzilla system located at fontconfig.org
-
-	Note that the normal 'make install' procedure for fontconfig is to
-	replace any existing fonts.conf file with the new version.  Place
-	any local customizations in local.conf which this file references.
-
-	Keith Packard
--->
-
-<!-- Font directory list -->
-
-	<dir>/usr/X11R6/lib/X11/fonts</dir>
-	
-	<dir>~/.fonts</dir>
-
-<!--
-  Accept deprecated 'mono' alias, replacing it with 'monospace'
--->
-	<match target="pattern">
-		<test qual="any" name="family">
-			<string>mono</string>
-		</test>
-		<edit name="family" mode="assign">
-			<string>monospace</string>
-		</edit>
-	</match>
-
-<!--
-  Accept alternate 'sans serif' spelling, replacing it with 'sans-serif'
--->
-	<match target="pattern">
-		<test qual="any" name="family">
-			<string>sans serif</string>
-		</test>
-		<edit name="family" mode="assign">
-			<string>sans-serif</string>
-		</edit>
-	</match>
-
-<!--
-  Accept deprecated 'sans' alias, replacing it with 'sans-serif'
--->
-	<match target="pattern">
-		<test qual="any" name="family">
-			<string>sans</string>
-		</test>
-		<edit name="family" mode="assign">
-			<string>sans-serif</string>
-		</edit>
-	</match>
-
-<!--
-  Mark common families with their generics so we'll get
-  something reasonable
--->
-
-<!--
-  Serif faces
- -->
-	<alias>
-		<family>Bitstream Vera Serif</family>
-		<family>Times New Roman</family>
-		<family>Thorndale AMT</family>
-		<family>Times</family>
-		<family>Nimbus Roman No9 L</family>
-		<family>Luxi Serif</family>
-		<family>Kochi Mincho</family>
-		<family>AR PL SungtiL GB</family>
-		<family>AR PL Mingti2L Big5</family>
-		<family>ＭＳ 明朝</family>
-		<family>Baekmuk Batang</family>
-		<family>FreeSerif</family>
-		<default><family>serif</family></default>
-	</alias>
-<!--
-  Sans-serif faces
- -->
-	<alias>
-		<family>Bitstream Vera Sans</family>
-		<family>Helvetica</family>
-		<family>Arial</family>
-		<family>Verdana</family>
-		<family>Albany AMT</family>
-		<family>Nimbus Sans L</family>
-		<family>Luxi Sans</family>
-		<family>Kochi Gothic</family>
-		<family>AR PL KaitiM GB</family>
-		<family>AR PL KaitiM Big5</family>
-		<family>ＭＳ ゴシック</family>
-		<family>Baekmuk Dotum</family>
-		<family>SimSun</family>
-		<family>FreeSans</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-<!--
-  Monospace faces
- -->
- 	<alias>
-		<family>Bitstream Vera Sans Mono</family>
-		<family>Courier</family>
-		<family>Courier New</family>
-		<family>Andale Mono</family>
-		<family>Luxi Mono</family>
-		<family>Cumberland AMT</family>
-		<family>Nimbus Mono L</family>
-		<family>NSimSun</family>
-		<family>FreeMono</family>
-		<default><family>monospace</family></default>
-	</alias>
-<!--
-  If the font still has no generic name, add sans-serif
- -->
-	<match target="pattern">
-		<test qual="all" name="family" compare="not_eq">
-			<string>sans-serif</string>
-		</test>
-		<test qual="all" name="family" compare="not_eq">
-			<string>serif</string>
-		</test>
-		<test qual="all" name="family" compare="not_eq">
-			<string>monospace</string>
-		</test>
-		<edit name="family" mode="append_last">
-			<string>sans-serif</string>
-		</edit>
-	</match>
-
-<!--
-  URW provides metric and shape compatible fonts for these 3 Adobe families.
-  -->
-        <alias>
-	  <family>Times</family>
-	  <accept><family>Nimbus Roman No9 L</family></accept>
-	</alias>
-        <alias>
-	  <family>Helvetica</family>
-	  <accept><family>Nimbus Sans L</family></accept>
-	</alias>
-        <alias>
-	  <family>Courier</family>
-	  <accept><family>Nimbus Mono L</family></accept>
-	</alias>
-
-<!--
- AMT provides metric and shape compatible fonts for these three web font
- families.
- -->
- 	<alias>
-		<family>Times New Roman</family>
-		<accept><family>Thorndale AMT</family></accept>
-	</alias>
- 	<alias>
-		<family>Arial</family>
-		<accept><family>Albany AMT</family></accept>
-	</alias>
- 	<alias>
-		<family>Courier New</family>
-		<accept><family>Cumberland AMT</family></accept>
-	</alias>
- 
-<!--
-  Some Asian fonts misadvertise themselves as monospaced when
-  in fact they are dual-spaced (half and full).  This makes
-  FreeType very confused as it forces all widths to match.
-  Undo this magic by disabling the width forcing code -->
-	<match target="font">
-		<test name="family"><string>GulimChe</string></test>
-		<edit name="globaladvance"><bool>false</bool></edit>
-	</match>
-
-	<match target="font">
-		<test name="family"><string>DotumChe</string></test>
-		<edit name="globaladvance"><bool>false</bool></edit>
-	</match>
-
-	<match target="font">
-		<test name="family"><string>BatangChe</string></test>
-		<edit name="globaladvance"><bool>false</bool></edit>
-	</match>
-
-	<match target="font">
-		<test name="family"><string>GungsuhChe</string></test>
-		<edit name="globaladvance"><bool>false</bool></edit>
-	</match>
-
-<!-- 
-	The Bitstream Vera fonts have GASP entries suggesting that hinting be
-	disabled below 8 ppem, but FreeType ignores those, preferring to use
-	the data found in the instructed hints.  The initial Vera release
-	didn't include the right instructions in the 'prep' table. Fix this
-	by disabling hinting manually at smaller sizes (< 8ppem)
- -->
-
-	<match target="font">
-		<test name="family">
-			<string>Bitstream Vera Sans</string>
-		</test>
-		<test name="pixelsize" compare="less">
-			<double>7.5</double>
-		</test>
-		<edit name="hinting">
-			<bool>false</bool>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Bitstream Vera Serif</string>
-		</test>
-		<test name="pixelsize" compare="less">
-			<double>7.5</double>
-		</test>
-		<edit name="hinting">
-			<bool>false</bool>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Bitstream Vera Sans Mono</string>
-		</test>
-		<test name="pixelsize" compare="less">
-			<double>7.5</double>
-		</test>
-		<edit name="hinting">
-			<bool>false</bool>
-		</edit>
-	</match>
-
-<!--
-  Load per-user customization file
--->
-	<include ignore_missing="yes">~/.fonts.conf</include>
-
-<!--
-  Load local system customization file
--->
-	<include ignore_missing="yes">conf.d</include>
-	<include ignore_missing="yes">local.conf</include>
-
-<!--
-  Provide required aliases for standard names
--->
-	<alias>
-		<family>serif</family>
-		<prefer>
-			<family>Bitstream Vera Serif</family>
-			<family>Times New Roman</family>
-			<family>Thorndale AMT</family>
-			<family>Luxi Serif</family>
-			<family>Nimbus Roman No9 L</family>
-			<family>Times</family>
-			<family>Frank Ruehl</family>
-			<family>Kochi Mincho</family>
-			<family>AR PL SungtiL GB</family>
-			<family>AR PL Mingti2L Big5</family>
-			<family>ＭＳ 明朝</family>
-			<family>Baekmuk Batang</family>
-			<family>FreeSerif</family>
-		</prefer>
-	</alias>
-	<alias>
-		<family>sans-serif</family>
-		<prefer>
-			<family>Bitstream Vera Sans</family>
-			<family>Verdana</family>
-			<family>Arial</family>
-			<family>Albany AMT</family>
-			<family>Luxi Sans</family>
-			<family>Nimbus Sans L</family>
-			<family>Helvetica</family>
-			<family>Nachlieli</family>
-			<family>Kochi Gothic</family>
-			<family>AR PL KaitiM GB</family>
-			<family>AR PL KaitiM Big5</family>
-			<family>ＭＳ ゴシック</family>
-			<family>Baekmuk Dotum</family>
-			<family>SimSun</family>
-			<family>FreeSans</family>
-		</prefer>
-	</alias>
-	<alias>
-		<family>monospace</family>
-		<prefer>
-			<family>Bitstream Vera Sans Mono</family>
-			<family>Andale Mono</family>
-			<family>Courier New</family>
-			<family>Cumberland AMT</family>
-			<family>Luxi Mono</family>
-			<family>Nimbus Mono L</family>
-			<family>Courier</family>
-			<family>Miriam Mono</family>
-			<family>Kochi Gothic</family>
-			<family>AR PL KaitiM GB</family>
-			<family>Baekmuk Dotum</family>
-			<family>FreeMono</family>
-		</prefer>
-	</alias>
-
-<!-- 
- Artificial oblique for fonts without an italic or oblique version
- -->
- 
-	<match target="font">
-		<!-- check to see if the font is roman -->
-		<test name="slant">
-			<const>roman</const>
-		</test>
-		<!-- check to see if the pattern requested non-roman -->
-		<test target="pattern" name="slant" compare="not_eq">
-			<const>roman</const>
-		</test>
-		<!-- multiply the matrix to slant the font -->
-		<edit name="matrix" mode="assign">
-			<times>
-				<name>matrix</name>
-				<matrix><double>1</double><double>0.2</double>
-					<double>0</double><double>1</double>
-				</matrix>
-			</times>
-		</edit>
-		<!-- pretend the font is oblique now -->
-		<edit name="slant" mode="assign">
-			<const>oblique</const>
-		</edit>
-	</match>
-
-<!--
- Synthetic emboldening for fonts that do not have bold face available
- -->
-
-	<match target="font">
-		<!-- check to see if the font is just regular -->
-		<test name="weight" compare="less_eq">
-			<int>100</int>
-		</test>
-		<!-- check to see if the pattern requests bold -->
-		<test target="pattern" name="weight" compare="more_eq">
-			<int>200</int>
-		</test>
-		<!-- set the embolden flag -->
-		<edit name="embolden" mode="assign">
-			<bool>true</bool>
-		</edit>
-	</match>
-
-
-	<config>
-<!--
-  These are the default Unicode chars that are expected to be blank
-  in fonts.  All other blank chars are assumed to be broken and
-  won't appear in the resulting charsets
- -->
-		<blank>
-			<int>0x0020</int>	<!-- SPACE -->
-			<int>0x00A0</int>	<!-- NO-BREAK SPACE -->
-			<int>0x00AD</int>	<!-- SOFT HYPHEN -->
-			<int>0x034F</int>	<!-- COMBINING GRAPHEME JOINER -->
-			<int>0x0600</int>	<!-- ARABIC NUMBER SIGN -->
-			<int>0x0601</int>	<!-- ARABIC SIGN SANAH -->
-			<int>0x0602</int>	<!-- ARABIC FOOTNOTE MARKER -->
-			<int>0x0603</int>	<!-- ARABIC SIGN SAFHA -->
-			<int>0x06DD</int>	<!-- ARABIC END OF AYAH -->
-			<int>0x070F</int>	<!-- SYRIAC ABBREVIATION MARK -->
-			<int>0x115F</int>	<!-- HANGUL CHOSEONG FILLER -->
-			<int>0x1160</int>	<!-- HANGUL JUNGSEONG FILLER -->
-			<int>0x1680</int>	<!-- OGHAM SPACE MARK -->
-			<int>0x17B4</int>	<!-- KHMER VOWEL INHERENT AQ -->
-			<int>0x17B5</int>	<!-- KHMER VOWEL INHERENT AA -->
-			<int>0x180E</int>	<!-- MONGOLIAN VOWEL SEPARATOR -->
-			<int>0x2000</int>	<!-- EN QUAD -->
-			<int>0x2001</int>	<!-- EM QUAD -->
-			<int>0x2002</int>	<!-- EN SPACE -->
-			<int>0x2003</int>	<!-- EM SPACE -->
-			<int>0x2004</int>	<!-- THREE-PER-EM SPACE -->
-			<int>0x2005</int>	<!-- FOUR-PER-EM SPACE -->
-			<int>0x2006</int>	<!-- SIX-PER-EM SPACE -->
-			<int>0x2007</int>	<!-- FIGURE SPACE -->
-			<int>0x2008</int>	<!-- PUNCTUATION SPACE -->
-			<int>0x2009</int>	<!-- THIN SPACE -->
-			<int>0x200A</int>	<!-- HAIR SPACE -->
-			<int>0x200B</int>	<!-- ZERO WIDTH SPACE -->
-			<int>0x200C</int>	<!-- ZERO WIDTH NON-JOINER -->
-			<int>0x200D</int>	<!-- ZERO WIDTH JOINER -->
-			<int>0x200E</int>	<!-- LEFT-TO-RIGHT MARK -->
-			<int>0x200F</int>	<!-- RIGHT-TO-LEFT MARK -->
-			<int>0x2028</int>	<!-- LINE SEPARATOR -->
-			<int>0x2029</int>	<!-- PARAGRAPH SEPARATOR -->
-			<int>0x202A</int>	<!-- LEFT-TO-RIGHT EMBEDDING -->
-			<int>0x202B</int>	<!-- RIGHT-TO-LEFT EMBEDDING -->
-			<int>0x202C</int>	<!-- POP DIRECTIONAL FORMATTING -->
-			<int>0x202D</int>	<!-- LEFT-TO-RIGHT OVERRIDE -->
-			<int>0x202E</int>	<!-- RIGHT-TO-LEFT OVERRIDE -->
-			<int>0x202F</int>	<!-- NARROW NO-BREAK SPACE -->
-			<int>0x205F</int>	<!-- MEDIUM MATHEMATICAL SPACE -->
-			<int>0x2060</int>	<!-- WORD JOINER -->
-			<int>0x2061</int>	<!-- FUNCTION APPLICATION -->
-			<int>0x2062</int>	<!-- INVISIBLE TIMES -->
-			<int>0x2063</int>	<!-- INVISIBLE SEPARATOR -->
-			<int>0x206A</int>	<!-- INHIBIT SYMMETRIC SWAPPING -->
-			<int>0x206B</int>	<!-- ACTIVATE SYMMETRIC SWAPPING -->
-			<int>0x206C</int>	<!-- INHIBIT ARABIC FORM SHAPING -->
-			<int>0x206D</int>	<!-- ACTIVATE ARABIC FORM SHAPING -->
-			<int>0x206E</int>	<!-- NATIONAL DIGIT SHAPES -->
-			<int>0x206F</int>	<!-- NOMINAL DIGIT SHAPES -->
-			<int>0x3000</int>	<!-- IDEOGRAPHIC SPACE -->
-			<int>0x3164</int>	<!-- HANGUL FILLER -->
-			<int>0xFEFF</int>	<!-- ZERO WIDTH NO-BREAK SPACE -->
-			<int>0xFFA0</int>	<!-- HALFWIDTH HANGUL FILLER -->
-			<int>0xFFF9</int>	<!-- INTERLINEAR ANNOTATION ANCHOR -->
-			<int>0xFFFA</int>	<!-- INTERLINEAR ANNOTATION SEPARATOR -->
-			<int>0xFFFB</int>	<!-- INTERLINEAR ANNOTATION TERMINATOR -->
-		</blank>
-<!--
-  Rescan configuration every 30 seconds when FcFontSetList is called
- -->
-		<rescan>
-			<int>30</int>
-		</rescan>
-	</config>
-
-</fontconfig>
diff --git a/x11-fonts/linux-f10-fontconfig/pkg-plist b/x11-fonts/linux-f10-fontconfig/pkg-plist
index 918babda115a..dad9315fb09e 100644
--- a/x11-fonts/linux-f10-fontconfig/pkg-plist
+++ b/x11-fonts/linux-f10-fontconfig/pkg-plist
@@ -1,17 +1,18 @@
-etc/fonts/fonts.conf
-etc/fonts/fonts.dtd
-etc/fonts/local.conf
+@comment file listing
+etc/fonts
+usr/bin/fc-cat
 usr/bin/fc-list
+usr/bin/fc-match
 usr/lib/libfontconfig.so.1
-usr/lib/libfontconfig.so.1.0.4
-usr/share/doc/fontconfig-%%PORTVERSION%%/AUTHORS
-usr/share/doc/fontconfig-%%PORTVERSION%%/COPYING
-usr/share/doc/fontconfig-%%PORTVERSION%%/README
-usr/share/doc/fontconfig-%%PORTVERSION%%/fontconfig-user.html
-usr/share/doc/fontconfig-%%PORTVERSION%%/fontconfig-user.txt
+usr/lib/libfontconfig.so.1.2.0
+usr/share/doc/fontconfig-2.4.2/AUTHORS
+usr/share/doc/fontconfig-2.4.2/COPYING
+usr/share/doc/fontconfig-2.4.2/README
+usr/share/doc/fontconfig-2.4.2/fontconfig-user.html
+usr/share/doc/fontconfig-2.4.2/fontconfig-user.txt
+usr/share/man/man1/fc-cat.1.gz
 usr/share/man/man1/fc-list.1.gz
+usr/share/man/man1/fc-match.1.gz
 usr/share/man/man5/fonts-conf.5.gz
-@dirrm etc/fonts
-@dirrm usr/share/doc/fontconfig-%%PORTVERSION%%
-@exec /bin/mkdir -p %D/usr/share/fonts
-@dirrm usr/share/fonts
+@comment non-empty directory listing in revers order
+@dirrm usr/share/doc/fontconfig-2.4.2
diff --git a/x11-fonts/linux-f8-fontconfig/Makefile b/x11-fonts/linux-f8-fontconfig/Makefile
index 3516be49859f..e8f1671c439c 100644
--- a/x11-fonts/linux-f8-fontconfig/Makefile
+++ b/x11-fonts/linux-f8-fontconfig/Makefile
@@ -1,37 +1,37 @@
-# New ports collection makefile for:	linux-fontconfig
-# Date created:				2003-11-19
-# Whom:					trevor
+# New ports collection makefile for:	x11-fonts/linux-f8-fontconfig
+# Date created:				2008-03-28
+# Whom:					bsam
 #
 # $FreeBSD$
 #
 
 PORTNAME=	fontconfig
-PORTVERSION=	2.2.3
-PORTREVISION=	7
+PORTVERSION=	2.4.2
 CATEGORIES=	x11-fonts linux
-DISTNAME=	${PORTNAME}-${PORTVERSION}-13
+PKGNAMEPREFIX=	linux-f8-
+DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
-COMMENT=	Linux/i386 binary of Fontconfig
+COMMENT=	An XML-based font configuration API for X Windows (Linux Fedora 8)
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	expat
-LINUX_DIST_VER=	4
-USE_LDCONFIG=	yes
-PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
-
+LINUX_DIST_VER=	8
+RPMVERSION=	5.fc8
 BRANDELF_DIRS=	usr/bin
+USE_LDCONFIG=	yes
 
 # We will use some other configuration file, so delete a linux one
 # Don't let the linux fc-cache mess up the native cache file
 post-extract:
-	@${RM} ${WRKSRC}/etc/fonts/fonts.conf \
-		${WRKSRC}/usr/bin/fc-cache \
-		${WRKSRC}/usr/share/man/man1/fc-cache.1.gz
+		@${RM} -r ${WRKSRC}/etc ${WRKSRC}/usr/share/fonts ${WRKSRC}/var \
+			${WRKSRC}/usr/bin/fc-cache \
+			${WRKSRC}/usr/share/man/man1/fc-cache.1.gz
+
+post-install:
+		@${LN} -s ${LOCALBASE}/etc/fonts ${PREFIX}/etc/
 
-# Here is our configuration file
-post-patch:
-	@${CAT} ${FILESDIR}/fonts.conf | ${SED} 's:/usr/X11R6:${LOCALBASE}:g' > ${WRKSRC}/etc/fonts/fonts.conf
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/linux-f8-fontconfig/distinfo.i386 b/x11-fonts/linux-f8-fontconfig/distinfo.i386
index 7814ce11feae..9dec16f42bb5 100644
--- a/x11-fonts/linux-f8-fontconfig/distinfo.i386
+++ b/x11-fonts/linux-f8-fontconfig/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/i386/fedora/4/fontconfig-2.2.3-13.i386.rpm) = bec74cb3c13774ec3bca101644598211
-SHA256 (rpm/i386/fedora/4/fontconfig-2.2.3-13.i386.rpm) = 6abada9a9d80c6d1a1edd629bf34a20a42a03ea873fbfed13adc4bbe60d4eaad
-SIZE (rpm/i386/fedora/4/fontconfig-2.2.3-13.i386.rpm) = 123276
-MD5 (rpm/i386/fedora/4/fontconfig-2.2.3-13.src.rpm) = e4931c296b82330273a8b7020a1596e6
-SHA256 (rpm/i386/fedora/4/fontconfig-2.2.3-13.src.rpm) = 3425e08912cf073cb48ce4509ec061419cea64cc4d11749c091be0664d711c25
-SIZE (rpm/i386/fedora/4/fontconfig-2.2.3-13.src.rpm) = 770587
+MD5 (rpm/i386/fedora/8/fontconfig-2.4.2-5.fc8.i386.rpm) = e7cd84ba7aee27b53c8429dc73205cba
+SHA256 (rpm/i386/fedora/8/fontconfig-2.4.2-5.fc8.i386.rpm) = ba4302361c139804e488adb07e375e4222d24bddf389c91590cf7bd4fc02d607
+SIZE (rpm/i386/fedora/8/fontconfig-2.4.2-5.fc8.i386.rpm) = 181170
+MD5 (rpm/i386/fedora/8/fontconfig-2.4.2-5.fc8.src.rpm) = 6292bf3efd898fcca13f2c505c64a505
+SHA256 (rpm/i386/fedora/8/fontconfig-2.4.2-5.fc8.src.rpm) = 8916a817e034cb45524a4a332b64d9ee1add824e3388d0ff994f53a82a4f2ea2
+SIZE (rpm/i386/fedora/8/fontconfig-2.4.2-5.fc8.src.rpm) = 1290502
diff --git a/x11-fonts/linux-f8-fontconfig/files/fonts.conf b/x11-fonts/linux-f8-fontconfig/files/fonts.conf
deleted file mode 100644
index 42770b4c0b8c..000000000000
--- a/x11-fonts/linux-f8-fontconfig/files/fonts.conf
+++ /dev/null
@@ -1,436 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/fonts.conf file to configure system font access -->
-<fontconfig>
-
-<!--
-	DO NOT EDIT THIS FILE.
-	IT WILL BE REPLACED WHEN FONTCONFIG IS UPDATED.
-	LOCAL CHANGES BELONG IN 'local.conf'.
-
-	The intent of this standard configuration file is to be adequate for
-	most environments.  If you have a reasonably normal environment and
-	have found problems with this configuration, they are probably
-	things that others will also want fixed.  Please submit any
-	problems to the fontconfig bugzilla system located at fontconfig.org
-
-	Note that the normal 'make install' procedure for fontconfig is to
-	replace any existing fonts.conf file with the new version.  Place
-	any local customizations in local.conf which this file references.
-
-	Keith Packard
--->
-
-<!-- Font directory list -->
-
-	<dir>/usr/X11R6/lib/X11/fonts</dir>
-	
-	<dir>~/.fonts</dir>
-
-<!--
-  Accept deprecated 'mono' alias, replacing it with 'monospace'
--->
-	<match target="pattern">
-		<test qual="any" name="family">
-			<string>mono</string>
-		</test>
-		<edit name="family" mode="assign">
-			<string>monospace</string>
-		</edit>
-	</match>
-
-<!--
-  Accept alternate 'sans serif' spelling, replacing it with 'sans-serif'
--->
-	<match target="pattern">
-		<test qual="any" name="family">
-			<string>sans serif</string>
-		</test>
-		<edit name="family" mode="assign">
-			<string>sans-serif</string>
-		</edit>
-	</match>
-
-<!--
-  Accept deprecated 'sans' alias, replacing it with 'sans-serif'
--->
-	<match target="pattern">
-		<test qual="any" name="family">
-			<string>sans</string>
-		</test>
-		<edit name="family" mode="assign">
-			<string>sans-serif</string>
-		</edit>
-	</match>
-
-<!--
-  Mark common families with their generics so we'll get
-  something reasonable
--->
-
-<!--
-  Serif faces
- -->
-	<alias>
-		<family>Bitstream Vera Serif</family>
-		<family>Times New Roman</family>
-		<family>Thorndale AMT</family>
-		<family>Times</family>
-		<family>Nimbus Roman No9 L</family>
-		<family>Luxi Serif</family>
-		<family>Kochi Mincho</family>
-		<family>AR PL SungtiL GB</family>
-		<family>AR PL Mingti2L Big5</family>
-		<family>ＭＳ 明朝</family>
-		<family>Baekmuk Batang</family>
-		<family>FreeSerif</family>
-		<default><family>serif</family></default>
-	</alias>
-<!--
-  Sans-serif faces
- -->
-	<alias>
-		<family>Bitstream Vera Sans</family>
-		<family>Helvetica</family>
-		<family>Arial</family>
-		<family>Verdana</family>
-		<family>Albany AMT</family>
-		<family>Nimbus Sans L</family>
-		<family>Luxi Sans</family>
-		<family>Kochi Gothic</family>
-		<family>AR PL KaitiM GB</family>
-		<family>AR PL KaitiM Big5</family>
-		<family>ＭＳ ゴシック</family>
-		<family>Baekmuk Dotum</family>
-		<family>SimSun</family>
-		<family>FreeSans</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-<!--
-  Monospace faces
- -->
- 	<alias>
-		<family>Bitstream Vera Sans Mono</family>
-		<family>Courier</family>
-		<family>Courier New</family>
-		<family>Andale Mono</family>
-		<family>Luxi Mono</family>
-		<family>Cumberland AMT</family>
-		<family>Nimbus Mono L</family>
-		<family>NSimSun</family>
-		<family>FreeMono</family>
-		<default><family>monospace</family></default>
-	</alias>
-<!--
-  If the font still has no generic name, add sans-serif
- -->
-	<match target="pattern">
-		<test qual="all" name="family" compare="not_eq">
-			<string>sans-serif</string>
-		</test>
-		<test qual="all" name="family" compare="not_eq">
-			<string>serif</string>
-		</test>
-		<test qual="all" name="family" compare="not_eq">
-			<string>monospace</string>
-		</test>
-		<edit name="family" mode="append_last">
-			<string>sans-serif</string>
-		</edit>
-	</match>
-
-<!--
-  URW provides metric and shape compatible fonts for these 3 Adobe families.
-  -->
-        <alias>
-	  <family>Times</family>
-	  <accept><family>Nimbus Roman No9 L</family></accept>
-	</alias>
-        <alias>
-	  <family>Helvetica</family>
-	  <accept><family>Nimbus Sans L</family></accept>
-	</alias>
-        <alias>
-	  <family>Courier</family>
-	  <accept><family>Nimbus Mono L</family></accept>
-	</alias>
-
-<!--
- AMT provides metric and shape compatible fonts for these three web font
- families.
- -->
- 	<alias>
-		<family>Times New Roman</family>
-		<accept><family>Thorndale AMT</family></accept>
-	</alias>
- 	<alias>
-		<family>Arial</family>
-		<accept><family>Albany AMT</family></accept>
-	</alias>
- 	<alias>
-		<family>Courier New</family>
-		<accept><family>Cumberland AMT</family></accept>
-	</alias>
- 
-<!--
-  Some Asian fonts misadvertise themselves as monospaced when
-  in fact they are dual-spaced (half and full).  This makes
-  FreeType very confused as it forces all widths to match.
-  Undo this magic by disabling the width forcing code -->
-	<match target="font">
-		<test name="family"><string>GulimChe</string></test>
-		<edit name="globaladvance"><bool>false</bool></edit>
-	</match>
-
-	<match target="font">
-		<test name="family"><string>DotumChe</string></test>
-		<edit name="globaladvance"><bool>false</bool></edit>
-	</match>
-
-	<match target="font">
-		<test name="family"><string>BatangChe</string></test>
-		<edit name="globaladvance"><bool>false</bool></edit>
-	</match>
-
-	<match target="font">
-		<test name="family"><string>GungsuhChe</string></test>
-		<edit name="globaladvance"><bool>false</bool></edit>
-	</match>
-
-<!-- 
-	The Bitstream Vera fonts have GASP entries suggesting that hinting be
-	disabled below 8 ppem, but FreeType ignores those, preferring to use
-	the data found in the instructed hints.  The initial Vera release
-	didn't include the right instructions in the 'prep' table. Fix this
-	by disabling hinting manually at smaller sizes (< 8ppem)
- -->
-
-	<match target="font">
-		<test name="family">
-			<string>Bitstream Vera Sans</string>
-		</test>
-		<test name="pixelsize" compare="less">
-			<double>7.5</double>
-		</test>
-		<edit name="hinting">
-			<bool>false</bool>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Bitstream Vera Serif</string>
-		</test>
-		<test name="pixelsize" compare="less">
-			<double>7.5</double>
-		</test>
-		<edit name="hinting">
-			<bool>false</bool>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Bitstream Vera Sans Mono</string>
-		</test>
-		<test name="pixelsize" compare="less">
-			<double>7.5</double>
-		</test>
-		<edit name="hinting">
-			<bool>false</bool>
-		</edit>
-	</match>
-
-<!--
-  Load per-user customization file
--->
-	<include ignore_missing="yes">~/.fonts.conf</include>
-
-<!--
-  Load local system customization file
--->
-	<include ignore_missing="yes">conf.d</include>
-	<include ignore_missing="yes">local.conf</include>
-
-<!--
-  Provide required aliases for standard names
--->
-	<alias>
-		<family>serif</family>
-		<prefer>
-			<family>Bitstream Vera Serif</family>
-			<family>Times New Roman</family>
-			<family>Thorndale AMT</family>
-			<family>Luxi Serif</family>
-			<family>Nimbus Roman No9 L</family>
-			<family>Times</family>
-			<family>Frank Ruehl</family>
-			<family>Kochi Mincho</family>
-			<family>AR PL SungtiL GB</family>
-			<family>AR PL Mingti2L Big5</family>
-			<family>ＭＳ 明朝</family>
-			<family>Baekmuk Batang</family>
-			<family>FreeSerif</family>
-		</prefer>
-	</alias>
-	<alias>
-		<family>sans-serif</family>
-		<prefer>
-			<family>Bitstream Vera Sans</family>
-			<family>Verdana</family>
-			<family>Arial</family>
-			<family>Albany AMT</family>
-			<family>Luxi Sans</family>
-			<family>Nimbus Sans L</family>
-			<family>Helvetica</family>
-			<family>Nachlieli</family>
-			<family>Kochi Gothic</family>
-			<family>AR PL KaitiM GB</family>
-			<family>AR PL KaitiM Big5</family>
-			<family>ＭＳ ゴシック</family>
-			<family>Baekmuk Dotum</family>
-			<family>SimSun</family>
-			<family>FreeSans</family>
-		</prefer>
-	</alias>
-	<alias>
-		<family>monospace</family>
-		<prefer>
-			<family>Bitstream Vera Sans Mono</family>
-			<family>Andale Mono</family>
-			<family>Courier New</family>
-			<family>Cumberland AMT</family>
-			<family>Luxi Mono</family>
-			<family>Nimbus Mono L</family>
-			<family>Courier</family>
-			<family>Miriam Mono</family>
-			<family>Kochi Gothic</family>
-			<family>AR PL KaitiM GB</family>
-			<family>Baekmuk Dotum</family>
-			<family>FreeMono</family>
-		</prefer>
-	</alias>
-
-<!-- 
- Artificial oblique for fonts without an italic or oblique version
- -->
- 
-	<match target="font">
-		<!-- check to see if the font is roman -->
-		<test name="slant">
-			<const>roman</const>
-		</test>
-		<!-- check to see if the pattern requested non-roman -->
-		<test target="pattern" name="slant" compare="not_eq">
-			<const>roman</const>
-		</test>
-		<!-- multiply the matrix to slant the font -->
-		<edit name="matrix" mode="assign">
-			<times>
-				<name>matrix</name>
-				<matrix><double>1</double><double>0.2</double>
-					<double>0</double><double>1</double>
-				</matrix>
-			</times>
-		</edit>
-		<!-- pretend the font is oblique now -->
-		<edit name="slant" mode="assign">
-			<const>oblique</const>
-		</edit>
-	</match>
-
-<!--
- Synthetic emboldening for fonts that do not have bold face available
- -->
-
-	<match target="font">
-		<!-- check to see if the font is just regular -->
-		<test name="weight" compare="less_eq">
-			<int>100</int>
-		</test>
-		<!-- check to see if the pattern requests bold -->
-		<test target="pattern" name="weight" compare="more_eq">
-			<int>200</int>
-		</test>
-		<!-- set the embolden flag -->
-		<edit name="embolden" mode="assign">
-			<bool>true</bool>
-		</edit>
-	</match>
-
-
-	<config>
-<!--
-  These are the default Unicode chars that are expected to be blank
-  in fonts.  All other blank chars are assumed to be broken and
-  won't appear in the resulting charsets
- -->
-		<blank>
-			<int>0x0020</int>	<!-- SPACE -->
-			<int>0x00A0</int>	<!-- NO-BREAK SPACE -->
-			<int>0x00AD</int>	<!-- SOFT HYPHEN -->
-			<int>0x034F</int>	<!-- COMBINING GRAPHEME JOINER -->
-			<int>0x0600</int>	<!-- ARABIC NUMBER SIGN -->
-			<int>0x0601</int>	<!-- ARABIC SIGN SANAH -->
-			<int>0x0602</int>	<!-- ARABIC FOOTNOTE MARKER -->
-			<int>0x0603</int>	<!-- ARABIC SIGN SAFHA -->
-			<int>0x06DD</int>	<!-- ARABIC END OF AYAH -->
-			<int>0x070F</int>	<!-- SYRIAC ABBREVIATION MARK -->
-			<int>0x115F</int>	<!-- HANGUL CHOSEONG FILLER -->
-			<int>0x1160</int>	<!-- HANGUL JUNGSEONG FILLER -->
-			<int>0x1680</int>	<!-- OGHAM SPACE MARK -->
-			<int>0x17B4</int>	<!-- KHMER VOWEL INHERENT AQ -->
-			<int>0x17B5</int>	<!-- KHMER VOWEL INHERENT AA -->
-			<int>0x180E</int>	<!-- MONGOLIAN VOWEL SEPARATOR -->
-			<int>0x2000</int>	<!-- EN QUAD -->
-			<int>0x2001</int>	<!-- EM QUAD -->
-			<int>0x2002</int>	<!-- EN SPACE -->
-			<int>0x2003</int>	<!-- EM SPACE -->
-			<int>0x2004</int>	<!-- THREE-PER-EM SPACE -->
-			<int>0x2005</int>	<!-- FOUR-PER-EM SPACE -->
-			<int>0x2006</int>	<!-- SIX-PER-EM SPACE -->
-			<int>0x2007</int>	<!-- FIGURE SPACE -->
-			<int>0x2008</int>	<!-- PUNCTUATION SPACE -->
-			<int>0x2009</int>	<!-- THIN SPACE -->
-			<int>0x200A</int>	<!-- HAIR SPACE -->
-			<int>0x200B</int>	<!-- ZERO WIDTH SPACE -->
-			<int>0x200C</int>	<!-- ZERO WIDTH NON-JOINER -->
-			<int>0x200D</int>	<!-- ZERO WIDTH JOINER -->
-			<int>0x200E</int>	<!-- LEFT-TO-RIGHT MARK -->
-			<int>0x200F</int>	<!-- RIGHT-TO-LEFT MARK -->
-			<int>0x2028</int>	<!-- LINE SEPARATOR -->
-			<int>0x2029</int>	<!-- PARAGRAPH SEPARATOR -->
-			<int>0x202A</int>	<!-- LEFT-TO-RIGHT EMBEDDING -->
-			<int>0x202B</int>	<!-- RIGHT-TO-LEFT EMBEDDING -->
-			<int>0x202C</int>	<!-- POP DIRECTIONAL FORMATTING -->
-			<int>0x202D</int>	<!-- LEFT-TO-RIGHT OVERRIDE -->
-			<int>0x202E</int>	<!-- RIGHT-TO-LEFT OVERRIDE -->
-			<int>0x202F</int>	<!-- NARROW NO-BREAK SPACE -->
-			<int>0x205F</int>	<!-- MEDIUM MATHEMATICAL SPACE -->
-			<int>0x2060</int>	<!-- WORD JOINER -->
-			<int>0x2061</int>	<!-- FUNCTION APPLICATION -->
-			<int>0x2062</int>	<!-- INVISIBLE TIMES -->
-			<int>0x2063</int>	<!-- INVISIBLE SEPARATOR -->
-			<int>0x206A</int>	<!-- INHIBIT SYMMETRIC SWAPPING -->
-			<int>0x206B</int>	<!-- ACTIVATE SYMMETRIC SWAPPING -->
-			<int>0x206C</int>	<!-- INHIBIT ARABIC FORM SHAPING -->
-			<int>0x206D</int>	<!-- ACTIVATE ARABIC FORM SHAPING -->
-			<int>0x206E</int>	<!-- NATIONAL DIGIT SHAPES -->
-			<int>0x206F</int>	<!-- NOMINAL DIGIT SHAPES -->
-			<int>0x3000</int>	<!-- IDEOGRAPHIC SPACE -->
-			<int>0x3164</int>	<!-- HANGUL FILLER -->
-			<int>0xFEFF</int>	<!-- ZERO WIDTH NO-BREAK SPACE -->
-			<int>0xFFA0</int>	<!-- HALFWIDTH HANGUL FILLER -->
-			<int>0xFFF9</int>	<!-- INTERLINEAR ANNOTATION ANCHOR -->
-			<int>0xFFFA</int>	<!-- INTERLINEAR ANNOTATION SEPARATOR -->
-			<int>0xFFFB</int>	<!-- INTERLINEAR ANNOTATION TERMINATOR -->
-		</blank>
-<!--
-  Rescan configuration every 30 seconds when FcFontSetList is called
- -->
-		<rescan>
-			<int>30</int>
-		</rescan>
-	</config>
-
-</fontconfig>
diff --git a/x11-fonts/linux-f8-fontconfig/pkg-plist b/x11-fonts/linux-f8-fontconfig/pkg-plist
index 918babda115a..dad9315fb09e 100644
--- a/x11-fonts/linux-f8-fontconfig/pkg-plist
+++ b/x11-fonts/linux-f8-fontconfig/pkg-plist
@@ -1,17 +1,18 @@
-etc/fonts/fonts.conf
-etc/fonts/fonts.dtd
-etc/fonts/local.conf
+@comment file listing
+etc/fonts
+usr/bin/fc-cat
 usr/bin/fc-list
+usr/bin/fc-match
 usr/lib/libfontconfig.so.1
-usr/lib/libfontconfig.so.1.0.4
-usr/share/doc/fontconfig-%%PORTVERSION%%/AUTHORS
-usr/share/doc/fontconfig-%%PORTVERSION%%/COPYING
-usr/share/doc/fontconfig-%%PORTVERSION%%/README
-usr/share/doc/fontconfig-%%PORTVERSION%%/fontconfig-user.html
-usr/share/doc/fontconfig-%%PORTVERSION%%/fontconfig-user.txt
+usr/lib/libfontconfig.so.1.2.0
+usr/share/doc/fontconfig-2.4.2/AUTHORS
+usr/share/doc/fontconfig-2.4.2/COPYING
+usr/share/doc/fontconfig-2.4.2/README
+usr/share/doc/fontconfig-2.4.2/fontconfig-user.html
+usr/share/doc/fontconfig-2.4.2/fontconfig-user.txt
+usr/share/man/man1/fc-cat.1.gz
 usr/share/man/man1/fc-list.1.gz
+usr/share/man/man1/fc-match.1.gz
 usr/share/man/man5/fonts-conf.5.gz
-@dirrm etc/fonts
-@dirrm usr/share/doc/fontconfig-%%PORTVERSION%%
-@exec /bin/mkdir -p %D/usr/share/fonts
-@dirrm usr/share/fonts
+@comment non-empty directory listing in revers order
+@dirrm usr/share/doc/fontconfig-2.4.2