From owner-svn-ports-head@freebsd.org Fri Mar 23 17:03:09 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 58A82F5A4FA; Fri, 23 Mar 2018 17:03:09 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F0EF47FC19; Fri, 23 Mar 2018 17:03:08 +0000 (UTC) (envelope-from tobik@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 EBE5B22B3A; Fri, 23 Mar 2018 17:03:08 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2NH38b3019935; Fri, 23 Mar 2018 17:03:08 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2NH38GK019934; Fri, 23 Mar 2018 17:03:08 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201803231703.w2NH38GK019934@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Fri, 23 Mar 2018 17:03:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465386 - head/x11-fonts/noto-lite X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/x11-fonts/noto-lite X-SVN-Commit-Revision: 465386 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.25 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: Fri, 23 Mar 2018 17:03:09 -0000 Author: tobik Date: Fri Mar 23 17:03:08 2018 New Revision: 465386 URL: https://svnweb.freebsd.org/changeset/ports/465386 Log: Resolve the conflict between x11-fonts/noto-lite and x11-fonts/noto Install the noto-lite fonts into their own directory i.e. share/fonts/noto-lite instead of into the same share/fonts/noto like noto. When both noto and noto-lite are installed there will be some duplication but that should be negligible given the ~1.2 GiB installed size of noto vs the ~4 MiB of noto-lite. noto-lite is now a dependency of www/chromium which actively prevents users from installing noto at the same time. PR: 226468 Approved by: sunpoet (maintainer timeout, 2 weeks) Modified: head/x11-fonts/noto-lite/Makefile Modified: head/x11-fonts/noto-lite/Makefile ============================================================================== --- head/x11-fonts/noto-lite/Makefile Fri Mar 23 16:54:47 2018 (r465385) +++ head/x11-fonts/noto-lite/Makefile Fri Mar 23 17:03:08 2018 (r465386) @@ -2,6 +2,7 @@ PORTNAME= noto PORTVERSION= 1.0.5 +PORTREVISION= 1 CATEGORIES= x11-fonts MASTER_SITES= https://noto-website.storage.googleapis.com/pkgs/ \ https://github.com/googlei18n/noto-emoji/raw/master/:emoji @@ -17,10 +18,10 @@ LICENSE= APACHE20 OFL11 LICENSE_COMB= multi USES= fonts zip +FONTNAME= noto-lite +NO_ARCH= yes NO_BUILD= yes NO_WRKSUBDIR= yes - -CONFLICTS_INSTALL= noto* LIST= NotoEmoji-Regular.ttf NotoSans-Bold.ttf NotoSans-BoldItalic.ttf NotoSans-Italic.ttf NotoSans-Regular.ttf NotoSansLinearB-Regular.ttf NotoSansSymbols-Regular.ttf NotoSerif-Bold.ttf NotoSerif-BoldItalic.ttf NotoSerif-Italic.ttf NotoSerif-Regular.ttf