From owner-svn-ports-head@freebsd.org Sat Aug 24 09:20:47 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E3BFCDB2BB; Sat, 24 Aug 2019 09:20:47 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46Ft6R5JMfz4n1D; Sat, 24 Aug 2019 09:20:47 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9420C2C82; Sat, 24 Aug 2019 09:20:47 +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 x7O9KlE9009908; Sat, 24 Aug 2019 09:20:47 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7O9Kk11009903; Sat, 24 Aug 2019 09:20:46 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201908240920.x7O9Kk11009903@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Sat, 24 Aug 2019 09:20:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r509716 - in head/print: . harfbuzz harfbuzz-bh-view harfbuzz-icu X-SVN-Group: ports-head X-SVN-Commit-Author: kwm X-SVN-Commit-Paths: in head/print: . harfbuzz harfbuzz-bh-view harfbuzz-icu X-SVN-Commit-Revision: 509716 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Aug 2019 09:20:48 -0000 Author: kwm Date: Sat Aug 24 09:20:46 2019 New Revision: 509716 URL: https://svnweb.freebsd.org/changeset/ports/509716 Log: Remove the hb-view utitilty from the main harfbuzz port and move it to it's own port. The hb-view utility is the only part of harfbuzz that requires cairo. So now harfbuzz doesn't pull in x11 libraries or mesa via cairo,this is usefull for ports that want to use harfbuzz but don't use or want x11. Add license Exp-run by: antoine@ PR: 239662 Added: head/print/harfbuzz-bh-view/ head/print/harfbuzz-bh-view/Makefile (contents, props changed) head/print/harfbuzz-bh-view/pkg-plist (contents, props changed) Modified: head/print/Makefile head/print/harfbuzz-icu/Makefile head/print/harfbuzz/Makefile head/print/harfbuzz/pkg-plist Modified: head/print/Makefile ============================================================================== --- head/print/Makefile Sat Aug 24 09:02:38 2019 (r509715) +++ head/print/Makefile Sat Aug 24 09:20:46 2019 (r509716) @@ -81,6 +81,7 @@ SUBDIR += gutenprint SUBDIR += gv SUBDIR += harfbuzz + SUBDIR += harfbuzz-hb-view SUBDIR += harfbuzz-icu SUBDIR += hp2xx SUBDIR += hplip Added: head/print/harfbuzz-bh-view/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/harfbuzz-bh-view/Makefile Sat Aug 24 09:20:46 2019 (r509716) @@ -0,0 +1,12 @@ +# $FreeBSD$ + +PORTREVISION= 0 +PKGNAMESUFFIX= -hb-view + +COMMENT= Harfbuzz hb-view utility + +MASTERDIR= ${.CURDIR}/../../print/harfbuzz +PLIST= ${.CURDIR}/pkg-plist +HARFBUZZ_SLAVE= hb-view + +.include "${MASTERDIR}/Makefile" Added: head/print/harfbuzz-bh-view/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/harfbuzz-bh-view/pkg-plist Sat Aug 24 09:20:46 2019 (r509716) @@ -0,0 +1,55 @@ +@comment bin/hb-ot-shape-closure +@comment bin/hb-shape +@comment bin/hb-subset +bin/hb-view +@comment include/harfbuzz/hb-aat-layout.h +@comment include/harfbuzz/hb-aat.h +@comment include/harfbuzz/hb-blob.h +@comment include/harfbuzz/hb-buffer.h +@comment include/harfbuzz/hb-common.h +@comment include/harfbuzz/hb-deprecated.h +@comment include/harfbuzz/hb-face.h +@comment include/harfbuzz/hb-font.h +@comment include/harfbuzz/hb-ft.h +@comment include/harfbuzz/hb-glib.h +@comment include/harfbuzz/hb-gobject-enums.h +@comment include/harfbuzz/hb-gobject-structs.h +@comment include/harfbuzz/hb-gobject.h +@comment include/harfbuzz/hb-graphite2.h +@comment include/harfbuzz/hb-map.h +@comment include/harfbuzz/hb-icu.h +@comment include/harfbuzz/hb-ot-color.h +@comment include/harfbuzz/hb-ot-deprecated.h +@comment include/harfbuzz/hb-ot-font.h +@comment include/harfbuzz/hb-ot-layout.h +@comment include/harfbuzz/hb-ot-math.h +@comment include/harfbuzz/hb-ot-name.h +@comment include/harfbuzz/hb-ot-shape.h +@comment include/harfbuzz/hb-ot-var.h +@comment include/harfbuzz/hb-ot.h +@comment include/harfbuzz/hb-set.h +@comment include/harfbuzz/hb-shape-plan.h +@comment include/harfbuzz/hb-shape.h +@comment include/harfbuzz/hb-subset.h +@comment include/harfbuzz/hb-unicode.h +@comment include/harfbuzz/hb-version.h +@comment include/harfbuzz/hb.h +@comment lib/cmake/harfbuzz/harfbuzz-config.cmake +@comment lib/girepository-1.0/HarfBuzz-0.0.typelib +@comment lib/libharfbuzz-gobject.so +@comment lib/libharfbuzz-gobject.so.0 +@comment lib/libharfbuzz-gobject.so.%%LIBVER%% +@comment lib/libharfbuzz-icu.so +@comment lib/libharfbuzz-icu.so.0 +@comment lib/libharfbuzz-icu.so.%%LIBVER%% +@comment lib/libharfbuzz-subset.so +@comment lib/libharfbuzz-subset.so.0 +@comment lib/libharfbuzz-subset.so.%%LIBVER%% +@comment lib/libharfbuzz.so +@comment lib/libharfbuzz.so.0 +@comment lib/libharfbuzz.so.%%LIBVER%% +@comment libdata/pkgconfig/harfbuzz-gobject.pc +@comment libdata/pkgconfig/harfbuzz-icu.pc +@comment libdata/pkgconfig/harfbuzz-subset.pc +@comment libdata/pkgconfig/harfbuzz.pc +@comment share/gir-1.0/HarfBuzz-0.0.gir Modified: head/print/harfbuzz-icu/Makefile ============================================================================== --- head/print/harfbuzz-icu/Makefile Sat Aug 24 09:02:38 2019 (r509715) +++ head/print/harfbuzz-icu/Makefile Sat Aug 24 09:20:46 2019 (r509716) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -icu COMMENT= Harfbuzz ICU support Modified: head/print/harfbuzz/Makefile ============================================================================== --- head/print/harfbuzz/Makefile Sat Aug 24 09:02:38 2019 (r509715) +++ head/print/harfbuzz/Makefile Sat Aug 24 09:20:46 2019 (r509716) @@ -3,22 +3,26 @@ PORTNAME= harfbuzz PORTVERSION= 2.6.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= print MASTER_SITES= http://www.freedesktop.org/software/harfbuzz/release/ MAINTAINER= gnome@FreeBSD.org COMMENT?= OpenType text shaping engine +LICENSE= MIT + LIB_DEPENDS= libfreetype.so:print/freetype2 \ libgraphite2.so:graphics/graphite2 -USE_LDCONFIG= yes USES= compiler:c++11-lib gettext-runtime gmake gnome libtool \ pathfix pkgconfig tar:xz -USE_GNOME= cairo glib20 introspection:build +USE_GNOME= glib20 introspection:build + GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-graphite2 --with-gobject=yes +USE_LDCONFIG= yes + INSTALL_TARGET= install-strip TEST_TARGET= check @@ -27,13 +31,22 @@ PLIST_SUB+= LIBVER=0.20600.1 HARFBUZZ_SLAVE?= no .if ${HARFBUZZ_SLAVE} == no -CONFIGURE_ARGS+= --without-icu -.else +CONFIGURE_ARGS+= --without-icu --without-cairo +.elif ${HARFBUZZ_SLAVE} == icu CONFIGURE_ARGS+= --with-icu \ + --without-cairo \ --disable-gtk-doc-html LIB_DEPENDS+= libharfbuzz.so:print/harfbuzz \ libicudata.so:devel/icu +.elif ${HARFBUZZ_SLAVE} == hb-view +CONFIGURE_ARGS+= --with-cairo \ + --without-icu +LIB_DEPENDS+= libharfbuzz.so:print/harfbuzz +USE_GNOME+= cairo +.endif + +.if ${HARFBUZZ_SLAVE} != no post-patch: ${REINPLACE_CMD} -e 's|install-data-am: install-data-local|install-data-am:|g' \ ${WRKSRC}/docs/Makefile.in Modified: head/print/harfbuzz/pkg-plist ============================================================================== --- head/print/harfbuzz/pkg-plist Sat Aug 24 09:02:38 2019 (r509715) +++ head/print/harfbuzz/pkg-plist Sat Aug 24 09:20:46 2019 (r509716) @@ -1,7 +1,6 @@ bin/hb-ot-shape-closure bin/hb-shape bin/hb-subset -bin/hb-view include/harfbuzz/hb-aat-layout.h include/harfbuzz/hb-aat.h include/harfbuzz/hb-blob.h