svn commit: r369800 - in head: Mk Mk/Uses math/vtk5

[Marcus von Appen]

Author: mva
Date: Thu Oct  2 07:53:52 2014
New Revision: 369800
URL: https://svnweb.freebsd.org/changeset/ports/369800
QAT: https://qat.redports.org/buildarchive/r369800/

Log:
  - Mark INSTALLS_EGGINFO as unsupported
  
  Differential Revision:	D843
  Reviewed by:	gahr@, koobs@
  Approved by:	bapt@ (portmgr)

Modified:
  head/Mk/Uses/python.mk
  head/Mk/bsd.sanity.mk
  head/math/vtk5/Makefile

Modified: head/Mk/Uses/python.mk
==============================================================================
--- head/Mk/Uses/python.mk	Thu Oct  2 07:45:59 2014	(r369799)
+++ head/Mk/Uses/python.mk	Thu Oct  2 07:53:52 2014	(r369800)
@@ -547,7 +547,7 @@ PYDISTUTILS_EGGINFODIR?=${STAGEDIR}${PYT
 add-plist-egginfo:
 .if !defined(_PYTHON_FEATURE_NOEGGINFO) && \
 	!defined(_PYTHON_FEATURE_AUTOPLIST) && \
-	(defined(INSTALLS_EGGINFO) || defined(_PYTHON_FEATURE_DISTUTILS)) && \
+	defined(_PYTHON_FEATURE_DISTUTILS) && \
 	defined(PYTHON_REL)
 . for egginfo in ${PYDISTUTILS_EGGINFO}
 	if [ -d "${PYDISTUTILS_EGGINFODIR}/${egginfo}" ]; then \

Modified: head/Mk/bsd.sanity.mk
==============================================================================
--- head/Mk/bsd.sanity.mk	Thu Oct  2 07:45:59 2014	(r369799)
+++ head/Mk/bsd.sanity.mk	Thu Oct  2 07:53:52 2014	(r369800)
@@ -134,7 +134,7 @@ DEV_WARNING+=	"PYDISTUTILS_INSTALLNOSING
 .endif
 
 .if defined(INSTALLS_EGGINFO)
-DEV_WARNING+=	"INSTALLS_EGGINFO is deprecated, please add the entry directly to the plist"
+DEV_ERROR+=	"INSTALLS_EGGINFO is no longer supported, please add the entry directly to the plist"
 .endif
 
 SANITY_UNSUPPORTED=	USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \

Modified: head/math/vtk5/Makefile
==============================================================================
--- head/math/vtk5/Makefile	Thu Oct  2 07:45:59 2014	(r369799)
+++ head/math/vtk5/Makefile	Thu Oct  2 07:53:52 2014	(r369800)
@@ -146,7 +146,8 @@ IGNORE=		python wrapping requires shared
 .endif
 USE_PYTHON=	yes
 PYDISTUTILS_PKGNAME=	VTK
-INSTALLS_EGGINFO=	yes
+# INSTALLS_EGGINFO support has been removed
+# INSTALLS_EGGINFO=	yes
 CMAKE_ARGS+=	-DVTK_WRAP_PYTHON:BOOL=ON \
     		-DVTK_PYTHON_SETUP_ARGS:STRING='--prefix="${PREFIX}"'
 PLIST_SUB+=	PYTHON=""