svn commit: r305904 - head/ports-mgmt/portmaster
Bryan Drewery
bdrewery at freebsd.org
Mon Oct 15 13:04:32 UTC 2012
On 10/15/2012 1:15 AM, Chris Rees wrote:
>
> On 15 Oct 2012 07:10, "Bryan Drewery" <bdrewery at freebsd.org
> <mailto:bdrewery at freebsd.org>> 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 at 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 <bsd.port.options.mk <http://bsd.port.options.mk>>
>>
>> +.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
More information about the svn-ports-all
mailing list