summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--www/aws-demos/Makefile89
-rw-r--r--www/aws-demos/files/patch-Makefile35
-rw-r--r--www/aws-demos/files/templates.tads264
-rw-r--r--www/aws-demos/pkg-plist186
-rw-r--r--www/aws/Makefile44
-rw-r--r--www/aws/distinfo8
-rw-r--r--www/aws/files/aws.gpr.in1
-rw-r--r--www/aws/files/patch-Makefile35
-rw-r--r--www/aws/files/patch-aws.gpr10
-rw-r--r--www/aws/files/patch-gps_Makefile11
-rw-r--r--www/aws/files/patch-src_core_aws-server-http__utils.adb22
-rw-r--r--www/aws/files/patch-src_src.gpr47
-rw-r--r--www/aws/files/patch-tools_tools.gpr12
-rw-r--r--www/aws/pkg-plist64
14 files changed, 302 insertions, 526 deletions
diff --git a/www/aws-demos/Makefile b/www/aws-demos/Makefile
index 87c8976fd079..1a82aae726bb 100644
--- a/www/aws-demos/Makefile
+++ b/www/aws-demos/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= aws
-PORTVERSION= 17.0.0
-PORTREVISION= 1
+PORTVERSION= 17.0.1
CATEGORIES= www
PKGNAMESUFFIX= -demos
@@ -20,8 +19,8 @@ BUILD_DEPENDS= gprbuild:devel/gprbuild \
USES= ada gmake python tar:bzip2
USE_GITHUB= yes
GH_ACCOUNT= AdaCore
-GH_PROJECT= aws
-GH_TAGNAME= 31d491e
+GH_TAGNAME= 17.0
+GH_TUPLE= AdaCore:templates-parser:17.0:tp/templates_parser
DISTINFO_FILE= ${PORTSDIR}/www/aws/distinfo
@@ -45,7 +44,6 @@ DEMO_DIRS+= dowload_manager
DEMO_DIRS+= hello_world
DEMO_DIRS+= hello_wsdl
DEMO_DIRS+= hotplug
-DEMO_DIRS+= https
DEMO_DIRS+= interoplab
DEMO_DIRS+= jabber_demo
DEMO_DIRS+= multiple_sessions
@@ -69,6 +67,42 @@ DEMO_DIRS+= ws
DEMO_DIRS+= ws_candy
DEMO_DIRS+= zdemo
+PROGS= multiple_sessions/multiple_sessions \
+ jabber_demo/jabber_demo \
+ auth/auth \
+ text_input/text_input \
+ web_block/web_block \
+ web_mail/web_mail \
+ websockets/websock \
+ wps/wps \
+ interoplab/interoplab_main \
+ soap_demo/soap_server \
+ soap_demo/soap_client \
+ web_block_ajax/web_block_ajax \
+ web_elements/web_elements_program \
+ cert/cert \
+ com/com_2 \
+ com/com_1 \
+ dowload_manager/download_manager \
+ hello_world/hello_world \
+ hello_wsdl/wsdl_demo_client \
+ hello_wsdl/wsdl_demo_server \
+ hotplug/main \
+ hotplug/hotplug \
+ res_demo/res_demo \
+ soap_vs/soap_svs \
+ soap_vs/soap_cvs \
+ test_mail/test_mail \
+ upload/upload \
+ vh_demo/vh_demo \
+ ws/ws \
+ ws_candy/candy \
+ split/split \
+ dispatch/dispatch \
+ zdemo/zdemo \
+ soap_disp/soap_server_disp \
+ soap_disp/soap_client
+
.include <bsd.port.pre.mk>
.if ${SSL_DEFAULT} == base
@@ -78,50 +112,51 @@ IGNORE_FreeBSD_9= Requires newer OpenSSL (set DEFAULT_VERSIONS+=ssl=openssl)
.if ${PORT_OPTIONS:MSSL}
CONF_ARGS+= SOCKET=openssl
DEMO_DIRS+= agent
+DEMO_DIRS+= https
DEMO_DIRS+= runme
+PROGS+= agent/agent \
+ https/https \
+ runme/runme
.endif
.if ${PORT_OPTIONS:MLDAP}
CONF_ARGS+= LDAP=true
DEMO_DIRS+= test_ldap
+PROGS+= test_ldap/test_ldap
.endif
post-patch:
@${REINPLACE_CMD} -e 's|@PREFIX@|${LOCALBASE}|g' \
${WRKSRC}/demos/test_ldap/test_ldap.gpr
- @${REINPLACE_CMD} -e 's| setup_tp | |' ${WRKSRC}/Makefile
+ @${REINPLACE_CMD} -e 's|latexpdf||' ${WRKSRC}/Makefile
+.for dd in ${DEMO_DIRS}
+ @${REINPLACE_CMD} -i '' -e 's|gprclean|gprclean -c|' \
+ ${WRKSRC}/demos/${dd}/Makefile
+.endfor
do-configure:
${MKDIR} ${WRKSRC}/.build/native/debug/static/obj
- cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
- ${MAKE_CMD} setup ${CONF_ARGS}
+ (cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+ ${MAKE_CMD} setup ${CONF_ARGS})
do-build:
.for dd in ${DEMO_DIRS}
@${ECHO_MSG} "=== BUILD ${dd} ==="
- cd ${WRKSRC}/demos/${dd} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}
+ (cd ${WRKSRC}/demos/${dd} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD})
+ (cd ${WRKSRC}/demos/${dd} && ${SETENV} ${MAKE_ENV} \
+ ${MAKE_CMD} clean && ${RM} -r Makefile *.ad[bs] *.gpr src)
.endfor
do-install:
- @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/templates \
- ${STAGEDIR}${EXAMPLESDIR}/images
+ @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/demos
+ (cd ${WRKSRC} && ${COPYTREE_SHARE} web_elements \
+ ${STAGEDIR}${EXAMPLESDIR})
.for dd in ${DEMO_DIRS:Nautobahn}
- ${FIND} ${WRKSRC}/demos/${dd} -type f -perm -0001 \
- -exec ${INSTALL_PROGRAM} {} ${STAGEDIR}${EXAMPLESDIR}/ \;
+ (cd ${WRKSRC}/demos && ${COPYTREE_SHARE} ${dd} \
+ ${STAGEDIR}${EXAMPLESDIR}/demos)
+.endfor
+.for prog in ${PROGS}
+ ${STRIP_CMD} ${STAGEDIR}${EXAMPLESDIR}/demos/${prog}
.endfor
- ${INSTALL_PROGRAM} ${WRKSRC}/demos/autobahn/obj/autobahn \
- ${STAGEDIR}${EXAMPLESDIR}
- ${INSTALL_SCRIPT} ${WRKSRC}/demos/autobahn/autobahn/run.sh \
- ${STAGEDIR}${EXAMPLESDIR}
- ${INSTALL_DATA} ${WRKSRC}/demos/autobahn/autobahn/aws.json \
- ${STAGEDIR}${EXAMPLESDIR}
- cd ${WRKSRC} && \
- ${COPYTREE_SHARE} web_elements ${STAGEDIR}${EXAMPLESDIR}
- ${INSTALL_DATA} ${WRKSRC}/demos/runme/aws_*.png \
- ${STAGEDIR}${EXAMPLESDIR}/images
- ${INSTALL_DATA} ${WRKSRC}/demos/web_mail/*html \
- ${STAGEDIR}${EXAMPLESDIR}/templates
- ${INSTALL_DATA} ${FILESDIR}/templates.tads \
- ${STAGEDIR}${EXAMPLESDIR}/templates
.include <bsd.port.post.mk>
diff --git a/www/aws-demos/files/patch-Makefile b/www/aws-demos/files/patch-Makefile
deleted file mode 100644
index 89d4a2757b5a..000000000000
--- a/www/aws-demos/files/patch-Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
---- Makefile.orig 2016-06-09 20:07:13 UTC
-+++ Makefile
-@@ -61,15 +61,14 @@ ALL_OPTIONS = $(MAKE_OPT) SOCKET="$(SOCK
- GPRBUILD="$(GPRBUILD)" ZLIB="$(ZLIB)" BDIR="$(BDIR)" \
- prefix="$(prefix)" ENABLE_SHARED="$(ENABLE_SHARED)" \
- SOEXT="$(SOEXT)" GNAT="$(GNAT)" \
-- T2A="../../$(BDIR)/static/tools/templates2ada" \
-+ T2A="$(prefix)/bin/templates2ada" \
- LIBRARY_TYPE="$(LIBRARY_TYPE)" PYTHON="$(PYTHON)" \
- TARGET="$(TARGET)" IS_CROSS=$(IS_CROSS) GPRINSTALL="$(GPRINSTALL)"
-
- build-doc:
- echo ""
- echo "=== Build doc"
-- ${MAKE} -C docs html latexpdf
-- ${MAKE} -C templates_parser/docs html latexpdf
-+ ${MAKE} -C docs html
-
- run_regtests:
- echo ""
-@@ -84,7 +83,7 @@ force:
-
- MODULES = config include ssl src gps regtests demos
-
--MODULES_SETUP = ${MODULES:%=%_setup} templates_parser_setup
-+MODULES_SETUP = ${MODULES:%=%_setup}
-
- MODULES_INSTALL = ${MODULES:%=%_install}
-
-@@ -346,4 +345,4 @@ gen_setup:
- setup: gen_setup setup_dir setup_modules setup_config setup_tp $(GEXT_MODULE)
-
- setup_tp:
-- $(MAKE) -C templates_parser setup $(GALL_OPTIONS)
-+ echo "Templates Parser has already been externally built"
diff --git a/www/aws-demos/files/templates.tads b/www/aws-demos/files/templates.tads
deleted file mode 100644
index 6691d4b43161..000000000000
--- a/www/aws-demos/files/templates.tads
+++ /dev/null
@@ -1,264 +0,0 @@
-@@-- This template is intended as a model of how to generate an Ada package
-@@-- describing all the variables used in a set of AWS templates.
-@@-- These Ada packages can then be used in your application to avoid
-@@-- hard-coded strings, and help maintain the templates and the code to
-@@-- parse them in sync.
-@@--
-@@-- This template contains two possible behaviors, chosen through the
-@@-- following variable:
-@@SET@@ SINGLE_FILE = False
-@@-- If you set it to True, then a single Ada package with its nested
-@@-- packages is generated. If you set it to False, then the file generated
-@@-- should be further processed through gnatchop, to generate several
-@@-- Ada files organized into several files. This latter organization
-@@-- avoids recompiling all your source files every time at least one
-@@-- template changes.
-@@--
-@@-- The following variable should be changed to set the name of the
-@@-- generated packages.
-@@SET@@ PACKAGE = Templates
-@@--
-@@--
-@@-- When designing your own template for Ada packages, you should take
-@@-- into account that the variables in your templates might not necessarily
-@@-- be valid Ada identifier names, and you should therefore update the calls
-@@-- to @_REPLACE:..._@ below.
-@@--
-@@-- This template example also assumes a convention for Lazy_Tags. If you
-@@-- are using such types, they are generally shared among templates, and
-@@-- the Ada package should reflect that fact. Assuming all such tags start
-@@-- with the prefix LAZY_, we generate one special package for them, and
-@@-- omit them in all the other packages.
-@@--
-@@-- Likewise, the templates2ada tool will not generate tag entries for tags
-@@-- that are set through a @@SET@@ statement, since these are purely internal
-@@-- to your template file and have no impact on your source code.
-@@--
-@@-- For the best use of this tool, it is recommended that your template not
-@@-- use @@INCLUDE@@ statements, but instead use a tag, set in the Ada code
-@@-- to the preprocessed result of the same template file. This allows you to
-@@-- better control unset tags. For instance, instead of using:
-@@-- @@INCLUDE@@ foo.thtml
-@@-- use something like:
-@@-- @_BLOCK_FOO_@
-@@-- and in your Ada code set BLOCK_FOO to the result of Parse ("foo.thtml").
-@@--
-@@-- The templates2ada tool is able to generate constants for the HTTP
-@@-- parameters set in your page, so that you can process them in your Ada
-@@-- code. A few conventions must be followed, however:
-@@-- - The name should be on a single line, preceded by "name=", as in
-@@-- name="FOO"
-@@-- - The name should use only letters, underscores and digits, unless you
-@@-- enhance the regular expressions below to also remove other special
-@@-- characters.
-@@-- - In some cases, you must use a AWS tag in the name of an HTTP param,
-@@-- for instance for checkboxes for which names should be unique (or you
-@@-- won't know when the parameter is set to false). In this case, the
-@@-- tag must be at the beginning or end of the name, not in the middle.
-@@-- If there are multiple tags, they should be separated by non-letters,
-@@-- as in:
-@@-- name="PN_@_TAG1_@:@_TAG2_"
-@@-- In this case, the following constant is generated:
-@@-- PN_Prefix : constant String := "PN";
-@@-- - The name mustn't be only an AWS tag. The following is invalid:
-@@-- name="@_TAG_@"
-@@-- To avoid generating constants for <a name=..>, you must put the name
-@@-- attribute right after the "<a". templates2ada doesn't try to parse the
-@@-- HTML file, and doesn't know anything about HTML structure.
-@@--
-@@-- Some HTTP parameters can be specified as GET parameters. These can be
-@@-- documented directly in the templates with the following format:
-@@-- @@-- HTTP_GET(name): documentation
-@@-- and an entry will be generated for it.
-@@-- One additional special kind of comment that is recognized by this tool is
-@@-- @@-- HTTP_URL(url): documentation
-@@-- This indicates the typical URL(s) associated with that template, and will
-@@-- result in an additional string constant in the generated package, which
-@@-- can for instance be used when registering the URLs, or when redirecting
-@@-- the user to another URL.
-@@--
-@@-- If you combine the use of HTTP_GET and HTTP_URL, this can help ensure
-@@-- that any URL redirection you do through AWS.Response.URL is valid, if you
-@@-- use the generated constants. In addition, you could generate a
-@@-- template file (for instance using all_urls.thtml in this distribution)
-@@-- that can be included in other templates.
-@@--
-@@-- When a variable is removed from a template, your source code will no
-@@-- longer compile. When a variable is added, you get no compilation error.
-@@-- However, running "gnat xref -u" on your application will help detect
-@@-- unreferenced variables, and thus tags that are used in templates but
-@@-- never set in the code. For instance:
-@@-- gnat xref -Pproject -u main.adb | grep templates
-@@-- will list all unused template variables from the template packages that
-@@-- are currently in use by your application. Template packages that are not
-@@-- even withed will not appear in this listing, but can generally be found
-@@-- through appropriate grep commands.
-@@--
-@@-- The following tags are available in this template:
-@@-- @_VARIABLE_@: Matrix of variable names for the current template,
-@@-- sorted alphabetically
-@@-- @_FILENAME_@: Vector of template file names. The name contains
-@@-- directories relative to the directory given to
-@@-- templates2ada
-@@-- @_BASENAME_@: Same as @_FILENAME_@, but contains only the base
-@@-- names of files, with no extension.
-@@-- @_VARIABLE_LIST_@: List of all variables defined in all templates,
-@@-- sorted alphabetically
-@@-- @_INCLUDE_@: List of templates included by the current template.
-@@-- Names are the base name.
-@@-- @_HTTP_@: List of http parameters that can be returned by the
-@@-- current template, sorted alphabetically.
-@@-- @_FROM_GET_@: For each of the HTTP parameters above, this boolean
-@@-- indicates whether it was defined in a HTTP_GET
-@@-- comment as explained above.
-@@-- @_URL_@: List of urls that are associated with the current
-@@-- template, sorted alphabetically.
-@@-- @_AJAX_EVENT_@: Event name (onclick, onchange...), corresponding
-@@-- action in AJAX_ACTION.
-@@-- @_AJAX_ACTION_@ Action for the given AJAX_EVENT above.
-@@-- @_AJAX_FILE_@ File in which the corresponding action has been
-@@-- found.
-@@-- @_SET_VAR_@ Name of SET constants in the template
-@@-- Only variables with prefix SET_ are exported.
-@@-- @_SET_VAL@ Values of the above constants.
-@@--
-@@-- This templates is processed through the tool templates2ada
-@@--
-@@-- Possible enhancements:
-@@-- - Take into account @@IF@@ statements, and make sure that all
-@@-- needed variable in each branch is properly set. Hard to do.
-@@-- - Have a way to specify comments for the variable, probably as a
-@@-- special comment in the template files themselves.
-@@-- - Handling of @@INCLUDE@@: the tags defined in the included file
-@@-- be also included in the generated package for the template, so
-@@-- that we can detect missing definitions. However, this means that
-@@-- such tags will be duplicated in several places... It is generally
-@@-- simpler to avoid using @@INCLUDE@@ statements.
-@@-- We could also use child packages to represent them
-@@--
--- DO NOT EDIT, THIS FILE HAS BEEN GENERATED
-package @_PACKAGE_@ is
- pragma Style_Checks (Off);
-
- package Lazy is
- @@TABLE@@
- @@IF@@ @_UPPER:SLICE(1..5):VARIABLE_LIST_@ = "LAZY_"
- @_CAPITALIZE:REPLACE_ALL(__/_):VARIABLE_LIST_@ : constant String := "@_VARIABLE_LIST_@";
- @@END_IF@@
- @@END_TABLE@@
- end Lazy;
-
-@@IF@@ @_SINGLE_FILE_@ = True
-@@TABLE@@
- package @_CAPITALIZE:REPLACE_ALL(\./_):BASENAME_@ is
- Template : constant String := "@_FILENAME_@";
- @@TABLE@@@
- @@IF@@ not @_IS_EMPTY:URL_@
- @@IF@@ @_TABLE_LINE_@ = 1
- URL : constant String := "@_URL_@";
- @@ELSE@@
- URL@_TABLE_LINE_@ : constant String := "@_URL_@";
- @@END_IF@@
- @@END_IF@@
- @@END_TABLE@@
-
- @@TABLE@@
- @@IF@@ not @_IS_EMPTY:VARIABLE_@ and @_UPPER:SLICE(1..5):VARIABLE_@ /= "LAZY_"
- @_CAPITALIZE:REPLACE_ALL(__/_):VARIABLE_@ : constant String := "@_VARIABLE_@";
- @@END_IF@@
- @@END_TABLE@@
-
-@@IF@@ @_EXIST:HTTP_@
-
- package HTTP is
- @@TABLE@@
- @@IF@@ not @_IS_EMPTY:HTTP_@
- @_CAPITALIZE:REPLACE_ALL(__/_):HTTP_@ : constant String := "@_HTTP_@";
- @@END_IF@@
- @@END_TABLE@@
- end HTTP;
-@@END_IF@@
-@@IF@@ @_EXIST:SET_VAR_@
-
- package Set is
- @@TABLE@@
- @_CAPITALIZE:REPLACE_ALL(__/_):SET_VAR_@ : constant String := "@_SET_VAL_@";
- @@END_TABLE@@
- end Set;
-@@END_IF@@
-@@IF@@ @_EXIST:AJAX_EVENT_@
-
- package Ajax is
- @@TABLE@@
- @@IF@@ not @_IS_EMPTY:AJAX_EVENT_@
- @_CAPITALIZE:AJAX_EVENT_@_@_CAPITALIZE:AJAX_ACTION_@ : constant String := "/@_AJAX_EVENT_@$@_AJAX_ACTION_@";
- @@END_IF@@
- @@END_TABLE@@
- end Ajax;
-@@END_IF@@
-
- end @_CAPITALIZE:REPLACE_ALL(\./_):BASENAME_@;
-
-@@END_TABLE@@
-@@END_IF@@
-end @_PACKAGE_@;
-
-@@IF@@ @_SINGLE_FILE_@ /= True
-@@TABLE@@
-@@-- @@TABLE@@
-@@-- @@IF@@ @_EXIST:INCLUDE_@
-@@-- with @_PACKAGE_@.@_CAPITALIZE:REPLACE_ALL(\./_):INCLUDE_@;
-@@-- @@END_IF@@
-@@-- @@END_TABLE@@
--- DO NOT EDIT, THIS FILE HAS BEEN GENERATED
-package @_PACKAGE_@.@_CAPITALIZE:REPLACE_ALL(\./_):BASENAME_@ is
- pragma Style_Checks (Off);
-
- Template : constant String := "@_FILENAME_@";
- @@TABLE@@@
- @@IF@@ not @_IS_EMPTY:URL_@
- @@IF@@ @_TABLE_LINE_@ = 1
- URL : constant String := "@_URL_@";
- @@ELSE@@
- URL@_TABLE_LINE_@ : constant String := "@_URL_@";
- @@END_IF@@
- @@END_IF@@
- @@END_TABLE@@
-
- @@TABLE@@
- @@IF@@ not @_IS_EMPTY:VARIABLE_@ and @_UPPER:SLICE(1..5):VARIABLE_@ /= "LAZY_"
- @_CAPITALIZE:REPLACE_ALL(__/_):VARIABLE_@ : constant String := "@_VARIABLE_@";
- @@END_IF@@
- @@END_TABLE@@
-@@IF@@ @_EXIST:HTTP_@
-
- package HTTP is
- @@TABLE@@
- @@IF@@ not @_IS_EMPTY:HTTP_@
- @_CAPITALIZE:REPLACE_ALL(__/_):HTTP_@ : constant String := "@_HTTP_@";
- @@END_IF@@
- @@END_TABLE@@
- end HTTP;
-@@END_IF@@
-@@IF@@ @_EXIST:SET_VAR_@
-
- package Set is
- @@TABLE@@
- @_CAPITALIZE:REPLACE_ALL(__/_):SET_VAR_@ : constant String := "@_SET_VAL_@";
- @@END_TABLE@@
- end Set;
-@@END_IF@@
-@@IF@@ @_EXIST:AJAX_EVENT_@
-
- package Ajax is
- @@TABLE@@
- @@IF@@ not @_IS_EMPTY:AJAX_EVENT_@
- @_CAPITALIZE:AJAX_EVENT_@_@_CAPITALIZE:AJAX_ACTION_@ : constant String := "/@_AJAX_EVENT_@$@_AJAX_ACTION_@";
- @@END_IF@@
- @@END_TABLE@@
- end Ajax;
-@@END_IF@@
-
-end @_PACKAGE_@.@_CAPITALIZE:REPLACE_ALL(\./_):BASENAME_@;
-@@END_TABLE@@
-@@END_IF@@
diff --git a/www/aws-demos/pkg-plist b/www/aws-demos/pkg-plist
index 809924b0e69b..a9d4e4b742b8 100644
--- a/www/aws-demos/pkg-plist
+++ b/www/aws-demos/pkg-plist
@@ -1,47 +1,138 @@
-%%SSL%%%%EXAMPLESDIR%%/agent
-%%EXAMPLESDIR%%/auth
-%%EXAMPLESDIR%%/autobahn
-%%EXAMPLESDIR%%/aws.json
-%%EXAMPLESDIR%%/candy
-%%EXAMPLESDIR%%/cert
-%%EXAMPLESDIR%%/com_1
-%%EXAMPLESDIR%%/com_2
-%%EXAMPLESDIR%%/dispatch
-%%EXAMPLESDIR%%/download_manager
-%%EXAMPLESDIR%%/hello_world
-%%EXAMPLESDIR%%/hotplug
-%%EXAMPLESDIR%%/https
-%%EXAMPLESDIR%%/images/aws_down.png
-%%EXAMPLESDIR%%/images/aws_logo.png
-%%EXAMPLESDIR%%/images/aws_up.png
-%%EXAMPLESDIR%%/interoplab_main
-%%EXAMPLESDIR%%/jabber_demo
-%%EXAMPLESDIR%%/main
-%%EXAMPLESDIR%%/multiple_sessions
-%%EXAMPLESDIR%%/res_demo
-%%EXAMPLESDIR%%/run.sh
-%%SSL%%%%EXAMPLESDIR%%/runme
-%%EXAMPLESDIR%%/soap_client
-%%EXAMPLESDIR%%/soap_cvs
-%%EXAMPLESDIR%%/soap_server
-%%EXAMPLESDIR%%/soap_server_disp
-%%EXAMPLESDIR%%/soap_svs
-%%EXAMPLESDIR%%/split
-%%LDAP%%%%EXAMPLESDIR%%/test_ldap
-%%EXAMPLESDIR%%/templates/templates.tads
-%%EXAMPLESDIR%%/templates/wm_error.thtml
-%%EXAMPLESDIR%%/templates/wm_login.html
-%%EXAMPLESDIR%%/templates/wm_message.thtml
-%%EXAMPLESDIR%%/templates/wm_reply.thtml
-%%EXAMPLESDIR%%/templates/wm_summary.thtml
-%%EXAMPLESDIR%%/test_mail
-%%EXAMPLESDIR%%/text_input
-%%EXAMPLESDIR%%/upload
-%%EXAMPLESDIR%%/vh_demo
-%%EXAMPLESDIR%%/web_block
-%%EXAMPLESDIR%%/web_block_ajax
-%%EXAMPLESDIR%%/web_block_ajax_templates
-%%EXAMPLESDIR%%/web_elements_program
+%%SSL%%%%EXAMPLESDIR%%/demos/agent/agent
+%%SSL%%%%EXAMPLESDIR%%/demos/agent/cert.pem
+%%EXAMPLESDIR%%/demos/auth/auth
+%%EXAMPLESDIR%%/demos/cert/README
+%%EXAMPLESDIR%%/demos/cert/aws-client1.p12
+%%EXAMPLESDIR%%/demos/cert/aws-client2.p12
+%%EXAMPLESDIR%%/demos/cert/aws-server.crt
+%%EXAMPLESDIR%%/demos/cert/aws-server.key
+%%EXAMPLESDIR%%/demos/cert/aws.ini
+%%EXAMPLESDIR%%/demos/cert/cert
+%%EXAMPLESDIR%%/demos/cert/crl1.pem
+%%EXAMPLESDIR%%/demos/cert/crl2.pem
+%%EXAMPLESDIR%%/demos/cert/private-ca.crt
+%%EXAMPLESDIR%%/demos/com/com_1
+%%EXAMPLESDIR%%/demos/com/com_2
+%%EXAMPLESDIR%%/demos/dispatch/dispatch
+%%EXAMPLESDIR%%/demos/dowload_manager/aws_download_manager_start.thtml
+%%EXAMPLESDIR%%/demos/dowload_manager/aws_download_manager_waiting.thtml
+%%EXAMPLESDIR%%/demos/dowload_manager/download_manager
+%%EXAMPLESDIR%%/demos/dowload_manager/main.html
+%%EXAMPLESDIR%%/demos/gSOAP/README
+%%EXAMPLESDIR%%/demos/gSOAP/c_client_doc.c
+%%EXAMPLESDIR%%/demos/gSOAP/c_client_rpc.c
+%%EXAMPLESDIR%%/demos/gSOAP/c_server_doc.c
+%%EXAMPLESDIR%%/demos/gSOAP/c_server_rpc.c
+%%EXAMPLESDIR%%/demos/gSOAP/hello_doc.wsdl
+%%EXAMPLESDIR%%/demos/gSOAP/hello_rpc.wsdl
+%%EXAMPLESDIR%%/demos/hello_world/hello_world
+%%EXAMPLESDIR%%/demos/hello_wsdl/hello.wsdl
+%%EXAMPLESDIR%%/demos/hello_wsdl/wsdl_demo_client
+%%EXAMPLESDIR%%/demos/hello_wsdl/wsdl_demo_server
+%%EXAMPLESDIR%%/demos/hotplug/hotplug
+%%EXAMPLESDIR%%/demos/hotplug/hotplug_module.ini
+%%EXAMPLESDIR%%/demos/hotplug/main
+%%SSL%%%%EXAMPLESDIR%%/demos/https/aws-server.crt
+%%SSL%%%%EXAMPLESDIR%%/demos/https/aws-server.key
+%%SSL%%%%EXAMPLESDIR%%/demos/https/aws.ini
+%%SSL%%%%EXAMPLESDIR%%/demos/https/https
+%%EXAMPLESDIR%%/demos/interoplab/interoplab_main
+%%EXAMPLESDIR%%/demos/interoplab/interoplab_main.wsdl
+%%EXAMPLESDIR%%/demos/jabber_demo/jabber_demo
+%%EXAMPLESDIR%%/demos/multiple_sessions/multiple_sessions
+%%EXAMPLESDIR%%/demos/res_demo/adains.png
+%%EXAMPLESDIR%%/demos/res_demo/page3.html
+%%EXAMPLESDIR%%/demos/res_demo/res_demo
+%%SSL%%%%EXAMPLESDIR%%/demos/runme/adains.png
+%%SSL%%%%EXAMPLESDIR%%/demos/runme/aws_down.png
+%%SSL%%%%EXAMPLESDIR%%/demos/runme/aws_logo.png
+%%SSL%%%%EXAMPLESDIR%%/demos/runme/aws_status.thtml
+%%SSL%%%%EXAMPLESDIR%%/demos/runme/aws_up.png
+%%SSL%%%%EXAMPLESDIR%%/demos/runme/cert.pem
+%%SSL%%%%EXAMPLESDIR%%/demos/runme/runme
+%%SSL%%%%EXAMPLESDIR%%/demos/runme/runme.ini
+%%EXAMPLESDIR%%/demos/soap_demo/soap_client
+%%EXAMPLESDIR%%/demos/soap_demo/soap_server
+%%EXAMPLESDIR%%/demos/soap_disp/soap_client
+%%EXAMPLESDIR%%/demos/soap_disp/soap_server_disp
+%%EXAMPLESDIR%%/demos/soap_vs/soap_cvs
+%%EXAMPLESDIR%%/demos/soap_vs/soap_svs
+%%EXAMPLESDIR%%/demos/split/404.thtml
+%%EXAMPLESDIR%%/demos/split/bounded_index.thtml
+%%EXAMPLESDIR%%/demos/split/bounded_s_index.thtml
+%%EXAMPLESDIR%%/demos/split/simple_index.thtml
+%%EXAMPLESDIR%%/demos/split/simple_s_index.thtml
+%%EXAMPLESDIR%%/demos/split/sliding_index.thtml
+%%EXAMPLESDIR%%/demos/split/sliding_s_index.thtml
+%%EXAMPLESDIR%%/demos/split/split
+%%EXAMPLESDIR%%/demos/split/split.thtml
+%%LDAP%%%%EXAMPLESDIR%%/demos/test_ldap/test_ldap
+%%EXAMPLESDIR%%/demos/test_mail/test_mail
+%%EXAMPLESDIR%%/demos/text_input/text_input
+%%EXAMPLESDIR%%/demos/upload/aws.ini
+%%EXAMPLESDIR%%/demos/upload/main.html
+%%EXAMPLESDIR%%/demos/upload/upload
+%%EXAMPLESDIR%%/demos/vh_demo/vh_demo
+%%EXAMPLESDIR%%/demos/web_block/counter.thtml
+%%EXAMPLESDIR%%/demos/web_block/page.thtml
+%%EXAMPLESDIR%%/demos/web_block/web_block
+%%EXAMPLESDIR%%/demos/web_block_ajax/page.thtml
+%%EXAMPLESDIR%%/demos/web_block_ajax/r_widget_counter.txml
+%%EXAMPLESDIR%%/demos/web_block_ajax/web_block_ajax
+%%EXAMPLESDIR%%/demos/web_block_ajax/widget_counter.thtml
+%%EXAMPLESDIR%%/demos/web_block_ajax_templates/page.thtml
+%%EXAMPLESDIR%%/demos/web_block_ajax_templates/r_widget_counter.txml
+%%EXAMPLESDIR%%/demos/web_block_ajax_templates/templates.tada
+%%EXAMPLESDIR%%/demos/web_block_ajax_templates/widget_counter.thtml
+%%EXAMPLESDIR%%/demos/web_elements/page1.html
+%%EXAMPLESDIR%%/demos/web_elements/page2.html
+%%EXAMPLESDIR%%/demos/web_elements/we_ajax_group.html
+%%EXAMPLESDIR%%/demos/web_elements/we_ajax_user.html
+%%EXAMPLESDIR%%/demos/web_elements/we_library.html
+%%EXAMPLESDIR%%/demos/web_elements/we_test_ajax.html
+%%EXAMPLESDIR%%/demos/web_elements/we_test_menu_css.html
+%%EXAMPLESDIR%%/demos/web_elements/we_test_notebook.html
+%%EXAMPLESDIR%%/demos/web_elements/we_test_rounded_boxes.html
+%%EXAMPLESDIR%%/demos/web_elements/web_elements.gpr.orig
+%%EXAMPLESDIR%%/demos/web_elements/web_elements_program
+%%EXAMPLESDIR%%/demos/web_elements/xml1.xml
+%%EXAMPLESDIR%%/demos/web_elements/xml10.xml
+%%EXAMPLESDIR%%/demos/web_elements/xml11.xml
+%%EXAMPLESDIR%%/demos/web_elements/xml2.xml
+%%EXAMPLESDIR%%/demos/web_elements/xml3.xml
+%%EXAMPLESDIR%%/demos/web_elements/xml4.xml
+%%EXAMPLESDIR%%/demos/web_elements/xml5.xml
+%%EXAMPLESDIR%%/demos/web_elements/xml6.xml
+%%EXAMPLESDIR%%/demos/web_elements/xml7.xml
+%%EXAMPLESDIR%%/demos/web_elements/xml8.xml
+%%EXAMPLESDIR%%/demos/web_elements/xml9.xml
+%%EXAMPLESDIR%%/demos/web_elements/xml_action.txml
+%%EXAMPLESDIR%%/demos/web_elements/xml_clear.xml
+%%EXAMPLESDIR%%/demos/web_elements/xml_clear_no.xml
+%%EXAMPLESDIR%%/demos/web_elements/xml_get_list.txml
+%%EXAMPLESDIR%%/demos/web_elements/xml_showdata.txml
+%%EXAMPLESDIR%%/demos/web_mail/web_mail
+%%EXAMPLESDIR%%/demos/web_mail/wm_error.thtml
+%%EXAMPLESDIR%%/demos/web_mail/wm_login.html
+%%EXAMPLESDIR%%/demos/web_mail/wm_message.thtml
+%%EXAMPLESDIR%%/demos/web_mail/wm_reply.thtml
+%%EXAMPLESDIR%%/demos/web_mail/wm_summary.thtml
+%%EXAMPLESDIR%%/demos/websockets/echo.xml
+%%EXAMPLESDIR%%/demos/websockets/page.thtml
+%%EXAMPLESDIR%%/demos/websockets/resp.xml
+%%EXAMPLESDIR%%/demos/websockets/websock
+%%EXAMPLESDIR%%/demos/wps/aws_directory.thtml
+%%EXAMPLESDIR%%/demos/wps/wps
+%%EXAMPLESDIR%%/demos/wps/wps.ini
+%%EXAMPLESDIR%%/demos/ws/aws_directory.thtml
+%%EXAMPLESDIR%%/demos/ws/page1.html
+%%EXAMPLESDIR%%/demos/ws/websocket-messages-test.html
+%%EXAMPLESDIR%%/demos/ws/ws
+%%EXAMPLESDIR%%/demos/ws/ws.ini
+%%EXAMPLESDIR%%/demos/ws_candy/candy
+%%EXAMPLESDIR%%/demos/ws_candy/page.thtml
+%%EXAMPLESDIR%%/demos/zdemo/adains.png.gz
+%%EXAMPLESDIR%%/demos/zdemo/zdemo
%%EXAMPLESDIR%%/web_elements/icons/ada.gif
%%EXAMPLESDIR%%/web_elements/icons/adb.gif
%%EXAMPLESDIR%%/web_elements/icons/ads.gif
@@ -107,10 +198,3 @@
%%EXAMPLESDIR%%/web_elements/readme.txt
%%EXAMPLESDIR%%/web_elements/rounded_boxes/rcorner.gif
%%EXAMPLESDIR%%/web_elements/rounded_boxes/rounded_boxes.tcss
-%%EXAMPLESDIR%%/web_mail
-%%EXAMPLESDIR%%/websock
-%%EXAMPLESDIR%%/wps
-%%EXAMPLESDIR%%/ws
-%%EXAMPLESDIR%%/wsdl_demo_client
-%%EXAMPLESDIR%%/wsdl_demo_server
-%%EXAMPLESDIR%%/zdemo
diff --git a/www/aws/Makefile b/www/aws/Makefile
index 083a91b1699d..f315dfe8ed29 100644
--- a/www/aws/Makefile
+++ b/www/aws/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= aws
-PORTVERSION= 17.0.0
-PORTREVISION= 1
+PORTVERSION= 17.0.1
CATEGORIES= www
MAINTAINER= marino@FreeBSD.org
@@ -13,18 +12,16 @@ LICENSE= GPLv3 GPLv3RLE
LICENSE_COMB= multi
BUILD_DEPENDS= gprbuild:devel/gprbuild \
- templates_parser>11:textproc/templates_parser \
xmlada>=4.4:textproc/xmlada \
asis>=2013:lang/asis \
gnatpython>=20101207:devel/gnatpython
-RUN_DEPENDS= templates_parser>11:textproc/templates_parser \
- xmlada>=4.4:textproc/xmlada
+RUN_DEPENDS= xmlada>=4.4:textproc/xmlada
USES= ada:run gmake python shebangfix tar:bzip2
USE_GITHUB= yes
GH_ACCOUNT= AdaCore
-GH_PROJECT= aws
-GH_TAGNAME= 31d491e
+GH_TAGNAME= 17.0
+GH_TUPLE= AdaCore:templates-parser:17.0:tp/templates_parser
GNU_CONFIGURE= yes
NO_MTREE= yes
@@ -36,8 +33,6 @@ NAME_IP6= --
NAME_STD= --
BUILD_TYPE= release
ADDL_RPATH= ${LOCALBASE}/lib:${LOCALBASE}/lib/aws/native/relocatable
-AUX_TARGET= ${ARCH:S/amd64/x86_64/}-aux-${OPSYS:tl}${OSREL}
-TEMPARSE= ${WRKSRC}/.build/${AUX_TARGET}/${BUILD_TYPE}
SHEBANG_FILES= tools/awsascb
OPTIONS_SINGLE= Secure-Socket-Layer
@@ -61,7 +56,6 @@ CONF_ARGS+= PYTHON=python${PYTHON_VER}
CONF_ARGS+= XMLADA=true
CONF_ARGS+= PRJ_BUILD=${DOTBUILD}
CONF_ARGS+= prefix=${PREFIX}
-CONF_ARGS+= LPATH=${PREFIX}/lib
CONF_ARGS+= ZPATH=/usr/lib
CONF_ARGS+= ZLIB=true
CONF_ARGS+= ASIS=true
@@ -81,8 +75,9 @@ IGNORE_FreeBSD_9= Requires newer OpenSSL (set DEFAULT_VERSIONS+=ssl=openssl)
CONF_ARGS+= SOCKET=openssl
CONF_ARGS+= LPATH=${OPENSSLLIB}
LINK_SSL=
-.endif
-.if ${PORT_OPTIONS:MGNUTLS}
+.else
+# it's not SSL so it must be GNUTLS
+CONF_ARGS+= LPATH=${PREFIX}/lib
CONF_ARGS+= SOCKET=gnutls
LINK_TLS=
.endif
@@ -126,42 +121,27 @@ CONF_ARGS+= ENABLE_SHARED=false
.endif
post-patch:
- @${MKDIR} ${WRKSRC}/templates_parser \
- ${TEMPARSE}/static/obj/temparse \
- ${TEMPARSE}/static/lib/temparse \
- ${TEMPARSE}/relocatable/obj/temparse \
- ${TEMPARSE}/relocatable/lib/temparse \
- ${WRKSRC}/templates_parser/tools \
- ${WRKSRC}/templates_parser/xsrc \
- ${WRKSRC}/templates_parser/src
@${REINPLACE_CMD} \
-e 's|@ADDITIONAL_RPATH@|${ADDL_RPATH}|' \
-e 's|@PREFIX@|${LOCALBASE}|g' \
${WRKSRC}/aws.gpr \
${WRKSRC}/src/src.gpr \
${WRKSRC}/include/include.gpr
- @${SED} -e 's|@PREFIX@|${LOCALBASE}|g' ${FILESDIR}/temparse.gpr.in \
- > ${WRKSRC}/templates_parser/temparse.gpr
+ @${REINPLACE_CMD} -e 's|latexpdf||' ${WRKSRC}/Makefile
do-configure:
-# If we want to do templates_parser copy in an earlier target then
-# templates_parser needs to be listed as an EXTRACT_DEPENDS
- @${CP} ${LOCALBASE}/lib/templates_parser/* \
- ${TEMPARSE}/static/lib/temparse
- @${CP} ${LOCALBASE}/lib/templates_parser.relocatable/*.ali \
- ${TEMPARSE}/relocatable/lib/temparse
- @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
- ${MAKE_CMD} setup ${CONF_ARGS}
+ (cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+ ${MAKE_CMD} setup ${CONF_ARGS})
do-build:
# We cannot use a redefined ALL_TARGET because MAKE_JOBS_SAFE is set
# for PROCESSORS, but that also sets -j for gmake which breaks build
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
${MAKE_CMD} ${MAKE_ARGS} build
-.if ${PORT_OPTIONS:MDOCS}
+
+do-build-DOCS-on:
cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} \
${MAKE_CMD} ${MAKE_ARGS} html
-.endif
test:
.if exists(${LOCALBASE}/bin/awsres)
diff --git a/www/aws/distinfo b/www/aws/distinfo
index 0250d673b4fa..97742ae02506 100644
--- a/www/aws/distinfo
+++ b/www/aws/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1465542815
-SHA256 (AdaCore-aws-17.0.0-31d491e_GH0.tar.gz) = ffa837c757164b9f0c7383f43f6e846f19ab80f77ade8ce43d9efc68e6e0b99d
-SIZE (AdaCore-aws-17.0.0-31d491e_GH0.tar.gz) = 2079967
+TIMESTAMP = 1476161971
+SHA256 (AdaCore-aws-17.0.1-17.0_GH0.tar.gz) = 3dfaca1fd965300d2e1506874f3bfacd6d913032cc7c6ae0ed148672634a870e
+SIZE (AdaCore-aws-17.0.1-17.0_GH0.tar.gz) = 2085711
+SHA256 (AdaCore-templates-parser-17.0_GH0.tar.gz) = 837693c5a5ff6acc0140b341a8e363e7e4e036e9316e516a53116eb0db3b88a7
+SIZE (AdaCore-templates-parser-17.0_GH0.tar.gz) = 216629
diff --git a/www/aws/files/aws.gpr.in b/www/aws/files/aws.gpr.in
index fc25927ea01e..c24fdcbd69a7 100644
--- a/www/aws/files/aws.gpr.in
+++ b/www/aws/files/aws.gpr.in
@@ -1,4 +1,3 @@
-with "templates_parser";
with "xmlada";
project AWS is
diff --git a/www/aws/files/patch-Makefile b/www/aws/files/patch-Makefile
deleted file mode 100644
index 89d4a2757b5a..000000000000
--- a/www/aws/files/patch-Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
---- Makefile.orig 2016-06-09 20:07:13 UTC
-+++ Makefile
-@@ -61,15 +61,14 @@ ALL_OPTIONS = $(MAKE_OPT) SOCKET="$(SOCK
- GPRBUILD="$(GPRBUILD)" ZLIB="$(ZLIB)" BDIR="$(BDIR)" \
- prefix="$(prefix)" ENABLE_SHARED="$(ENABLE_SHARED)" \
- SOEXT="$(SOEXT)" GNAT="$(GNAT)" \
-- T2A="../../$(BDIR)/static/tools/templates2ada" \
-+ T2A="$(prefix)/bin/templates2ada" \
- LIBRARY_TYPE="$(LIBRARY_TYPE)" PYTHON="$(PYTHON)" \
- TARGET="$(TARGET)" IS_CROSS=$(IS_CROSS) GPRINSTALL="$(GPRINSTALL)"
-
- build-doc:
- echo ""
- echo "=== Build doc"
-- ${MAKE} -C docs html latexpdf
-- ${MAKE} -C templates_parser/docs html latexpdf
-+ ${MAKE} -C docs html
-
- run_regtests:
- echo ""
-@@ -84,7 +83,7 @@ force:
-
- MODULES = config include ssl src gps regtests demos
-
--MODULES_SETUP = ${MODULES:%=%_setup} templates_parser_setup
-+MODULES_SETUP = ${MODULES:%=%_setup}
-
- MODULES_INSTALL = ${MODULES:%=%_install}
-
-@@ -346,4 +345,4 @@ gen_setup:
- setup: gen_setup setup_dir setup_modules setup_config setup_tp $(GEXT_MODULE)
-
- setup_tp:
-- $(MAKE) -C templates_parser setup $(GALL_OPTIONS)
-+ echo "Templates Parser has already been externally built"
diff --git a/www/aws/files/patch-aws.gpr b/www/aws/files/patch-aws.gpr
index 36abec267e22..882e991d7911 100644
--- a/www/aws/files/patch-aws.gpr
+++ b/www/aws/files/patch-aws.gpr
@@ -1,15 +1,5 @@
--- aws.gpr.orig 2014-11-15 19:27:52 UTC
+++ aws.gpr
-@@ -44,7 +44,8 @@ aggregate library project AWS is
- when "Windows_NT" =>
- for Library_Options use ("-lwsock32", "-lws2_32");
- when others =>
-- null;
-+ for Library_Options use ("-R", "-Wl,-R,@PREFIX@/lib" &
-+ ":@PREFIX@/lib/templates_parser.relocatable");
- end case;
-
- case Shared.LDAP is
@@ -55,7 +56,7 @@ aggregate library project AWS is
Project'Library_Options & ("-lwldap32");
when others =>
diff --git a/www/aws/files/patch-gps_Makefile b/www/aws/files/patch-gps_Makefile
deleted file mode 100644
index 2c7bf888349b..000000000000
--- a/www/aws/files/patch-gps_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- gps/Makefile.orig 2015-06-22 10:52:10 UTC
-+++ gps/Makefile
-@@ -20,7 +20,7 @@
-
- ALL_API = $(sort $(shell ls ../src/core/*.ads ../src/extended/*.ads \
- ../src/soap/*.ads ../src/xsrc/*.ads \
-- ../templates_parser/src/*.ads ../templates_parser/xsrc/*.ads))
-+ ))
-
- setup:
-
diff --git a/www/aws/files/patch-src_core_aws-server-http__utils.adb b/www/aws/files/patch-src_core_aws-server-http__utils.adb
new file mode 100644
index 000000000000..13c537f374ce
--- /dev/null
+++ b/www/aws/files/patch-src_core_aws-server-http__utils.adb
@@ -0,0 +1,22 @@
+Current_Process_Id is not available on GCC 6.x
+
+--- src/core/aws-server-http_utils.adb.orig 2016-09-28 15:14:26 UTC
++++ src/core/aws-server-http_utils.adb
+@@ -39,7 +39,6 @@ with Ada.Strings.Unbounded;
+ with Ada.Text_IO;
+
+ with GNAT.MD5;
+-with GNAT.OS_Lib;
+ with GNAT.Regexp;
+
+ with AWS.Attachments;
+@@ -924,8 +923,7 @@ package body AWS.Server.HTTP_Utils is
+
+ function Get_File_Upload_UID return String is
+ use GNAT;
+- Pid : constant Natural := Integer'Max
+- (0, OS_Lib.Pid_To_Integer (OS_Lib.Current_Process_Id));
++ Pid : constant Natural := 0;
+ -- On OS where Current_Process_Id is not support -1 is returned. We
+ -- ensure that in this case the Pid is set to 0 in this case.
+ UID : Natural;
diff --git a/www/aws/files/patch-src_src.gpr b/www/aws/files/patch-src_src.gpr
index d2d760cea269..7091cb6a81c2 100644
--- a/www/aws/files/patch-src_src.gpr
+++ b/www/aws/files/patch-src_src.gpr
@@ -1,31 +1,6 @@
--- src/src.gpr.orig 2015-06-22 10:52:10 UTC
+++ src/src.gpr
-@@ -21,13 +21,14 @@ with "../.build/projects/aws_xmlada";
- with "../shared";
- with "../include/include";
- with "../ssl/ssl";
-+with "../templates_parser/temparse";
-
- library project Src is
-
- for Languages use ("Ada", "Project file", "Makefile");
-
- for Source_Dirs use
-- ("core", "extended", "../templates_parser/src", "../config/src",
-+ ("core", "extended", "../config/src",
- "../config/ssl", "../" & Shared.Target_Dir & "/setup/src", ".");
-
- -- XMLAda Installed, add xsrc and soap directories
-@@ -35,7 +36,7 @@ library project Src is
- case Shared.XMLAda is
- when "Installed" =>
- for Source_Dirs use project'Source_Dirs &
-- ("xsrc", "soap", "../templates_parser/xsrc");
-+ ("xsrc", "soap");
- when "Disabled" =>
- null;
- end case;
-@@ -68,7 +69,7 @@ library project Src is
+@@ -68,7 +68,7 @@ library project Src is
when "Windows_NT" =>
for Library_Options use ("-lwsock32", "-lws2_32");
when others =>
@@ -34,7 +9,7 @@
end case;
case Shared.LDAP is
-@@ -79,7 +80,7 @@ library project Src is
+@@ -79,7 +79,7 @@ library project Src is
Project'Library_Options & ("-lwldap32");
when others =>
for Library_Options use
@@ -43,21 +18,3 @@
end case;
when "Disabled" =>
-@@ -124,17 +125,6 @@ library project Src is
- for Implementation_Suffix ("Makefile") use ".txt";
- for Implementation_Exceptions ("Makefile") use ("Makefile");
-
-- -- Templates Parser
--
-- for Specification ("Templates_Parser.Configuration")
-- use "templates_parser-configuration__aws.ads";
--
-- for Implementation ("Templates_Parser.Input")
-- use "templates_parser-input__aws.adb";
--
-- for Implementation ("Templates_Parser_Tasking")
-- use "templates_parser_tasking__standard_tasking.adb";
--
- -- SOCKLIB
-
- case Shared.SOCKLIB is
diff --git a/www/aws/files/patch-tools_tools.gpr b/www/aws/files/patch-tools_tools.gpr
deleted file mode 100644
index 6abe82675e3b..000000000000
--- a/www/aws/files/patch-tools_tools.gpr
+++ /dev/null
@@ -1,12 +0,0 @@
---- tools/tools.gpr.orig 2015-06-22 10:52:10 UTC
-+++ tools/tools.gpr
-@@ -27,8 +27,7 @@ project Tools is
-
- for Source_Dirs use (".", "../templates_parser/tools");
-
-- for Main use ("awsres.adb", "aws_password.adb", "templates2ada.adb",
-- "webxref.adb", "templatespp.adb");
-+ for Main use ("awsres.adb", "aws_password.adb", "webxref.adb");
-
- case Shared.XMLAda is
- when "Installed" =>
diff --git a/www/aws/pkg-plist b/www/aws/pkg-plist
index 1d89098a84c3..6887b7d86063 100644
--- a/www/aws/pkg-plist
+++ b/www/aws/pkg-plist
@@ -332,6 +332,29 @@
%%SHARED%%include/aws.relocatable/ssl.ads
%%SHARED%%include/aws.relocatable/ssl.gpr
%%SHARED%%include/aws.relocatable/ssl_lib.gpr
+%%SHARED%%include/aws.relocatable/templates_parser-cached_files.adb
+%%SHARED%%include/aws.relocatable/templates_parser-configuration__aws.ads
+%%SHARED%%include/aws.relocatable/templates_parser-data.adb
+%%SHARED%%include/aws.relocatable/templates_parser-debug.adb
+%%SHARED%%include/aws.relocatable/templates_parser-debug.ads
+%%SHARED%%include/aws.relocatable/templates_parser-definitions.adb
+%%SHARED%%include/aws.relocatable/templates_parser-expr.adb
+%%SHARED%%include/aws.relocatable/templates_parser-filter.adb
+%%SHARED%%include/aws.relocatable/templates_parser-input.ads
+%%SHARED%%include/aws.relocatable/templates_parser-input__aws.adb
+%%SHARED%%include/aws.relocatable/templates_parser-macro.adb
+%%SHARED%%include/aws.relocatable/templates_parser-print_tree.adb
+%%SHARED%%include/aws.relocatable/templates_parser-query.adb
+%%SHARED%%include/aws.relocatable/templates_parser-query.ads
+%%SHARED%%include/aws.relocatable/templates_parser-simplifier.adb
+%%SHARED%%include/aws.relocatable/templates_parser-utils.adb
+%%SHARED%%include/aws.relocatable/templates_parser-utils.ads
+%%SHARED%%include/aws.relocatable/templates_parser-xml.adb
+%%SHARED%%include/aws.relocatable/templates_parser-xml.ads
+%%SHARED%%include/aws.relocatable/templates_parser.adb
+%%SHARED%%include/aws.relocatable/templates_parser.ads
+%%SHARED%%include/aws.relocatable/templates_parser_tasking.ads
+%%SHARED%%include/aws.relocatable/templates_parser_tasking__standard_tasking.adb
%%SHARED%%include/aws.relocatable/wrappers.c
%%SHARED%%include/aws.relocatable/zlib-streams.adb
%%SHARED%%include/aws.relocatable/zlib-streams.ads
@@ -490,6 +513,14 @@
%%SHARED%%lib/aws.relocatable/soap-xml.ali
%%SHARED%%lib/aws.relocatable/soap.ali
%%SHARED%%lib/aws.relocatable/ssl.ali
+%%SHARED%%lib/aws.relocatable/templates_parser-configuration__aws.ali
+%%SHARED%%lib/aws.relocatable/templates_parser-debug.ali
+%%SHARED%%lib/aws.relocatable/templates_parser-input__aws.ali
+%%SHARED%%lib/aws.relocatable/templates_parser-query.ali
+%%SHARED%%lib/aws.relocatable/templates_parser-utils.ali
+%%SHARED%%lib/aws.relocatable/templates_parser-xml.ali
+%%SHARED%%lib/aws.relocatable/templates_parser.ali
+%%SHARED%%lib/aws.relocatable/templates_parser_tasking__standard_tasking.ali
%%SHARED%%lib/aws.relocatable/zlib-streams.ali
%%SHARED%%lib/aws.relocatable/zlib-thin.ali
%%SHARED%%lib/aws.relocatable/zlib.ali
@@ -512,6 +543,8 @@ bin/ada2wsdl
bin/aws_password
bin/awsascb
bin/awsres
+bin/templates2ada
+bin/templatespp
bin/webxref
bin/wsdl2aws
include/aws/aws-attachments.adb
@@ -810,6 +843,29 @@ include/aws/src.gpr
include/aws/ssl.ads
include/aws/ssl.gpr
include/aws/ssl_lib.gpr
+include/aws/templates_parser-cached_files.adb
+include/aws/templates_parser-configuration__aws.ads
+include/aws/templates_parser-data.adb
+include/aws/templates_parser-debug.adb
+include/aws/templates_parser-debug.ads
+include/aws/templates_parser-definitions.adb
+include/aws/templates_parser-expr.adb
+include/aws/templates_parser-filter.adb
+include/aws/templates_parser-input.ads
+include/aws/templates_parser-input__aws.adb
+include/aws/templates_parser-macro.adb
+include/aws/templates_parser-print_tree.adb
+include/aws/templates_parser-query.adb
+include/aws/templates_parser-query.ads
+include/aws/templates_parser-simplifier.adb
+include/aws/templates_parser-utils.adb
+include/aws/templates_parser-utils.ads
+include/aws/templates_parser-xml.adb
+include/aws/templates_parser-xml.ads
+include/aws/templates_parser.adb
+include/aws/templates_parser.ads
+include/aws/templates_parser_tasking.ads
+include/aws/templates_parser_tasking__standard_tasking.adb
include/aws/wrappers.c
include/aws/zlib-streams.adb
include/aws/zlib-streams.ads
@@ -968,6 +1024,14 @@ lib/aws/soap-wsdl.ali
lib/aws/soap-xml.ali
lib/aws/soap.ali
lib/aws/ssl.ali
+lib/aws/templates_parser-configuration__aws.ali
+lib/aws/templates_parser-debug.ali
+lib/aws/templates_parser-input__aws.ali
+lib/aws/templates_parser-query.ali
+lib/aws/templates_parser-utils.ali
+lib/aws/templates_parser-xml.ali
+lib/aws/templates_parser.ali
+lib/aws/templates_parser_tasking__standard_tasking.ali
lib/aws/zlib-streams.ali
lib/aws/zlib-thin.ali
lib/aws/zlib.ali
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-19 13:56:35 +0000