Framework: sync with upstream

Taken from: FreeBSD

MOVED

@@ -8238,3 +8238,6 @@ www/eaccelerator||2016-03-20|Has expired: cannot be installed: doesn't work with
 devel/pecl-inclued||2016-03-20|Has expired: cannot be installed: doesn't work with lang/php56 port (doesn't support PHP 5.5 5.6 70)
 security/pecl-taint||2016-03-20|Has expired: cannot be installed: doesn't work with lang/php56 port (doesn't support PHP 5.5 5.6 70)
 net/libnids-libnet11|net/libnids|2016-03-20|Same content
+lang/cloudabi-clang|devel/cloudabi-toolchain|2016-03-21|Merged
+graphics/hugin-devel||2016-03-22|overtaken by released version
+graphics/hugin-2016||2016-03-22|overtaken by released version

Mk/bsd.licenses.mk

@@ -611,17 +611,9 @@ ${_LICENSE_COOKIE}:
 .	if !defined(NO_LICENSES_DIALOGS)
 # Dialog interface
 .		if ${_LICENSE_COMB} == "single"
-	@trap '${RM} -f $$tmpfile' EXIT INT TERM; \
-	tmpfile=$$(mktemp -t portlicenses); \
-	while true; do \
-		${DIALOG} --menu "License for ${PKGNAME} (${_LICENSE})" 21 70 15 accept "Accept license" reject "Reject license" view "View license" 2>"$${tmpfile}"; \
-		result=`${CAT} $${tmpfile}`; \
-		case $${result} in \
-		accept) break ;; \
-		reject) exit 1;; \
-		view)   ${DIALOG} --textbox "${_LICENSE_FILE}" 21 75 ;; \
-		esac; \
-	done
+	@${DIALOG} --title "License for ${PKGNAME} (${_LICENSE})" \
+		--yes-label Accept --no-label Reject --yesno \
+		"$$(${CAT} ${_LICENSE_FILE})" 21 76
 
 .		elif ${_LICENSE_COMB} == "dual"
 	@${RM} -f ${_LICENSE_ASK_DATA}

Mk/bsd.options.desc.mk

@@ -415,6 +415,7 @@ RADIUS_DESC?=		RADIUS protocol support
 RAW_DESC?=		RAW format support
 READLINE_DESC?=		Command line editing via libreadline
 REDIS_DESC?=		Redis key-value store database support
+REGEX_DESC?=		Regular expression support
 RESIN3_DESC?=		Resin 3.x support
 RTMP_DESC?=		RTMP protocol support via librtmp
 RUBY_DESC?=		Ruby bindings or support