Removing font-alias was a mistake, readd it which fixes tigervnc (and more)

Pointyhat to:	bapt
Reported by:	Corey <merlincorey@hushmail.me>

9 files changed, 32 insertions, 4 deletions

diff --git a/MOVED b/MOVED
index db19dcfb078c..67e523af579a 100644
--- a/MOVED
+++ b/MOVED
@@ -7441,4 +7441,3 @@ devel/p5-Errno||2015-03-09|Errno is part of Perl
 devel/p5-Class-XSAccessor-Array||2015-03-09|Has been a part of devel/p5-Class-XSAccessor for >5 years. Use that port instead
 multimedia/ffmpeg25|multimedia/ffmpeg26|2015-03-14|ffmpeg upstream now points to 2.6.x series
 www/squid33|www/squid|2015-03-15|Has expired: Reached EOL on 28 August 2014, use www/squid (v3.4) instead
-x11-fonts/font-alias||2015-03-20|Not needed anymore aliases are created dynamically
diff --git a/Mk/Uses/display.mk b/Mk/Uses/display.mk
index 200b58b26703..5b5c8b533559 100644
--- a/Mk/Uses/display.mk
+++ b/Mk/Uses/display.mk
@@ -18,6 +18,7 @@ display_ARGS=	install
 .if !defined(DISPLAY)
 BUILD_DEPENDS+=	Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver \
 	${LOCALBASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps \
+	${LOCALBASE}/lib/X11/fonts/misc/fonts.alias:${PORTSDIR}/x11-fonts/font-alias \
 	${LOCALBASE}/share/X11/xkb/rules/base:${PORTSDIR}/x11/xkeyboard-config \
 	xkbcomp:${PORTSDIR}/x11/xkbcomp
 
diff --git a/Mk/bsd.xorg.mk b/Mk/bsd.xorg.mk
index 72427c95bb3c..f3f8ebc563e5 100644
--- a/Mk/bsd.xorg.mk
+++ b/Mk/bsd.xorg.mk
@@ -72,10 +72,12 @@ USES+=		libtool
 FONTNAME?=	${PORTNAME:C/.*-//g:S/type/Type/:S/ttf/TTF/:S/speedo/Speedo/}
 CONFIGURE_ARGS+=	--with-fontrootdir=${PREFIX}/lib/X11/fonts
 CONFIGURE_ENV+=	FONTROOTDIR=${PREFIX}/lib/X11/fonts
+.    if !defined(NOFONT)
 USES+=	fonts
 BUILD_DEPENDS+=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
 				bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
-.endif
+.    endif
+.  endif
 
 . if ${XORG_CAT} == "lib"
 USES+=		pathfix libtool:keepla
diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index 13fc7285c610..97cd5b0a4e40 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	vnc
 PORTVERSION=	4.1.3
-PORTREVISION=	9
+PORTREVISION=	8
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://home.bluelife.at/ports/distfiles/${DIST_SUBDIR}/:vnc
 DISTNAME=	vnc-4_1_3-unixsrc
@@ -55,7 +55,8 @@ MAKE_ARGS=	AR='ar rc'
 .endif
 
 RUN_DEPENDS+=	xauth:${PORTSDIR}/x11/xauth \
-		xorg-fonts-miscbitmaps>0:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps
+		xorg-fonts-miscbitmaps>0:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps \
+		${LOCALBASE}/lib/X11/fonts/misc/fonts.alias:${PORTSDIR}/x11-fonts/font-alias
 
 EXTRA_PATCHES+=	${WRKSRC}/xc.patch \
 		${PATCHDIR}/vnc.def-patch \
diff --git a/x11-fonts/Makefile b/x11-fonts/Makefile
index ae2ce7734b13..e9e20dc38373 100644
--- a/x11-fonts/Makefile
+++ b/x11-fonts/Makefile
@@ -47,6 +47,7 @@
     SUBDIR += font-adobe-utopia-100dpi
     SUBDIR += font-adobe-utopia-75dpi
     SUBDIR += font-adobe-utopia-type1
+    SUBDIR += font-alias
     SUBDIR += font-arabic-misc
     SUBDIR += font-bh-100dpi
     SUBDIR += font-bh-75dpi
diff --git a/x11-fonts/font-alias/Makefile b/x11-fonts/font-alias/Makefile
new file mode 100644
index 000000000000..86ae2c15e102
--- /dev/null
+++ b/x11-fonts/font-alias/Makefile
@@ -0,0 +1,15 @@
+# Created by: Pawel Worach
+# $FreeBSD$
+
+PORTNAME=	font-alias
+PORTVERSION=	1.0.3
+PORTREVISION=	2
+CATEGORIES=	x11-fonts
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org Font aliases
+
+XORG_CAT=	font
+NOFONT=		yes
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/font-alias/distinfo b/x11-fonts/font-alias/distinfo
new file mode 100644
index 000000000000..ff640278ee95
--- /dev/null
+++ b/x11-fonts/font-alias/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/font/font-alias-1.0.3.tar.bz2) = 8b453b2aae1cfa8090009ca037037b8c5e333550651d5a158b7264ce1d472c9a
+SIZE (xorg/font/font-alias-1.0.3.tar.bz2) = 102537
diff --git a/x11-fonts/font-alias/pkg-descr b/x11-fonts/font-alias/pkg-descr
new file mode 100644
index 000000000000..448b621e1ac1
--- /dev/null
+++ b/x11-fonts/font-alias/pkg-descr
@@ -0,0 +1,3 @@
+This package contains X.Org Font aliases.
+
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-alias/pkg-plist b/x11-fonts/font-alias/pkg-plist
new file mode 100644
index 000000000000..77c2e5ec4897
--- /dev/null
+++ b/x11-fonts/font-alias/pkg-plist
@@ -0,0 +1,4 @@
+lib/X11/fonts/100dpi/fonts.alias
+lib/X11/fonts/75dpi/fonts.alias
+lib/X11/fonts/cyrillic/fonts.alias
+lib/X11/fonts/misc/fonts.alias