Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 17 May 2014 21:21:18 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r354373 - in head/www: aws aws-demos aws-demos/files aws/files
Message-ID:  <201405172121.s4HLLIqP005914@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Sat May 17 21:21:18 2014
New Revision: 354373
URL: http://svnweb.freebsd.org/changeset/ports/354373
QAT: https://qat.redports.org/buildarchive/r354373/

Log:
  www/aws: Upgrade from 3.1.0.0 => 3.2.0.0
  
  The templates parser was split out from AWS and due to quirk how
  GPRBuild interacts with aggregate library projects, linking it as a
  separate library was more than challenging.  It would drop a library
  exchange file (aws.lexch) in /usr/local/lib/templates_parser during
  the linking process.  Ports are not support to touch areas outside of
  their work directory -- if they do, builders will notice and fail the
  port.  After hours of trying to get GPRLib to behave, I was reduced to
  copying the *.ali files over to the work directory and creating a
  custom gpr file to make linking legal.  In the process, I noticed AWS
  was linking back to work directory (sanity checks don't flag this yet)
  so that was fixed the the custom "-R" option that I added to GPRBuild
  a couple of years ago.
  
  I had to create a custom aws.gpr file for lib/gnat, and it works really
  well.  Currently something like 238 of 243 tests are passing and the
  failing ones are socket related and may looking for linux-specific
  output in a couple of cases.
  
  * Documentation is now based on Sphinx.
  * A fixed package list has replaced the generated one (due to number
    of options, this was a real chore to generate and validate)
  * The option to generate only a shared library was removed.  It was
    confusing and not really useful.  It produces static and shared
    libraries by default, and the shared ones can be suppressed optionally.
  * The FreeBSD-specific makefile was removed.  The previous issue was
    caused by the way the compiler was built which has since been fixed
  * ASIS was added as dependency
  * RUN_DEPENDS were defined (they were missing before)
  * GNUTLS support was fixed.  It requires version 3 now and does not
    required gcrypt or openssl anymore which indicated a previous problem.
  
  The aws-demos port had some missing files and other problems.  It has
  been updated at the same time.  Note that the output directory has
  changed from share/examples/aws-demos to share/examples/aws.  A couple
  of tests that were broken now build, and a new test was added.
  
  This update comes straight from the latest repositories and was custom
  packaged.  The annual Adacore release was about 5 months old.

Added:
  head/www/aws-demos/files/patch-demos_web__elements_web__elements.gpr   (contents, props changed)
  head/www/aws-demos/files/templates.tads   (contents, props changed)
  head/www/aws/files/aws.gpr.in   (contents, props changed)
  head/www/aws/files/patch-aws.gpr   (contents, props changed)
  head/www/aws/files/patch-gps_makefile   (contents, props changed)
  head/www/aws/files/patch-regtests_0043__check__mem_test.opt   (contents, props changed)
  head/www/aws/files/patch-regtests_0213__check__mem__nossl_test.opt   (contents, props changed)
  head/www/aws/files/patch-tools_tools.gpr   (contents, props changed)
  head/www/aws/files/temparse.gpr.in   (contents, props changed)
  head/www/aws/pkg-plist   (contents, props changed)
Deleted:
  head/www/aws-demos/distinfo
  head/www/aws/Makefile.FreeBSD
  head/www/aws/files/patch-config__projects__aws.gpr
  head/www/aws/files/patch-docs__gentexifile
  head/www/aws/files/patch-docs__makefile
  head/www/aws/files/patch-docs_docs.gpr
  head/www/aws/files/patch-regtests__0043_check_mem__test.opt
  head/www/aws/files/patch-templates_parser__docs__gentexifile
  head/www/aws/files/patch-templates_parser__docs__makefile
Modified:
  head/www/aws-demos/Makefile
  head/www/aws-demos/pkg-plist
  head/www/aws/Makefile
  head/www/aws/distinfo
  head/www/aws/files/patch-include_include.gpr
  head/www/aws/files/patch-makefile
  head/www/aws/files/patch-src_core_aws-net.adb
  head/www/aws/files/patch-src_src.gpr

Modified: head/www/aws-demos/Makefile
==============================================================================
--- head/www/aws-demos/Makefile	Sat May 17 20:55:36 2014	(r354372)
+++ head/www/aws-demos/Makefile	Sat May 17 21:21:18 2014	(r354373)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws
-PORTVERSION=	3.1.0.0
-PORTREVISION=	1
+PORTVERSION=	3.2.0.0
 CATEGORIES=	www
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 PKGNAMESUFFIX=	-demos
@@ -14,12 +13,13 @@ COMMENT=	Adacore Ada Web Server demos
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS+=	gprbuild>=20120510:${PORTSDIR}/devel/gprbuild \
-		xmlada>=3.2:${PORTSDIR}/textproc/xmlada \
+BUILD_DEPENDS=	gprbuild:${PORTSDIR}/devel/gprbuild \
+		xmlada>=4.4:${PORTSDIR}/textproc/xmlada \
 		aws>=3.1:${PORTSDIR}/www/aws
 
-USE_BZIP2=	yes
-USES=		ada gmake
+USES=		ada gmake tar:bzip2
+
+DISTINFO_FILE=	${PORTSDIR}/www/aws/distinfo
 
 CONF_ARGS=	PROCESSORS=1
 CONF_ARGS+=	GCC=ada
@@ -27,6 +27,7 @@ CONF_ARGS+=	prefix=${PREFIX}
 
 OPTIONS_DEFINE=		SSL LDAP
 OPTIONS_DEFAULT=	SSL
+OPTIONS_SUB=		yes
 
 DEMO_DIRS+=	auth
 DEMO_DIRS+=	autobahn
@@ -35,7 +36,9 @@ DEMO_DIRS+=	com
 DEMO_DIRS+=	dispatch
 DEMO_DIRS+=	dowload_manager
 DEMO_DIRS+=	hello_world
+DEMO_DIRS+=	hello_wsdl
 DEMO_DIRS+=	hotplug
+DEMO_DIRS+=	interoplab
 DEMO_DIRS+=	jabber_demo
 DEMO_DIRS+=	multiple_sessions
 DEMO_DIRS+=	res_demo
@@ -55,36 +58,26 @@ DEMO_DIRS+=	web_mail
 DEMO_DIRS+=	websockets
 DEMO_DIRS+=	wps
 DEMO_DIRS+=	ws
+DEMO_DIRS+=	ws_candy
 DEMO_DIRS+=	zdemo
 
-# These don't build, fail finding "aws.ini"
-#DEMO_DIRS+=	hello_wsdl
-#DEMO_DIRS+=	interoplab
-
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSSL}
 CONF_ARGS+=	SOCKET=openssl
 DEMO_DIRS+=	agent
 DEMO_DIRS+=	runme
-PLIST_SUB+=	OSSL=""
-.else
-PLIST_SUB+=	OSSL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MLDAP}
 CONF_ARGS+=	LDAP=true
 DEMO_DIRS+=	test_ldap
-PLIST_SUB+=	LDAP=""
-.else
-PLIST_SUB+=	LDAP="@comment "
 .endif
 
-EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}${PKGNAMESUFFIX}
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|@PREFIX@|${LOCALBASE}|g' \
 		${WRKSRC}/demos/test_ldap/test_ldap.gpr
+	@${REINPLACE_CMD} -e 's| setup_tp | |' ${WRKSRC}/makefile
 
 do-configure:
 	${MKDIR} ${WRKSRC}/.build/native/debug/static/obj
@@ -98,10 +91,19 @@ do-build:
 .endfor
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/examples/aws-demos
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/templates \
+		${STAGEDIR}${EXAMPLESDIR}/images
 .for dd in ${DEMO_DIRS}
 	${FIND} ${WRKSRC}/demos/${dd} -type f -perm -0001 \
-	   -exec ${INSTALL} {} ${STAGEDIR}${PREFIX}/share/examples/aws-demos/ \;
+	   -exec ${INSTALL} {} ${STAGEDIR}${EXAMPLESDIR}/ \;
 .endfor
+	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.mk>

Added: head/www/aws-demos/files/patch-demos_web__elements_web__elements.gpr
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/aws-demos/files/patch-demos_web__elements_web__elements.gpr	Sat May 17 21:21:18 2014	(r354373)
@@ -0,0 +1,10 @@
+--- demos/web_elements/web_elements.gpr.orig	2014-05-15 19:48:07.000000000 +0000
++++ demos/web_elements/web_elements.gpr
+@@ -25,6 +25,7 @@ project Web_Elements is
+ 
+    package Builder is
+       for Default_Switches ("Ada") use ("-gnat05");
++      for Executable ("web_elements.adb") use "web_elements_program";
+    end Builder;
+ 
+ end Web_Elements;

Added: head/www/aws-demos/files/templates.tads
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/aws-demos/files/templates.tads	Sat May 17 21:21:18 2014	(r354373)
@@ -0,0 +1,264 @@
+@@--  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@@

Modified: head/www/aws-demos/pkg-plist
==============================================================================
--- head/www/aws-demos/pkg-plist	Sat May 17 20:55:36 2014	(r354372)
+++ head/www/aws-demos/pkg-plist	Sat May 17 21:21:18 2014	(r354373)
@@ -1,6 +1,7 @@
-%%OSSL%%%%EXAMPLESDIR%%/agent
+%%SSL%%%%EXAMPLESDIR%%/agent
 %%EXAMPLESDIR%%/auth
 %%EXAMPLESDIR%%/autobahn
+%%EXAMPLESDIR%%/candy
 %%EXAMPLESDIR%%/cert
 %%EXAMPLESDIR%%/com_1
 %%EXAMPLESDIR%%/com_2
@@ -8,13 +9,16 @@
 %%EXAMPLESDIR%%/download_manager
 %%EXAMPLESDIR%%/hello_world
 %%EXAMPLESDIR%%/hotplug
-@comment broken %%EXAMPLESDIR%%/interoplab_main
+%%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
-%%OSSL%%%%EXAMPLESDIR%%/runme
 %%EXAMPLESDIR%%/run.sh
+%%SSL%%%%EXAMPLESDIR%%/runme
 %%EXAMPLESDIR%%/soap_client
 %%EXAMPLESDIR%%/soap_cvs
 %%EXAMPLESDIR%%/soap_server
@@ -22,6 +26,12 @@
 %%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
@@ -29,13 +39,85 @@
 %%EXAMPLESDIR%%/web_block
 %%EXAMPLESDIR%%/web_block_ajax
 %%EXAMPLESDIR%%/web_block_ajax_templates
-%%EXAMPLESDIR%%/web_elements
+%%EXAMPLESDIR%%/web_elements_program
+%%EXAMPLESDIR%%/web_elements/icons/ada.gif
+%%EXAMPLESDIR%%/web_elements/icons/adb.gif
+%%EXAMPLESDIR%%/web_elements/icons/ads.gif
+%%EXAMPLESDIR%%/web_elements/icons/alert.black.gif
+%%EXAMPLESDIR%%/web_elements/icons/alert.red.gif
+%%EXAMPLESDIR%%/web_elements/icons/arrow.png
+%%EXAMPLESDIR%%/web_elements/icons/back.gif
+%%EXAMPLESDIR%%/web_elements/icons/binary.gif
+%%EXAMPLESDIR%%/web_elements/icons/binhex.gif
+%%EXAMPLESDIR%%/web_elements/icons/bomb.gif
+%%EXAMPLESDIR%%/web_elements/icons/break.gif
+%%EXAMPLESDIR%%/web_elements/icons/c.gif
+%%EXAMPLESDIR%%/web_elements/icons/compressed.gif
+%%EXAMPLESDIR%%/web_elements/icons/dirup.gif
+%%EXAMPLESDIR%%/web_elements/icons/dvi.gif
+%%EXAMPLESDIR%%/web_elements/icons/f.gif
+%%EXAMPLESDIR%%/web_elements/icons/file.gif
+%%EXAMPLESDIR%%/web_elements/icons/file_red.gif
+%%EXAMPLESDIR%%/web_elements/icons/file_sec.gif
+%%EXAMPLESDIR%%/web_elements/icons/folder.gif
+%%EXAMPLESDIR%%/web_elements/icons/folder.open.gif
+%%EXAMPLESDIR%%/web_elements/icons/image1.gif
+%%EXAMPLESDIR%%/web_elements/icons/image2.gif
+%%EXAMPLESDIR%%/web_elements/icons/image3.gif
+%%EXAMPLESDIR%%/web_elements/icons/layout.gif
+%%EXAMPLESDIR%%/web_elements/icons/movie.gif
+%%EXAMPLESDIR%%/web_elements/icons/p.gif
+%%EXAMPLESDIR%%/web_elements/icons/patch.gif
+%%EXAMPLESDIR%%/web_elements/icons/pdf.gif
+%%EXAMPLESDIR%%/web_elements/icons/ps.gif
+%%EXAMPLESDIR%%/web_elements/icons/quill.gif
+%%EXAMPLESDIR%%/web_elements/icons/rcorner.gif
+%%EXAMPLESDIR%%/web_elements/icons/script.gif
+%%EXAMPLESDIR%%/web_elements/icons/sound1.gif
+%%EXAMPLESDIR%%/web_elements/icons/sound2.gif
+%%EXAMPLESDIR%%/web_elements/icons/tar.gif
+%%EXAMPLESDIR%%/web_elements/icons/tex.gif
+%%EXAMPLESDIR%%/web_elements/icons/text.gif
+%%EXAMPLESDIR%%/web_elements/icons/unknown.gif
+%%EXAMPLESDIR%%/web_elements/icons/uu.gif
+%%EXAMPLESDIR%%/web_elements/javascripts/ajax_api.tjs
+%%EXAMPLESDIR%%/web_elements/javascripts/aws.tjs
+%%EXAMPLESDIR%%/web_elements/javascripts/aws_action_clear.tjs
+%%EXAMPLESDIR%%/web_elements/javascripts/aws_action_js.tjs
+%%EXAMPLESDIR%%/web_elements/javascripts/aws_action_replace.tjs
+%%EXAMPLESDIR%%/web_elements/javascripts/aws_action_xml.tjs
+%%EXAMPLESDIR%%/web_elements/javascripts/aws_func_clear.tjs
+%%EXAMPLESDIR%%/web_elements/javascripts/aws_func_replace.tjs
+%%EXAMPLESDIR%%/web_elements/javascripts/aws_func_xml.tjs
+%%EXAMPLESDIR%%/web_elements/javascripts/aws_kernel.tjs
+%%EXAMPLESDIR%%/web_elements/javascripts/aws_sortable.tjs
+%%EXAMPLESDIR%%/web_elements/javascripts/behaviour.js
+%%EXAMPLESDIR%%/web_elements/javascripts/cookies.js
+%%EXAMPLESDIR%%/web_elements/javascripts/dragdrop.js
+%%EXAMPLESDIR%%/web_elements/javascripts/effects.js
+%%EXAMPLESDIR%%/web_elements/javascripts/prototype.js
+%%EXAMPLESDIR%%/web_elements/javascripts/scriptaculous.js
+%%EXAMPLESDIR%%/web_elements/menu_css/arrow.png
+%%EXAMPLESDIR%%/web_elements/menu_css/menu.tcss
+%%EXAMPLESDIR%%/web_elements/mime.types
+%%EXAMPLESDIR%%/web_elements/notebook/cookies.js
+%%EXAMPLESDIR%%/web_elements/notebook/notebook.thtml
+%%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
-@comment broken %%EXAMPLESDIR%%/wsdl_demo_client
-@comment broken %%EXAMPLESDIR%%/wsdl_demo_server
+%%EXAMPLESDIR%%/wsdl_demo_client
+%%EXAMPLESDIR%%/wsdl_demo_server
 %%EXAMPLESDIR%%/zdemo
-@dirrmtry %%EXAMPLESDIR%%
-@dirrmtry share/examples
+@dirrm %%EXAMPLESDIR%%/images
+@dirrm %%EXAMPLESDIR%%/templates
+@dirrm %%EXAMPLESDIR%%/web_elements/icons
+@dirrm %%EXAMPLESDIR%%/web_elements/javascripts
+@dirrm %%EXAMPLESDIR%%/web_elements/menu_css
+@dirrm %%EXAMPLESDIR%%/web_elements/notebook
+@dirrm %%EXAMPLESDIR%%/web_elements/rounded_boxes
+@dirrm %%EXAMPLESDIR%%/web_elements
+@dirrm %%EXAMPLESDIR%%

Modified: head/www/aws/Makefile
==============================================================================
--- head/www/aws/Makefile	Sat May 17 20:55:36 2014	(r354372)
+++ head/www/aws/Makefile	Sat May 17 21:21:18 2014	(r354373)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws
-PORTVERSION=	3.1.0.0
-PORTREVISION=	2
+PORTVERSION=	3.2.0.0
 CATEGORIES=	www
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 
@@ -14,28 +13,40 @@ LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	gprbuild:${PORTSDIR}/devel/gprbuild \
-		xmlada>=3.2:${PORTSDIR}/textproc/xmlada \
+		templates_parser>11:${PORTSDIR}/textproc/templates_parser \
+		xmlada>=4.4:${PORTSDIR}/textproc/xmlada \
+		asis>=2013:${PORTSDIR}/lang/asis \
 		gnatpython>=20101207:${PORTSDIR}/devel/gnatpython
+RUN_DEPENDS=	templates_parser>11:${PORTSDIR}/textproc/templates_parser \
+		xmlada>=4.4:${PORTSDIR}/textproc/xmlada
 
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 NO_MTREE=	yes
 USES=		ada gmake tar:bzip2
 DOTBUILD=	release
+LINK_SSL=	--
+LINK_TLS=	--
+LINK_LDP=	--
+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}
 
 OPTIONS_SINGLE=		Secure-Socket-Layer
-OPTIONS_DEFINE=		IP6 DEBUG LDAP DSRT RELOC
-OPTIONS_DEFAULT=	SSL
+OPTIONS_DEFINE=		IP6 DEBUG LDAP SHARED DOCS
+OPTIONS_DEFAULT=	SSL SHARED
+OPTIONS_SUB=		yes
 NO_OPTIONS_SORT=	yes
+DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
 OPTIONS_SINGLE_Secure-Socket-Layer= SSL GNUTLS NOSSL
 
 NOSSL_DESC=		Disable SSL support
-DSRT_DESC=		Disable shared runtime
-RELOC_DESC=		Build shared libraries (default is static)
+SHARED_DESC=		Build shared libraries in addition to static ones
 IP6_DESC=		Support IPv6 instead of IPv4
 
-MAKE_ENV+=	AWK=${AWK}
 MAKEFILE=	makefile
 
 CONF_ARGS=	PROCESSORS=${MAKE_JOBS_NUMBER}
@@ -46,6 +57,9 @@ 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
+CONF_ARGS+=	DEFAULT_LIBRARY_TYPE=static
 
 .include <bsd.port.options.mk>
 
@@ -57,11 +71,19 @@ CONF_ARGS+=	ZPATH=/usr/lib
 WITH_OPENSSL_PORT= yes
 USE_OPENSSL=	yes
 CONF_ARGS+=	SOCKET=openssl
-.elif ${PORT_OPTIONS:MGNUTLS}
+CONF_ARGS+=	LPATH=${PREFIX}/lib
+LINK_SSL=
+.endif
+.if ${PORT_OPTIONS:MGNUTLS}
 CONF_ARGS+=	SOCKET=gnutls
-LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
-LIB_DEPENDS+=	crypto:${PORTSDIR}/security/openssl
-LIB_DEPENDS+=	gcrypt:${PORTSDIR}/security/libgcrypt
+CONF_ARGS+=	LPATH=${PREFIX}/lib/gnutls3
+LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls3
+LINK_TLS=
+.endif
+.if ${PORT_OPTIONS:MNOSSL}
+CONF_ARGS+=	SOCKET=std
+CONF_ARGS+=	LPATH=
+NAME_STD=
 .endif
 
 ####################
@@ -71,6 +93,7 @@ LIB_DEPENDS+=	gcrypt:${PORTSDIR}/securit
 .if ${PORT_OPTIONS:MLDAP}
 USE_OPENLDAP=	yes
 CONF_ARGS+=	LDAP=true
+LINK_LDP=
 .endif
 
 ####################
@@ -79,6 +102,8 @@ CONF_ARGS+=	LDAP=true
 
 .if ${PORT_OPTIONS:MIP6}
 CONF_ARGS+=	IPv6=true
+NAME_IP4=	--
+NAME_IP6=
 .endif
 
 #####################
@@ -87,32 +112,45 @@ CONF_ARGS+=	IPv6=true
 
 .if ${PORT_OPTIONS:MDEBUG}
 CONF_ARGS+=	DEBUG=true
+BUILD_TYPE=	debug
 .endif
 
 ##############################
 ##  Shared Runtime Library  ##
 ##############################
 
-.if ${PORT_OPTIONS:MDSRT}
+.if ${PORT_OPTIONS:MSHARED}
+CONF_ARGS+=	ENABLE_SHARED=true
+.else
 CONF_ARGS+=	ENABLE_SHARED=false
 .endif
 
-############################
-##  Default Library Type  ##
-############################
-
-.if ${PORT_OPTIONS:MRELOC}
-CONF_ARGS+=	DEFAULT_LIBRARY_TYPE=relocatable
-.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' \
+	    -e 's|@ADDITIONAL_RPATH@|${ADDL_RPATH}|' \
+	    -e 's|@PREFIX@|${LOCALBASE}|g' \
+	   	${WRKSRC}/aws.gpr \
 		${WRKSRC}/src/src.gpr \
 		${WRKSRC}/include/include.gpr
+	@(${CAT} ${FILESDIR}/temparse.gpr.in | \
+	    ${SED} -e 's|@PREFIX@|${LOCALBASE}|g' \
+		> ${WRKSRC}/templates_parser/temparse.gpr)
 
 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} \
 		${GMAKE} setup ${CONF_ARGS}
 
@@ -120,25 +158,30 @@ 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} \
-		${GMAKE} ${MAKE_ARGS} build build_doc
+		${GMAKE} ${MAKE_ARGS} build
+.if ${PORT_OPTIONS:MDOCS}
+	cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} \
+		${MAKE_CMD} ${MAKE_ARGS} html
+.endif
 
-test: install
-	@cd ${WRKSRC}/regtests && ${SETENV} ${MAKE_ENV} \
+test:
+.if exists(${LOCALBASE}/bin/awsres)
+	@cd ${WRKSRC}/regtests && ${SETENV} ${MAKE_ENV} TIMEOUT=75 \
 		python${PYTHON_VER} testsuite.py
+.else
+	@${ECHO} "AWS has to be installed before testing"
+.endif
 
 post-install:
-# 	AWS plist changes due to options are complex, and are not simply
-#	additive.  Trying to capture every permutation is error prone and
-#	tedious, so a generated PLIST is the way to go.
-	@cd ${STAGEDIR}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \
-	   ${SORT} >> ${TMPPLIST}
-	@cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d | ${AWK} '/\//' | ${SORT} -r | \
-	   ${SED} -e '/lib\/gnat$$/d' -e '/share\/doc$$/d' -e '/share\/gps/d' \
-	   -e '/share\/examples$$/d' -e 's/^/@dirrm /g' >> ${TMPPLIST}
-	@echo "@unexec rmdir %D/lib/gnat 2>/dev/null || true" >> ${TMPPLIST}
-	@echo "@unexec rmdir %D/share/gps/plug-ins 2>/dev/null || true" >> ${TMPPLIST}
-	@echo "@unexec rmdir %D/share/gps 2>/dev/null || true" >> ${TMPPLIST}
-	@echo "@unexec rmdir %D/share/doc 2>/dev/null || true" >> ${TMPPLIST}
-	@echo "@unexec rmdir %D/share/examples 2>/dev/null || true" >> ${TMPPLIST}
+	${RM} -rf ${STAGEDIR}${PREFIX}/share/gpr/manifests
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \
+		${STAGEDIR}${PREFIX}/share/gps/plug-ins
+	${CAT} ${FILESDIR}/aws.gpr.in | ${SED} -e 's|@PREFIX@|${PREFIX}|g' \
+		-e 's|@SSL@|${LINK_SSL}|g' -e 's|@TLS@|${LINK_TLS}|g' \
+		-e 's|@LDP@|${LINK_LDP}|g' -e 's|@IP4@|${NAME_IP4}|g' \
+		-e 's|@IP6@|${NAME_IP6}|g' -e 's|@STD@|${NAME_STD}|g' \
+		> ${STAGEDIR}${PREFIX}/lib/gnat/aws.gpr
+	cd ${WRKSRC}/gps && ${INSTALL_DATA} *.xml aws.py \
+		${STAGEDIR}${PREFIX}/share/gps/plug-ins
 
 .include <bsd.port.mk>

Modified: head/www/aws/distinfo
==============================================================================
--- head/www/aws/distinfo	Sat May 17 20:55:36 2014	(r354372)
+++ head/www/aws/distinfo	Sat May 17 21:21:18 2014	(r354373)
@@ -1,2 +1,2 @@
-SHA256 (aws-3.1.0.0.tar.bz2) = bb2896d81ab15f62a6fc8b7ae5c7191bf04ee9875e021ec0639cdbc435f8b8da
-SIZE (aws-3.1.0.0.tar.bz2) = 1529933
+SHA256 (aws-3.2.0.0.tar.bz2) = 21b396003e1e925954b73a0206e3dcc5978369147de926eac4eda352c9ad0c52
+SIZE (aws-3.2.0.0.tar.bz2) = 1443916

Added: head/www/aws/files/aws.gpr.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/aws/files/aws.gpr.in	Sat May 17 21:21:18 2014	(r354373)
@@ -0,0 +1,60 @@
+with "templates_parser";
+with "xmlada";
+
+project AWS is
+
+   type AWS_Kind_Type is ("static", "relocatable");
+   AWS_Kind : AWS_Kind_Type := external ("LIBRARY_TYPE", "static");
+
+   for Library_Name use "aws";
+   for Library_Kind use AWS_Kind;
+   case AWS_Kind is
+      when "relocatable" =>
+         for Source_Dirs use ("../../include/aws.relocatable");
+         for Library_Dir use "../../lib/aws.relocatable";
+         for Library_Version use "libaws.so";
+      when others =>
+         for Source_Dirs use ("../../include/aws");
+         for Library_Dir use "../../lib/aws";
+   end case;
+   for Externally_Built use "true";
+
+   package Linker is
+      for Linker_Options use ("-L@PREFIX@/lib", "-Wl,-R,@PREFIX@/lib"
+         @SSL@  , "-lssl", "-lcrypto"
+         @TLS@  , "-L@PREFIX@/lib/gnutls3", "-Wl,-R,@PREFIX@/lib/gnutls3"
+         @TLS@  , "-lgnutls"
+         @LDP@  , "-lldap"
+      );
+   end Linker;
+
+   package Naming is
+
+      @IP4@  for Implementation ("AWS.Net.Std") use "aws-net-std__gnat.adb";
+
+      @IP6@  for Implementation ("AWS.Net.Std") use "aws-net-std__ipv6.adb";
+
+      @STD@  for Implementation ("AWS.Net.SSL") use "aws-net-ssl__dummy.adb";
+      @STD@  for Specification ("AWS.Net.SSL.Certificate.Impl")
+      @STD@    use "aws-net-ssl-certificate-impl__dummy.ads";
+      @STD@  for Implementation ("AWS.Net.SSL.Certificate.Impl")
+      @STD@    use "aws-net-ssl-certificate-impl__dummy.adb";
+      @STD@  for Specification ("SSL.Thin") use "ssl-thin__dummy.ads";
+
+      @SSL@  for Implementation ("AWS.Net.SSL") use "aws-net-ssl__openssl.adb";
+      @SSL@  for Specification ("AWS.Net.SSL.Certificate.Impl")
+      @SSL@    use "aws-net-ssl-certificate-impl__openssl.ads";
+      @SSL@  for Implementation ("AWS.Net.SSL.Certificate.Impl")
+      @SSL@    use "aws-net-ssl-certificate-impl__openssl.adb";
+      @SSL@  for Specification ("SSL.Thin") use "ssl-thin__openssl.ads";
+
+      @TLS@  for Implementation ("AWS.Net.SSL") use "aws-net-ssl__gnutls.adb";
+      @TLS@  for Specification ("AWS.Net.SSL.Certificate.Impl")
+      @TLS@    use "aws-net-ssl-certificate-impl__gnutls.ads";
+      @TLS@  for Implementation ("AWS.Net.SSL.Certificate.Impl")
+      @TLS@    use "aws-net-ssl-certificate-impl__gnutls.adb";
+      @TLS@  for Specification ("SSL.Thin") use "ssl-thin__gnutls.ads";
+
+   end Naming;
+
+end AWS;

Added: head/www/aws/files/patch-aws.gpr
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/aws/files/patch-aws.gpr	Sat May 17 21:21:18 2014	(r354373)
@@ -0,0 +1,71 @@
+--- aws.gpr.orig	2014-05-15 19:48:07.000000000 +0000
++++ 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 =>
+                      for Library_Options use
+-                       Project'Library_Options & ("-lldap");
++                       Project'Library_Options & ("-L@PREFIX@/lib", "-lldap");
+                end case;
+ 
+             when "Disabled" =>
+@@ -69,49 +70,4 @@ aggregate library project AWS is
+ 
+    package Builder renames Shared.Builder;
+ 
+-   -------------
+-   -- Install --
+-   -------------
+-
+-   package Install is
+-      --  examples
+-
+-      for Artifacts ("share/examples/aws/images")
+-        use ("demos/runme/aws_*.png");
+-      for Artifacts ("share/examples/aws/templates")
+-        use ("demos/web_mail/*html");
+-
+-      --  support files (templates)
+-
+-      for Artifacts ("share/examples/aws/templates")
+-        use ("templates_parser/tools/templates.tads");
+-      for Artifacts ("share/examples/aws/web_elements")
+-        use ("web_elements/menu_css", "web_elements/notebook",
+-             "web_elements/rounded_boxes", "web_elements/icons",
+-             "web_elements/javascripts",
+-             "web_elements/mime.types", "web_elements/readme.txt");
+-
+-      case Shared.S_Target is
+-         when "Windows_NT" =>
+-            for Artifacts ("lib/aws")
+-              use (Shared.Target_Dir & "/common/win32/aws.coff");
+-         when others =>
+-            null;
+-      end case;
+-
+-      -- documentations
+-
+-      for Artifacts ("share/doc/aws") use ("docs/build/html");
+-      for Artifacts ("share/doc/aws/pdf") use ("docs/build/latex/*.pdf");
+-      for Artifacts ("share/doc/aws/templates_parser")
+-        use ("templates_parser/docs/build/html");
+-      for Artifacts ("share/doc/aws/templates_parser/pdf")
+-        use ("templates_parser/docs/build/latex/*.pdf");
+-
+-      --  gps plug-ins
+-
+-      for Artifacts ("share/gps/plug-ins") use ("gps/*.xml", "gps/aws.py");
+-
+-   end Install;
+-
+ end AWS;

Added: head/www/aws/files/patch-gps_makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/aws/files/patch-gps_makefile	Sat May 17 21:21:18 2014	(r354373)
@@ -0,0 +1,11 @@
+--- gps/makefile.orig	2014-05-15 19:48:07.000000000 +0000
++++ 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:
+ 

Modified: head/www/aws/files/patch-include_include.gpr
==============================================================================
--- head/www/aws/files/patch-include_include.gpr	Sat May 17 20:55:36 2014	(r354372)
+++ head/www/aws/files/patch-include_include.gpr	Sat May 17 21:21:18 2014	(r354373)
@@ -1,8 +1,6 @@
-$NetBSD: patch-include_include.gpr,v 1.1 2012/07/08 20:14:28 marino Exp $
-
---- include/include.gpr.orig	2011-01-25 20:52:57.000000000 +0000
+--- include/include.gpr.orig	2014-05-15 19:48:07.000000000 +0000
 +++ include/include.gpr
-@@ -40,6 +40,7 @@ project Include is
+@@ -31,6 +31,7 @@ library project Include is
  
     for Library_Name use "aws_include";
     for Library_Kind use Shared.Library_Type;

Modified: head/www/aws/files/patch-makefile
==============================================================================
--- head/www/aws/files/patch-makefile	Sat May 17 20:55:36 2014	(r354372)
+++ head/www/aws/files/patch-makefile	Sat May 17 21:21:18 2014	(r354373)
@@ -1,12 +1,27 @@
-Prevent empty ${EXAMPLESDIR}/bin directory from being created
-
---- makefile.orig	2013-07-03 01:11:54.000000000 +0000
+--- makefile.orig	2014-05-15 19:48:07.000000000 +0000
 +++ makefile
-@@ -390,7 +390,6 @@ endif
- 	$(MKDIR) -p $(DESTDIR)$(I_AGP)
- 	$(MKDIR) -p $(DESTDIR)$(I_TPL)
- 	$(MKDIR) -p $(DESTDIR)$(I_IMG)
--	$(MKDIR) -p $(DESTDIR)$(I_SBN)
- 	$(MKDIR) -p $(DESTDIR)$(I_PLG)
- 	$(MKDIR) -p $(DESTDIR)$(I_WEL)
+@@ -61,15 +61,14 @@ ALL_OPTIONS	= $(MAKE_OPT) SOCKET="$(SOCK
+ 	GPRBUILD="$(GPRBUILD)" ZLIB="$(ZLIB)" BDIR="$(BDIR)" \
+ 	prefix="$(prefix)" ENABLE_SHARED="$(ENABLE_SHARED)" \
+ 	SOEXT="$(SOEXT)" BUILD_DOC_SCRIPT="false" 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 ""
+@@ -343,4 +342,5 @@ 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"
++	#$(MAKE) -C templates_parser setup $(GALL_OPTIONS)

Added: head/www/aws/files/patch-regtests_0043__check__mem_test.opt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/aws/files/patch-regtests_0043__check__mem_test.opt	Sat May 17 21:21:18 2014	(r354373)
@@ -0,0 +1,14 @@
+--- regtests/0043_check_mem/test.opt.orig	2014-05-15 19:48:07.000000000 +0000
++++ regtests/0043_check_mem/test.opt
+@@ -1,3 +1,11 @@
+ !ssl DEAD
+ !xmlada DEAD
++x86-dragonfly DEAD "no gnatmem"
++x86-freebsd DEAD "no gnatmem"
++x86-openbsd DEAD "no gnatmem"
++x86-netbsd DEAD "no gnatmem"
++x86_64-dragonfly DEAD "no gnatmem"
++x86_64-freebsd DEAD "no gnatmem"
++x86_64-openbsd DEAD "no gnatmem"
++x86_64-netbsd DEAD "no gnatmem"
+ darwin DEAD "no gnatmem"

Added: head/www/aws/files/patch-regtests_0213__check__mem__nossl_test.opt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/aws/files/patch-regtests_0213__check__mem__nossl_test.opt	Sat May 17 21:21:18 2014	(r354373)
@@ -0,0 +1,14 @@
+--- regtests/0213_check_mem_nossl/test.opt.orig	2014-05-15 19:48:07.000000000 +0000
++++ regtests/0213_check_mem_nossl/test.opt
+@@ -1,3 +1,11 @@
+ !xmlada DEAD
+ !asis DEAD
++x86-dragonfly DEAD "no gnatmem"
++x86-freebsd DEAD "no gnatmem"
++x86-openbsd DEAD "no gnatmem"
++x86-netbsd DEAD "no gnatmem"
++x86_64-dragonfly DEAD "no gnatmem"
++x86_64-freebsd DEAD "no gnatmem"
++x86_64-openbsd DEAD "no gnatmem"
++x86_64-netbsd DEAD "no gnatmem"
+ darwin DEAD "no gnatmem"

Modified: head/www/aws/files/patch-src_core_aws-net.adb
==============================================================================
--- head/www/aws/files/patch-src_core_aws-net.adb	Sat May 17 20:55:36 2014	(r354372)
+++ head/www/aws/files/patch-src_core_aws-net.adb	Sat May 17 21:21:18 2014	(r354373)
@@ -1,6 +1,6 @@
---- src/core/aws-net.adb.orig	2014-04-03 07:44:04.691630539 +0200
-+++ src/core/aws-net.adb	2014-04-03 15:48:00.868957657 +0200
-@@ -439,7 +439,7 @@
+--- src/core/aws-net.adb.orig	2014-05-15 19:48:07.000000000 +0000
++++ src/core/aws-net.adb
+@@ -552,7 +552,7 @@ package body AWS.Net is
  
           --  to be shure that it is S1 and S2 connected together
  
@@ -8,3 +8,4 @@
 +         exit when Peer_Addr (STC (S2)) = Get_Addr (STC (S1))
             and then Peer_Port (STC (S2)) = Get_Port (STC (S1))
             and then Peer_Port (STC (S1)) = Get_Port (STC (S2));
+ 

Modified: head/www/aws/files/patch-src_src.gpr
==============================================================================
--- head/www/aws/files/patch-src_src.gpr	Sat May 17 20:55:36 2014	(r354372)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405172121.s4HLLIqP005914>