Index: head/x11/libXfont/files/patch-FreeType_fttools.c
===================================================================
--- head/x11/libXfont/files/patch-FreeType_fttools.c	(revision 108591)
+++ head/x11/libXfont/files/patch-FreeType_fttools.c	(nonexistent)
@@ -1,12 +0,0 @@
---- FreeType/fttools.c.orig	Sun Mar 21 18:30:36 2004
-+++ FreeType/fttools.c	Sun Mar 21 18:30:56 2004
-@@ -34,7 +34,8 @@
- #endif
- 
- #include "font.h"
--#include "freetype/freetype.h"
-+#include "ft2build.h"
-+#include FT_FREETYPE_H
- #include "freetype/ftsnames.h"
- #include "freetype/ttnameid.h"
- #include "ft.h"

Property changes on: head/x11/libXfont/files/patch-FreeType_fttools.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/x11/libXfont/files/patch-FreeType_ftfuncs.c
===================================================================
--- head/x11/libXfont/files/patch-FreeType_ftfuncs.c	(revision 108591)
+++ head/x11/libXfont/files/patch-FreeType_ftfuncs.c	(nonexistent)
@@ -1,12 +0,0 @@
---- FreeType/ftfuncs.c.orig	Sun Mar 21 18:29:28 2004
-+++ FreeType/ftfuncs.c	Sun Mar 21 18:29:46 2004
-@@ -31,7 +31,8 @@
- #include "fntfilst.h"
- #include "fontutil.h"
- #include <X11/fonts/FSproto.h>
--#include "freetype/freetype.h"
-+#include "ft2build.h"
-+#include FT_FREETYPE_H
- #include "freetype/ftsizes.h"
- #include "freetype/ttnameid.h"
- #include "freetype/tttables.h"

Property changes on: head/x11/libXfont/files/patch-FreeType_ftfuncs.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/x11/libXfont/files/patch-FreeType_ftenc.c
===================================================================
--- head/x11/libXfont/files/patch-FreeType_ftenc.c	(revision 108591)
+++ head/x11/libXfont/files/patch-FreeType_ftenc.c	(nonexistent)
@@ -1,12 +0,0 @@
---- FreeType/ftenc.c.orig	Sun Mar 21 18:28:11 2004
-+++ FreeType/ftenc.c	Sun Mar 21 18:28:50 2004
-@@ -29,7 +29,8 @@
- 
- #include "fontmisc.h"
- #include "fontenc.h"
--#include "freetype/freetype.h"
-+#include "ft2build.h"
-+#include FT_FREETYPE_H
- #include "freetype/ttnameid.h"
- #include "freetype/tttables.h"
- #include "freetype/t1tables.h"

Property changes on: head/x11/libXfont/files/patch-FreeType_ftenc.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/x11/libXfont/Makefile
===================================================================
--- head/x11/libXfont/Makefile	(revision 108591)
+++ head/x11/libXfont/Makefile	(revision 108592)
@@ -1,33 +1,32 @@
 # New ports collection makefile for:   libXfont
 # Date Created:			29 Oct, 2003
 # Whom:				Eric Anholt <anholt@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	libXfont
-PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTVERSION=	1.4.2
 CATEGORIES=	x11
 MASTER_SITES=	http://pdx.freedesktop.org/~xlibs/release/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X font libary
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig \
 		${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
 CONFLICTS=	XFree86-libraries-*
 
 USE_BZIP2=	yes
 PREFIX?=	${X11BASE}
 MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--enable-freetype
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack pkgconfig
 
 .include <bsd.port.mk>

Property changes on: head/x11/libXfont/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/x11/libXfont/distinfo
===================================================================
--- head/x11/libXfont/distinfo	(revision 108591)
+++ head/x11/libXfont/distinfo	(revision 108592)
@@ -1,2 +1,2 @@
-MD5 (libXfont-1.4.1.tar.bz2) = 727494cca74277c75005e077a41b7d5c
-SIZE (libXfont-1.4.1.tar.bz2) = 366483
+MD5 (libXfont-1.4.2.tar.bz2) = 7c548377a836a6a7344a62d73d1e8578
+SIZE (libXfont-1.4.2.tar.bz2) = 357750

Property changes on: head/x11/libXfont/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/x11/libXfont/pkg-plist
===================================================================
--- head/x11/libXfont/pkg-plist	(revision 108591)
+++ head/x11/libXfont/pkg-plist	(revision 108592)
@@ -1,13 +1,15 @@
 include/X11/fonts/FS.h
 include/X11/fonts/FSproto.h
 include/X11/fonts/font.h
 include/X11/fonts/fontconf.h
 include/X11/fonts/fontenc.h
+include/X11/fonts/fontmod.h
 include/X11/fonts/fontproto.h
 include/X11/fonts/fontstruct.h
+include/X11/fonts/fontutil.h
 include/X11/fonts/fsmasks.h
 lib/libXfont.a
 lib/libXfont.la
 lib/libXfont.so
 lib/libXfont.so.1
 libdata/pkgconfig/xfont.pc

Property changes on: head/x11/libXfont/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/x11-fonts/libXfont/files/patch-FreeType_fttools.c
===================================================================
--- head/x11-fonts/libXfont/files/patch-FreeType_fttools.c	(revision 108591)
+++ head/x11-fonts/libXfont/files/patch-FreeType_fttools.c	(nonexistent)
@@ -1,12 +0,0 @@
---- FreeType/fttools.c.orig	Sun Mar 21 18:30:36 2004
-+++ FreeType/fttools.c	Sun Mar 21 18:30:56 2004
-@@ -34,7 +34,8 @@
- #endif
- 
- #include "font.h"
--#include "freetype/freetype.h"
-+#include "ft2build.h"
-+#include FT_FREETYPE_H
- #include "freetype/ftsnames.h"
- #include "freetype/ttnameid.h"
- #include "ft.h"

Property changes on: head/x11-fonts/libXfont/files/patch-FreeType_fttools.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/x11-fonts/libXfont/files/patch-FreeType_ftfuncs.c
===================================================================
--- head/x11-fonts/libXfont/files/patch-FreeType_ftfuncs.c	(revision 108591)
+++ head/x11-fonts/libXfont/files/patch-FreeType_ftfuncs.c	(nonexistent)
@@ -1,12 +0,0 @@
---- FreeType/ftfuncs.c.orig	Sun Mar 21 18:29:28 2004
-+++ FreeType/ftfuncs.c	Sun Mar 21 18:29:46 2004
-@@ -31,7 +31,8 @@
- #include "fntfilst.h"
- #include "fontutil.h"
- #include <X11/fonts/FSproto.h>
--#include "freetype/freetype.h"
-+#include "ft2build.h"
-+#include FT_FREETYPE_H
- #include "freetype/ftsizes.h"
- #include "freetype/ttnameid.h"
- #include "freetype/tttables.h"

Property changes on: head/x11-fonts/libXfont/files/patch-FreeType_ftfuncs.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/x11-fonts/libXfont/files/patch-FreeType_ftenc.c
===================================================================
--- head/x11-fonts/libXfont/files/patch-FreeType_ftenc.c	(revision 108591)
+++ head/x11-fonts/libXfont/files/patch-FreeType_ftenc.c	(nonexistent)
@@ -1,12 +0,0 @@
---- FreeType/ftenc.c.orig	Sun Mar 21 18:28:11 2004
-+++ FreeType/ftenc.c	Sun Mar 21 18:28:50 2004
-@@ -29,7 +29,8 @@
- 
- #include "fontmisc.h"
- #include "fontenc.h"
--#include "freetype/freetype.h"
-+#include "ft2build.h"
-+#include FT_FREETYPE_H
- #include "freetype/ttnameid.h"
- #include "freetype/tttables.h"
- #include "freetype/t1tables.h"

Property changes on: head/x11-fonts/libXfont/files/patch-FreeType_ftenc.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/x11-fonts/libXfont/Makefile
===================================================================
--- head/x11-fonts/libXfont/Makefile	(revision 108591)
+++ head/x11-fonts/libXfont/Makefile	(revision 108592)
@@ -1,33 +1,32 @@
 # New ports collection makefile for:   libXfont
 # Date Created:			29 Oct, 2003
 # Whom:				Eric Anholt <anholt@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	libXfont
-PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTVERSION=	1.4.2
 CATEGORIES=	x11
 MASTER_SITES=	http://pdx.freedesktop.org/~xlibs/release/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X font libary
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig \
 		${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
 CONFLICTS=	XFree86-libraries-*
 
 USE_BZIP2=	yes
 PREFIX?=	${X11BASE}
 MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--enable-freetype
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack pkgconfig
 
 .include <bsd.port.mk>

Property changes on: head/x11-fonts/libXfont/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/x11-fonts/libXfont/distinfo
===================================================================
--- head/x11-fonts/libXfont/distinfo	(revision 108591)
+++ head/x11-fonts/libXfont/distinfo	(revision 108592)
@@ -1,2 +1,2 @@
-MD5 (libXfont-1.4.1.tar.bz2) = 727494cca74277c75005e077a41b7d5c
-SIZE (libXfont-1.4.1.tar.bz2) = 366483
+MD5 (libXfont-1.4.2.tar.bz2) = 7c548377a836a6a7344a62d73d1e8578
+SIZE (libXfont-1.4.2.tar.bz2) = 357750

Property changes on: head/x11-fonts/libXfont/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/x11-fonts/libXfont/pkg-plist
===================================================================
--- head/x11-fonts/libXfont/pkg-plist	(revision 108591)
+++ head/x11-fonts/libXfont/pkg-plist	(revision 108592)
@@ -1,13 +1,15 @@
 include/X11/fonts/FS.h
 include/X11/fonts/FSproto.h
 include/X11/fonts/font.h
 include/X11/fonts/fontconf.h
 include/X11/fonts/fontenc.h
+include/X11/fonts/fontmod.h
 include/X11/fonts/fontproto.h
 include/X11/fonts/fontstruct.h
+include/X11/fonts/fontutil.h
 include/X11/fonts/fsmasks.h
 lib/libXfont.a
 lib/libXfont.la
 lib/libXfont.so
 lib/libXfont.so.1
 libdata/pkgconfig/xfont.pc

Property changes on: head/x11-fonts/libXfont/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property