From owner-svn-ports-all@freebsd.org Thu Dec 10 12:27:57 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B357B9D7740; Thu, 10 Dec 2015 12:27:57 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 8B894189F; Thu, 10 Dec 2015 12:27:57 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBACRuIu097913; Thu, 10 Dec 2015 12:27:56 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBACRuPM097909; Thu, 10 Dec 2015 12:27:56 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201512101227.tBACRuPM097909@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Thu, 10 Dec 2015 12:27:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r403449 - in head/x11-fonts: . libXfont2 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.20 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: Thu, 10 Dec 2015 12:27:57 -0000 Author: kwm Date: Thu Dec 10 12:27:56 2015 New Revision: 403449 URL: https://svnweb.freebsd.org/changeset/ports/403449 Log: Add libXfont2. libXfont2 is the same as the old libXfont libary, but has a shiny new API/ABI that avoids referencing symbols in the X server directly. The code for the X server to use this version is awaiting review and merging still. Comment the CPE information out since it unclear which product name will be used. Added: head/x11-fonts/libXfont2/ - copied from r403426, head/x11-fonts/libXfont/ Modified: head/x11-fonts/Makefile head/x11-fonts/libXfont2/Makefile head/x11-fonts/libXfont2/distinfo head/x11-fonts/libXfont2/pkg-plist Modified: head/x11-fonts/Makefile ============================================================================== --- head/x11-fonts/Makefile Thu Dec 10 11:37:44 2015 (r403448) +++ head/x11-fonts/Makefile Thu Dec 10 12:27:56 2015 (r403449) @@ -114,6 +114,7 @@ SUBDIR += lfpfonts-var SUBDIR += libFS SUBDIR += libXfont + SUBDIR += libXfont2 SUBDIR += libXfontcache SUBDIR += libXft SUBDIR += liberation-fonts-ttf Modified: head/x11-fonts/libXfont2/Makefile ============================================================================== --- head/x11-fonts/libXfont/Makefile Wed Dec 9 15:39:21 2015 (r403426) +++ head/x11-fonts/libXfont2/Makefile Thu Dec 10 12:27:56 2015 (r403449) @@ -1,9 +1,8 @@ # Created by: Eric Anholt # $FreeBSD$ -PORTNAME= libXfont -PORTVERSION= 1.5.1 -PORTEPOCH= 2 +PORTNAME= libXfont2 +PORTVERSION= 2.0.0 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org @@ -14,10 +13,14 @@ LIB_DEPENDS= libfreetype.so:${PORTSDIR}/ XORG_CAT= lib USE_XORG= xproto:both xtrans fontsproto:both fontenc INSTALL_TARGET= install-strip -USES+= cpe -CPE_PRODUCT= libxfont -CPE_VENDOR= x - -CONFIGURE_ARGS=--without-xmlto --disable-devel-docs +#USES+= cpe +#CPE_PRODUCT= libxfont +#CPE_VENDOR= x + +CONFIGURE_ARGS=--without-xmlto --disable-devel-docs --without-fop + +# will be removed in the next release +post-install: + @${RM} ${STAGEDIR}${PREFIX}/include/X11/fonts/fontconf.h .include Modified: head/x11-fonts/libXfont2/distinfo ============================================================================== --- head/x11-fonts/libXfont/distinfo Wed Dec 9 15:39:21 2015 (r403426) +++ head/x11-fonts/libXfont2/distinfo Thu Dec 10 12:27:56 2015 (r403449) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXfont-1.5.1.tar.bz2) = b70898527c73f9758f551bbab612af611b8a0962202829568d94f3edf4d86098 -SIZE (xorg/lib/libXfont-1.5.1.tar.bz2) = 502903 +SHA256 (xorg/lib/libXfont2-2.0.0.tar.bz2) = 49c9bc8bb347890d958cfef2f601246e367caa1e4ab47502a374f8c926a74674 +SIZE (xorg/lib/libXfont2-2.0.0.tar.bz2) = 487706 Modified: head/x11-fonts/libXfont2/pkg-plist ============================================================================== --- head/x11-fonts/libXfont/pkg-plist Wed Dec 9 15:39:21 2015 (r403426) +++ head/x11-fonts/libXfont2/pkg-plist Thu Dec 10 12:27:56 2015 (r403449) @@ -1,20 +1,6 @@ -include/X11/fonts/bdfint.h -include/X11/fonts/bitmap.h -include/X11/fonts/bufio.h -include/X11/fonts/fntfil.h -include/X11/fonts/fntfilio.h -include/X11/fonts/fntfilst.h -include/X11/fonts/fontconf.h -include/X11/fonts/fontencc.h -include/X11/fonts/fontmisc.h -include/X11/fonts/fontshow.h -include/X11/fonts/fontutil.h -include/X11/fonts/fontxlfd.h -include/X11/fonts/ft.h -include/X11/fonts/ftfuncs.h -include/X11/fonts/pcf.h -lib/libXfont.a -lib/libXfont.so -lib/libXfont.so.1 -lib/libXfont.so.1.4.1 -libdata/pkgconfig/xfont.pc +include/X11/fonts/libxfont2.h +lib/libXfont2.a +lib/libXfont2.so +lib/libXfont2.so.2 +lib/libXfont2.so.2.0.0 +libdata/pkgconfig/xfont2.pc