3 files changed, 136 insertions, 145 deletions

diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile
index b556f8e2a51f..f8406b85e374 100644
--- a/x11-fonts/fontconfig/Makefile
+++ b/x11-fonts/fontconfig/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE=	yes
 PREFIX?=	${X11BASE}
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL_VER=13
-USE_GNOME=	gnomehack gnometarget pkgconfig
+USE_GNOME=	gnomehack gnometarget lthack pkgconfig
 CONFIGURE_ARGS=	--with-confdir=${PREFIX}/etc/fonts \
 		--with-expat-includes=${LOCALBASE}/include \
 		--with-expat-lib=${LOCALBASE}/lib \
@@ -156,10 +156,11 @@ MAN3=		FcAtomicCreate.3  \
 MAN5=		fonts-conf.5
 
 .include <bsd.port.pre.mk>
+
 .if ${XFREE86_VERSION} == 3
-MTREE_FILE=     /etc/mtree/BSD.x11.dist
+MTREE_FILE=	/etc/mtree/BSD.x11.dist
 .else
-MTREE_FILE=     /etc/mtree/BSD.x11-4.dist
+MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
 .endif
 
 post-install:
diff --git a/x11-fonts/fontconfig/files/patch-configure b/x11-fonts/fontconfig/files/patch-configure
deleted file mode 100644
index 03d747d5205e..000000000000
--- a/x11-fonts/fontconfig/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Fri Mar  7 16:06:13 2003
-+++ configure	Mon Mar 31 13:31:40 2003
-@@ -5452,6 +5452,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11-fonts/fontconfig/pkg-plist b/x11-fonts/fontconfig/pkg-plist
index 8034fb010a78..d5c26dcfdf24 100644
--- a/x11-fonts/fontconfig/pkg-plist
+++ b/x11-fonts/fontconfig/pkg-plist
@@ -9,137 +9,137 @@ lib/libfontconfig.a
 lib/libfontconfig.so
 lib/libfontconfig.so.1
 libdata/pkgconfig/fontconfig.pc
-share/doc/fontconfig/fontconfig-devel.txt
-share/doc/fontconfig/fontconfig-devel/index.html
-share/doc/fontconfig/fontconfig-devel/r1016.html
-share/doc/fontconfig/fontconfig-devel/r1042.html
-share/doc/fontconfig/fontconfig-devel/r1064.html
-share/doc/fontconfig/fontconfig-devel/r1087.html
-share/doc/fontconfig/fontconfig-devel/r1111.html
-share/doc/fontconfig/fontconfig-devel/r1134.html
-share/doc/fontconfig/fontconfig-devel/r1159.html
-share/doc/fontconfig/fontconfig-devel/r1184.html
-share/doc/fontconfig/fontconfig-devel/r120.html
-share/doc/fontconfig/fontconfig-devel/r1209.html
-share/doc/fontconfig/fontconfig-devel/r1234.html
-share/doc/fontconfig/fontconfig-devel/r1259.html
-share/doc/fontconfig/fontconfig-devel/r1281.html
-share/doc/fontconfig/fontconfig-devel/r1306.html
-share/doc/fontconfig/fontconfig-devel/r1331.html
-share/doc/fontconfig/fontconfig-devel/r1356.html
-share/doc/fontconfig/fontconfig-devel/r1383.html
-share/doc/fontconfig/fontconfig-devel/r141.html
-share/doc/fontconfig/fontconfig-devel/r1414.html
-share/doc/fontconfig/fontconfig-devel/r1437.html
-share/doc/fontconfig/fontconfig-devel/r1460.html
-share/doc/fontconfig/fontconfig-devel/r1486.html
-share/doc/fontconfig/fontconfig-devel/r1515.html
-share/doc/fontconfig/fontconfig-devel/r1545.html
-share/doc/fontconfig/fontconfig-devel/r1575.html
-share/doc/fontconfig/fontconfig-devel/r1608.html
-share/doc/fontconfig/fontconfig-devel/r162.html
-share/doc/fontconfig/fontconfig-devel/r1629.html
-share/doc/fontconfig/fontconfig-devel/r1650.html
-share/doc/fontconfig/fontconfig-devel/r1672.html
-share/doc/fontconfig/fontconfig-devel/r1693.html
-share/doc/fontconfig/fontconfig-devel/r1715.html
-share/doc/fontconfig/fontconfig-devel/r1736.html
-share/doc/fontconfig/fontconfig-devel/r1758.html
-share/doc/fontconfig/fontconfig-devel/r1780.html
-share/doc/fontconfig/fontconfig-devel/r1802.html
-share/doc/fontconfig/fontconfig-devel/r1823.html
-share/doc/fontconfig/fontconfig-devel/r183.html
-share/doc/fontconfig/fontconfig-devel/r1847.html
-share/doc/fontconfig/fontconfig-devel/r1868.html
-share/doc/fontconfig/fontconfig-devel/r1890.html
-share/doc/fontconfig/fontconfig-devel/r1913.html
-share/doc/fontconfig/fontconfig-devel/r1936.html
-share/doc/fontconfig/fontconfig-devel/r1959.html
-share/doc/fontconfig/fontconfig-devel/r1980.html
-share/doc/fontconfig/fontconfig-devel/r2009.html
-share/doc/fontconfig/fontconfig-devel/r2034.html
-share/doc/fontconfig/fontconfig-devel/r204.html
-share/doc/fontconfig/fontconfig-devel/r2062.html
-share/doc/fontconfig/fontconfig-devel/r2099.html
-share/doc/fontconfig/fontconfig-devel/r2130.html
-share/doc/fontconfig/fontconfig-devel/r2157.html
-share/doc/fontconfig/fontconfig-devel/r2181.html
-share/doc/fontconfig/fontconfig-devel/r2207.html
-share/doc/fontconfig/fontconfig-devel/r2231.html
-share/doc/fontconfig/fontconfig-devel/r2255.html
-share/doc/fontconfig/fontconfig-devel/r228.html
-share/doc/fontconfig/fontconfig-devel/r2280.html
-share/doc/fontconfig/fontconfig-devel/r2304.html
-share/doc/fontconfig/fontconfig-devel/r2328.html
-share/doc/fontconfig/fontconfig-devel/r2350.html
-share/doc/fontconfig/fontconfig-devel/r2378.html
-share/doc/fontconfig/fontconfig-devel/r2399.html
-share/doc/fontconfig/fontconfig-devel/r2420.html
-share/doc/fontconfig/fontconfig-devel/r2443.html
-share/doc/fontconfig/fontconfig-devel/r2469.html
-share/doc/fontconfig/fontconfig-devel/r249.html
-share/doc/fontconfig/fontconfig-devel/r2491.html
-share/doc/fontconfig/fontconfig-devel/r2513.html
-share/doc/fontconfig/fontconfig-devel/r2535.html
-share/doc/fontconfig/fontconfig-devel/r2557.html
-share/doc/fontconfig/fontconfig-devel/r2579.html
-share/doc/fontconfig/fontconfig-devel/r2600.html
-share/doc/fontconfig/fontconfig-devel/r2621.html
-share/doc/fontconfig/fontconfig-devel/r2646.html
-share/doc/fontconfig/fontconfig-devel/r2682.html
-share/doc/fontconfig/fontconfig-devel/r270.html
-share/doc/fontconfig/fontconfig-devel/r2717.html
-share/doc/fontconfig/fontconfig-devel/r2745.html
-share/doc/fontconfig/fontconfig-devel/r2770.html
-share/doc/fontconfig/fontconfig-devel/r2791.html
-share/doc/fontconfig/fontconfig-devel/r2816.html
-share/doc/fontconfig/fontconfig-devel/r2841.html
-share/doc/fontconfig/fontconfig-devel/r2866.html
-share/doc/fontconfig/fontconfig-devel/r2892.html
-share/doc/fontconfig/fontconfig-devel/r2914.html
-share/doc/fontconfig/fontconfig-devel/r2936.html
-share/doc/fontconfig/fontconfig-devel/r295.html
-share/doc/fontconfig/fontconfig-devel/r2958.html
-share/doc/fontconfig/fontconfig-devel/r2983.html
-share/doc/fontconfig/fontconfig-devel/r3012.html
-share/doc/fontconfig/fontconfig-devel/r3037.html
-share/doc/fontconfig/fontconfig-devel/r3069.html
-share/doc/fontconfig/fontconfig-devel/r3102.html
-share/doc/fontconfig/fontconfig-devel/r3138.html
-share/doc/fontconfig/fontconfig-devel/r3161.html
-share/doc/fontconfig/fontconfig-devel/r3184.html
-share/doc/fontconfig/fontconfig-devel/r3209.html
-share/doc/fontconfig/fontconfig-devel/r323.html
-share/doc/fontconfig/fontconfig-devel/r3231.html
-share/doc/fontconfig/fontconfig-devel/r344.html
-share/doc/fontconfig/fontconfig-devel/r372.html
-share/doc/fontconfig/fontconfig-devel/r401.html
-share/doc/fontconfig/fontconfig-devel/r476.html
-share/doc/fontconfig/fontconfig-devel/r504.html
-share/doc/fontconfig/fontconfig-devel/r591.html
-share/doc/fontconfig/fontconfig-devel/r632.html
-share/doc/fontconfig/fontconfig-devel/r655.html
-share/doc/fontconfig/fontconfig-devel/r676.html
-share/doc/fontconfig/fontconfig-devel/r704.html
-share/doc/fontconfig/fontconfig-devel/r726.html
-share/doc/fontconfig/fontconfig-devel/r750.html
-share/doc/fontconfig/fontconfig-devel/r771.html
-share/doc/fontconfig/fontconfig-devel/r792.html
-share/doc/fontconfig/fontconfig-devel/r818.html
-share/doc/fontconfig/fontconfig-devel/r839.html
-share/doc/fontconfig/fontconfig-devel/r862.html
-share/doc/fontconfig/fontconfig-devel/r883.html
-share/doc/fontconfig/fontconfig-devel/r917.html
-share/doc/fontconfig/fontconfig-devel/r940.html
-share/doc/fontconfig/fontconfig-devel/r963.html
-share/doc/fontconfig/fontconfig-devel/r99.html
-share/doc/fontconfig/fontconfig-devel/r994.html
-share/doc/fontconfig/fontconfig-devel/x19.html
-share/doc/fontconfig/fontconfig-devel/x31.html
-share/doc/fontconfig/fontconfig-devel/x93.html
-share/doc/fontconfig/fontconfig-user.html
-share/doc/fontconfig/fontconfig-user.txt
-@dirrm share/doc/fontconfig/fontconfig-devel
-@dirrm share/doc/fontconfig
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel.txt
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/index.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1016.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/r1159.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1184.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/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/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/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/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/r2255.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r228.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2280.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2304.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/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/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/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/r3209.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r323.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3231.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/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/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.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/fontconfig-devel
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/fontconfig
 @dirrm etc/fonts