68 files changed, 74 insertions, 401 deletions

diff --git a/x11-fonts/bdftopcf/Makefile b/x11-fonts/bdftopcf/Makefile
index 3e664f1c80fb..a5c6d9ebb9fd 100644
--- a/x11-fonts/bdftopcf/Makefile
+++ b/x11-fonts/bdftopcf/Makefile
@@ -9,7 +9,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Convert X font from BDF to PCF
 
 XORG_CAT=	app
-USE_XORG=	xfont xorg-macros
+USE_XORG=	xfont
 
 PLIST_FILES=	bin/bdftopcf
 MAN1=		bdftopcf.1
diff --git a/x11-fonts/encodings/Makefile b/x11-fonts/encodings/Makefile
index 5433a32fcf42..4840274f3c38 100644
--- a/x11-fonts/encodings/Makefile
+++ b/x11-fonts/encodings/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    encodings
-# Date created:				Oct 29 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	encodings
 PORTVERSION=	1.0.4
diff --git a/x11-fonts/font-adobe-100dpi/Makefile b/x11-fonts/font-adobe-100dpi/Makefile
index 00642965804d..0f634fac98ad 100644
--- a/x11-fonts/font-adobe-100dpi/Makefile
+++ b/x11-fonts/font-adobe-100dpi/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-adobe-100dpi
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-adobe-100dpi
 PORTVERSION=	1.0.3
diff --git a/x11-fonts/font-adobe-75dpi/Makefile b/x11-fonts/font-adobe-75dpi/Makefile
index a25694b5817e..ecdd02c74118 100644
--- a/x11-fonts/font-adobe-75dpi/Makefile
+++ b/x11-fonts/font-adobe-75dpi/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-adobe-75dpi
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-adobe-75dpi
 PORTVERSION=	1.0.3
diff --git a/x11-fonts/font-adobe-utopia-100dpi/Makefile b/x11-fonts/font-adobe-utopia-100dpi/Makefile
index 5c5b0d730b9a..9abf4ae020a1 100644
--- a/x11-fonts/font-adobe-utopia-100dpi/Makefile
+++ b/x11-fonts/font-adobe-utopia-100dpi/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-adobe-utopia-100dpi
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-adobe-utopia-100dpi
 PORTVERSION=	1.0.4
diff --git a/x11-fonts/font-adobe-utopia-75dpi/Makefile b/x11-fonts/font-adobe-utopia-75dpi/Makefile
index ec8617212bd8..6fcafcc10485 100644
--- a/x11-fonts/font-adobe-utopia-75dpi/Makefile
+++ b/x11-fonts/font-adobe-utopia-75dpi/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-adobe-utopia-75dpi
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-adobe-utopia-75dpi
 PORTVERSION=	1.0.4
diff --git a/x11-fonts/font-adobe-utopia-type1/Makefile b/x11-fonts/font-adobe-utopia-type1/Makefile
index 41f2b8e479c1..a19133eee9c9 100644
--- a/x11-fonts/font-adobe-utopia-type1/Makefile
+++ b/x11-fonts/font-adobe-utopia-type1/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-adobe-utopia-type1
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-adobe-utopia-type1
 PORTVERSION=	1.0.4
diff --git a/x11-fonts/font-alias/Makefile b/x11-fonts/font-alias/Makefile
index d1a956f0fe94..e745bae96ee0 100644
--- a/x11-fonts/font-alias/Makefile
+++ b/x11-fonts/font-alias/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-alias
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-alias
 PORTVERSION=	1.0.3
diff --git a/x11-fonts/font-arabic-misc/Makefile b/x11-fonts/font-arabic-misc/Makefile
index ba5403247476..3c3987487db5 100644
--- a/x11-fonts/font-arabic-misc/Makefile
+++ b/x11-fonts/font-arabic-misc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-arabic-misc
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-arabic-misc
 PORTVERSION=	1.0.3
diff --git a/x11-fonts/font-bh-100dpi/Makefile b/x11-fonts/font-bh-100dpi/Makefile
index d6d927c7caf4..2411a3755b50 100644
--- a/x11-fonts/font-bh-100dpi/Makefile
+++ b/x11-fonts/font-bh-100dpi/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-bh-100dpi
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-bh-100dpi
 PORTVERSION=	1.0.3
diff --git a/x11-fonts/font-bh-75dpi/Makefile b/x11-fonts/font-bh-75dpi/Makefile
index 11f97744af53..921a01d55dea 100644
--- a/x11-fonts/font-bh-75dpi/Makefile
+++ b/x11-fonts/font-bh-75dpi/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-bh-75dpi
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-bh-75dpi
 PORTVERSION=	1.0.3
diff --git a/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile b/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
index ca44b27427ab..a23ca06f6f95 100644
--- a/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
+++ b/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-bh-lucidatypewriter-100dpi
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-bh-lucidatypewriter-100dpi
 PORTVERSION=	1.0.3
diff --git a/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile b/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
index 8b3169d15ae1..335df69d056d 100644
--- a/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
+++ b/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-bh-lucidatypewriter-75dpi
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-bh-lucidatypewriter-75dpi
 PORTVERSION=	1.0.3
diff --git a/x11-fonts/font-bh-ttf/Makefile b/x11-fonts/font-bh-ttf/Makefile
index 6e4df07f0e3e..ae81fe96ad78 100644
--- a/x11-fonts/font-bh-ttf/Makefile
+++ b/x11-fonts/font-bh-ttf/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-bh-ttf
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-bh-ttf
 PORTVERSION=	1.0.3
diff --git a/x11-fonts/font-bh-type1/Makefile b/x11-fonts/font-bh-type1/Makefile
index f2972e460bae..65d892853606 100644
--- a/x11-fonts/font-bh-type1/Makefile
+++ b/x11-fonts/font-bh-type1/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-bh-type1
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-bh-type1
 PORTVERSION=	1.0.3
diff --git a/x11-fonts/font-bitstream-100dpi/Makefile b/x11-fonts/font-bitstream-100dpi/Makefile
index b6bbad0c4e03..a38a56e46efd 100644
--- a/x11-fonts/font-bitstream-100dpi/Makefile
+++ b/x11-fonts/font-bitstream-100dpi/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-bitstream-100dpi
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-bitstream-100dpi
 PORTVERSION=	1.0.3
diff --git a/x11-fonts/font-bitstream-75dpi/Makefile b/x11-fonts/font-bitstream-75dpi/Makefile
index f7e40ef5860e..4ef122e674da 100644
--- a/x11-fonts/font-bitstream-75dpi/Makefile
+++ b/x11-fonts/font-bitstream-75dpi/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-bitstream-75dpi
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-bitstream-75dpi
 PORTVERSION=	1.0.3
diff --git a/x11-fonts/font-bitstream-speedo/Makefile b/x11-fonts/font-bitstream-speedo/Makefile
index 87b08931ece5..d2a81599f3e6 100644
--- a/x11-fonts/font-bitstream-speedo/Makefile
+++ b/x11-fonts/font-bitstream-speedo/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    font-bitstream-speedo
-# Date created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	font-bitstream-speedo
 PORTVERSION=	1.0.2
diff --git a/x11-fonts/font-bitstream-type1/Makefile b/x11-fonts/font-bitstream-type1/Makefile
index 030a966bc19a..00a6e5f6ea59 100644
--- a/x11-fonts/font-bitstream-type1/Makefile
+++ b/x11-fonts/font-bitstream-type1/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-bitstream-type1
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-bitstream-type1
 PORTVERSION=	1.0.3
diff --git a/x11-fonts/font-cronyx-cyrillic/Makefile b/x11-fonts/font-cronyx-cyrillic/Makefile
index d4608f4ab0b7..3bca6ecb3393 100644
--- a/x11-fonts/font-cronyx-cyrillic/Makefile
+++ b/x11-fonts/font-cronyx-cyrillic/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-cronyx-cyrillic
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-cronyx-cyrillic
 PORTVERSION=	1.0.3
diff --git a/x11-fonts/font-cursor-misc/Makefile b/x11-fonts/font-cursor-misc/Makefile
index 3a860ff44a50..09920f54db8d 100644
--- a/x11-fonts/font-cursor-misc/Makefile
+++ b/x11-fonts/font-cursor-misc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-cursor-misc
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-cursor-misc
 PORTVERSION=	1.0.3
diff --git a/x11-fonts/font-daewoo-misc/Makefile b/x11-fonts/font-daewoo-misc/Makefile
index f3722913f9dc..952dd3368ec4 100644
--- a/x11-fonts/font-daewoo-misc/Makefile
+++ b/x11-fonts/font-daewoo-misc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-daewoo-misc
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-daewoo-misc
 PORTVERSION=	1.0.3
diff --git a/x11-fonts/font-dec-misc/Makefile b/x11-fonts/font-dec-misc/Makefile
index 8d1f8b97811f..a6bf1edc1613 100644
--- a/x11-fonts/font-dec-misc/Makefile
+++ b/x11-fonts/font-dec-misc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-dec-misc
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-dec-misc
 PORTVERSION=	1.0.3
diff --git a/x11-fonts/font-ibm-type1/Makefile b/x11-fonts/font-ibm-type1/Makefile
index 8746b3565d47..ae4dd6e902ad 100644
--- a/x11-fonts/font-ibm-type1/Makefile
+++ b/x11-fonts/font-ibm-type1/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-ibm-type1
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-ibm-type1
 PORTVERSION=	1.0.3
diff --git a/x11-fonts/font-isas-misc/Makefile b/x11-fonts/font-isas-misc/Makefile
index 0f3b0ca6af92..0e038369fad8 100644
--- a/x11-fonts/font-isas-misc/Makefile
+++ b/x11-fonts/font-isas-misc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-isas-misc
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-isas-misc
 PORTVERSION=	1.0.3
diff --git a/x11-fonts/font-jis-misc/Makefile b/x11-fonts/font-jis-misc/Makefile
index bae0599d1c7c..43968fb8cf68 100644
--- a/x11-fonts/font-jis-misc/Makefile
+++ b/x11-fonts/font-jis-misc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-jis-misc
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-jis-misc
 PORTVERSION=	1.0.3
diff --git a/x11-fonts/font-micro-misc/Makefile b/x11-fonts/font-micro-misc/Makefile
index e5844493f6e8..b443a44ad6ba 100644
--- a/x11-fonts/font-micro-misc/Makefile
+++ b/x11-fonts/font-micro-misc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-micro-misc
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-micro-misc
 PORTVERSION=	1.0.3
diff --git a/x11-fonts/font-misc-cyrillic/Makefile b/x11-fonts/font-misc-cyrillic/Makefile
index 8c88914dce75..d06da8356f8f 100644
--- a/x11-fonts/font-misc-cyrillic/Makefile
+++ b/x11-fonts/font-misc-cyrillic/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-misc-cyrillic
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-misc-cyrillic
 PORTVERSION=	1.0.3
diff --git a/x11-fonts/font-misc-ethiopic/Makefile b/x11-fonts/font-misc-ethiopic/Makefile
index 867740a13761..81cdcf829b0b 100644
--- a/x11-fonts/font-misc-ethiopic/Makefile
+++ b/x11-fonts/font-misc-ethiopic/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    font-misc-ethiopic
-# Date created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	font-misc-ethiopic
 PORTVERSION=	1.0.3
diff --git a/x11-fonts/font-misc-meltho/Makefile b/x11-fonts/font-misc-meltho/Makefile
index 53d159e69b5d..00116af8ef12 100644
--- a/x11-fonts/font-misc-meltho/Makefile
+++ b/x11-fonts/font-misc-meltho/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    font-misc-meltho
-# Date created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	font-misc-meltho
 PORTVERSION=	1.0.3
diff --git a/x11-fonts/font-misc-misc/Makefile b/x11-fonts/font-misc-misc/Makefile
index b10ab100c2d9..99e9eb502854 100644
--- a/x11-fonts/font-misc-misc/Makefile
+++ b/x11-fonts/font-misc-misc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-misc-misc
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-misc-misc
 PORTVERSION=	1.1.2
diff --git a/x11-fonts/font-mutt-misc/Makefile b/x11-fonts/font-mutt-misc/Makefile
index 9bbf5c767031..28ff192bad5f 100644
--- a/x11-fonts/font-mutt-misc/Makefile
+++ b/x11-fonts/font-mutt-misc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-mutt-misc
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-mutt-misc
 PORTVERSION=	1.0.3
diff --git a/x11-fonts/font-schumacher-misc/Makefile b/x11-fonts/font-schumacher-misc/Makefile
index b62692bf0885..06b1f426bf94 100644
--- a/x11-fonts/font-schumacher-misc/Makefile
+++ b/x11-fonts/font-schumacher-misc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-schumacher-misc
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-schumacher-misc
 PORTVERSION=	1.1.2
diff --git a/x11-fonts/font-screen-cyrillic/Makefile b/x11-fonts/font-screen-cyrillic/Makefile
index 0b016a6230e4..bd2a49c0efa7 100644
--- a/x11-fonts/font-screen-cyrillic/Makefile
+++ b/x11-fonts/font-screen-cyrillic/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-screen-cyrillic
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-screen-cyrillic
 PORTVERSION=	1.0.4
diff --git a/x11-fonts/font-sony-misc/Makefile b/x11-fonts/font-sony-misc/Makefile
index bc7d85ef8783..0ffd90e41426 100644
--- a/x11-fonts/font-sony-misc/Makefile
+++ b/x11-fonts/font-sony-misc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-sony-misc
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-sony-misc
 PORTVERSION=	1.0.3
diff --git a/x11-fonts/font-sun-misc/Makefile b/x11-fonts/font-sun-misc/Makefile
index 9fefb6115368..0eeee719e87f 100644
--- a/x11-fonts/font-sun-misc/Makefile
+++ b/x11-fonts/font-sun-misc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-sun-misc
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-sun-misc
 PORTVERSION=	1.0.3
diff --git a/x11-fonts/font-util/Makefile b/x11-fonts/font-util/Makefile
index 362b1689e859..faea38bc0269 100644
--- a/x11-fonts/font-util/Makefile
+++ b/x11-fonts/font-util/Makefile
@@ -10,9 +10,6 @@ COMMENT=	Create an index of X font files in a directory
 
 XORG_CAT=	font
 
-USES=		pkgconfig
-USE_XORG=	xorg-macros
-
 MAN1=		bdftruncate.1 ucs2any.1
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-winitzki-cyrillic/Makefile b/x11-fonts/font-winitzki-cyrillic/Makefile
index bcdbe43a0c10..9b8b09b01f6b 100644
--- a/x11-fonts/font-winitzki-cyrillic/Makefile
+++ b/x11-fonts/font-winitzki-cyrillic/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-winitzki-cyrillic
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-winitzki-cyrillic
 PORTVERSION=	1.0.3
diff --git a/x11-fonts/font-xfree86-type1/Makefile b/x11-fonts/font-xfree86-type1/Makefile
index d38aad97e7d8..3095a1df874d 100644
--- a/x11-fonts/font-xfree86-type1/Makefile
+++ b/x11-fonts/font-xfree86-type1/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    font-xfree86-type1
-# Date created:		28 Aug 2005
-# Whom:			Pawel Worach
-#
+# Created by: Pawel Worach
 # $FreeBSD$
-#
 
 PORTNAME=	font-xfree86-type1
 PORTVERSION=	1.0.4
diff --git a/x11-fonts/fontcacheproto/Makefile b/x11-fonts/fontcacheproto/Makefile
index 1e49db118561..e0075d15ce71 100644
--- a/x11-fonts/fontcacheproto/Makefile
+++ b/x11-fonts/fontcacheproto/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	fontcacheproto
-# Date Created:				08 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	fontcacheproto
 PORTVERSION=	0.1.3
diff --git a/x11-fonts/fontsproto/Makefile b/x11-fonts/fontsproto/Makefile
index 4ed4e6e81906..878eaadfc28c 100644
--- a/x11-fonts/fontsproto/Makefile
+++ b/x11-fonts/fontsproto/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	fontsproto
-# Date Created:				08 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	fontsproto
-PORTVERSION=	2.1.1
+PORTVERSION=	2.1.2
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-fonts/fontsproto/distinfo b/x11-fonts/fontsproto/distinfo
index 8e940644168c..10e1d1e18c37 100644
--- a/x11-fonts/fontsproto/distinfo
+++ b/x11-fonts/fontsproto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/fontsproto-2.1.1.tar.bz2) = 9c9abc81e2927e6b6ffc6eece1f3fbc7559f506a2848673a21e72c0ae4d639bc
-SIZE (xorg/proto/fontsproto-2.1.1.tar.bz2) = 131040
+SHA256 (xorg/proto/fontsproto-2.1.2.tar.bz2) = 869c97e5a536a8f3c9bc8b9923780ff1f062094bab935e26f96df3d6f1aa68a9
+SIZE (xorg/proto/fontsproto-2.1.2.tar.bz2) = 141990
diff --git a/x11-fonts/fonttosfnt/Makefile b/x11-fonts/fonttosfnt/Makefile
index 1c9241f71392..0f2e56bd806a 100644
--- a/x11-fonts/fonttosfnt/Makefile
+++ b/x11-fonts/fonttosfnt/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	fonttosfnt
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	fonttosfnt
 PORTVERSION=	1.0.4
diff --git a/x11-fonts/fslsfonts/Makefile b/x11-fonts/fslsfonts/Makefile
index f4f242cae1e7..e320b07c0afa 100644
--- a/x11-fonts/fslsfonts/Makefile
+++ b/x11-fonts/fslsfonts/Makefile
@@ -8,7 +8,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	List fonts served by the X font server
 
 XORG_CAT=	app
-USE_XORG=	x11 libfs xorg-macros
+USE_XORG=	x11 libfs
 
 PLIST_FILES=	bin/fslsfonts
 
diff --git a/x11-fonts/libFS/Makefile b/x11-fonts/libFS/Makefile
index ad9cbf69d41a..69f34b00aebc 100644
--- a/x11-fonts/libFS/Makefile
+++ b/x11-fonts/libFS/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	libFS
-# Date Created:				21 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	libFS
-PORTVERSION=	1.0.3
+PORTVERSION=	1.0.4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-fonts/libFS/distinfo b/x11-fonts/libFS/distinfo
index 56f1fd9480a8..db35f4f22834 100644
--- a/x11-fonts/libFS/distinfo
+++ b/x11-fonts/libFS/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libFS-1.0.3.tar.bz2) = ab7af9754568af60b54be67c0966cb742ad7eb7ff73faa2c76e0b71c988f2419
-SIZE (xorg/lib/libFS-1.0.3.tar.bz2) = 284331
+SHA256 (xorg/lib/libFS-1.0.4.tar.bz2) = 7073761e7594d43180a922605fb64cce60e5ccb8c06f8efa24f2d4621f5e8315
+SIZE (xorg/lib/libFS-1.0.4.tar.bz2) = 291155
diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile
index 841f08226709..922cce5de158 100644
--- a/x11-fonts/libXfont/Makefile
+++ b/x11-fonts/libXfont/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for:   libXfont
-# Date Created:			29 Oct, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXfont
-PORTVERSION=	1.4.4
-PORTREVISION=	1
+PORTVERSION=	1.4.5
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
 
diff --git a/x11-fonts/libXfont/distinfo b/x11-fonts/libXfont/distinfo
index 41f79caa5bf5..caac3e2a6446 100644
--- a/x11-fonts/libXfont/distinfo
+++ b/x11-fonts/libXfont/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXfont-1.4.4.tar.bz2) = a2065f5f66882f7a9cb0eb674e16d284da48e449af443eda272e99832be8239a
-SIZE (xorg/lib/libXfont-1.4.4.tar.bz2) = 440022
+SHA256 (xorg/lib/libXfont-1.4.5.tar.bz2) = bbf96fb80b6b95cdb1dc968085082a6e668193a54cd9d6e2af669909c0cb7170
+SIZE (xorg/lib/libXfont-1.4.5.tar.bz2) = 470879
diff --git a/x11-fonts/libXfont/files/patch-src_fontfile_decompress.c b/x11-fonts/libXfont/files/patch-src_fontfile_decompress.c
deleted file mode 100644
index 7499041631fa..000000000000
--- a/x11-fonts/libXfont/files/patch-src_fontfile_decompress.c
+++ /dev/null
@@ -1,101 +0,0 @@
-From bd48ad11fd11412c62c3ac8ed5d52c4f10a985aa Mon Sep 17 00:00:00 2001
-From: Joerg Sonnenberger <joerg@britannica.bec.de>
-Date: Sun, 21 Aug 2011 16:51:53 +0000
-Subject: Do proper input validation to fix for CVE-2011-2895.
-
-It ensures that all valid input can be decompressed, checks that the
-overflow conditions doesn't happen and generally tightens the
-validation of the LZW stream and doesn't pessimize the inner loop for
-no good reason. It's derived from a change in libarchive from 2004.
-
-Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
-Reviewed-by: Tomas Hoger <thoger@redhat.com>
-
---- src/fontfile/decompress.c.orig	2011-08-10 22:22:01.000000000 +0200
-+++ src/fontfile/decompress.c	2012-03-13 12:55:35.000000000 +0100
-@@ -97,7 +97,7 @@ static char_type magic_header[] = { "\03
- #define FIRST	257	/* first free entry */
- #define	CLEAR	256	/* table clear output code */
- 
--#define STACK_SIZE  8192
-+#define STACK_SIZE  65300
- 
- typedef struct _compressedFILE {
-     BufFilePtr	    file;
-@@ -178,14 +178,12 @@ BufFilePushCompressed (BufFilePtr f)
- 	file->tab_suffix[code] = (char_type) code;
-     }
-     file->free_ent = ((file->block_compress) ? FIRST : 256 );
-+    file->oldcode = -1;
-     file->clear_flg = 0;
-     file->offset = 0;
-     file->size = 0;
-     file->stackp = file->de_stack;
-     bzero(file->buf, BITS);
--    file->finchar = file->oldcode = getcode (file);
--    if (file->oldcode != -1)
--	*file->stackp++ = file->finchar;
-     return BufFileCreate ((char *) file,
- 			  BufCompressedFill,
- 			  0,
-@@ -230,9 +228,6 @@ BufCompressedFill (BufFilePtr f)
- 	if (buf == bufend)
- 	    break;
- 
--	if (oldcode == -1)
--	    break;
--
- 	code = getcode (file);
- 	if (code == -1)
- 	    break;
-@@ -241,26 +236,35 @@ BufCompressedFill (BufFilePtr f)
- 	    for ( code = 255; code >= 0; code-- )
- 	    	file->tab_prefix[code] = 0;
- 	    file->clear_flg = 1;
--	    file->free_ent = FIRST - 1;
--	    if ( (code = getcode (file)) == -1 )	/* O, untimely death! */
--	    	break;
-+	    file->free_ent = FIRST;
-+	    oldcode = -1;
-+	    continue;
-     	}
-     	incode = code;
-     	/*
-      	 * Special case for KwKwK string.
-      	 */
-     	if ( code >= file->free_ent ) {
-+	    if ( code > file->free_ent || oldcode == -1 ) {
-+		/* Bad stream. */
-+		return BUFFILEEOF;
-+	    }
- 	    *stackp++ = finchar;
- 	    code = oldcode;
-     	}
--    
-+
-+	/*
-+	 * The above condition ensures that code < free_ent.
-+	 * The construction of tab_prefixof in turn guarantees that
-+	 * each iteration decreases code and therefore stack usage is
-+	 * bound by 1 << BITS - 256.
-+	 */
-+
-     	/*
-      	 * Generate output characters in reverse order
-      	 */
-     	while ( code >= 256 )
-     	{
--	    if (stackp - de_stack >= STACK_SIZE - 1)
--		return BUFFILEEOF;
- 	    *stackp++ = file->tab_suffix[code];
- 	    code = file->tab_prefix[code];
-     	}
-@@ -270,7 +274,7 @@ BufCompressedFill (BufFilePtr f)
-     	/*
-      	 * Generate the new entry.
-      	 */
--    	if ( (code=file->free_ent) < file->maxmaxcode ) {
-+    	if ( (code=file->free_ent) < file->maxmaxcode && oldcode != -1) {
- 	    file->tab_prefix[code] = (unsigned short)oldcode;
- 	    file->tab_suffix[code] = finchar;
- 	    file->free_ent = code+1;
diff --git a/x11-fonts/libXfontcache/Makefile b/x11-fonts/libXfontcache/Makefile
index 19974c04aa83..6c902efce3b2 100644
--- a/x11-fonts/libXfontcache/Makefile
+++ b/x11-fonts/libXfontcache/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	libXfontcache
-# Date Created:				21 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	libXfontcache
 PORTVERSION=	1.0.5
diff --git a/x11-fonts/libfontenc/Makefile b/x11-fonts/libfontenc/Makefile
index 41c3c2966460..163fd2173b61 100644
--- a/x11-fonts/libfontenc/Makefile
+++ b/x11-fonts/libfontenc/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	libfontenc
-# Date Created:				08 Aug 2005
-# Whom:					Dejan Lesjak <lesi@FreeBSD.org>
-#
+# Created by: Dejan Lesjak <lesi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libfontenc
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.2
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-fonts/libfontenc/distinfo b/x11-fonts/libfontenc/distinfo
index ee6157e6b56c..875d9c05a18d 100644
--- a/x11-fonts/libfontenc/distinfo
+++ b/x11-fonts/libfontenc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libfontenc-1.1.0.tar.bz2) = 348a1b0142f61afeaafc9497e997d6f10074affed8682e202d019f10170b9cbf
-SIZE (xorg/lib/libfontenc-1.1.0.tar.bz2) = 268872
+SHA256 (xorg/lib/libfontenc-1.1.2.tar.bz2) = a9a4efed3359b2e80161bb66b65038fac145137fa134e71335264cbc23b02f62
+SIZE (xorg/lib/libfontenc-1.1.2.tar.bz2) = 294884
diff --git a/x11-fonts/mkfontdir/Makefile b/x11-fonts/mkfontdir/Makefile
index a6b1b5ff1d51..ec1e96435034 100644
--- a/x11-fonts/mkfontdir/Makefile
+++ b/x11-fonts/mkfontdir/Makefile
@@ -8,7 +8,6 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Create an index of X font files in a directory
 
-USE_XORG=	xorg-macros
 RUN_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
 XORG_CAT=	app
diff --git a/x11-fonts/mkfontscale/Makefile b/x11-fonts/mkfontscale/Makefile
index 554da7e3a9f4..36237906d325 100644
--- a/x11-fonts/mkfontscale/Makefile
+++ b/x11-fonts/mkfontscale/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Creates an index of scalable font files for X
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
 XORG_CAT=	app
-USE_XORG=	xproto fontenc xorg-macros
+USE_XORG=	xproto fontenc
 
 PLIST_FILES=	bin/mkfontscale
 MAN1=		mkfontscale.1
diff --git a/x11-fonts/showfont/Makefile b/x11-fonts/showfont/Makefile
index 2dc85b5c45f5..e16f27b882ad 100644
--- a/x11-fonts/showfont/Makefile
+++ b/x11-fonts/showfont/Makefile
@@ -8,7 +8,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Font dumper for the X font server
 
 XORG_CAT=	app
-USE_XORG=	libfs xorg-macros
+USE_XORG=	libfs
 
 PLIST_FILES=	bin/showfont
 
diff --git a/x11-fonts/xf86bigfontproto/Makefile b/x11-fonts/xf86bigfontproto/Makefile
index 8ff6b00520d5..7ac176973507 100644
--- a/x11-fonts/xf86bigfontproto/Makefile
+++ b/x11-fonts/xf86bigfontproto/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xf86bigfontproto
-# Date Created:				06 Feb 2006
-# Whom:					Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xf86bigfontproto
 PORTVERSION=	1.2.0
diff --git a/x11-fonts/xfontsel/Makefile b/x11-fonts/xfontsel/Makefile
index f2b5bd195764..490b92b4c39e 100644
--- a/x11-fonts/xfontsel/Makefile
+++ b/x11-fonts/xfontsel/Makefile
@@ -8,7 +8,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Point and click selection of X11 font names
 
 XORG_CAT=	app
-USE_XORG=	xt xaw xorg-macros
+USE_XORG=	xt xaw
 
 MAN1=		xfontsel.1
 
diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile
index f43c4ddf8b4f..e864876d30a0 100644
--- a/x11-fonts/xfs/Makefile
+++ b/x11-fonts/xfs/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	xfs
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xfs
-PORTVERSION=	1.1.1
+PORTVERSION=	1.1.3
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
 
@@ -17,7 +12,7 @@ XORG_CAT=	app
 USE_GMAKE=	yes
 USE_XORG=	libfs xfont xtrans
 USE_RC_SUBR=	xfs
-CONFIGURE_ENV+=	ac_cv_path_XMLTO=""
+CONFIGURE_ARGS=	--without-xmlto --without-fop
 
 MAN1=		xfs.1
 
diff --git a/x11-fonts/xfs/distinfo b/x11-fonts/xfs/distinfo
index b6e6da07048d..7b7d7f082f70 100644
--- a/x11-fonts/xfs/distinfo
+++ b/x11-fonts/xfs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xfs-1.1.1.tar.bz2) = 0c83763a3c9843fdb1d420f18bea3632c5d7aaf91f94a6d9b3f0f5f1d541b5fb
-SIZE (xorg/app/xfs-1.1.1.tar.bz2) = 216188
+SHA256 (xorg/app/xfs-1.1.3.tar.bz2) = 7bf44a32ad04dbbcf3b5eef2cbfe879459378b312cb795e0d2d25e665f7196b7
+SIZE (xorg/app/xfs-1.1.3.tar.bz2) = 232076
diff --git a/x11-fonts/xfsinfo/Makefile b/x11-fonts/xfsinfo/Makefile
index 30e09b16ba53..4fbfaa297d3e 100644
--- a/x11-fonts/xfsinfo/Makefile
+++ b/x11-fonts/xfsinfo/Makefile
@@ -8,7 +8,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X font server information utility
 
 XORG_CAT=	app
-USE_XORG=	x11 libfs xorg-macros
+USE_XORG=	x11 libfs
 
 PLIST_FILES=	bin/xfsinfo
 
diff --git a/x11-fonts/xlsfonts/Makefile b/x11-fonts/xlsfonts/Makefile
index bb94368b11c8..e5a042e36e74 100644
--- a/x11-fonts/xlsfonts/Makefile
+++ b/x11-fonts/xlsfonts/Makefile
@@ -8,7 +8,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Server font list displayer for X
 
 XORG_CAT=	app
-USE_XORG=	x11 xorg-macros
+USE_XORG=	x11
 
 PLIST_FILES=	bin/xlsfonts
 
diff --git a/x11-fonts/xorg-fonts-100dpi/Makefile b/x11-fonts/xorg-fonts-100dpi/Makefile
index 5c6d686abb45..e8270772d6b8 100644
--- a/x11-fonts/xorg-fonts-100dpi/Makefile
+++ b/x11-fonts/xorg-fonts-100dpi/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:    xorg-fonts-100dpi
-# Date created:		30 May 2004
-# Whom:			anholt@FreeBSD.org
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xorg-fonts-100dpi
-PORTVERSION=	7.5.1
+PORTVERSION=	7.7
 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 47cb254dc1e2..4ee956d93dcb 100644
--- a/x11-fonts/xorg-fonts-75dpi/Makefile
+++ b/x11-fonts/xorg-fonts-75dpi/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:    xorg-fonts-75dpi
-# Date created:		30 May 2004
-# Whom:			anholt@FreeBSD.org
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xorg-fonts-75dpi
-PORTVERSION=	7.5.1
+PORTVERSION=	7.7
 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 6e217a9f46a2..dac9095814bd 100644
--- a/x11-fonts/xorg-fonts-cyrillic/Makefile
+++ b/x11-fonts/xorg-fonts-cyrillic/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:    xorg-fonts-cyrillic
-# Date created:		30 May 2004
-# Whom:			anholt@FreeBSD.org
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xorg-fonts-cyrillic
-PORTVERSION=	7.5.1
+PORTVERSION=	7.7
 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 a614c97fb587..ae344757cff4 100644
--- a/x11-fonts/xorg-fonts-miscbitmaps/Makefile
+++ b/x11-fonts/xorg-fonts-miscbitmaps/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:    xorg-fonts-miscbitmaps
-# Date created:		30 May 2004
-# Whom:			anholt@FreeBSD.org
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xorg-fonts-miscbitmaps
-PORTVERSION=	7.5.1
+PORTVERSION=	7.7
 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 a8196261d34f..14647fd63165 100644
--- a/x11-fonts/xorg-fonts-truetype/Makefile
+++ b/x11-fonts/xorg-fonts-truetype/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:    xorg-fonts-truetype
-# Date created:		30 May 2004
-# Whom:			anholt@FreeBSD.org
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xorg-fonts-truetype
-PORTVERSION=	7.5.1
+PORTVERSION=	7.7
 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 3c4341923d0b..635107604b65 100644
--- a/x11-fonts/xorg-fonts-type1/Makefile
+++ b/x11-fonts/xorg-fonts-type1/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:    xorg-fonts-type1
-# Date created:		30 May 2004
-# Whom:			anholt@FreeBSD.org
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xorg-fonts-type1
-PORTVERSION=	7.5.1
+PORTVERSION=	7.7
 CATEGORIES=	x11-fonts
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/x11-fonts/xorg-fonts/Makefile b/x11-fonts/xorg-fonts/Makefile
index 627c4152b6a6..d89ea411592d 100644
--- a/x11-fonts/xorg-fonts/Makefile
+++ b/x11-fonts/xorg-fonts/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for:    xorg-fonts
-# Date created:				Jun 22 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xorg-fonts
-PORTVERSION=	7.5.1
+PORTVERSION=	7.7
 CATEGORIES=	x11-fonts
 MASTER_SITES=	# none
 DISTFILES=	# none