From owner-svn-ports-head@FreeBSD.ORG  Wed Oct  3 09:18:52 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6FC9E1065674;
	Wed,  3 Oct 2012 09:18:52 +0000 (UTC) (envelope-from sbz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5B7308FC14;
	Wed,  3 Oct 2012 09:18:52 +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 q939IqNF099503;
	Wed, 3 Oct 2012 09:18:52 GMT (envelope-from sbz@svn.freebsd.org)
Received: (from sbz@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q939IqVV099501;
	Wed, 3 Oct 2012 09:18:52 GMT (envelope-from sbz@svn.freebsd.org)
Message-Id: <201210030918.q939IqVV099501@svn.freebsd.org>
From: Sofian Brabez <sbz@FreeBSD.org>
Date: Wed, 3 Oct 2012 09:18:52 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r305194 - head/lang/python
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Wed, 03 Oct 2012 09:18:52 -0000

Author: sbz
Date: Wed Oct  3 09:18:51 2012
New Revision: 305194
URL: http://svn.freebsd.org/changeset/ports/305194

Log:
  - Add pkgng support

Modified:
  head/lang/python/Makefile

Modified: head/lang/python/Makefile
==============================================================================
--- head/lang/python/Makefile	Wed Oct  3 08:40:48 2012	(r305193)
+++ head/lang/python/Makefile	Wed Oct  3 09:18:51 2012	(r305194)
@@ -30,6 +30,14 @@ PORTUPGRADE_CMD=	${LOCALBASE}/sbin/portu
 PORTUPGRADE_CMD=	${LOCALBASE}/sbin/portmaster
 .endif
 
+.if defined(WITH_PKGNG)
+PKG_LIST=	${PKG_BIN} query -a '%n-%v'
+PKG_LIST_FILES=	${PKG_INFO} -l
+.else
+PKG_LIST=	${PKG_INFO} -Ea
+PKG_LIST_FILES=	${PKG_INFO} -L
+.endif
+
 upgrade-site-packages:
 	@if [ ! -x ${PORTUPGRADE_CMD} ]; then \
 		${ECHO_MSG} "Please install ports-mgmt/portupgrade."; \
@@ -41,8 +49,8 @@ upgrade-site-packages:
 		GREP_ARGS="$${GREP_ARGS} -e lib/python$$ver"; \
 	done; \
 	UPD=""; \
-	for pkg in `${PKG_INFO} -Ea`; do \
-		${PKG_INFO} -L $${pkg} | ${GREP} $${GREP_ARGS} && \
+	for pkg in `${PKG_LIST}`; do \
+		${PKG_LIST_FILES} $${pkg} | ${GREP} $${GREP_ARGS} && \
 			UPD="$${UPD} $${pkg}"; \
 	done; \
 	if [ "$${UPD}" ]; then \