15 files changed, 97 insertions, 50 deletions

diff --git a/x11-fonts/XFree86-4-font100dpi/Makefile b/x11-fonts/XFree86-4-font100dpi/Makefile
index cb9dab40fbf4..37fa9ddbd973 100644
--- a/x11-fonts/XFree86-4-font100dpi/Makefile
+++ b/x11-fonts/XFree86-4-font100dpi/Makefile
@@ -6,24 +6,23 @@
 #
 
 PORTNAME=	font100dpi
-PORTVERSION=	4.2.0
+PORTVERSION=	4.3.0
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X${PORTVERSION:S/.//g}src-2.tgz
+DISTFILES=	X430src-4.tgz
 
 MAINTAINER=	anholt@freebsd.org
 COMMENT=	XFree86-4 bitmap 100 dpi fonts
 
-BUILD_DEPENDS=	ucs2any.pl:${PORTSDIR}/x11/XFree86-4-clients
+BUILD_DEPENDS=	ucs2any:${PORTSDIR}/x11/XFree86-4-clients
 RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
 
 XFREE86_VERSION=	4
 USE_IMAKE=		YES
 PROJECTROOT=		-DProjectRoot=${PREFIX}
 DIST_SUBDIR=		xc
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - xc/fonts
 WRKSRC=			${WRKDIR}/xc/fonts/bdf/100dpi
 
 do-configure:
diff --git a/x11-fonts/XFree86-4-font100dpi/distinfo b/x11-fonts/XFree86-4-font100dpi/distinfo
index f30a822c4c32..f12d863ee0b1 100644
--- a/x11-fonts/XFree86-4-font100dpi/distinfo
+++ b/x11-fonts/XFree86-4-font100dpi/distinfo
@@ -1 +1 @@
-MD5 (xc/X420src-2.tgz) = dae33268a9f2735b9678a81fb23e8d3e
+MD5 (xc/X430src-4.tgz) = 567903747018f2534965ab6cb3976b38
diff --git a/x11-fonts/XFree86-4-font75dpi/Makefile b/x11-fonts/XFree86-4-font75dpi/Makefile
index 6655d28ef3f7..e31b5bafadff 100644
--- a/x11-fonts/XFree86-4-font75dpi/Makefile
+++ b/x11-fonts/XFree86-4-font75dpi/Makefile
@@ -6,24 +6,23 @@
 #
 
 PORTNAME=	font75dpi
-PORTVERSION=	4.2.0
+PORTVERSION=	4.3.0
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X${PORTVERSION:S/.//g}src-2.tgz
+DISTFILES=	X430src-4.tgz
 
 MAINTAINER=	anholt@freebsd.org
 COMMENT=	XFree86-4 bitmap 75 dpi fonts
 
-BUILD_DEPENDS=	ucs2any.pl:${PORTSDIR}/x11/XFree86-4-clients
+BUILD_DEPENDS=	ucs2any:${PORTSDIR}/x11/XFree86-4-clients
 RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
 
 XFREE86_VERSION=	4
 USE_IMAKE=		YES
 PROJECTROOT=		-DProjectRoot=${PREFIX}
 DIST_SUBDIR=		xc
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - xc/fonts
 WRKSRC=			${WRKDIR}/xc/fonts/bdf/75dpi
 
 do-configure:
diff --git a/x11-fonts/XFree86-4-font75dpi/distinfo b/x11-fonts/XFree86-4-font75dpi/distinfo
index f30a822c4c32..f12d863ee0b1 100644
--- a/x11-fonts/XFree86-4-font75dpi/distinfo
+++ b/x11-fonts/XFree86-4-font75dpi/distinfo
@@ -1 +1 @@
-MD5 (xc/X420src-2.tgz) = dae33268a9f2735b9678a81fb23e8d3e
+MD5 (xc/X430src-4.tgz) = 567903747018f2534965ab6cb3976b38
diff --git a/x11-fonts/XFree86-4-fontCyrillic/Makefile b/x11-fonts/XFree86-4-fontCyrillic/Makefile
index 662894f50f96..0af62c9538bc 100644
--- a/x11-fonts/XFree86-4-fontCyrillic/Makefile
+++ b/x11-fonts/XFree86-4-fontCyrillic/Makefile
@@ -6,34 +6,25 @@
 #
 
 PORTNAME=	fontCyrillic
-PORTVERSION=	4.2.0
-PORTREVISION=   4
+PORTVERSION=	4.3.0
 CATEGORIES=	x11-fonts
-MASTER_SITES=   ${MASTER_SITE_XFREE:S/$/:x/} \
-		http://koi8.pp.ru/dist/:xrus
-MASTER_SITE_SUBDIR=	${PORTVERSION}/:x
+MASTER_SITES=	${MASTER_SITE_XFREE}
+MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=      X${PORTVERSION:S/.//g}src-2.tgz:x \
-		xrus-2.3.1-xf4-bdf.tgz:xrus
+DISTFILES=	X430src-4.tgz
 
 MAINTAINER=	anholt@freebsd.org
-COMMENT=	XFree86-4 Cyrillic Fonts
+COMMENT=	XFree86-4 Cyrillic fonts
 
-BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+BUILD_DEPENDS=	ucs2any:${PORTSDIR}/x11/XFree86-4-clients
 RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
 
 XFREE86_VERSION=	4
 USE_IMAKE=		YES
 PROJECTROOT=		-DProjectRoot=${PREFIX}
 DIST_SUBDIR=		xc
-EXTRACT_ONLY=           X${PORTVERSION:S/.//g}src-2.tgz
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - xc/fonts
 WRKSRC=			${WRKDIR}/xc/fonts/bdf/cyrillic
 
-post-extract:
-	cd ${WRKSRC} && \
-	    ${TAR} zxf ${DISTDIR}/${DIST_SUBDIR}/xrus-2.3.1-xf4-bdf.tgz
-
 do-configure:
 	(cd ${WRKDIR}/xc/fonts/encodings && \
 	 imake -DUseInstalled ${PROJECTROOT} -I${PREFIX}/lib/X11/config \
diff --git a/x11-fonts/XFree86-4-fontCyrillic/distinfo b/x11-fonts/XFree86-4-fontCyrillic/distinfo
index 320af09e20f9..f12d863ee0b1 100644
--- a/x11-fonts/XFree86-4-fontCyrillic/distinfo
+++ b/x11-fonts/XFree86-4-fontCyrillic/distinfo
@@ -1,2 +1 @@
-MD5 (xc/X420src-2.tgz) = dae33268a9f2735b9678a81fb23e8d3e
-MD5 (xc/xrus-2.3.1-xf4-bdf.tgz) = af43b304e206217d43f97f5c1b8ccb9e
+MD5 (xc/X430src-4.tgz) = 567903747018f2534965ab6cb3976b38
diff --git a/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile b/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile
index e30fd1afc3e1..3f18c1b550c3 100644
--- a/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile
+++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile
@@ -6,25 +6,24 @@
 #
 
 PORTNAME=	fontDefaultBitmaps
-PORTVERSION=	4.2.0
+PORTVERSION=	4.3.0
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz X${PORTVERSION:S/.//g}src-2.tgz
-EXTRACT_ONLY=	X${PORTVERSION:S/.//g}src-2.tgz
+DISTFILES=	X430src-4.tgz X430src-1.tgz
+EXTRACT_ONLY=	X430src-4.tgz
 
 MAINTAINER=	anholt@freebsd.org
 COMMENT=	XFree86-4 default bitmap fonts
 
-BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+BUILD_DEPENDS=	ucs2any:${PORTSDIR}/x11/XFree86-4-clients
 RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
 
 XFREE86_VERSION=	4
 USE_IMAKE=		YES
 PROJECTROOT=		-DProjectRoot=${PREFIX}
 DIST_SUBDIR=		xc
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - xc/fonts
 WRKSRC=			${WRKDIR}/xc/fonts/bdf/misc
 
 post-extract:
diff --git a/x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo b/x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo
index 104e06940969..7b856dc3c094 100644
--- a/x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo
+++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo
@@ -1,2 +1,2 @@
-MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
-MD5 (xc/X420src-2.tgz) = dae33268a9f2735b9678a81fb23e8d3e
+MD5 (xc/X430src-4.tgz) = 567903747018f2534965ab6cb3976b38
+MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af
diff --git a/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist b/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist
index 69f2810456be..0ce6f07cac34 100644
--- a/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist
+++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist
@@ -1,8 +1,10 @@
 lib/X11/fonts/misc/10x20-ISO8859-1.pcf.gz
 lib/X11/fonts/misc/10x20-ISO8859-10.pcf.gz
+lib/X11/fonts/misc/10x20-ISO8859-11.pcf.gz
 lib/X11/fonts/misc/10x20-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/10x20-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/10x20-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/10x20-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/10x20-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/10x20-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/10x20-ISO8859-4.pcf.gz
@@ -17,11 +19,27 @@ lib/X11/fonts/misc/12x24.pcf.gz
 lib/X11/fonts/misc/12x24rk.pcf.gz
 lib/X11/fonts/misc/18x18ja.pcf.gz
 lib/X11/fonts/misc/18x18ko.pcf.gz
+lib/X11/fonts/misc/4x6-ISO8859-1.pcf.gz
+lib/X11/fonts/misc/4x6-ISO8859-10.pcf.gz
+lib/X11/fonts/misc/4x6-ISO8859-13.pcf.gz
+lib/X11/fonts/misc/4x6-ISO8859-14.pcf.gz
+lib/X11/fonts/misc/4x6-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/4x6-ISO8859-16.pcf.gz
+lib/X11/fonts/misc/4x6-ISO8859-2.pcf.gz
+lib/X11/fonts/misc/4x6-ISO8859-3.pcf.gz
+lib/X11/fonts/misc/4x6-ISO8859-4.pcf.gz
+lib/X11/fonts/misc/4x6-ISO8859-5.pcf.gz
+lib/X11/fonts/misc/4x6-ISO8859-7.pcf.gz
+lib/X11/fonts/misc/4x6-ISO8859-8.pcf.gz
+lib/X11/fonts/misc/4x6-ISO8859-9.pcf.gz
+lib/X11/fonts/misc/4x6-KOI8-R.pcf.gz
+lib/X11/fonts/misc/4x6.pcf.gz
 lib/X11/fonts/misc/5x7-ISO8859-1.pcf.gz
 lib/X11/fonts/misc/5x7-ISO8859-10.pcf.gz
 lib/X11/fonts/misc/5x7-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/5x7-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/5x7-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/5x7-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/5x7-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/5x7-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/5x7-ISO8859-4.pcf.gz
@@ -36,6 +54,7 @@ lib/X11/fonts/misc/5x8-ISO8859-10.pcf.gz
 lib/X11/fonts/misc/5x8-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/5x8-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/5x8-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/5x8-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/5x8-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/5x8-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/5x8-ISO8859-4.pcf.gz
@@ -50,6 +69,7 @@ lib/X11/fonts/misc/6x10-ISO8859-10.pcf.gz
 lib/X11/fonts/misc/6x10-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/6x10-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/6x10-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/6x10-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/6x10-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/6x10-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/6x10-ISO8859-4.pcf.gz
@@ -64,6 +84,7 @@ lib/X11/fonts/misc/6x12-ISO8859-10.pcf.gz
 lib/X11/fonts/misc/6x12-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/6x12-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/6x12-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/6x12-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/6x12-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/6x12-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/6x12-ISO8859-4.pcf.gz
@@ -75,9 +96,11 @@ lib/X11/fonts/misc/6x12-KOI8-R.pcf.gz
 lib/X11/fonts/misc/6x12.pcf.gz
 lib/X11/fonts/misc/6x13-ISO8859-1.pcf.gz
 lib/X11/fonts/misc/6x13-ISO8859-10.pcf.gz
+lib/X11/fonts/misc/6x13-ISO8859-11.pcf.gz
 lib/X11/fonts/misc/6x13-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/6x13-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/6x13-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/6x13-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/6x13-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/6x13-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/6x13-ISO8859-4.pcf.gz
@@ -92,6 +115,7 @@ lib/X11/fonts/misc/6x13B-ISO8859-10.pcf.gz
 lib/X11/fonts/misc/6x13B-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/6x13B-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/6x13B-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/6x13B-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/6x13B-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/6x13B-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/6x13B-ISO8859-4.pcf.gz
@@ -105,6 +129,7 @@ lib/X11/fonts/misc/6x13O-ISO8859-10.pcf.gz
 lib/X11/fonts/misc/6x13O-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/6x13O-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/6x13O-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/6x13O-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/6x13O-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/6x13O-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/6x13O-ISO8859-4.pcf.gz
@@ -117,6 +142,7 @@ lib/X11/fonts/misc/6x9-ISO8859-10.pcf.gz
 lib/X11/fonts/misc/6x9-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/6x9-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/6x9-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/6x9-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/6x9-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/6x9-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/6x9-ISO8859-4.pcf.gz
@@ -128,9 +154,11 @@ lib/X11/fonts/misc/6x9-KOI8-R.pcf.gz
 lib/X11/fonts/misc/6x9.pcf.gz
 lib/X11/fonts/misc/7x13-ISO8859-1.pcf.gz
 lib/X11/fonts/misc/7x13-ISO8859-10.pcf.gz
+lib/X11/fonts/misc/7x13-ISO8859-11.pcf.gz
 lib/X11/fonts/misc/7x13-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/7x13-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/7x13-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/7x13-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/7x13-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/7x13-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/7x13-ISO8859-4.pcf.gz
@@ -142,9 +170,11 @@ lib/X11/fonts/misc/7x13-KOI8-R.pcf.gz
 lib/X11/fonts/misc/7x13.pcf.gz
 lib/X11/fonts/misc/7x13B-ISO8859-1.pcf.gz
 lib/X11/fonts/misc/7x13B-ISO8859-10.pcf.gz
+lib/X11/fonts/misc/7x13B-ISO8859-11.pcf.gz
 lib/X11/fonts/misc/7x13B-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/7x13B-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/7x13B-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/7x13B-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/7x13B-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/7x13B-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/7x13B-ISO8859-4.pcf.gz
@@ -155,9 +185,11 @@ lib/X11/fonts/misc/7x13B-ISO8859-9.pcf.gz
 lib/X11/fonts/misc/7x13B.pcf.gz
 lib/X11/fonts/misc/7x13O-ISO8859-1.pcf.gz
 lib/X11/fonts/misc/7x13O-ISO8859-10.pcf.gz
+lib/X11/fonts/misc/7x13O-ISO8859-11.pcf.gz
 lib/X11/fonts/misc/7x13O-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/7x13O-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/7x13O-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/7x13O-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/7x13O-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/7x13O-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/7x13O-ISO8859-4.pcf.gz
@@ -167,9 +199,11 @@ lib/X11/fonts/misc/7x13O-ISO8859-9.pcf.gz
 lib/X11/fonts/misc/7x13O.pcf.gz
 lib/X11/fonts/misc/7x14-ISO8859-1.pcf.gz
 lib/X11/fonts/misc/7x14-ISO8859-10.pcf.gz
+lib/X11/fonts/misc/7x14-ISO8859-11.pcf.gz
 lib/X11/fonts/misc/7x14-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/7x14-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/7x14-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/7x14-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/7x14-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/7x14-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/7x14-ISO8859-4.pcf.gz
@@ -182,9 +216,11 @@ lib/X11/fonts/misc/7x14-KOI8-R.pcf.gz
 lib/X11/fonts/misc/7x14.pcf.gz
 lib/X11/fonts/misc/7x14B-ISO8859-1.pcf.gz
 lib/X11/fonts/misc/7x14B-ISO8859-10.pcf.gz
+lib/X11/fonts/misc/7x14B-ISO8859-11.pcf.gz
 lib/X11/fonts/misc/7x14B-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/7x14B-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/7x14B-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/7x14B-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/7x14B-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/7x14B-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/7x14B-ISO8859-4.pcf.gz
@@ -198,6 +234,7 @@ lib/X11/fonts/misc/8x13-ISO8859-10.pcf.gz
 lib/X11/fonts/misc/8x13-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/8x13-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/8x13-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/8x13-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/8x13-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/8x13-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/8x13-ISO8859-4.pcf.gz
@@ -212,6 +249,7 @@ lib/X11/fonts/misc/8x13B-ISO8859-10.pcf.gz
 lib/X11/fonts/misc/8x13B-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/8x13B-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/8x13B-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/8x13B-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/8x13B-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/8x13B-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/8x13B-ISO8859-4.pcf.gz
@@ -225,6 +263,7 @@ lib/X11/fonts/misc/8x13O-ISO8859-10.pcf.gz
 lib/X11/fonts/misc/8x13O-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/8x13O-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/8x13O-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/8x13O-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/8x13O-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/8x13O-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/8x13O-ISO8859-4.pcf.gz
@@ -236,9 +275,11 @@ lib/X11/fonts/misc/8x16.pcf.gz
 lib/X11/fonts/misc/8x16rk.pcf.gz
 lib/X11/fonts/misc/9x15-ISO8859-1.pcf.gz
 lib/X11/fonts/misc/9x15-ISO8859-10.pcf.gz
+lib/X11/fonts/misc/9x15-ISO8859-11.pcf.gz
 lib/X11/fonts/misc/9x15-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/9x15-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/9x15-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/9x15-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/9x15-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/9x15-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/9x15-ISO8859-4.pcf.gz
@@ -250,9 +291,11 @@ lib/X11/fonts/misc/9x15-KOI8-R.pcf.gz
 lib/X11/fonts/misc/9x15.pcf.gz
 lib/X11/fonts/misc/9x15B-ISO8859-1.pcf.gz
 lib/X11/fonts/misc/9x15B-ISO8859-10.pcf.gz
+lib/X11/fonts/misc/9x15B-ISO8859-11.pcf.gz
 lib/X11/fonts/misc/9x15B-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/9x15B-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/9x15B-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/9x15B-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/9x15B-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/9x15B-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/9x15B-ISO8859-4.pcf.gz
@@ -263,9 +306,11 @@ lib/X11/fonts/misc/9x15B-ISO8859-9.pcf.gz
 lib/X11/fonts/misc/9x15B.pcf.gz
 lib/X11/fonts/misc/9x18-ISO8859-1.pcf.gz
 lib/X11/fonts/misc/9x18-ISO8859-10.pcf.gz
+lib/X11/fonts/misc/9x18-ISO8859-11.pcf.gz
 lib/X11/fonts/misc/9x18-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/9x18-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/9x18-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/9x18-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/9x18-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/9x18-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/9x18-ISO8859-4.pcf.gz
@@ -280,6 +325,7 @@ lib/X11/fonts/misc/9x18B-ISO8859-10.pcf.gz
 lib/X11/fonts/misc/9x18B-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/9x18B-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/9x18B-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/9x18B-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/9x18B-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/9x18B-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/9x18B-ISO8859-4.pcf.gz
@@ -305,6 +351,20 @@ lib/X11/fonts/misc/clR5x10.pcf.gz
 lib/X11/fonts/misc/clR5x6.pcf.gz
 lib/X11/fonts/misc/clR5x8.pcf.gz
 lib/X11/fonts/misc/clR6x10.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-1.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-10.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-13.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-14.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-16.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-2.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-3.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-4.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-5.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-7.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-8.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-9.pcf.gz
+lib/X11/fonts/misc/clR6x12-KOI8-R.pcf.gz
 lib/X11/fonts/misc/clR6x12.pcf.gz
 lib/X11/fonts/misc/clR6x13.pcf.gz
 lib/X11/fonts/misc/clR6x6.pcf.gz
@@ -326,6 +386,8 @@ lib/X11/fonts/misc/cu-devnag12.pcf.gz
 lib/X11/fonts/misc/cu-lig12.pcf.gz
 lib/X11/fonts/misc/cu-pua12.pcf.gz
 lib/X11/fonts/misc/cu12.pcf.gz
+lib/X11/fonts/misc/cuarabic12.pcf.gz
+lib/X11/fonts/misc/cudevnag12.pcf.gz
 lib/X11/fonts/misc/cursor.pcf.gz
 lib/X11/fonts/misc/deccurs.pcf.gz
 lib/X11/fonts/misc/decsess.pcf.gz
diff --git a/x11-fonts/XFree86-4-fontEncodings/Makefile b/x11-fonts/XFree86-4-fontEncodings/Makefile
index 5ad6d899b956..4d2fd82a5865 100644
--- a/x11-fonts/XFree86-4-fontEncodings/Makefile
+++ b/x11-fonts/XFree86-4-fontEncodings/Makefile
@@ -6,23 +6,23 @@
 #
 
 PORTNAME=	fontEncodings
-PORTVERSION=	4.2.0
+PORTVERSION=	4.3.0
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR=	${PORTVERSION}
+MASTER_SITE_SUBDIR=	4.3.0
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X${PORTVERSION:S/.//g}src-2.tgz
+DISTFILES=	X430src-4.tgz
 
 MAINTAINER=	anholt@freebsd.org
 COMMENT=	XFree86-4 font encoding files
 
-BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+BUILD_DEPENDS=	ucs2any:${PORTSDIR}/x11/XFree86-4-clients
 
 XFREE86_VERSION=	4
 USE_IMAKE=		YES
 PROJECTROOT=		-DProjectRoot=${PREFIX}
 DIST_SUBDIR=		xc
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - xc/fonts
+EXTRACT_AFTER_ARGS=	| ${TAR} -xf - xc/fonts/encodings
 WRKSRC=			${WRKDIR}/xc/fonts/encodings
 
 do-configure:
diff --git a/x11-fonts/XFree86-4-fontEncodings/distinfo b/x11-fonts/XFree86-4-fontEncodings/distinfo
index f30a822c4c32..f12d863ee0b1 100644
--- a/x11-fonts/XFree86-4-fontEncodings/distinfo
+++ b/x11-fonts/XFree86-4-fontEncodings/distinfo
@@ -1 +1 @@
-MD5 (xc/X420src-2.tgz) = dae33268a9f2735b9678a81fb23e8d3e
+MD5 (xc/X430src-4.tgz) = 567903747018f2534965ab6cb3976b38
diff --git a/x11-fonts/XFree86-4-fontEncodings/pkg-plist b/x11-fonts/XFree86-4-fontEncodings/pkg-plist
index 5b96b9be161f..8c1d3252b280 100644
--- a/x11-fonts/XFree86-4-fontEncodings/pkg-plist
+++ b/x11-fonts/XFree86-4-fontEncodings/pkg-plist
@@ -1,8 +1,8 @@
 lib/X11/fonts/encodings/adobe-dingbats.enc.gz
 lib/X11/fonts/encodings/adobe-standard.enc.gz
 lib/X11/fonts/encodings/adobe-symbol.enc.gz
-lib/X11/fonts/encodings/dec-special.enc
 lib/X11/fonts/encodings/armscii-8.enc
+lib/X11/fonts/encodings/dec-special.enc
 lib/X11/fonts/encodings/encodings.dir
 lib/X11/fonts/encodings/ibm-cp437.enc
 lib/X11/fonts/encodings/ibm-cp850.enc
@@ -30,6 +30,7 @@ lib/X11/fonts/encodings/microsoft-cp1255.enc
 lib/X11/fonts/encodings/microsoft-cp1256.enc
 lib/X11/fonts/encodings/microsoft-cp1257.enc
 lib/X11/fonts/encodings/microsoft-cp1258.enc
+lib/X11/fonts/encodings/microsoft-win3.1.enc
 lib/X11/fonts/encodings/mulearabic-0.enc
 lib/X11/fonts/encodings/mulearabic-1.enc
 lib/X11/fonts/encodings/mulearabic-2.enc
diff --git a/x11-fonts/XFree86-4-fontScalable/Makefile b/x11-fonts/XFree86-4-fontScalable/Makefile
index 3364a267156e..a1729f333cdd 100644
--- a/x11-fonts/XFree86-4-fontScalable/Makefile
+++ b/x11-fonts/XFree86-4-fontScalable/Makefile
@@ -6,24 +6,23 @@
 #
 
 PORTNAME=	fontScalable
-PORTVERSION=	4.2.0
+PORTVERSION=	4.3.0
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X${PORTVERSION:S/.//g}src-2.tgz
+DISTFILES=	X430src-4.tgz X430src-5.tgz
 
 MAINTAINER=	anholt@freebsd.org
-COMMENT=	XFree86-4 Scalable font files
+COMMENT=	XFree86-4 scalable fonts
 
-BUILD_DEPENDS=	ucs2any.pl:${PORTSDIR}/x11/XFree86-4-clients
+BUILD_DEPENDS=	ucs2any:${PORTSDIR}/x11/XFree86-4-clients
 RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
 
 XFREE86_VERSION=	4
 USE_IMAKE=		YES
 PROJECTROOT=		-DProjectRoot=${PREFIX}
 DIST_SUBDIR=		xc
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - xc/fonts
 WRKSRC=			${WRKDIR}/xc/fonts
 
 # XFree86 User Config:
@@ -68,7 +67,6 @@ PLIST_SUB+=	TT:="@comment "
 TT:=	-DBuildTTFonts=NO
 .endif
 
-
 do-configure:
 	(cd ${WRKDIR}/xc/fonts/encodings && \
 	 imake -DUseInstalled ${PROJECTROOT} -I${PREFIX}/lib/X11/config \
diff --git a/x11-fonts/XFree86-4-fontScalable/distinfo b/x11-fonts/XFree86-4-fontScalable/distinfo
index f30a822c4c32..b77af1f6e664 100644
--- a/x11-fonts/XFree86-4-fontScalable/distinfo
+++ b/x11-fonts/XFree86-4-fontScalable/distinfo
@@ -1 +1,2 @@
-MD5 (xc/X420src-2.tgz) = dae33268a9f2735b9678a81fb23e8d3e
+MD5 (xc/X430src-4.tgz) = 567903747018f2534965ab6cb3976b38
+MD5 (xc/X430src-5.tgz) = 4dbdbe9a85c8f7f98dd0ee015a3c7b4f
diff --git a/x11-fonts/XFree86-4-fontScalable/pkg-plist b/x11-fonts/XFree86-4-fontScalable/pkg-plist
index bde8957714cc..777c36610b26 100644
--- a/x11-fonts/XFree86-4-fontScalable/pkg-plist
+++ b/x11-fonts/XFree86-4-fontScalable/pkg-plist
@@ -1,7 +1,5 @@
 %%CID:%%lib/X11/fonts/CID/fonts.dir
 %%CID:%%lib/X11/fonts/CID/fonts.scale
-lib/X11/fonts/PEX/Roman.phont
-lib/X11/fonts/PEX/Roman_M.phont
 %%SPEEDO:%%lib/X11/fonts/Speedo/encodings.dir
 %%SPEEDO:%%lib/X11/fonts/Speedo/font0419.spd
 %%SPEEDO:%%lib/X11/fonts/Speedo/font0582.spd