svn commit: r370431 - head/Mk

[Baptiste Daroussin]

Author: bapt
Date: Wed Oct  8 10:08:24 2014
New Revision: 370431
URL: https://svnweb.freebsd.org/changeset/ports/370431
QAT: https://qat.redports.org/buildarchive/r370431/

Log:
  Use bsd.sanity.mk to check for INSTALLS_SHLIB

Modified:
  head/Mk/bsd.port.mk
  head/Mk/bsd.sanity.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Wed Oct  8 10:07:59 2014	(r370430)
+++ head/Mk/bsd.port.mk	Wed Oct  8 10:08:24 2014	(r370431)
@@ -3733,9 +3733,6 @@ install-ldconfig-file:
 	@${ECHO_CMD} ${LOCALBASE}/${LDCONFIG32_DIR}/${UNIQUENAME} >> ${TMPPLIST}
 .endif
 .endif
-.if defined(INSTALLS_SHLIB)
-	@${ECHO_MSG} "INSTALLS_SHLIB is deprecated. Use USE_LDCONFIG instead."
-.endif
 .endif
 .endif
 

Modified: head/Mk/bsd.sanity.mk
==============================================================================
--- head/Mk/bsd.sanity.mk	Wed Oct  8 10:07:59 2014	(r370430)
+++ head/Mk/bsd.sanity.mk	Wed Oct  8 10:08:24 2014	(r370431)
@@ -140,7 +140,8 @@ DEV_ERROR+=	"INSTALLS_EGGINFO is no long
 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 NO_INSTALL_MANPAGES
+		USE_GETTEXT USE_GMAKE USE_SCONS USE_DRUPAL NO_INSTALL_MANPAGES \
+		INSTALLS_SHLIB
 SANITY_DEPRECATED=	USE_XZ USE_BZIP2 USE_PYDISTUTILS PYTHON_CONCURRENT_INSTALL \
 		PYDISTUTILS_AUTOPLIST PYTHON_PY3K_PLIST_HACK PYDISTUTILS_NOEGGINFO \
 		USE_PYTHON_PREFIX PYTHON_PKGNAMESUFFIX
@@ -166,6 +167,7 @@ USE_GETTEXT_ALT=	USES=gettext
 USE_SCONS_ALT=		USES=scons
 USE_DRUPAL_ALT=		USES=drupal
 USE_PYDISTUTILS_ALT=		USE_PYTHON=distutils
+INSTALLS_SHLIB_ALT=	USE_LDCONFIG
 PYTHON_CONCURRENT_INSTALL_ALT=	USE_PYTHON=concurrent
 PYDISTUTILS_AUTOPLIST_ALT=	USE_PYTHON=autoplist
 PYTHON_PY3K_PLIST_HACK_ALT=	USE_PYTHON=py3kplist