From owner-svn-ports-all@FreeBSD.ORG Wed Mar 6 07:04:45 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
by hub.freebsd.org (Postfix) with ESMTP id B0E6F814;
Wed, 6 Mar 2013 07:04:45 +0000 (UTC)
(envelope-from bapt@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 8B9736C4;
Wed, 6 Mar 2013 07:04:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2674juJ011739;
Wed, 6 Mar 2013 07:04:45 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2674jZ2011738;
Wed, 6 Mar 2013 07:04:45 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201303060704.r2674jZ2011738@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 6 Mar 2013 07:04:45 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-head@freebsd.org
Subject: svn commit: r313504 - head/Mk
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Mar 2013 07:04:45 -0000
Author: bapt
Date: Wed Mar 6 07:04:45 2013
New Revision: 313504
URL: http://svnweb.freebsd.org/changeset/ports/313504
Log:
Do not append options to pkg-plist when using pkgng given that this is already
appended to +MANIFEST in bsd.pkgng.mk
Submitted by: bdrewery
Modified:
head/Mk/bsd.port.mk
Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk Wed Mar 6 06:36:04 2013 (r313503)
+++ head/Mk/bsd.port.mk Wed Mar 6 07:04:45 2013 (r313504)
@@ -5740,8 +5740,10 @@ generate-plist:
.endif
.endif
.endif
+.if !defined(WITH_PKGNG)
@cd ${.CURDIR} && { ${MAKE} pretty-print-config | fold -sw 120 | ${SED} -e 's/^/@comment OPTIONS:/'; } >> ${TMPPLIST}
.endif
+.endif
${TMPPLIST}:
@cd ${.CURDIR} && ${MAKE} generate-plist