From owner-svn-ports-head@FreeBSD.ORG Fri Mar 29 20:43:55 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id E2965962; Fri, 29 Mar 2013 20:43:55 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id D44589F9; Fri, 29 Mar 2013 20:43:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2TKht0T031521; Fri, 29 Mar 2013 20:43:55 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2TKhtBN031518; Fri, 29 Mar 2013 20:43:55 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201303292043.r2TKhtBN031518@svn.freebsd.org> From: Bryan Drewery Date: Fri, 29 Mar 2013 20:43:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r315570 - in head/ports-mgmt/portmaster: . files 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: Fri, 29 Mar 2013 20:43:56 -0000 Author: bdrewery Date: Fri Mar 29 20:43:54 2013 New Revision: 315570 URL: http://svnweb.freebsd.org/changeset/ports/315570 Log: - Update to 3.15 - Add extra mirror - Remove PKGNGPATCH option Changes: - The pkgng patch has been fully integrated upstream with its history copied from the pkgng repo over to portmaster's repo - Add extra messages before/after killing background processes so that 'Terminated' messages look less unexpected - Fix running from / trying to build the entire tree - pkgng: Fix -s not respecting the automatic flag - Fix "Argument list too long" errors - Add PM_SU_CMD documentation to the sample config file [1] - Fix -o not showing the specified origin [pkgng patch bug] Submitted by: Oleg Pudeyev [1] Deleted: head/ports-mgmt/portmaster/files/ Modified: head/ports-mgmt/portmaster/Makefile head/ports-mgmt/portmaster/distinfo head/ports-mgmt/portmaster/pkg-message Modified: head/ports-mgmt/portmaster/Makefile ============================================================================== --- head/ports-mgmt/portmaster/Makefile Fri Mar 29 20:12:12 2013 (r315569) +++ head/ports-mgmt/portmaster/Makefile Fri Mar 29 20:43:54 2013 (r315570) @@ -1,10 +1,10 @@ # $FreeBSD$ PORTNAME= portmaster -PORTVERSION= 3.14 -PORTREVISION= 9 +PORTVERSION= 3.15 CATEGORIES= ports-mgmt MASTER_SITES= GH \ + LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/portmaster/ DISTNAME= ${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION}-${GH_COMMIT} @@ -15,12 +15,10 @@ LICENSE= BSD USE_GITHUB= yes GH_ACCOUNT= portmaster -GH_COMMIT= 31009f6 +GH_COMMIT= 36a0273 GH_TAGNAME= ${GH_COMMIT} -OPTIONS_DEFINE= BASH ZSH PKGNGPATCH -OPTIONS_DEFAULT+= PKGNGPATCH -PKGNGPATCH_DESC=Enable PKGNG support +OPTIONS_DEFINE= BASH ZSH PLIST_FILES= sbin/portmaster etc/portmaster.rc.sample @@ -28,16 +26,6 @@ MAN8= portmaster.8 .include -.if ${PORT_OPTIONS:MPKGNGPATCH} -PATCH_SITES+= http://mirror.shatow.net/freebsd/portmaster/ -PATCHFILES+= patch-portmaster-pkgng.gz -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-files::with_pkgng_current -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-files::pkg_install-pkgng-ss -. if ${PORT_OPTIONS:MZSH} -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-files::zsh-completions -. endif -.endif - .if ${PORT_OPTIONS:MBASH} PLIST_FILES+= etc/bash_completion.d/portmaster.sh PLIST_DIRSTRY+= etc/bash_completion.d @@ -71,8 +59,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/files/zsh-completions \ ${PREFIX}/share/zsh/site-functions/_portmaster .endif -.if ${PORT_OPTIONS:MPKGNGPATCH} ${CAT} ${PKGMESSAGE} -.endif .include Modified: head/ports-mgmt/portmaster/distinfo ============================================================================== --- head/ports-mgmt/portmaster/distinfo Fri Mar 29 20:12:12 2013 (r315569) +++ head/ports-mgmt/portmaster/distinfo Fri Mar 29 20:43:54 2013 (r315570) @@ -1,4 +1,2 @@ -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 +SHA256 (portmaster-portmaster-3.15-36a0273.tar.gz) = 87571acac8b74a7b1135fd6f13da61d86b90bd82df38b49a00fc9aee3f2c42b0 +SIZE (portmaster-portmaster-3.15-36a0273.tar.gz) = 44493 Modified: head/ports-mgmt/portmaster/pkg-message ============================================================================== --- head/ports-mgmt/portmaster/pkg-message Fri Mar 29 20:12:12 2013 (r315569) +++ head/ports-mgmt/portmaster/pkg-message Fri Mar 29 20:43:54 2013 (r315570) @@ -1,5 +1,5 @@ If you want to switch to the new pkg(8) format, and have not already done so, -there are some extra steps to take: +there are some extra 1-time steps to take: Enable PKGNG as your package format: