From owner-svn-ports-head@FreeBSD.ORG Mon Oct 15 06:10:45 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 808DF97C; Mon, 15 Oct 2012 06:10:45 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4F4258FC08; Mon, 15 Oct 2012 06:10:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9F6AjIM027488; Mon, 15 Oct 2012 06:10:45 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9F6Ajoo027485; Mon, 15 Oct 2012 06:10:45 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201210150610.q9F6Ajoo027485@svn.freebsd.org> From: Bryan Drewery Date: Mon, 15 Oct 2012 06:10:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305904 - head/ports-mgmt/portmaster X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 06:10:45 -0000 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 + .if ${PORT_OPTIONS:MBASH} PLIST_FILES+= etc/bash_completion.d/portmaster.sh PLIST_DIRSTRY+= etc/bash_completion.d Modified: head/ports-mgmt/portmaster/distinfo ============================================================================== --- head/ports-mgmt/portmaster/distinfo Mon Oct 15 05:41:22 2012 (r305903) +++ head/ports-mgmt/portmaster/distinfo Mon Oct 15 06:10:44 2012 (r305904) @@ -1,2 +1,4 @@ SHA256 (portmaster-portmaster-3.14-31009f6.tar.gz) = 9029531c486d937c09974baa0174f5a59b5e54c2400ab60caabb09af3add9605 SIZE (portmaster-portmaster-3.14-31009f6.tar.gz) = 42265 +SHA256 (patch-portmaster-pkgng.gz) = f55e9e8e2117988a5b1e58c269c109d00d1468892b6d742210c9bafca41e1d34 +SIZE (patch-portmaster-pkgng.gz) = 9937