Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 6 Mar 2013 07:04:45 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r313504 - head/Mk
Message-ID:  <201303060704.r2674jZ2011738@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303060704.r2674jZ2011738>