svn commit: r362031 - in head: . Mk

[Baptiste Daroussin]

Author: bapt
Date: Wed Jul 16 05:55:14 2014
New Revision: 362031
URL: http://svnweb.freebsd.org/changeset/ports/362031
QAT: https://qat.redports.org/buildarchive/r362031/

Log:
  Now that all LIB_DEPENDS has been switched to modern version, remove support
  for ancient version.
  
  Phabric:	D415
  Reviewed by:	swills

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

Modified: head/CHANGES
==============================================================================
--- head/CHANGES	Wed Jul 16 05:53:34 2014	(r362030)
+++ head/CHANGES	Wed Jul 16 05:55:14 2014	(r362031)
@@ -10,6 +10,11 @@ in the release notes and/or placed into 
 
 All ports committers are allowed to commit to this file.
 
+20140715:
+AUTHOR: bapt at FreeBSD.org
+
+  Only one format is now support in LIB_DEPENDS: lib*.so
+
 20140708:
 AUTHOR: mva at FreeBSD.org
 

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Wed Jul 16 05:53:34 2014	(r362030)
+++ head/Mk/bsd.port.mk	Wed Jul 16 05:55:14 2014	(r362031)
@@ -4928,7 +4928,7 @@ ${deptype:tl}-depends:
 lib-depends:
 .if defined(LIB_DEPENDS) && !defined(NO_DEPENDS)
 	@set -e ; \
-	for i in ${LIB_DEPENDS:M*.so*\:*}; do \
+	for i in ${LIB_DEPENDS}; do \
 		lib=$${i%%:*} ; \
 		dir=$${i#*:}  ; \
 		target="${DEPENDS_TARGET}"; \
@@ -4957,43 +4957,6 @@ lib-depends:
 			${ECHO_MSG}; \
 		fi ; \
 	done
-	@set -e ; for i in ${LIB_DEPENDS:N*.so*\:*}; do \
-		lib=$${i%%:*}; \
-		pattern="`${ECHO_CMD} $$lib | ${SED} -E -e 's/\./\\\\./g' -e 's/(\\\\)?\+/\\\\+/g'`"\
-		dir=$${i#*:}; \
-		target=$${i##*:}; \
-		if ${TEST} $$dir = $$target; then \
-			target="${DEPENDS_TARGET}"; \
-			depends_args="${DEPENDS_ARGS}"; \
-		else \
-			dir=$${dir%%:*}; \
-		fi; \
-		${ECHO_MSG} -n "===>   ${PKGNAME} depends on shared library: $$lib"; \
-		if ${LDCONFIG} ${_LDCONFIG_FLAGS} -r | ${GREP} -vwF -e "${PKGCOMPATDIR}" | ${GREP} -qwE -e "-l$$pattern"; then \
-			${ECHO_MSG} " - found"; \
-			if [ ${_DEPEND_ALWAYS} = 1 ]; then \
-				${ECHO_MSG} "       (but building it anyway)"; \
-				notfound=1; \
-			else \
-				notfound=0; \
-			fi; \
-		else \
-			${ECHO_MSG} " - not found"; \
-			notfound=1; \
-		fi; \
-		if [ $$notfound != 0 ]; then \
-			${ECHO_MSG} "===>    Verifying $$target for $$lib in $$dir"; \
-			if [ ! -d "$$dir" ]; then \
-				${ECHO_MSG} "     => No directory for $$lib.  Skipping.."; \
-			else \
-				${_INSTALL_DEPENDS} \
-				if ! ${LDCONFIG} ${_LDCONFIG_FLAGS} -r | ${GREP} -vwF -e "${PKGCOMPATDIR}" | ${GREP} -qwE -e "-l$$pattern"; then \
-					${ECHO_MSG} "Error: shared library \"$$lib\" does not exist"; \
-					${FALSE}; \
-				fi; \
-			fi; \
-		fi; \
-	done
 .endif
 
 .endif

Modified: head/Mk/bsd.sanity.mk
==============================================================================
--- head/Mk/bsd.sanity.mk	Wed Jul 16 05:53:34 2014	(r362030)
+++ head/Mk/bsd.sanity.mk	Wed Jul 16 05:55:14 2014	(r362031)
@@ -56,7 +56,7 @@ DEV_WARNING+=	"USE_GNOME=desktopfileutil
 .endif
 
 .if defined(LIB_DEPENDS) && ${LIB_DEPENDS:Nlib*}
-DEV_WARNING+=	"Please use the new format for LIB_DEPENDS, see handbook for details"
+DEV_ERROR+=	"Please use the new format for LIB_DEPENDS, see handbook for details"
 .endif
 
 .if defined(USE_TCL) || defined(USE_TCL_BUILD) || defined(USE_TCL_RUN) || defined(USE_TCL_WRAPPER) || \