From owner-svn-ports-all@freebsd.org Mon Oct 8 15:37:35 2018 Return-Path: Delivered-To: svn-ports-all@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 7D41F10C2E02; Mon, 8 Oct 2018 15:37:35 +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.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 33CD28F89A; Mon, 8 Oct 2018 15:37:35 +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 2A8FE2477B; Mon, 8 Oct 2018 15:37:35 +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 w98FbZ97007911; Mon, 8 Oct 2018 15:37:35 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w98FbZTj007910; Mon, 8 Oct 2018 15:37:35 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201810081537.w98FbZTj007910@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Mon, 8 Oct 2018 15:37:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r481547 - head/graphics/gegl X-SVN-Group: ports-head X-SVN-Commit-Author: kwm X-SVN-Commit-Paths: head/graphics/gegl X-SVN-Commit-Revision: 481547 X-SVN-Commit-Repository: ports 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.27 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: Mon, 08 Oct 2018 15:37:35 -0000 Author: kwm Date: Mon Oct 8 15:37:34 2018 New Revision: 481547 URL: https://svnweb.freebsd.org/changeset/ports/481547 Log: Fix conflict with coreutils. [1] Previous in gegl3 the pkgnamesuffix of that port cause gcut to be installed as gcut3. Now after the move there isn't a pkgnamesuffix anymore. Base the new suffix on the value off GEGL_VER. PR: 232054 [1] Submitted by: tobic@ Reported by: w.schwarzenfeld@utanet.at Modified: head/graphics/gegl/Makefile Modified: head/graphics/gegl/Makefile ============================================================================== --- head/graphics/gegl/Makefile Mon Oct 8 15:29:07 2018 (r481546) +++ head/graphics/gegl/Makefile Mon Oct 8 15:37:34 2018 (r481547) @@ -41,6 +41,7 @@ SHEBANG_FILES= tools/xml_insert.sh # Fix conflicts with graphics/gegl and sysutils/coreutils EXAMPLESDIR= ${PREFIX}/share/examples/gegl${PKGNAMESUFFIX} +UNIQUE_SUFFIX= -${GEGL_VER} UNIQUE_SUFFIX_FILES= bin/gcut OPTIONS_SUB= yes