svn commit: r365170 - in head/Mk: . Uses

[Marcus von Appen]

Author: mva
Date: Sun Aug 17 10:36:08 2014
New Revision: 365170
URL: http://svnweb.freebsd.org/changeset/ports/365170
QAT: https://qat.redports.org/buildarchive/r365170/

Log:
  - Deprecate INSTALLS_EGGINFO
  
  - Remove PYTHON_MASTER_SITES deprecation; the knob is completely gone and can
    not be tested for, since it does not get assigned by default
  
  With hat:	python@

Modified:
  head/Mk/Uses/python.mk
  head/Mk/bsd.sanity.mk

Modified: head/Mk/Uses/python.mk
==============================================================================
--- head/Mk/Uses/python.mk	Sun Aug 17 10:22:49 2014	(r365169)
+++ head/Mk/Uses/python.mk	Sun Aug 17 10:36:08 2014	(r365170)
@@ -208,10 +208,6 @@
 # PYDISTUTILS_NOEGGINFO
 #			- Deprecated, use USE_PYTHON=noegginfo instead
 #
-# PYTHON_MASTER_SITES
-#			- Deprecated, use MASTER_SITE_PYTHON instead,
-#			  see bsd.sites.mk
-#
 # PYTHON_DEFAULT_VERSION
 # PYTHON2_DEFAULT_VERSION
 # PYTHON3_DEFAULT_VERSION

Modified: head/Mk/bsd.sanity.mk
==============================================================================
--- head/Mk/bsd.sanity.mk	Sun Aug 17 10:22:49 2014	(r365169)
+++ head/Mk/bsd.sanity.mk	Sun Aug 17 10:36:08 2014	(r365170)
@@ -145,14 +145,17 @@ DEV_WARNING+=	"USE_PYTHON_BUILD is depre
 DEV_WARNING+=	"PYDISTUTILS_INSTALLNOSINGLE is deprecated, please do not use it anymore"
 .endif
 
+.if defined(INSTALLS_EGGINFO)
+DEV_WARNING+=	"INSTALLS_EGGINFO is deprecated, please add the entry directly to the plist"
+.endif
+
 SANITY_UNSUPPORTED=	USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \
 		USE_READLINE USE_ICONV PERL_CONFIGURE PERL_MODBUILD \
 		USE_PERL5_BUILD USE_PERL5_RUN USE_DISPLAY USE_FUSE \
 		USE_GETTEXT USE_GMAKE USE_SCONS USE_DRUPAL
 SANITY_DEPRECATED=	USE_XZ USE_BZIP2 USE_PYDISTUTILS PYTHON_CONCURRENT_INSTALL \
 		PYDISTUTILS_AUTOPLIST PYTHON_PY3K_PLIST_HACK PYDISTUTILS_NOEGGINFO \
-		PYTHON_MASTER_SITES USE_PYTHON_PREFIX PYTHON_PKGNAMESUFFIX \
-		NO_INSTALL_MANPAGES
+		USE_PYTHON_PREFIX PYTHON_PKGNAMESUFFIX NO_INSTALL_MANPAGES
 
 USE_OPENAL_ALT=		USES=openal
 USE_FAM_ALT=		USES=fam
@@ -181,7 +184,6 @@ PYTHON_PY3K_PLIST_HACK_ALT=	USE_PYTHON=p
 PYDISTUTILS_NOEGGINFO_ALT=	USE_PYTHON=noegginfo
 USE_PYTHON_PREFIX_ALT=		USE_PYTHON=pythonprefix
 PYTHON_PKGNAMESUFFIX_ALT=	PYTHON_PKGNAMEPREFIX
-PYTHON_MASTER_SITES_ALT=	MASTER_SITE_PYTHON
 NO_INSTALL_MANPAGES_ALT=	USES=imake:noman
 
 .for a in ${SANITY_DEPRECATED}