Update to 1.4.2, fixing a buffer overflow in dirfile.c.

6 files changed, 5 insertions, 40 deletions

diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile
index b2376ab64f4b..1deaf0bbe6ee 100644
--- a/x11-fonts/libXfont/Makefile
+++ b/x11-fonts/libXfont/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libXfont
-PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTVERSION=	1.4.2
 CATEGORIES=	x11
 MASTER_SITES=	http://pdx.freedesktop.org/~xlibs/release/
 
diff --git a/x11-fonts/libXfont/distinfo b/x11-fonts/libXfont/distinfo
index 81165d9d3285..556c73919034 100644
--- a/x11-fonts/libXfont/distinfo
+++ b/x11-fonts/libXfont/distinfo
@@ -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
diff --git a/x11-fonts/libXfont/files/patch-FreeType_ftenc.c b/x11-fonts/libXfont/files/patch-FreeType_ftenc.c
deleted file mode 100644
index 77079f54d255..000000000000
--- a/x11-fonts/libXfont/files/patch-FreeType_ftenc.c
+++ /dev/null
@@ -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"
diff --git a/x11-fonts/libXfont/files/patch-FreeType_ftfuncs.c b/x11-fonts/libXfont/files/patch-FreeType_ftfuncs.c
deleted file mode 100644
index 03afb6b4659f..000000000000
--- a/x11-fonts/libXfont/files/patch-FreeType_ftfuncs.c
+++ /dev/null
@@ -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"
diff --git a/x11-fonts/libXfont/files/patch-FreeType_fttools.c b/x11-fonts/libXfont/files/patch-FreeType_fttools.c
deleted file mode 100644
index dd19c889ec4a..000000000000
--- a/x11-fonts/libXfont/files/patch-FreeType_fttools.c
+++ /dev/null
@@ -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"
diff --git a/x11-fonts/libXfont/pkg-plist b/x11-fonts/libXfont/pkg-plist
index 00d31e4afd31..9f5fdb9a1c25 100644
--- a/x11-fonts/libXfont/pkg-plist
+++ b/x11-fonts/libXfont/pkg-plist
@@ -3,8 +3,10 @@ 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