31 files changed, 56 insertions, 108 deletions

diff --git a/x11-fonts/font-xfree86-type1/Makefile b/x11-fonts/font-xfree86-type1/Makefile
index 9d61e65426d0..0afa526c7828 100644
--- a/x11-fonts/font-xfree86-type1/Makefile
+++ b/x11-fonts/font-xfree86-type1/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	font-xfree86-type1
-PORTVERSION=	1.0.0
+PORTVERSION=	1.0.1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-fonts/font-xfree86-type1/distinfo b/x11-fonts/font-xfree86-type1/distinfo
index 9c5ec95368fe..ce450b89f0cd 100644
--- a/x11-fonts/font-xfree86-type1/distinfo
+++ b/x11-fonts/font-xfree86-type1/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-xfree86-type1-1.0.0.tar.bz2) = e66f36a6d68203cc4cf7b56ebbb192dd
-SHA256 (xorg/font/font-xfree86-type1-1.0.0.tar.bz2) = ef76d3b91d1bdaa9ff73cc1e5905ad4bbdc028f06157d0d2319d38e7b7f84a4d
-SIZE (xorg/font/font-xfree86-type1-1.0.0.tar.bz2) = 66079
+MD5 (xorg/font/font-xfree86-type1-1.0.1.tar.bz2) = d7e965776c7f0c30b0f09742176fb77a
+SHA256 (xorg/font/font-xfree86-type1-1.0.1.tar.bz2) = 8fd9f9b81120d8afc25ea8901a8a91d7428c45cd9cfe7a7bef2b15c8b8d5f341
+SIZE (xorg/font/font-xfree86-type1-1.0.1.tar.bz2) = 71607
diff --git a/x11-fonts/fslsfonts/Makefile b/x11-fonts/fslsfonts/Makefile
index a9fb10a95160..5097104bf085 100644
--- a/x11-fonts/fslsfonts/Makefile
+++ b/x11-fonts/fslsfonts/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fslsfonts
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.2
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-fonts/fslsfonts/distinfo b/x11-fonts/fslsfonts/distinfo
index 702f70488962..8461314aa681 100644
--- a/x11-fonts/fslsfonts/distinfo
+++ b/x11-fonts/fslsfonts/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/fslsfonts-1.0.1.tar.bz2) = c7b2f8a938749d41dc86db6bd1e6a4ca
-SHA256 (xorg/app/fslsfonts-1.0.1.tar.bz2) = 3feb006a25f36856924e26249fe84b27142678f97175780960f085e1e263a62e
-SIZE (xorg/app/fslsfonts-1.0.1.tar.bz2) = 76928
+MD5 (xorg/app/fslsfonts-1.0.2.tar.bz2) = a61be25c87ee42169ee4dc8344acc9e2
+SHA256 (xorg/app/fslsfonts-1.0.2.tar.bz2) = 9c8e7d573284272c633b5cf18e3358830b27bde72f4bc1ae83a1ab337d463a92
+SIZE (xorg/app/fslsfonts-1.0.2.tar.bz2) = 88561
diff --git a/x11-fonts/libFS/Makefile b/x11-fonts/libFS/Makefile
index c3ca72db2f17..5bd36b982de0 100644
--- a/x11-fonts/libFS/Makefile
+++ b/x11-fonts/libFS/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libFS
-PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTVERSION=	1.0.1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-fonts/libFS/distinfo b/x11-fonts/libFS/distinfo
index 78c9b5bf3c3d..e8a9b43f9a97 100644
--- a/x11-fonts/libFS/distinfo
+++ b/x11-fonts/libFS/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libFS-1.0.0.tar.bz2) = dfd5de47e232db0891410bec8ee6707b
-SHA256 (xorg/lib/libFS-1.0.0.tar.bz2) = 2f18f9fa0e18a3eab3c154ba820ad64b5c6ee364e147524055a553a130ccfdde
-SIZE (xorg/lib/libFS-1.0.0.tar.bz2) = 236606
+MD5 (xorg/lib/libFS-1.0.1.tar.bz2) = 81521249353fa33be7a4bb0062c2fbb9
+SHA256 (xorg/lib/libFS-1.0.1.tar.bz2) = 9bf92ffdb51e69e07682cd1a6c0101f2a833b16b9bfa5d601491ff46a35a2cf5
+SIZE (xorg/lib/libFS-1.0.1.tar.bz2) = 239934
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;
- 
diff --git a/x11-fonts/mkfontdir/Makefile b/x11-fonts/mkfontdir/Makefile
index b7d609430d11..8ec6333babaf 100644
--- a/x11-fonts/mkfontdir/Makefile
+++ b/x11-fonts/mkfontdir/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mkfontdir
-PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTVERSION=	1.0.4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-fonts/mkfontdir/distinfo b/x11-fonts/mkfontdir/distinfo
index b1c479e324a7..a9ac5fe880fc 100644
--- a/x11-fonts/mkfontdir/distinfo
+++ b/x11-fonts/mkfontdir/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/mkfontdir-1.0.3.tar.bz2) = 4d0f89a23f77e22f1671a77bf0898955
-SHA256 (xorg/app/mkfontdir-1.0.3.tar.bz2) = 2a786e03611a53c7f6263db446c0c9ef76e94bcf930b0b5867cc6a9c19653074
-SIZE (xorg/app/mkfontdir-1.0.3.tar.bz2) = 62898
+MD5 (xorg/app/mkfontdir-1.0.4.tar.bz2) = 35394bf3f746a57fba624dba52fdbba3
+SHA256 (xorg/app/mkfontdir-1.0.4.tar.bz2) = 6f9a3cc70d27704ee8e4ff01d5d69c974b059fd7e470172b68cfa477c7caf8e3
+SIZE (xorg/app/mkfontdir-1.0.4.tar.bz2) = 70506
diff --git a/x11-fonts/mkfontscale/Makefile b/x11-fonts/mkfontscale/Makefile
index 2cc4301f0e91..f893dc8386fc 100644
--- a/x11-fonts/mkfontscale/Makefile
+++ b/x11-fonts/mkfontscale/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mkfontscale
-PORTVERSION=	1.0.3
+PORTVERSION=	1.0.6
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-fonts/mkfontscale/distinfo b/x11-fonts/mkfontscale/distinfo
index d7a2771bbd83..f557bbb00a0b 100644
--- a/x11-fonts/mkfontscale/distinfo
+++ b/x11-fonts/mkfontscale/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/mkfontscale-1.0.3.tar.bz2) = 1d608771aca9695b828cec1e34178fd1
-SHA256 (xorg/app/mkfontscale-1.0.3.tar.bz2) = 0458a3a5525b4ab458a018648ef8575afc191f904364c00e27876a7bd53af020
-SIZE (xorg/app/mkfontscale-1.0.3.tar.bz2) = 94674
+MD5 (xorg/app/mkfontscale-1.0.6.tar.bz2) = 0d0752af232054b720febcc1b2fd6c57
+SHA256 (xorg/app/mkfontscale-1.0.6.tar.bz2) = 273512f86fdc46689e9295409982dff0fb5b2ab0cac1690c0d973907bb7b6776
+SIZE (xorg/app/mkfontscale-1.0.6.tar.bz2) = 105475
diff --git a/x11-fonts/showfont/Makefile b/x11-fonts/showfont/Makefile
index 1a42e2b69d7b..b85dfe5db725 100644
--- a/x11-fonts/showfont/Makefile
+++ b/x11-fonts/showfont/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	showfont
-PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTVERSION=	1.0.2
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-fonts/showfont/distinfo b/x11-fonts/showfont/distinfo
index 1a91304f82ed..7f6b846fc197 100644
--- a/x11-fonts/showfont/distinfo
+++ b/x11-fonts/showfont/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/showfont-1.0.1.tar.bz2) = 339b2faf1ca5114fda414338e15b6e21
-SHA256 (xorg/app/showfont-1.0.1.tar.bz2) = 87db3cf12914abc6b074d12b35c7f39c8fd7b5d3933b339e2c1260a51061760c
-SIZE (xorg/app/showfont-1.0.1.tar.bz2) = 77016
+MD5 (xorg/app/showfont-1.0.2.tar.bz2) = 8f83d774ed4cc2a6dca86edd856d820a
+SHA256 (xorg/app/showfont-1.0.2.tar.bz2) = 9bd0373659b2f24120dba887fd155f99aed02e4a7c2afae69e7db1c1fa05e88c
+SIZE (xorg/app/showfont-1.0.2.tar.bz2) = 90582
diff --git a/x11-fonts/xfontsel/Makefile b/x11-fonts/xfontsel/Makefile
index 7714d539dfb6..abb90afebec3 100644
--- a/x11-fonts/xfontsel/Makefile
+++ b/x11-fonts/xfontsel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfontsel
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile
index 69954987ba16..de1419eddd92 100644
--- a/x11-fonts/xfs/Makefile
+++ b/x11-fonts/xfs/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xfs
-PORTVERSION=	1.0.5
-PORTREVISION=	1
+PORTVERSION=	1.0.8
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
 
@@ -21,18 +20,16 @@ ALL_TARGET=	all config
 
 MAN1=		xfs.1
 
-.if !defined(WITHOUT_XFS_CACHE)
-USE_XORG+=	fontcacheproto x11
-CFLAGS+=	-DFONTCACHE
-.else
 post-patch:
+	${REINPLACE_CMD} '/^config_DATA/d' ${WRKSRC}/Makefile.in
+.if defined(WITHOUT_XFS_CACHE)
 	${REINPLACE_CMD} -e 's|^cache|XCOMM &|' ${WRKSRC}/config.cpp
 .endif
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/config ${PREFIX}/lib/X11/fs/config.default
-	@if [ ! -f ${PREFIX}/lib/X11/fs/config ]; then \
-		${INSTALL_SCRIPT} ${WRKSRC}/config ${PREFIX}/lib/X11/fs/config; \
+	${INSTALL_SCRIPT} ${WRKSRC}/config ${PREFIX}/etc/X11/fs/config.default
+	@if [ ! -f ${PREFIX}/etc/X11/fs/config ]; then \
+		${INSTALL_SCRIPT} ${WRKSRC}/config ${PREFIX}/etc/X11/fs/config; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/xfs/distinfo b/x11-fonts/xfs/distinfo
index d0f8c8540432..3484d5eac284 100644
--- a/x11-fonts/xfs/distinfo
+++ b/x11-fonts/xfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xfs-1.0.5.tar.bz2) = 3fc73b5e39a1fe8b8d96563c8144cffe
-SHA256 (xorg/app/xfs-1.0.5.tar.bz2) = f586f2101d42e512e7d20a6a6715c3c2cad19cacbee3b4034a0818de349e38f9
-SIZE (xorg/app/xfs-1.0.5.tar.bz2) = 152131
+MD5 (xorg/app/xfs-1.0.8.tar.bz2) = f10717e45535b64eb45226aac571dac2
+SHA256 (xorg/app/xfs-1.0.8.tar.bz2) = 34b5040b3db7552fc1cdfa46f926ce5b7217ea5d77cfafbbddf94fbae6b4f482
+SIZE (xorg/app/xfs-1.0.8.tar.bz2) = 161279
diff --git a/x11-fonts/xfs/files/patch-Makefile.in b/x11-fonts/xfs/files/patch-Makefile.in
deleted file mode 100644
index 2fecfe5ad0ee..000000000000
--- a/x11-fonts/xfs/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sat Jul  8 12:35:19 2006
-+++ Makefile.in	Sat Jul  8 12:35:21 2006
-@@ -289,7 +289,7 @@
- FSERRORS = /var/log/xfs.log
- FONTDIR = $(libdir)/X11/fonts
- FONTPATH = $(FONTDIR)/misc/,$(FONTDIR)/TTF/,$(FONTDIR)/Type1/,$(FONTDIR)/CID/,$(FONTDIR)/100dpi/,$(FONTDIR)/75dpi/
--config_DATA = config
-+#config_DATA = config
- EXTRA_DIST = xfs.def config.cpp $(appman_PRE)
- CLEANFILES = config $(appman_DATA)
- appmandir = $(APP_MAN_DIR)
diff --git a/x11-fonts/xfs/pkg-install b/x11-fonts/xfs/pkg-install
index 183fcb6dd3f9..9979ff9a1e1a 100644
--- a/x11-fonts/xfs/pkg-install
+++ b/x11-fonts/xfs/pkg-install
@@ -6,7 +6,7 @@ fi
 
 PKG_PREFIX=${PKG_PREFIX:=/usr/X11R6}
 
-XINITCONFDIR=${PKG_PREFIX}/lib/X11/fs
+XINITCONFDIR=${PKG_PREFIX}/etc/X11/fs
 if [ ! -f ${XINITCONFDIR}/config ]; then
 	cp ${XINITCONFDIR}/config.default ${XINITCONFDIR}/config
 fi
diff --git a/x11-fonts/xfs/pkg-plist b/x11-fonts/xfs/pkg-plist
index 02c0cee1f5f5..e2378ab6db01 100644
--- a/x11-fonts/xfs/pkg-plist
+++ b/x11-fonts/xfs/pkg-plist
@@ -1,5 +1,6 @@
 bin/xfs
-@unexec if cmp -s %D/lib/X11/fs/config.default %D/lib/X11/fs/config; then rm -f %D/lib/X11/fs/config; fi
-lib/X11/fs/config.default
-@exec if [ ! -f %D/lib/X11/fs/config ] ; then cp -p %D/%F %B/config; fi
-@dirrmtry lib/X11/fs
+@unexec if cmp -s %D/etc/X11/fs/config.default %D/etc/X11/fs/config; then rm -f %D/etc/X11/fs/config; fi
+etc/X11/fs/config.default
+@exec if [ ! -f %D/etc/X11/fs/config ] ; then cp -p %D/%F %B/config; fi
+@dirrmtry etc/X11/fs
+@dirrmtry etc/X11
diff --git a/x11-fonts/xfsinfo/Makefile b/x11-fonts/xfsinfo/Makefile
index 858ad2b44157..d1456bab4220 100644
--- a/x11-fonts/xfsinfo/Makefile
+++ b/x11-fonts/xfsinfo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xfsinfo
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.2
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-fonts/xfsinfo/distinfo b/x11-fonts/xfsinfo/distinfo
index 2a37289742ee..f95281dbdffd 100644
--- a/x11-fonts/xfsinfo/distinfo
+++ b/x11-fonts/xfsinfo/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xfsinfo-1.0.1.tar.bz2) = e98b18fbce1261de30b1de819d86f48a
-SHA256 (xorg/app/xfsinfo-1.0.1.tar.bz2) = adc33443b3a7f334d2407de702004a0491f24708e0e1abe74cd8ae114cd60cd9
-SIZE (xorg/app/xfsinfo-1.0.1.tar.bz2) = 74335
+MD5 (xorg/app/xfsinfo-1.0.2.tar.bz2) = e6c0071f6d5436113982f4a575d3f94b
+SHA256 (xorg/app/xfsinfo-1.0.2.tar.bz2) = 95aaca84f948fc7e25d82c58d3fdbba44911b99f3e205378ce82a786c11bb96f
+SIZE (xorg/app/xfsinfo-1.0.2.tar.bz2) = 87787
diff --git a/x11-fonts/xorg-fonts-100dpi/Makefile b/x11-fonts/xorg-fonts-100dpi/Makefile
index be413b06e564..3e74cb97fddc 100644
--- a/x11-fonts/xorg-fonts-100dpi/Makefile
+++ b/x11-fonts/xorg-fonts-100dpi/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg-fonts-100dpi
-PORTVERSION=	7.3
+PORTVERSION=	7.4
 CATEGORIES=	x11-fonts
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/x11-fonts/xorg-fonts-75dpi/Makefile b/x11-fonts/xorg-fonts-75dpi/Makefile
index 0981f2d82729..e72bce6792dc 100644
--- a/x11-fonts/xorg-fonts-75dpi/Makefile
+++ b/x11-fonts/xorg-fonts-75dpi/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg-fonts-75dpi
-PORTVERSION=	7.3
+PORTVERSION=	7.4
 CATEGORIES=	x11-fonts
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/x11-fonts/xorg-fonts-cyrillic/Makefile b/x11-fonts/xorg-fonts-cyrillic/Makefile
index 3ee0e6454351..546547d44e21 100644
--- a/x11-fonts/xorg-fonts-cyrillic/Makefile
+++ b/x11-fonts/xorg-fonts-cyrillic/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg-fonts-cyrillic
-PORTVERSION=	7.3
+PORTVERSION=	7.4
 CATEGORIES=	x11-fonts
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/x11-fonts/xorg-fonts-miscbitmaps/Makefile b/x11-fonts/xorg-fonts-miscbitmaps/Makefile
index 2d89072e96b7..3939118788be 100644
--- a/x11-fonts/xorg-fonts-miscbitmaps/Makefile
+++ b/x11-fonts/xorg-fonts-miscbitmaps/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg-fonts-miscbitmaps
-PORTVERSION=	7.3
+PORTVERSION=	7.4
 CATEGORIES=	x11-fonts
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/x11-fonts/xorg-fonts-truetype/Makefile b/x11-fonts/xorg-fonts-truetype/Makefile
index 684022a20695..b01829e8098d 100644
--- a/x11-fonts/xorg-fonts-truetype/Makefile
+++ b/x11-fonts/xorg-fonts-truetype/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg-fonts-truetype
-PORTVERSION=	7.3
+PORTVERSION=	7.4
 CATEGORIES=	x11-fonts
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/x11-fonts/xorg-fonts-type1/Makefile b/x11-fonts/xorg-fonts-type1/Makefile
index bf10b17a3a74..0648a55d79c9 100644
--- a/x11-fonts/xorg-fonts-type1/Makefile
+++ b/x11-fonts/xorg-fonts-type1/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg-fonts-type1
-PORTVERSION=	7.3
+PORTVERSION=	7.4
 CATEGORIES=	x11-fonts
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/x11-fonts/xorg-fonts/Makefile b/x11-fonts/xorg-fonts/Makefile
index 9640236c8fc2..7a8c707ef3fb 100644
--- a/x11-fonts/xorg-fonts/Makefile
+++ b/x11-fonts/xorg-fonts/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xorg-fonts
-PORTVERSION=	7.3
-PORTREVISION=	1
+PORTVERSION=	7.4
 CATEGORIES=	x11-fonts
 MASTER_SITES=	# none
 DISTFILES=	# none