From owner-svn-ports-head@FreeBSD.ORG  Mon Oct 15 15:50:22 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
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 261005DB;
 Mon, 15 Oct 2012 15:50:22 +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 F32678FC0C;
 Mon, 15 Oct 2012 15:50:21 +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 q9FFoLQH020646;
 Mon, 15 Oct 2012 15:50:21 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9FFoLXb020644;
 Mon, 15 Oct 2012 15:50:21 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201210151550.q9FFoLXb020644@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Mon, 15 Oct 2012 15:50:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r305916 - 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
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Oct 2012 15:50:22 -0000

Author: bdrewery
Date: Mon Oct 15 15:50:21 2012
New Revision: 305916
URL: http://svn.freebsd.org/changeset/ports/305916

Log:
  - Rename PKGNG option to PKGNGPATCH to fix
    this port confusing bsd.pkgng.mk into thinking
    that WITH_PKGNG is defined and pkg(8) shoul be
    used to register.
  
  Pointyhat to:	bdrewery
  Feature safe:	yes

Modified:
  head/ports-mgmt/portmaster/Makefile

Modified: head/ports-mgmt/portmaster/Makefile
==============================================================================
--- head/ports-mgmt/portmaster/Makefile	Mon Oct 15 14:45:38 2012	(r305915)
+++ head/ports-mgmt/portmaster/Makefile	Mon Oct 15 15:50:21 2012	(r305916)
@@ -2,7 +2,7 @@
 
 PORTNAME=	portmaster
 PORTVERSION=	3.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	GH \
   		http://mirror.shatow.net/freebsd/portmaster/
@@ -18,10 +18,10 @@ GH_ACCOUNT=	portmaster
 GH_COMMIT=	31009f6
 GH_TAGNAME=	${GH_COMMIT}
 
-OPTIONS_DEFINE=	BASH ZSH PKGNG
+OPTIONS_DEFINE=	BASH ZSH PKGNGPATCH
 BASH_DESC=	Install programmable completions for Bash
 ZSH_DESC=	Install programmable completions for zsh
-PKGNG_DESC=	Enable PKGNG support
+PKGNGPATCH_DESC=Enable PKGNG support
 
 PLIST_FILES=	sbin/portmaster etc/portmaster.rc.sample
 
@@ -29,7 +29,7 @@ MAN8=		portmaster.8
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MPKGNG}
+.if ${PORT_OPTIONS:MPKGNGPATCH}
 PATCH_SITES+=	http://mirror.shatow.net/freebsd/portmaster/
 PATCHFILES+=	patch-portmaster-pkgng.gz
 .endif