From owner-svn-ports-all@FreeBSD.ORG Fri Mar 20 07:19:54 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DCF2D543; Fri, 20 Mar 2015 07:19:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C7824DDB; Fri, 20 Mar 2015 07:19:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2K7Jsu3063128; Fri, 20 Mar 2015 07:19:54 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2K7JqfA063121; Fri, 20 Mar 2015 07:19:52 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201503200719.t2K7JqfA063121@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Fri, 20 Mar 2015 07:19:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381713 - in head: . Mk Mk/Uses net/vnc x11-fonts x11-fonts/font-alias X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Mar 2015 07:19:55 -0000 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 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@FreeBSD.org COMMENT= X.Org Font aliases XORG_CAT= font -FONTDIR= 100dpi 75dpi misc cyrillic +NOFONT= yes .include