svn commit: r383711 - head/Mk/Scripts

Antoine Brodin antoine at FreeBSD.org
Fri Apr 10 08:45:10 UTC 2015


Author: antoine
Date: Fri Apr 10 08:45:09 2015
New Revision: 383711
URL: https://svnweb.freebsd.org/changeset/ports/383711

Log:
  - Remove dead function from find-lib.sh
  - Print a message if dependency registration on a package failed
  
  With hat:	portmgr

Modified:
  head/Mk/Scripts/actual-package-depends.sh
  head/Mk/Scripts/find-lib.sh

Modified: head/Mk/Scripts/actual-package-depends.sh
==============================================================================
--- head/Mk/Scripts/actual-package-depends.sh	Fri Apr 10 08:30:25 2015	(r383710)
+++ head/Mk/Scripts/actual-package-depends.sh	Fri Apr 10 08:45:09 2015	(r383711)
@@ -50,7 +50,8 @@ find_dep() {
 	pattern=$1
 	case ${pattern} in
 	*\>*|*\<*|*=*)
-		${PKG_BIN} info -Eg "${pattern}" 2>/dev/null
+		${PKG_BIN} info -Eg "${pattern}" 2>/dev/null ||
+			echo "actual-package-depends: dependency on ${pattern} not registered" >&2
 		return
 		;;
 	/*)

Modified: head/Mk/Scripts/find-lib.sh
==============================================================================
--- head/Mk/Scripts/find-lib.sh	Fri Apr 10 08:30:25 2015	(r383710)
+++ head/Mk/Scripts/find-lib.sh	Fri Apr 10 08:45:09 2015	(r383711)
@@ -14,25 +14,6 @@ fi
 lib=$1
 dirs="${LIB_DIRS} `cat ${LOCALBASE}/libdata/ldconfig/* 2>/dev/null || :`"
 
-absolute_path() {
-	local file myifs target
-	file=$1
-
-	myifs=${IFS}
-	IFS='/'
-	set -- ${file}
-	IFS=${myifs}
-	for el; do
-		case $el in
-		.) continue ;;
-		'') continue ;;
-		..) target=${target%/*} ;;
-		*) target="${target}/${el}" ;;
-		esac
-	done
-	echo ${target}
-}
-
 for libdir in ${dirs} ; do
 	test -f ${libdir}/${lib} || continue
 	libfile=${libdir}/${lib}


More information about the svn-ports-head mailing list