Framework: sync with upstream

Taken from: FreeBSD

MOVED

@@ -8329,3 +8329,4 @@ security/easypg||2016-05-22|Has expired: Included into emacs since 2.3
 databases/py-sqlalchemy|databases/py-sqlalchemy07|2016-05-18|Renamed to databases/py-sqlalchemy07
 databases/py-sqlalchemy-devel|databases/py-sqlalchemy08|2016-05-18|Renamed to databases/py-sqlalchemy08
 misc/kdehier4||2016-05-25|Not used since 2014
+devel/maven-ant-tasks||2016-05-27|Use Maven directly

Mk/Uses/ada.mk

@@ -2,11 +2,10 @@
 #
 # Establish Ada-capable compiler as a build dependency
 # To change default compiler, define ADA_DEFAULT in make.conf to 5
-# Note that gcc47-aux is being removed soon, so 47 is not a legal default
 #
 # Feature:      ada
 # Usage:        USES=ada
-# Valid ARGS:   49, 5, 6, run
+# Valid ARGS:   5, 6, run
 #
 # MAINTAINER: [email protected]
 
@@ -16,16 +15,12 @@ _INCLUDE_USES_ADA_MK=    yes
 CC=	ada
 ADAXX=	gcc6	# framework default
 
-. if ${ada_ARGS:M49}
-ADAXX=	gcc
-. elif ${ada_ARGS:M5}
+. if ${ada_ARGS:M5}
 ADAXX=	gcc5
 . elif ${ada_ARGS:M6}
 ADAXX=	gcc6
 . elif defined(ADA_DEFAULT)
-.  if ${ADA_DEFAULT} == 49
-ADAXX=	gcc
-.  elif ${ADA_DEFAULT} == 5
+.  if ${ADA_DEFAULT} == 5
 ADAXX=	gcc5
 .  endif
 . endif

UPDATING

@@ -5,6 +5,24 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20160527
+  AFFECTS: Users of mail/opensmtpd-extras (any of them)
+  AUTHOR: [email protected]
+
+  The invocation for extras has changed. Some extras might fail unless
+  you pass all options/arguments separated by quotes:
+
+      filter myfilter dnsbl "-c /var/chroot/dnsbl" "-h my.dnsbl.com"
+
+  Additionally, extras now run in a chroot. Either pass "-C" to skip the
+  chroot entirely (not recommended), or put all required config files,
+  resolv.conf, and external binaries into the chroot. For example:
+
+      # mkdir -p /var/chroot/dnsbl/etc
+      # cp /etc/resolv.conf /var/chroot/dnsbl/etc
+
+      And pass "-c /var/chroot/dnsbl" to the filter.
+
 20160526:
   AFFECTS: Users of mail/opensmtpd
   AUTHOR: [email protected]