ports/170316: Mk/bsd.options.mk: add compatibility for PORTDATA for optionsNG

[Jason Helfman]

>Number:         170316
>Category:       ports
>Synopsis:       Mk/bsd.options.mk: add compatibility for PORTDATA for optionsNG
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 01 19:30:15 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Jason Helfman
>Release:        FreeBSD 9.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 9.0-STABLE FreeBSD 9.0-STABLE #6 r235139: Tue May 8 21:19:03 UTC 2012 simon at freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL i386


	
>Description:
Add portdata to optionsNG as a default.

PORT_OPTIONS added is DATA
>How-To-Repeat:
	
>Fix:

Index: Mk/bsd.options.mk
===================================================================
--- Mk/bsd.options.mk	(revision 301838)
+++ Mk/bsd.options.mk	(working copy)
@@ -29,10 +29,15 @@
 
 OPTIONSFILE?=	${PORT_DBDIR}/${UNIQUENAME}/options
 
-#ALL_OPTIONS=	DOCS \
+#ALL_OPTIONS=	DATA \
+#		DOCS \
 #		NLS
 
 # Set the default values for the global options, as defined by portmgr
+.if !defined(NOPORTDATA)
+PORT_OPTIONS+=	DATA
+.endif
+
 .if !defined(NOPORTDOCS)
 PORT_OPTIONS+=	DOCS
 .endif
@@ -200,6 +205,10 @@
 .endif
 
 ## Now some compatibility
+.if empty(PORT_OPTIONS:MDATA)
+NOPORTDATA=	yes
+.endif
+
 .if empty(PORT_OPTIONS:MDOCS)
 NOPORTDOCS=	yes
 .endif
>Release-Note:
>Audit-Trail:
>Unformatted: