svn commit: r487602 - head/Mk

[Rene Ladan]

Author: rene
Date: Sun Dec 16 16:56:22 2018
New Revision: 487602
URL: https://svnweb.freebsd.org/changeset/ports/487602

Log:
  Remove partial support for flavored DEPRECATED and EXPIRATION_DATE
  
  Although nice in theory, all 19 ports that were using it had an "if FLAVOR"
  block in them anyway and it broke support for various tools, such as rmport,
  Freshports (possibly) and pkg notes.
  
  This reverts r484598
  
  Discussed with:	tcberner

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Sun Dec 16 16:49:17 2018	(r487601)
+++ head/Mk/bsd.port.mk	Sun Dec 16 16:56:22 2018	(r487602)
@@ -1504,8 +1504,7 @@ FLAVORS:=	${FLAVOR} ${FLAVORS:N${FLAVOR}}
 
 .if !empty(FLAVOR) && !defined(_DID_FLAVORS_HELPERS)
 _DID_FLAVORS_HELPERS=	yes
-_FLAVOR_HELPERS_OVERRIDE=	DESCR PLIST PKGNAMEPREFIX PKGNAMESUFFIX \
-							DEPRECATED EXPIRATION_DATE
+_FLAVOR_HELPERS_OVERRIDE=	DESCR PLIST PKGNAMEPREFIX PKGNAMESUFFIX
 _FLAVOR_HELPERS_APPEND=	 	CONFLICTS CONFLICTS_BUILD CONFLICTS_INSTALL \
 							PKG_DEPENDS EXTRACT_DEPENDS PATCH_DEPENDS \
 							FETCH_DEPENDS BUILD_DEPENDS LIB_DEPENDS \