From owner-svn-ports-head@FreeBSD.ORG Mon Oct 15 13:04:32 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 54E26180 for ; Mon, 15 Oct 2012 13:04:32 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [8.8.178.135]) by mx1.freebsd.org (Postfix) with ESMTP id 2E8658FC19 for ; Mon, 15 Oct 2012 13:04:32 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q9FD4WKo023360 for ; Mon, 15 Oct 2012 13:04:32 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q9FD4WLo023356 for svn-ports-head@freebsd.org; Mon, 15 Oct 2012 13:04:32 GMT (envelope-from bdrewery) Received: (qmail 20988 invoked from network); 15 Oct 2012 08:04:30 -0500 Received: from unknown (HELO ?10.10.0.115?) (freebsd@shatow.net@10.10.0.115) by sweb.xzibition.com with ESMTPA; 15 Oct 2012 08:04:30 -0500 Message-ID: <507C09DB.7020301@FreeBSD.org> Date: Mon, 15 Oct 2012 08:04:27 -0500 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:16.0) Gecko/20121010 Thunderbird/16.0.1 MIME-Version: 1.0 To: Chris Rees Subject: Re: svn commit: r305904 - head/ports-mgmt/portmaster References: <201210150610.q9F6Ajoo027485@svn.freebsd.org> In-Reply-To: X-Enigmail-Version: 1.4.5 OpenPGP: id=3C9B0CF9; url=http://www.shatow.net/bryan/bryan.asc Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 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: Mon, 15 Oct 2012 13:04:32 -0000 On 10/15/2012 1:15 AM, Chris Rees wrote: > > On 15 Oct 2012 07:10, "Bryan Drewery" > wrote: >> >> Author: bdrewery >> Date: Mon Oct 15 06:10:44 2012 >> New Revision: 305904 >> URL: http://svn.freebsd.org/changeset/ports/305904 >> >> Log: >> - Add backup non-https mirror >> - Add PKGNG option to apply pkgng support patch. This will >> be fully integrated upstream in the next version. This >> functionality is only enabled when WITH_PKGNG is defined >> in make.conf (or a recent CURRENT by default, see >> UPDATING 20121010). Due to the compat OPTION handling, >> defining WITH_PKGNG will also apply the patch by default. >> The pkgng patch is contributed by avilla@ >> >> Feature safe: yes >> >> Modified: >> head/ports-mgmt/portmaster/Makefile >> head/ports-mgmt/portmaster/distinfo >> >> Modified: head/ports-mgmt/portmaster/Makefile >> > ============================================================================== >> --- head/ports-mgmt/portmaster/Makefile Mon Oct 15 05:41:22 2012 > (r305903) >> +++ head/ports-mgmt/portmaster/Makefile Mon Oct 15 06:10:44 2012 > (r305904) >> @@ -2,7 +2,10 @@ >> >> PORTNAME= portmaster >> PORTVERSION= 3.14 >> +PORTREVISION= 1 >> CATEGORIES= ports-mgmt >> +MASTER_SITES= GH \ >> + http://mirror.shatow.net/freebsd/portmaster/ >> DISTNAME= ${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION}-${GH_COMMIT} >> >> MAINTAINER= bdrewery@FreeBSD.org >> @@ -15,9 +18,10 @@ GH_ACCOUNT= portmaster >> GH_COMMIT= 31009f6 >> GH_TAGNAME= ${GH_COMMIT} >> >> -OPTIONS_DEFINE= BASH ZSH >> +OPTIONS_DEFINE= BASH ZSH PKGNG >> BASH_DESC= Install programmable completions for Bash >> ZSH_DESC= Install programmable completions for zsh >> +PKGNG_DESC= Enable PKGNG support >> >> PLIST_FILES= sbin/portmaster etc/portmaster.rc.sample >> >> @@ -25,6 +29,11 @@ MAN8= portmaster.8 >> >> .include > >> >> +.if ${PORT_OPTIONS:MPKGNG} >> +PATCH_SITES+= http://mirror.shatow.net/freebsd/portmaster/ >> +PATCHFILES+= patch-portmaster-pkgng.gz >> +.endif >> + > > You almost certainly want to version the patch file. > Well, the ideal plan is that upstream won't change now, so the patch will only be needed for 1 version. However, you're right. If we need to update the upstream, I will not touch this existing file, but add a new versioned one. > Chris > Thanks! Bryan