Index: Mk/Scripts/actual-package-depends.sh
===================================================================
--- Mk/Scripts/actual-package-depends.sh	(svn+ssh://svn.freebsd.org/ports/head)	(revision 0)
+++ Mk/Scripts/actual-package-depends.sh	(revision 377642)
@@ -0,0 +1,29 @@
+#!/bin/sh
+# MAINTAINER: portmgr@FeeeBSD.org
+# $FreeBSD$
+
+if [ -z "${PKG_BIN}" ]; then
+	echo "PKG_BIN required in environment." >&2
+	exit 1
+fi
+
+find_dep() {
+	pattern=$1
+	case ${pattern} in
+	*\>*|*\<*|*=*)
+		${PKG_BIN} info -Eg "${pattern}" 2>/dev/null
+		return
+		;;
+	/*)
+		searchfile=$pattern
+		;;
+	*)
+		searchfile=$(/usr/bin/which ${pattern} 2>/dev/null)
+		;;
+	esac
+	[ -n "${searchfile}" ] && ${PKG_BIN} which -q ${searchfile}
+}
+
+for lookup; do
+	${PKG_BIN} query "\"%n\": {origin: \"%o\", version: \"%v\"}" "$(find_dep ${lookup})" || :
+done

Property changes on: Mk/Scripts/actual-package-depends.sh
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: Mk/Scripts/find-lib.sh
===================================================================
--- Mk/Scripts/find-lib.sh	(svn+ssh://svn.freebsd.org/ports/head)	(revision 0)
+++ Mk/Scripts/find-lib.sh	(revision 377643)
@@ -0,0 +1,23 @@
+#!/bin/sh
+# MAINTAINER: portmgr@FreeBSD.org
+# $FreeBSD$
+
+if [ -z "${LIB_DIRS}" -o -z "${LOCALBASE}" ]; then
+	echo "LIB_DIRS, LOCALBASE required in environment." >&2
+	exit 1
+fi
+
+if [ $# -ne 1 ]; then
+	echo "$0: no argument provided." >&2
+fi
+
+lib=$1
+dirs="${LIB_DIRS} `cat ${LOCALBASE}/libdata/ldconfig/* 2>/dev/null || :`"
+
+for libdir in ${dirs} ; do
+	test -f ${libdir}/${lib} || continue
+	libfile=`realpath ${libdir}/${lib}`
+	[ `file -b -L --mime-type ${libfile}` = "application/x-sharedlib" ] || continue
+	echo $libfile
+	break
+done

Property changes on: Mk/Scripts/find-lib.sh
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk	(svn+ssh://svn.freebsd.org/ports/head)	(revision 377690)
+++ Mk/bsd.port.mk	(working copy)
@@ -4473,18 +4473,8 @@
 		target="${DEPENDS_TARGET}"; \
 		depends_args="${DEPENDS_ARGS}"; \
 		${ECHO_MSG}  -n "===>   ${PKGNAME} depends on shared library: $${lib}" ; \
-		found=0 ; \
-		dirs="${LIB_DIRS} `${CAT} ${LOCALBASE}/libdata/ldconfig/* 2>/dev/null || : `" ; \
-		for libdir in $$dirs; do \
-			test -f $${libdir}/$${lib} || continue; \
-			if [ -x /usr/bin/file ]; then \
-				_LIB_FILE=`realpath $${libdir}/$${lib}`; \
-				[ `file -b -L --mime-type $${_LIB_FILE}` = "application/x-sharedlib" ] || continue ; \
-			fi ; \
-			found=1 ; \
-			${ECHO_MSG} -n " - found ($${_LIB_FILE})"; \
-		done ; \
-		if [ $${found} -eq 0 ]; then \
+		libfile=`${SETENV} LIB_DIRS="${LIB_DIRS}" LOCALBASE="${LOCALBASE}" ${SH} ${SCRIPTSDIR}/find-lib.sh $${lib}` ; \
+		if [ -z "$${libfile}" ]; then \
 			${ECHO_MSG} " - not found"; \
 			${ECHO_MSG} "===>    Verifying for $$lib in $$dir"; \
 			if [ ! -d "$$dir" ] ; then \
@@ -4493,7 +4483,7 @@
 				${_INSTALL_DEPENDS} \
 			fi ; \
 		else \
-			${ECHO_MSG}; \
+			${ECHO_MSG} " - found ($${libfile})"; \
 		fi ; \
 	done
 .endif
@@ -4801,9 +4791,11 @@
 	done
 
 ACTUAL-PACKAGE-DEPENDS?= \
-	if [ "${_LIB_RUN_DEPENDS}" != "  " ]; then \
-		${PKG_QUERY} "\"%n\": {origin: %o, version: \"%v\"}" " " ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,:C,${PORTSDIR}/,,} 2>/dev/null || : ; \
-	fi
+	depfiles="" ; \
+	for lib in ${LIB_DEPENDS:C/\:.*//}; do \
+		depfiles="$$depfiles `${SETENV} LIB_DIRS="${LIB_DIRS}" LOCALBASE="${LOCALBASE}" ${SH} ${SCRIPTSDIR}/find-lib.sh $${lib}`" ; \
+	done ; \
+	${SETENV} PKG_BIN="${PKG_BIN}" ${SH} ${SCRIPTSDIR}/actual-package-depends.sh $${depfiles} ${RUN_DEPENDS:C/(.*)\:.*/"\1"/}
 
 create-manifest:
 	@${MKDIR} ${METADIR}; \
Index: Mk/bsd.options.mk
===================================================================
--- Mk/bsd.options.mk	(svn+ssh://svn.freebsd.org/ports/head)	(revision 377690)
+++ Mk/bsd.options.mk	(working copy)
@@ -99,8 +99,6 @@
 #				USE_FOO+= bar
 #				If you need more than one option, you can do
 #				FOO=bar,baz and you'll get USE_FOO=bar baz
-# ${opt}_USE_OFF=	FOO=bar	When option is disabled, it will enable
-#				USE_FOO+= bar
 #
 # For each of:
 # ALL_TARGET CATEGORIES CFLAGS CONFIGURE_ENV CONFLICTS CONFLICTS_BUILD
@@ -462,12 +460,6 @@
 .      endif
 .    endfor
 .  else
-.    if defined(${opt}_USE_OFF)
-.      for option in ${${opt}_USE_OFF}
-_u=		${option:C/=.*//g}
-USE_${_u:tu}+=	${option:C/.*=//g:C/,/ /g}
-.      endfor
-.    endif
 .    if defined(${opt}_CONFIGURE_ENABLE)
 .      for iopt in ${${opt}_CONFIGURE_ENABLE}
 CONFIGURE_ARGS+=	--disable-${iopt:C/=.*//}
Index: www/chromium/Makefile
===================================================================
--- www/chromium/Makefile	(svn+ssh://svn.freebsd.org/ports/head)	(revision 377690)
+++ www/chromium/Makefile	(working copy)
@@ -52,7 +52,7 @@
 		libwebp.so:${PORTSDIR}/graphics/webp
 
 RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins \
-		${LOCALBASE}/lib/X11/fonts/Droid/fonts.dir:${PORTSDIR}/x11-fonts/droid-fonts-ttf \
+		droid-fonts-ttf>0:${PORTSDIR}/x11-fonts/droid-fonts-ttf \
 		xdg-open:${PORTSDIR}/devel/xdg-utils
 
 ONLY_FOR_ARCHS=	i386 amd64