Index: head/devel/ada-util/Makefile
===================================================================
--- head/devel/ada-util/Makefile	(revision 404783)
+++ head/devel/ada-util/Makefile	(revision 404784)
@@ -1,58 +1,61 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	ada-util
 PORTVERSION=	1.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	marino@FreeBSD.org
 COMMENT=	Utility library for Ada 2005 applications
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	gprbuild:${PORTSDIR}/devel/gprbuild \
-		xmlada>=4.4:${PORTSDIR}/textproc/xmlada \
 		${LOCALBASE}/lib/gnat/ahven.gpr:${PORTSDIR}/devel/ahven
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 
 USES=		ada gmake
 USE_GITHUB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-ahven
 CONFIGURE_ENV=	ac_cv_lib_dl_dlopen=no
 LDFLAGS=	-L${LOCALBASE}/lib
 
 GH_ACCOUNT=	stcarrez
 GH_TAGNAME=	b6612400
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,freebsd\*,dragonfly*|freebsd*,' \
 		-e "s/^NR_CPUS=.*/NR_CPUS=${MAKE_JOBS_NUMBER}/" \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|@prefix@|$${DESTDIR}@prefix@|' \
 		-e '/GPRINSTALL/ \
 		s|--prefix|--project-subdir=lib/gnat --prefix|' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e '/Content_Type/d' \
 		${WRKSRC}/src/http/util-http-rest.adb
 
 	# Loggers are hardcoded for several packages at the INFO level
 	# which is quite useless for things like spawning commands.
 	# Set the loggers to filter out everything up less than ERROR
 
 	@${REINPLACE_CMD} -e '/Loggers.Create/s|);|, Util.Log.ERROR_LEVEL);|'\
 		${WRKSRC}/src/http/aws/util-http-clients-web.adb \
 		${WRKSRC}/src/http/curl/util-http-clients-curl.adb \
 		${WRKSRC}/src/http/util-http-clients.adb \
 		${WRKSRC}/src/http/util-http-parts.adb \
 		${WRKSRC}/src/util-beans-factory.adb \
 		${WRKSRC}/src/util-processes.adb \
 		${WRKSRC}/src/util-properties-bundles.adb \
 		${WRKSRC}/src/xml/util-serialize-io-xml.adb
 
 post-install:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/gnat/manifests
+	# Scoop up all the source files gprinstall missed. (!)
+	${INSTALL_DATA} ${WRKSRC}/src/*.ad[bs] ${WRKSRC}/src/http/*.ad[bs] \
+		${WRKSRC}/src/os-linux/*.ad[bs] \
+		${STAGEDIR}${PREFIX}/include/util.static
 
 .include <bsd.port.mk>
Index: head/devel/ada-util/files/patch-configure
===================================================================
--- head/devel/ada-util/files/patch-configure	(nonexistent)
+++ head/devel/ada-util/files/patch-configure	(revision 404784)
@@ -0,0 +1,84 @@
+--- configure.orig	2015-10-11 18:41:42 UTC
++++ configure
+@@ -3874,81 +3874,11 @@ UTIL_HAVE_PRJ_DIRECTORIES=${gnat_project
+ # XMLAda library
+ ##########################################
+ 
+-gnat_xml_ada=xmlada-config
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking xmlada library" >&5
+-$as_echo_n "checking xmlada library... " >&6; }
+ 
+-# Check whether --with-xmlada was given.
+-if test "${with_xmlada+set}" = set; then :
+-  withval=$with_xmlada;
+-  gnat_xml_ada=${withval}/xmlada-config
+-  WITH_XML_ADA="with \"${withval}\";";
+-  UTIL_XML_DIR='src/xml';
+-  UTIL_HAVE_XML='yes';
+-
+-else
+-
+-  WITH_XML_ADA='';
+-  UTIL_XML_DIR='src';
+-  UTIL_HAVE_XML='no';
+-
+-fi
+-
+-
+-ac_xml_version=`$gnat_xml_ada --version 2>/dev/null | sed -e 's, ,-,g'`
+-case $ac_xml_version in
+-  XmlAda-3.2*)
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_xml_version" >&5
+-$as_echo "$ac_xml_version" >&6; }
+-      WITH_XML_ADA="with \"xmlada\";";
+-      UTIL_XML_DIR='src/xml';
+-      UTIL_XML_VERSION='3';
+-      UTIL_HAVE_XML='yes';
+-      ;;
+-
+-  XmlAda-4.*|XmlAda-2013|XmlAda-2014)
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_xml_version" >&5
+-$as_echo "$ac_xml_version" >&6; }
+-      WITH_XML_ADA="with \"xmlada\";";
+-      UTIL_XML_DIR='src/xml';
+-      UTIL_XML_VERSION='4';
+-      UTIL_HAVE_XML='yes';
+-      ;;
+-
+-  *)
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-      ;;
+-
+-esac
+-
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether xmlada project exists" >&5
+-$as_echo_n "checking whether xmlada project exists... " >&6; }
+-  echo "with \"xmlada\"; project t is for Source_Dirs use (); end t;" > t.gpr
+-  $GNATMAKE -p -Pt >/dev/null 2>/dev/null
+-  if test $? -eq 0; then
+-    gnat_project_xmlada=yes
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, using xmlada" >&5
+-$as_echo "yes, using xmlada" >&6; }
+-    gnat_project_with_xmlada="with \"xmlada\";";
+-  else
+-    gnat_project_xmlada=no
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-  fi;
+-  rm -f t.gpr
+-
+-
+-if test T$gnat_project_xmlada_sax = Tno; then
+   WITH_XML_ADA='';
+   UTIL_XML_DIR='src';
+   UTIL_XML_VERSION='none';
+   UTIL_HAVE_XML='no';
+-fi
+-
+-
+-
+-
+ 
+ 
+ ##########################################

Property changes on: head/devel/ada-util/files/patch-configure
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/ada-util/pkg-plist
===================================================================
--- head/devel/ada-util/pkg-plist	(revision 404783)
+++ head/devel/ada-util/pkg-plist	(revision 404784)
@@ -1,295 +1,349 @@
 include/util.static/util-algorithms.ads
 include/util.static/util-beans-basic-lists.adb
 include/util.static/util-beans-basic-lists.ads
 include/util.static/util-beans-basic-ranges.adb
 include/util.static/util-beans-basic-ranges.ads
 include/util.static/util-beans-basic.ads
+include/util.static/util-beans-factory.adb
 include/util.static/util-beans-factory.ads
+include/util.static/util-beans-lists-strings.adb
 include/util.static/util-beans-lists-strings.ads
 include/util.static/util-beans-lists.ads
 include/util.static/util-beans-methods.ads
+include/util.static/util-beans-objects-datasets.adb
 include/util.static/util-beans-objects-datasets.ads
 include/util.static/util-beans-objects-enums.adb
 include/util.static/util-beans-objects-enums.ads
+include/util.static/util-beans-objects-hash.adb
 include/util.static/util-beans-objects-hash.ads
+include/util.static/util-beans-objects-lists.adb
 include/util.static/util-beans-objects-lists.ads
+include/util.static/util-beans-objects-maps.adb
 include/util.static/util-beans-objects-maps.ads
+include/util.static/util-beans-objects-pairs.adb
 include/util.static/util-beans-objects-pairs.ads
 include/util.static/util-beans-objects-records.adb
 include/util.static/util-beans-objects-records.ads
+include/util.static/util-beans-objects-time.adb
 include/util.static/util-beans-objects-time.ads
 include/util.static/util-beans-objects-to_access.adb
 include/util.static/util-beans-objects-to_access.ads
 include/util.static/util-beans-objects-vectors.ads
+include/util.static/util-beans-objects.adb
 include/util.static/util-beans-objects.ads
 include/util.static/util-beans-ranges.ads
 include/util.static/util-beans.ads
 include/util.static/util-concurrent-arrays.adb
 include/util.static/util-concurrent-arrays.ads
 include/util.static/util-concurrent-copies.adb
 include/util.static/util-concurrent-copies.ads
 include/util.static/util-concurrent-counters.adb
 include/util.static/util-concurrent-counters.ads
 include/util.static/util-concurrent-fifos.adb
 include/util.static/util-concurrent-fifos.ads
+include/util.static/util-concurrent-locks.adb
 include/util.static/util-concurrent-locks.ads
 include/util.static/util-concurrent-pools.adb
 include/util.static/util-concurrent-pools.ads
 include/util.static/util-concurrent.ads
+include/util.static/util-dates-formats.adb
 include/util.static/util-dates-formats.ads
+include/util.static/util-dates-iso8601.adb
 include/util.static/util-dates-iso8601.ads
+include/util.static/util-dates-rfc7231.adb
 include/util.static/util-dates-rfc7231.ads
+include/util.static/util-dates.adb
 include/util.static/util-dates.ads
 include/util.static/util-encoders-base16.adb
 include/util.static/util-encoders-base16.ads
+include/util.static/util-encoders-base64.adb
 include/util.static/util-encoders-base64.ads
+include/util.static/util-encoders-hmac-sha1.adb
 include/util.static/util-encoders-hmac-sha1.ads
 include/util.static/util-encoders-hmac.ads
+include/util.static/util-encoders-sha1.adb
 include/util.static/util-encoders-sha1.ads
+include/util.static/util-encoders.adb
 include/util.static/util-encoders.ads
+include/util.static/util-events-channels.adb
 include/util.static/util-events-channels.ads
+include/util.static/util-events.adb
 include/util.static/util-events.ads
+include/util.static/util-files.adb
 include/util.static/util-files.ads
+include/util.static/util-http-clients-mockups.adb
 include/util.static/util-http-clients-mockups.ads
+include/util.static/util-http-clients.adb
 include/util.static/util-http-clients.ads
+include/util.static/util-http-cookies.adb
 include/util.static/util-http-cookies.ads
+include/util.static/util-http-mockups.adb
 include/util.static/util-http-mockups.ads
+include/util.static/util-http-parts.adb
 include/util.static/util-http-parts.ads
 include/util.static/util-http-rest-rest_get_vector.adb
 include/util.static/util-http-rest-rest_get_vector.ads
 include/util.static/util-http-rest.adb
 include/util.static/util-http-rest.ads
+include/util.static/util-http-tools.adb
 include/util.static/util-http-tools.ads
+include/util.static/util-http.adb
 include/util.static/util-http.ads
 include/util.static/util-listeners-lifecycles.adb
 include/util.static/util-listeners-lifecycles.ads
 include/util.static/util-listeners-observers.adb
 include/util.static/util-listeners-observers.ads
 include/util.static/util-listeners.ads
+include/util.static/util-locales.adb
 include/util.static/util-locales.ads
+include/util.static/util-log-appenders.adb
 include/util.static/util-log-appenders.ads
 include/util.static/util-log-loggers-traceback-gnat.adb
+include/util.static/util-log-loggers-traceback-none.adb
+include/util.static/util-log-loggers.adb
 include/util.static/util-log-loggers.ads
+include/util.static/util-log.adb
 include/util.static/util-log.ads
+include/util.static/util-measures.adb
 include/util.static/util-measures.ads
+include/util.static/util-processes-os.adb
 include/util.static/util-processes-os.ads
+include/util.static/util-processes.adb
 include/util.static/util-processes.ads
+include/util.static/util-properties-basic.adb
 include/util.static/util-properties-basic.ads
+include/util.static/util-properties-bundles.adb
 include/util.static/util-properties-bundles.ads
 include/util.static/util-properties-discrete.adb
 include/util.static/util-properties-discrete.ads
+include/util.static/util-properties-factories.adb
 include/util.static/util-properties-factories.ads
+include/util.static/util-properties-hash.adb
 include/util.static/util-properties-hash.ads
+include/util.static/util-properties-json.adb
 include/util.static/util-properties-json.ads
+include/util.static/util-properties.adb
 include/util.static/util-properties.ads
 include/util.static/util-refs.adb
 include/util.static/util-refs.ads
+include/util.static/util-serialize-contexts.adb
 include/util.static/util-serialize-contexts.ads
+include/util.static/util-serialize-io-csv.adb
 include/util.static/util-serialize-io-csv.ads
+include/util.static/util-serialize-io-json.adb
 include/util.static/util-serialize-io-json.ads
-include/util.static/util-serialize-io-xml-get_location-xmlada-4.adb
-include/util.static/util-serialize-io-xml.ads
+include/util.static/util-serialize-io.adb
 include/util.static/util-serialize-io.ads
 include/util.static/util-serialize-mappers-record_mapper.adb
 include/util.static/util-serialize-mappers-record_mapper.ads
 include/util.static/util-serialize-mappers-vector_mapper.adb
 include/util.static/util-serialize-mappers-vector_mapper.ads
+include/util.static/util-serialize-mappers.adb
 include/util.static/util-serialize-mappers.ads
+include/util.static/util-serialize-tools.adb
 include/util.static/util-serialize-tools.ads
 include/util.static/util-serialize.ads
 include/util.static/util-stacks.adb
 include/util.static/util-stacks.ads
+include/util.static/util-streams-buffered.adb
 include/util.static/util-streams-buffered.ads
+include/util.static/util-streams-files.adb
 include/util.static/util-streams-files.ads
+include/util.static/util-streams-pipes.adb
 include/util.static/util-streams-pipes.ads
+include/util.static/util-streams-raw.adb
 include/util.static/util-streams-raw.ads
+include/util.static/util-streams-sockets.adb
 include/util.static/util-streams-sockets.ads
+include/util.static/util-streams-texts.adb
 include/util.static/util-streams-texts.ads
+include/util.static/util-streams.adb
 include/util.static/util-streams.ads
 include/util.static/util-strings-builders-transforms.ads
 include/util.static/util-strings-builders.ads
 include/util.static/util-strings-maps.ads
 include/util.static/util-strings-sets.ads
 include/util.static/util-strings-tokenizers.ads
+include/util.static/util-strings-transforms.adb
 include/util.static/util-strings-transforms.ads
 include/util.static/util-strings-vectors.ads
 include/util.static/util-strings.adb
 include/util.static/util-strings.ads
 include/util.static/util-systems-constants.ads
+include/util.static/util-systems-dlls.adb
 include/util.static/util-systems-dlls.ads
 include/util.static/util-systems-os.ads
 include/util.static/util-systems-types.ads
 include/util.static/util-systems.ads
 include/util.static/util-texts-builders.adb
 include/util.static/util-texts-builders.ads
 include/util.static/util-texts-formats.adb
 include/util.static/util-texts-formats.ads
 include/util.static/util-texts-tokenizers.adb
 include/util.static/util-texts-tokenizers.ads
 include/util.static/util-texts-transforms.adb
 include/util.static/util-texts-transforms.ads
 include/util.static/util-texts.ads
 include/util.static/util.ads
 include/util_http_curl.static/util-http-clients-curl-constants.ads
 include/util_http_curl.static/util-http-clients-curl.ads
 include/util_unit.static/ahven-astrings.ads
 include/util_unit.static/ahven-framework.adb
 include/util_unit.static/ahven-framework.ads
 include/util_unit.static/ahven-listeners-basic.ads
 include/util_unit.static/ahven-listeners.ads
 include/util_unit.static/ahven-long_astrings.ads
 include/util_unit.static/ahven-parameters.ads
 include/util_unit.static/ahven-results.ads
 include/util_unit.static/ahven-runner.ads
 include/util_unit.static/ahven-slist.adb
 include/util_unit.static/ahven-slist.ads
 include/util_unit.static/ahven-tap_runner.ads
 include/util_unit.static/ahven-temporary_output.ads
 include/util_unit.static/ahven-text_runner.ads
 include/util_unit.static/ahven-xml_runner.ads
 include/util_unit.static/ahven.adb
 include/util_unit.static/ahven.ads
 include/util_unit.static/ahven_compat.ads
 include/util_unit.static/util-assertions.adb
 include/util_unit.static/util-assertions.ads
 include/util_unit.static/util-test_caller.adb
 include/util_unit.static/util-test_caller.ads
 include/util_unit.static/util-tests-servers.ads
 include/util_unit.static/util-tests.adb
 include/util_unit.static/util-tests.ads
 include/util_unit.static/util-xunit.adb
 include/util_unit.static/util-xunit.ads
 lib/gnat/util.gpr
 lib/gnat/util_http.gpr
 lib/gnat/util_http_curl.gpr
 lib/gnat/util_unit.gpr
 lib/util.static/libada_util.a
 lib/util.static/util-algorithms.ali
 lib/util.static/util-beans-basic-lists.ali
 lib/util.static/util-beans-basic-ranges.ali
 lib/util.static/util-beans-basic.ali
 lib/util.static/util-beans-factory.ali
 lib/util.static/util-beans-lists-strings.ali
 lib/util.static/util-beans-lists.ali
 lib/util.static/util-beans-methods.ali
 lib/util.static/util-beans-objects-datasets.ali
 lib/util.static/util-beans-objects-enums.ali
 lib/util.static/util-beans-objects-hash.ali
 lib/util.static/util-beans-objects-lists.ali
 lib/util.static/util-beans-objects-maps.ali
 lib/util.static/util-beans-objects-pairs.ali
 lib/util.static/util-beans-objects-records.ali
 lib/util.static/util-beans-objects-time.ali
 lib/util.static/util-beans-objects-to_access.ali
 lib/util.static/util-beans-objects-vectors.ali
 lib/util.static/util-beans-objects.ali
 lib/util.static/util-beans-ranges.ali
 lib/util.static/util-beans.ali
 lib/util.static/util-concurrent-arrays.ali
 lib/util.static/util-concurrent-copies.ali
 lib/util.static/util-concurrent-counters.ali
 lib/util.static/util-concurrent-fifos.ali
 lib/util.static/util-concurrent-locks.ali
 lib/util.static/util-concurrent-pools.ali
 lib/util.static/util-concurrent.ali
 lib/util.static/util-dates-formats.ali
 lib/util.static/util-dates-iso8601.ali
 lib/util.static/util-dates-rfc7231.ali
 lib/util.static/util-dates.ali
 lib/util.static/util-encoders-base16.ali
 lib/util.static/util-encoders-base64.ali
 lib/util.static/util-encoders-hmac-sha1.ali
 lib/util.static/util-encoders-hmac.ali
 lib/util.static/util-encoders-sha1.ali
 lib/util.static/util-encoders.ali
 lib/util.static/util-events-channels.ali
 lib/util.static/util-events.ali
 lib/util.static/util-files.ali
 lib/util.static/util-http-clients-mockups.ali
 lib/util.static/util-http-clients.ali
 lib/util.static/util-http-cookies.ali
 lib/util.static/util-http-mockups.ali
 lib/util.static/util-http-parts.ali
 lib/util.static/util-http-rest-rest_get_vector.ali
 lib/util.static/util-http-rest.ali
 lib/util.static/util-http-tools.ali
 lib/util.static/util-http.ali
 lib/util.static/util-listeners-lifecycles.ali
 lib/util.static/util-listeners-observers.ali
 lib/util.static/util-listeners.ali
 lib/util.static/util-locales.ali
 lib/util.static/util-log-appenders.ali
 lib/util.static/util-log-loggers.ali
 lib/util.static/util-log.ali
 lib/util.static/util-measures.ali
 lib/util.static/util-processes-os.ali
 lib/util.static/util-processes.ali
 lib/util.static/util-properties-basic.ali
 lib/util.static/util-properties-bundles.ali
 lib/util.static/util-properties-discrete.ali
 lib/util.static/util-properties-factories.ali
 lib/util.static/util-properties-hash.ali
 lib/util.static/util-properties-json.ali
 lib/util.static/util-properties.ali
 lib/util.static/util-refs.ali
 lib/util.static/util-serialize-contexts.ali
 lib/util.static/util-serialize-io-csv.ali
 lib/util.static/util-serialize-io-json.ali
-lib/util.static/util-serialize-io-xml.ali
 lib/util.static/util-serialize-io.ali
 lib/util.static/util-serialize-mappers-record_mapper.ali
 lib/util.static/util-serialize-mappers-vector_mapper.ali
 lib/util.static/util-serialize-mappers.ali
 lib/util.static/util-serialize-tools.ali
 lib/util.static/util-serialize.ali
 lib/util.static/util-stacks.ali
 lib/util.static/util-streams-buffered.ali
 lib/util.static/util-streams-files.ali
 lib/util.static/util-streams-pipes.ali
 lib/util.static/util-streams-raw.ali
 lib/util.static/util-streams-sockets.ali
 lib/util.static/util-streams-texts.ali
 lib/util.static/util-streams.ali
 lib/util.static/util-strings-builders-transforms.ali
 lib/util.static/util-strings-builders.ali
 lib/util.static/util-strings-maps.ali
 lib/util.static/util-strings-sets.ali
 lib/util.static/util-strings-tokenizers.ali
 lib/util.static/util-strings-transforms.ali
 lib/util.static/util-strings-vectors.ali
 lib/util.static/util-strings.ali
 lib/util.static/util-systems-constants.ali
 lib/util.static/util-systems-dlls.ali
 lib/util.static/util-systems-os.ali
 lib/util.static/util-systems-types.ali
 lib/util.static/util-systems.ali
 lib/util.static/util-texts-builders.ali
 lib/util.static/util-texts-formats.ali
 lib/util.static/util-texts-tokenizers.ali
 lib/util.static/util-texts-transforms.ali
 lib/util.static/util-texts.ali
 lib/util.static/util.ali
 lib/util_http_curl.static/libada_util_curl.a
 lib/util_http_curl.static/util-http-clients-curl-constants.ali
 lib/util_http_curl.static/util-http-clients-curl.ali
 lib/util_unit.static/ahven-astrings.ali
 lib/util_unit.static/ahven-framework.ali
 lib/util_unit.static/ahven-listeners-basic.ali
 lib/util_unit.static/ahven-listeners.ali
 lib/util_unit.static/ahven-long_astrings.ali
 lib/util_unit.static/ahven-parameters.ali
 lib/util_unit.static/ahven-results.ali
 lib/util_unit.static/ahven-runner.ali
 lib/util_unit.static/ahven-slist.ali
 lib/util_unit.static/ahven-tap_runner.ali
 lib/util_unit.static/ahven-temporary_output.ali
 lib/util_unit.static/ahven-text_runner.ali
 lib/util_unit.static/ahven-xml_runner.ali
 lib/util_unit.static/ahven.ali
 lib/util_unit.static/ahven_compat.ali
 lib/util_unit.static/libada_util_unit.a
 lib/util_unit.static/util-assertions.ali
 lib/util_unit.static/util-test_caller.ali
 lib/util_unit.static/util-tests-servers.ali
 lib/util_unit.static/util-tests.ali
 lib/util_unit.static/util-xunit.ali