- Update X.org ports to 7.4+ (few ports are more recent than the katamari).

- Bump PORTREVISION for all ports depending on libglut since the shlib
version number went from 4 to 3.
- Bump PORTREVISION for all ports depending on libXaw as libXaw.so.8 isn't
installed anymore.
- Couple of ports fixes (mostly missing xorg components added to USE_XORG).

4 files changed, 5 insertions, 41 deletions

diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile
index a3b0d68e6b29..89e6afb89459 100644
--- a/x11-fonts/libXfont/Makefile
+++ b/x11-fonts/libXfont/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libXfont
-PORTVERSION=	1.3.1
-PORTREVISION=	3
+PORTVERSION=	1.3.4
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
 
@@ -17,6 +16,6 @@ COMMENT=	X font libary
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
 XORG_CAT=	lib
-USE_XORG=	fontcacheproto xproto:both xtrans fontsproto:both fontenc
+USE_XORG=	xproto:both xtrans fontsproto:both fontenc
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/libXfont/distinfo b/x11-fonts/libXfont/distinfo
index bf35c32dadf0..a7cd75698b08 100644
--- a/x11-fonts/libXfont/distinfo
+++ b/x11-fonts/libXfont/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXfont-1.3.1.tar.bz2) = b2f396b62633819bbdd9748383876e21
-SHA256 (xorg/lib/libXfont-1.3.1.tar.bz2) = dcfb7dc980a16ad98ac984b98321148864ea8b4637d3dd3773e483a14158a9b1
-SIZE (xorg/lib/libXfont-1.3.1.tar.bz2) = 564235
+MD5 (xorg/lib/libXfont-1.3.4.tar.bz2) = 788371ee566ef97ed4ca0794873b38cf
+SHA256 (xorg/lib/libXfont-1.3.4.tar.bz2) = b09f23f1fd758fe25336d084455229e6847fab9dcaec839846431f0f4fe7d9f0
+SIZE (xorg/lib/libXfont-1.3.4.tar.bz2) = 571087
diff --git a/x11-fonts/libXfont/files/patch-CVE-2008-0006 b/x11-fonts/libXfont/files/patch-CVE-2008-0006
deleted file mode 100644
index 95f7b2f28019..000000000000
--- a/x11-fonts/libXfont/files/patch-CVE-2008-0006
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git src/bitmap/pcfread.c src/bitmap/pcfread.c
-index fd41849..c5db255 100644
---- src/bitmap/pcfread.c
-+++ src/bitmap/pcfread.c
-@@ -588,6 +588,9 @@ pcfReadFont(FontPtr pFont, FontFilePtr file,
-     pFont->info.lastRow = pcfGetINT16(file, format);
-     pFont->info.defaultCh = pcfGetINT16(file, format);
-     if (IS_EOF(file)) goto Bail;
-+    if (pFont->info.firstCol > pFont->info.lastCol ||
-+       pFont->info.firstRow > pFont->info.lastRow ||
-+       pFont->info.lastCol-pFont->info.firstCol > 255) goto Bail;
- 
-     nencoding = (pFont->info.lastCol - pFont->info.firstCol + 1) *
- 	(pFont->info.lastRow - pFont->info.firstRow + 1);
-@@ -726,6 +729,9 @@ pcfReadFontInfo(FontInfoPtr pFontInfo, FontFilePtr file)
-     pFontInfo->lastRow = pcfGetINT16(file, format);
-     pFontInfo->defaultCh = pcfGetINT16(file, format);
-     if (IS_EOF(file)) goto Bail;
-+    if (pFontInfo->firstCol > pFontInfo->lastCol ||
-+       pFontInfo->firstRow > pFontInfo->lastRow ||
-+       pFontInfo->lastCol-pFontInfo->firstCol > 255) goto Bail;
- 
-     nencoding = (pFontInfo->lastCol - pFontInfo->firstCol + 1) *
- 	(pFontInfo->lastRow - pFontInfo->firstRow + 1);
diff --git a/x11-fonts/libXfont/files/patch-src_fontfile_catalogue.c b/x11-fonts/libXfont/files/patch-src_fontfile_catalogue.c
deleted file mode 100644
index f25280eef906..000000000000
--- a/x11-fonts/libXfont/files/patch-src_fontfile_catalogue.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/fontfile/catalogue.c.orig
-+++ src/fontfile/catalogue.c
-@@ -156,7 +156,7 @@ CatalogueRescan (FontPathElementPtr fpe)
-     while (entry = readdir(dir), entry != NULL)
-     {
- 	snprintf(link, sizeof link, "%s/%s", path, entry->d_name);
--	len = readlink(link, dest, sizeof dest);
-+	len = readlink(link, dest, sizeof dest - 1);
- 	if (len < 0)
- 	    continue;
-