From owner-svn-ports-all@freebsd.org Mon Oct 8 19:37:17 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 9D95010C9713; Mon, 8 Oct 2018 19:37:17 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from smtpq6.tb.mail.iss.as9143.net (smtpq6.tb.mail.iss.as9143.net [212.54.42.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2238979D06; Mon, 8 Oct 2018 19:37:17 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from [212.54.42.135] (helo=smtp11.tb.mail.iss.as9143.net) by smtpq6.tb.mail.iss.as9143.net with esmtp (Exim 4.86_2) (envelope-from ) id 1g9bL1-0006sH-Pf; Mon, 08 Oct 2018 21:37:07 +0200 Received: from d34030.upc-d.chello.nl ([213.46.34.30] helo=[192.168.0.47]) by smtp11.tb.mail.iss.as9143.net with esmtp (Exim 4.86_2) (envelope-from ) id 1g9bL1-0001Ww-Mt; Mon, 08 Oct 2018 21:37:07 +0200 Message-ID: Subject: Re: svn commit: r481547 - head/graphics/gegl From: Koop Mast To: Tobias Kortkamp , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Date: Mon, 08 Oct 2018 21:37:07 +0200 In-Reply-To: <1539013540.913511.1534733424.75653610@webmail.messagingengine.com> References: <201810081537.w98FbZTj007910@repo.freebsd.org> <1539013540.913511.1534733424.75653610@webmail.messagingengine.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5 FreeBSD GNOME Team Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-SourceIP: 213.46.34.30 X-Ziggo-spambar: / X-Ziggo-spamscore: 0.0 X-Ziggo-spamreport: CMAE Analysis: v=2.3 cv=G9Go7Os5 c=1 sm=1 tr=0 a=A4srH7kgSix8FTkTlriEHg==:17 a=IkcTkHD0fZMA:10 a=smKx5t2vBNcA:10 a=6I5d2MoRAAAA:8 a=eFWEd84AacsQ0h4xbsMA:9 a=QEXdDO2ut3YA:10 a=IjZwj45LgO3ly-622nXo:22 X-Ziggo-Spam-Status: No X-Spam-Status: No X-Spam-Flag: No 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 19:37:17 -0000 Argh, ok sorry about that. I wasn't really paying attention to the patch and "oh that's easy, I can do that before dinner" and not paying attention. -Koop On Mon, 2018-10-08 at 17:45 +0200, Tobias Kortkamp wrote: > On Mon, Oct 8, 2018, at 17:37, Koop Mast wrote: > > 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 (r4 > > 81546) > > +++ head/graphics/gegl/Makefile Mon Oct 8 15:37:34 2018 (r4 > > 81547) > > @@ -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 > > Thanks, but I did not submit this. Why not use the patch as > submitted? Setting EXAMPLESDIR is useless now, the comment is > outdated (gegl conflicts with gegl?), and PORTREVISION must be > bumped because bin/gcut is now installed as bin/gcut-0.4.