From owner-svn-ports-all@FreeBSD.ORG Wed Jul 16 05:55:15 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 65E18A35; Wed, 16 Jul 2014 05:55:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 47F572F80; Wed, 16 Jul 2014 05:55:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6G5tFMA066496; Wed, 16 Jul 2014 05:55:15 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6G5tEQq066493; Wed, 16 Jul 2014 05:55:14 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201407160555.s6G5tEQq066493@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 16 Jul 2014 05:55:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362031 - in head: . Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jul 2014 05:55:15 -0000 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@FreeBSD.org + + Only one format is now support in LIB_DEPENDS: lib*.so + 20140708: AUTHOR: mva@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) || \