explicit_lib_depends.sh:

 - check if an installed libtool records dependencies recursively and
   print a warning if it does
       currently it prints the warning on every system which has libtool
       installed from ports (only my local version doesn't do this, the
       version in the ports is not correctly patched for this, a patch
       similar in complexity (= simple) like the ltdl.m4 one in the
       libtool-port-patch-directory is needed)
 - enhance the regex which is responsible to not print a dependency to
   the port we are just checking
 - add a work in progress (not executed) to collapse the USE_* which
   can have more than one value

neededlibs.sh:
 - we also care about shared libs

resolveportsfromlibs.sh:
 - take care about USE_OPENSSL, USE_EFL, USE_GL, USE_FAM, USE_OPENLDAP,
   USE_SDL
 - search in the "ldconfig -r" output if we can not find the lib ourself
 - a better way of getting the first part of the LIB_DEPENDS stuff
   (lib/libXYZ.so can be specified now too)
 - some line wrapping + whitespace
 - print the origin for the USE_* too (except USE_OPENSSL), so an user
   can make some sanity checks and the explicit_lib_depends.sh can DTRT
   if we check the USE_* port itself
 - warn if we can not determine the right component (can happen for XORG)
   unambiguously.

1 files changed, 38 insertions, 1 deletions

diff --git a/Tools/scripts/explicit_lib_depends.sh b/Tools/scripts/explicit_lib_depends.sh
index afd8e289ccd7..e9de4cb9fa21 100755
--- a/Tools/scripts/explicit_lib_depends.sh
+++ b/Tools/scripts/explicit_lib_depends.sh
@@ -83,6 +83,15 @@ if [ -z "${PKG_DBDIR} -o ! -d "${PKG_DBDIR}" ]; then
 	PKG_DBDIR=/var/db/pkg
 fi
 
+libtool=$(which libtool 2>/dev/null)
+if [ -x ${libtool} ]; then
+	libtool_deplibs=$(grep link_all_deplibs ${libtool} | head -1 | \
+		cut -d = -f 2)
+	if [ "X${libtool_deplibs}" != Xno ]; then
+		echo WARNING: your libtool records dependencies recursively, you can not trust the following output. | fmt
+	fi
+fi
+
 for i in $@; do
 	if [ -d "${i}" ]; then
 		current_port="${i}"
@@ -118,6 +127,34 @@ for i in $@; do
 	' < ${current_port}/+CONTENTS | \
 		xargs ${PORTSDIR}/Tools/scripts/neededlibs.sh | \
 		xargs ${PORTSDIR}/Tools/scripts/resolveportsfromlibs.sh ${bases} | \
-		egrep -v "${myorigin}\$"
+		egrep -v "(\(${myorigin}\)|${myorigin})\$"
  
 done | sort -u
+
+exit 0
+
+# NOT YET: untested, just an outline of what needs to be done
+awk '	/USE_GNOME+=/ {
+		if (have_gnome != 1) {
+			use_gnome = sprintf("%s", $2);
+		} else {
+			use_gnome = sprintf("%s %s", use_gnome, $2);
+			have_gnome = 1;
+		}
+	}
+	/USE_XORG+=/ {
+		if (have_gnome != 1) {
+			use_gnome = sprintf("%s", $2);
+		} else {
+			use_gnome = sprintf("%s %s", use_gnome, $2);
+			have_gnome = 1;
+		}
+	}
+	END {
+		if (have_gnome == 1) {
+			printf("USE_GNOME=	%s\n", have_gnome);
+		}
+		if (have_xorg == 1) {
+			printf("USE_XORG=	%s\n", have_xorg);
+		}
+	}'