summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Marino <marino@FreeBSD.org>2015-12-29 20:35:43 +0000
committerJohn Marino <marino@FreeBSD.org>2015-12-29 20:35:43 +0000
commit2538b6c8f6f471a7e051caa3bc40c1bd5673708e (patch)
tree77efbb3c9fbcdf3817138937181d750460e2022e
parent- Update to 4.2.2 (diff)
devel/ada-util: Add many missing source files, remove xmlada support
I have my doubts about gprinstall. It missed installing many source files. I can only assume it's buggy. Scoop them up in a crude fashion with post-install target. While here, turn off xmlada support. The configure script in this are is hopelessly broken (it doesn't want to accept no for an answer) so just rip out the configure script guts. XML/Ada is GPL and it will carry the license to any project that uses Ada-util. It also makes XML/Ada a run dependency for the same project. Probably in the future I will return support in form of a non-default option, but I'll want up to a more recent version.
-rw-r--r--devel/ada-util/Makefile7
-rw-r--r--devel/ada-util/files/patch-configure84
-rw-r--r--devel/ada-util/pkg-plist60
3 files changed, 146 insertions, 5 deletions
diff --git a/devel/ada-util/Makefile b/devel/ada-util/Makefile
index c097f9df34a4..912b2e1d378b 100644
--- a/devel/ada-util/Makefile
+++ b/devel/ada-util/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ada-util
PORTVERSION= 1.8.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MAINTAINER= marino@FreeBSD.org
@@ -13,7 +13,6 @@ 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
@@ -54,5 +53,9 @@ post-patch:
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>
diff --git a/devel/ada-util/files/patch-configure b/devel/ada-util/files/patch-configure
new file mode 100644
index 000000000000..ccff1e42ef0f
--- /dev/null
+++ b/devel/ada-util/files/patch-configure
@@ -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
+-
+-
+-
+-
+
+
+ ##########################################
diff --git a/devel/ada-util/pkg-plist b/devel/ada-util/pkg-plist
index 0e394cd9c5a2..f425f00b6490 100644
--- a/devel/ada-util/pkg-plist
+++ b/devel/ada-util/pkg-plist
@@ -4,23 +4,32 @@ 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
@@ -32,90 +41,136 @@ 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
@@ -235,7 +290,6 @@ 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