From owner-freebsd-ports@freebsd.org  Wed Mar 28 12:57:20 2018
Return-Path: <owner-freebsd-ports@freebsd.org>
Delivered-To: freebsd-ports@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 0E77AF5A211
 for <freebsd-ports@mailman.ysv.freebsd.org>;
 Wed, 28 Mar 2018 12:57:20 +0000 (UTC)
 (envelope-from bob@rancor.immure.com)
Received: from rancor.immure.com (108-84-10-9.lightspeed.austtx.sbcglobal.net
 [108.84.10.9])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "darth.immure.com", Issuer "darth.immure.com" (not verified))
 by mx1.freebsd.org (Postfix) with ESMTPS id 8A6A16809A;
 Wed, 28 Mar 2018 12:57:19 +0000 (UTC)
 (envelope-from bob@rancor.immure.com)
Received: from rancor.immure.com (localhost [127.0.0.1])
 by rancor.immure.com (8.15.2/8.15.2) with ESMTPS id w2SCv2uc094305
 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO);
 Wed, 28 Mar 2018 07:57:02 -0500 (CDT)
 (envelope-from bob@rancor.immure.com)
Received: (from bob@localhost)
 by rancor.immure.com (8.15.2/8.15.2/Submit) id w2SCv2UM094304;
 Wed, 28 Mar 2018 07:57:02 -0500 (CDT) (envelope-from bob)
Date: Wed, 28 Mar 2018 07:57:02 -0500
From: Bob Willcox <bob@immure.com>
To: Antoine Brodin <antoine@freebsd.org>
Cc: Michael Grimm <trashcan@ellael.org>, Mark Johnston <markj@freebsd.org>,
 ports list <freebsd-ports@freebsd.org>
Subject: Re: perl5.24 build failing on a new 11.1-STABLE install
Message-ID: <20180328125702.GH56808@rancor.immure.com>
Reply-To: Bob Willcox <bob@immure.com>
References: <20180327200002.GF76012@rancor.immure.com>
 <98386C91-02F7-4896-B7EF-863A02F41E46@ellael.org>
 <CAALwa8=GJjZVM7a7NpGxPgTvN23JXJwGgZ3CCrm8DWCAnhqNpw@mail.gmail.com>
 <13E37416-E5A5-4A19-BB56-2C13CC217B43@ellael.org>
 <CAALwa8nP5RT56JuEuouYDKPv8u8BNF6mtYEHQxHOSf+756b--w@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAALwa8nP5RT56JuEuouYDKPv8u8BNF6mtYEHQxHOSf+756b--w@mail.gmail.com>
User-Agent: Mutt/1.9.2 (2017-12-15)
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-ports>,
 <mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports/>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
 <mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Mar 2018 12:57:20 -0000

On Wed, Mar 28, 2018 at 12:45:27PM +0000, Antoine Brodin wrote:
> On Wed, Mar 28, 2018 at 12:42 PM, Michael Grimm <trashcan@ellael.org> wrote:
> > Antoine Brodin <antoine@freebsd.org> wrote:
> >
> >> On Wed, Mar 28, 2018 at 12:04 PM, Michael Grimm <trashcan@ellael.org> wrote:
> >
> >>> FreeBSD 11.1-STABLE #0 r331660: Wed Mar 28 08:36:15 CEST 2018     root@mer-waases:/usr/obj/usr/src/sys/CUSTOM
> >
> >> You can try to revert https://svnweb.freebsd.org/changeset/base/331551
> >
> > Please excuse my ignorance, but I haven't done that before. After a quick scan in svn help I came up with:
> >
> >         svn merge -r 331660:331551
> >
> > Is this correct?
> > What I want to achieve is keeping all commits besides 331551
> 
> svn merge -c -331551 .
> 
> Antoine

Thanks Antoine, I've done the above svn command and am now rebuilding world on
my system. Should be able to give it a try this evening when I get home.

Bob

-- 
Bob Willcox    | The amount of flak received on any subject is inversely
bob@immure.com | proportional to the subject's true value.
Austin, TX     |