svn commit: r366154 - head/Mk

[Antoine Brodin]

Author: antoine
Date: Mon Aug 25 21:17:37 2014
New Revision: 366154
URL: http://svnweb.freebsd.org/changeset/ports/366154
QAT: https://qat.redports.org/buildarchive/r366154/

Log:
  Remove support for NOPORTDATA
  
  Differential Revision: https://reviews.freebsd.org/D629
  Reviewed by:	bapt
  With hat:	portmgr

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Mon Aug 25 21:16:56 2014	(r366153)
+++ head/Mk/bsd.port.mk	Mon Aug 25 21:17:37 2014	(r366154)
@@ -1634,12 +1634,6 @@ PLIST_SUB+=	        PORTEXAMPLES="@comme
 PLIST_SUB+=	        PORTEXAMPLES=""
 .endif
 
-.if defined(NOPORTDATA)
-PLIST_SUB+=	        PORTDATA="@comment "
-.else
-PLIST_SUB+=	        PORTDATA=""
-.endif
-
 CONFIGURE_SHELL?=	${SH}
 MAKE_SHELL?=	${SH}
 
@@ -5590,7 +5584,7 @@ add-plist-examples:
 .endif
 
 .if !target(add-plist-data)
-.if defined(PORTDATA) && !defined(NOPORTDATA)
+.if defined(PORTDATA)
 add-plist-data:
 	@if ${EGREP} -qe '^@cw?d' ${TMPPLIST} && \
 		[ "`${SED} -En -e '/^@cw?d[ 	]*/s,,,p' ${TMPPLIST} | ${TAIL} -n 1`" != "${PREFIX}" ]; then \