From owner-freebsd-current@FreeBSD.ORG Wed Oct 10 22:20:36 2012 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7CA595F4; Wed, 10 Oct 2012 22:20:36 +0000 (UTC) (envelope-from vince@unsane.co.uk) Received: from unsane.co.uk (unsane-pt.tunnel.tserv5.lon1.ipv6.he.net [IPv6:2001:470:1f08:110::2]) by mx1.freebsd.org (Postfix) with ESMTP id E8E578FC0A; Wed, 10 Oct 2012 22:20:35 +0000 (UTC) Received: from vincemacbook.unsane.co.uk (vincemacbook.unsane.co.uk [10.10.10.20]) (authenticated bits=0) by unsane.co.uk (8.14.5/8.14.5) with ESMTP id q9AMKYne053286 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Wed, 10 Oct 2012 23:20:34 +0100 (BST) (envelope-from vince@unsane.co.uk) Message-ID: <5075F4B2.6070200@unsane.co.uk> Date: Wed, 10 Oct 2012 23:20:34 +0100 From: Vincent Hoffman User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:16.0) Gecko/20121005 Thunderbird/16.0 MIME-Version: 1.0 To: Matthew Seaman Subject: Re: [HEADSUP] current switched by default to pkgng References: <20121010134421.GI26497@ithaqua.etoilebsd.net> <50758134.9070701@mail.zedat.fu-berlin.de> <5075ACE3.9030509@FreeBSD.org> <5075C00F.8040600@freebsd.org> <5075D175.5060901@FreeBSD.org> In-Reply-To: <5075D175.5060901@FreeBSD.org> X-Enigmail-Version: 1.4.5 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: freebsd-current@freebsd.org X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Oct 2012 22:20:36 -0000 On 10/10/2012 20:50, Matthew Seaman wrote: > On 10/10/2012 19:35, Stefan Esser wrote: >> Am 10.10.2012 19:14, schrieb Matthew Seaman: >>> On 10/10/2012 15:07, O. Hartmann wrote: >>>> Is ports-mgmt/portmaster now dealing with pkgng? >>> >>> Not yet. bdrewery has taken over the portmaster port and pkgng >>> related updates are expected in the near future. >>> >>> Until then, you still need to follow the instructions here: >>> >>> https://github.com/pkgng/pkgng/blob/master/FAQ.md#15 >> >> In order to get the portmaster-pkgng patch to apply, >> the filename in the second line must be changed: >> >> from ./portmaster.sh.in >> to ./portmaster > > That's if you were to patch an already installed copy of portmaster. > The patch is designed to be placed in > > ${PORTSDIR}/ports-mgmt/portmaster/files/ > > so it would be applied as part of the normal process of building the > portmaster port. In which case portmaster.sh.in is definitely the > correct target. Actually not so, maybe something has changed recently? [root@ostracod /usr/ports/ports-mgmt/portmaster]# head -4 files/patch-portmaster-pkgng --- ./portmaster.sh.in.orig 2012-10-01 09:34:15.000000000 +0100 +++ ./portmaster.sh.in 2012-10-02 18:14:34.319249588 +0100 @@ -47,7 +47,7 @@ #=============== Begin functions we always want to have =============== [root@ostracod /usr/ports/ports-mgmt/portmaster]# make patch ===> License BSD accepted by the user ===> Found saved configuration for portmaster-3.11 ===> portmaster-3.14 depends on file: /usr/local/sbin/pkg - found ===> Extracting for portmaster-3.14 => SHA256 Checksum OK for portmaster-portmaster-3.14-31009f6.tar.gz. ===> Patching for portmaster-3.14 ===> Applying FreeBSD patches for portmaster-3.14 File to patch: ^C=> Patch patch-portmaster-pkgng failed to apply cleanly. While if edited as suggested [root@ostracod /usr/ports/ports-mgmt/portmaster]# !head head -4 files/patch-portmaster-pkgng --- ./portmaster.sh.in.orig 2012-10-01 09:34:15.000000000 +0100 +++ ./portmaster 2012-10-02 18:14:34.319249588 +0100 @@ -47,7 +47,7 @@ #=============== Begin functions we always want to have =============== [root@ostracod /usr/ports/ports-mgmt/portmaster]# make patch ===> License BSD accepted by the user ===> Found saved configuration for portmaster-3.11 ===> portmaster-3.14 depends on file: /usr/local/sbin/pkg - found ===> Extracting for portmaster-3.14 => SHA256 Checksum OK for portmaster-portmaster-3.14-31009f6.tar.gz. ===> Patching for portmaster-3.14 ===> Applying FreeBSD patches for portmaster-3.14 [root@ostracod /usr/ports/ports-mgmt/portmaster]# Vince