svn commit: r381713 - in head: . Mk Mk/Uses net/vnc x11-fonts x11-fonts/font-alias
Baptiste Daroussin
bapt at FreeBSD.org
Fri Mar 20 07:19:55 UTC 2015
Author: bapt
Date: Fri Mar 20 07:19:51 2015
New Revision: 381713
URL: https://svnweb.freebsd.org/changeset/ports/381713
QAT: https://qat.redports.org/buildarchive/r381713/
Log:
Removing font-alias was a mistake, readd it which fixes tigervnc (and more)
Pointyhat to: bapt
Reported by: Corey <merlincorey at hushmail.me>
Added:
head/x11-fonts/font-alias/
- copied from r381701, head/x11-fonts/font-alias/
Modified:
head/MOVED
head/Mk/Uses/display.mk
head/Mk/bsd.xorg.mk
head/net/vnc/Makefile
head/x11-fonts/Makefile
head/x11-fonts/font-alias/Makefile
Modified: head/MOVED
==============================================================================
--- head/MOVED Fri Mar 20 07:07:26 2015 (r381712)
+++ head/MOVED Fri Mar 20 07:19:51 2015 (r381713)
@@ -7441,4 +7441,3 @@ devel/p5-Errno||2015-03-09|Errno is part
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
Modified: head/Mk/Uses/display.mk
==============================================================================
--- head/Mk/Uses/display.mk Fri Mar 20 07:07:26 2015 (r381712)
+++ head/Mk/Uses/display.mk Fri Mar 20 07:19:51 2015 (r381713)
@@ -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
Modified: head/Mk/bsd.xorg.mk
==============================================================================
--- head/Mk/bsd.xorg.mk Fri Mar 20 07:07:26 2015 (r381712)
+++ head/Mk/bsd.xorg.mk Fri Mar 20 07:19:51 2015 (r381713)
@@ -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
Modified: head/net/vnc/Makefile
==============================================================================
--- head/net/vnc/Makefile Fri Mar 20 07:07:26 2015 (r381712)
+++ head/net/vnc/Makefile Fri Mar 20 07:19:51 2015 (r381713)
@@ -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 \
Modified: head/x11-fonts/Makefile
==============================================================================
--- head/x11-fonts/Makefile Fri Mar 20 07:07:26 2015 (r381712)
+++ head/x11-fonts/Makefile Fri Mar 20 07:19:51 2015 (r381713)
@@ -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
Modified: head/x11-fonts/font-alias/Makefile
==============================================================================
--- head/x11-fonts/font-alias/Makefile Thu Mar 19 23:11:48 2015 (r381701)
+++ head/x11-fonts/font-alias/Makefile Fri Mar 20 07:19:51 2015 (r381713)
@@ -3,13 +3,13 @@
PORTNAME= font-alias
PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MAINTAINER= x11 at FreeBSD.org
COMMENT= X.Org Font aliases
XORG_CAT= font
-FONTDIR= 100dpi 75dpi misc cyrillic
+NOFONT= yes
.include <bsd.port.mk>
More information about the svn-ports-head
mailing list