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.

18 files changed, 294 insertions, 146 deletions

diff --git a/www/aws/files/aws.gpr.in b/www/aws/files/aws.gpr.in
new file mode 100644
index 000000000000..fc25927ea01e
--- /dev/null
+++ b/www/aws/files/aws.gpr.in
@@ -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;
diff --git a/www/aws/files/patch-aws.gpr b/www/aws/files/patch-aws.gpr
new file mode 100644
index 000000000000..dcb33c019d51
--- /dev/null
+++ b/www/aws/files/patch-aws.gpr
@@ -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;
diff --git a/www/aws/files/patch-config__projects__aws.gpr b/www/aws/files/patch-config__projects__aws.gpr
deleted file mode 100644
index 6191d2e5e7c3..000000000000
--- a/www/aws/files/patch-config__projects__aws.gpr
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/projects/aws.gpr.orig	2013-07-03 01:11:54.000000000 +0000
-+++ config/projects/aws.gpr
-@@ -22,7 +22,6 @@ with "aws/aws_crypto_lib";
- with "aws/aws_ssl_support";
- with "aws/aws_ssl_lib";
- with "aws/aws_ssl_error_lib";
--with "aws/aws_dl_lib";
- with "aws/aws_shared";
- with "aws/aws_config";
- 
diff --git a/www/aws/files/patch-docs__gentexifile b/www/aws/files/patch-docs__gentexifile
deleted file mode 100644
index 60715044e77a..000000000000
--- a/www/aws/files/patch-docs__gentexifile
+++ /dev/null
@@ -1,25 +0,0 @@
---- docs/gentexifile.orig	2013-07-03 01:11:54.000000000 +0000
-+++ docs/gentexifile
-@@ -32,12 +32,7 @@ SOURCE=$1
- TARGET=`basename ${SOURCE}`.texi
- TMPTAR=${TARGET}.tmp
- 
--awk=`type gawk 2>/dev/null`
--if [ x"$awk" = x ]; then
--   awk="awk"
--else
--   awk="gawk"
--fi
-+awk=${AWK}
- 
- $awk 'BEGIN{out=1}$1=="end"&&substr($0,1,1)=="e"{out=1}out==1{print}$1=="private"&&$2!="with"&&out==1{out=0; print "   --  implementation removed"}' ${SOURCE} > genout
- 
-@@ -51,7 +46,7 @@ if [ $# = 1 ]; then
- echo "@group"            >>${TMPTAR}
- fi
- echo ""                  >>${TMPTAR}
--sed -f ada.sed genout    >>${TMPTAR}
-+sed -E -f ada.sed genout >>${TMPTAR}
- echo ""                  >>${TMPTAR}
- if [ $# = 1 ]; then
- echo "@end group"        >>${TMPTAR}
diff --git a/www/aws/files/patch-docs__makefile b/www/aws/files/patch-docs__makefile
deleted file mode 100644
index 7d72b2ca7bc7..000000000000
--- a/www/aws/files/patch-docs__makefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- docs/makefile.orig	2013-07-03 01:11:54.000000000 +0000
-+++ docs/makefile
-@@ -116,10 +116,9 @@ build_doc: $(APIFILES) aws_docs sg_docs
- 	echo AWS Documentation built with success.
- 	${MAKE} -C ../templates_parser doc
- 
--aws_docs: aws.texi aws.pdf aws.html aws.txt aws.info
-+aws_docs: aws.texi aws.html aws.txt aws.info
- 
--sg_docs: style-guide.pdf style-guide.html style-guide.txt \
--	style-guide.info
-+sg_docs: style-guide.html style-guide.txt style-guide.info
- 
- setup:
- 
diff --git a/www/aws/files/patch-docs_docs.gpr b/www/aws/files/patch-docs_docs.gpr
deleted file mode 100644
index d7ea1305a07d..000000000000
--- a/www/aws/files/patch-docs_docs.gpr
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-docs_docs.gpr,v 1.1 2012/07/08 20:14:28 marino Exp $
-
---- docs/docs.gpr.orig	2011-01-25 20:53:19.000000000 +0000
-+++ docs/docs.gpr
-@@ -55,7 +55,7 @@ project Docs is
- 
-    package Binder is
-       for Default_Switches ("Ada")
--         use Shared.Builder'Default_Switches ("Ada") & ("-static");
-+         use Shared.Builder'Default_Switches ("Ada");
-    end Binder;
- 
-    -------------
diff --git a/www/aws/files/patch-gps_makefile b/www/aws/files/patch-gps_makefile
new file mode 100644
index 000000000000..b58d1885dc6d
--- /dev/null
+++ b/www/aws/files/patch-gps_makefile
@@ -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:
+ 
diff --git a/www/aws/files/patch-include_include.gpr b/www/aws/files/patch-include_include.gpr
index 04e4aa0782a4..04eaca066d29 100644
--- a/www/aws/files/patch-include_include.gpr
+++ b/www/aws/files/patch-include_include.gpr
@@ -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;
diff --git a/www/aws/files/patch-makefile b/www/aws/files/patch-makefile
index e91eeca06a2d..88d3ca23cc4e 100644
--- a/www/aws/files/patch-makefile
+++ b/www/aws/files/patch-makefile
@@ -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)
diff --git a/www/aws/files/patch-regtests_0043__check__mem_test.opt b/www/aws/files/patch-regtests_0043__check__mem_test.opt
new file mode 100644
index 000000000000..8e38b77a18fe
--- /dev/null
+++ b/www/aws/files/patch-regtests_0043__check__mem_test.opt
@@ -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"
diff --git a/www/aws/files/patch-regtests_0213__check__mem__nossl_test.opt b/www/aws/files/patch-regtests_0213__check__mem__nossl_test.opt
new file mode 100644
index 000000000000..054d5fae5aeb
--- /dev/null
+++ b/www/aws/files/patch-regtests_0213__check__mem__nossl_test.opt
@@ -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"
diff --git a/www/aws/files/patch-regtests__0043_check_mem__test.opt b/www/aws/files/patch-regtests__0043_check_mem__test.opt
deleted file mode 100644
index 7f1b3d05ef24..000000000000
--- a/www/aws/files/patch-regtests__0043_check_mem__test.opt
+++ /dev/null
@@ -1,13 +0,0 @@
---- regtests/0043_check_mem/test.opt.orig	2010-12-13 14:42:37 +0000
-+++ regtests/0043_check_mem/test.opt
-@@ -1,2 +1,10 @@
- !ssl DEAD
- !xmlada DEAD
-+x86-dragonfly DEAD
-+x86-freebsd DEAD
-+x86-openbsd DEAD
-+x86-netbsd DEAD
-+x86_64-dragonfly DEAD
-+x86_64-freebsd DEAD
-+x86_64-openbsd DEAD
-+x86_64-netbsd DEAD
diff --git a/www/aws/files/patch-src_core_aws-net.adb b/www/aws/files/patch-src_core_aws-net.adb
index a0623f6374e0..2df8ea26f328 100644
--- a/www/aws/files/patch-src_core_aws-net.adb
+++ b/www/aws/files/patch-src_core_aws-net.adb
@@ -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));
+ 
diff --git a/www/aws/files/patch-src_src.gpr b/www/aws/files/patch-src_src.gpr
index ce940d623add..8854955864dc 100644
--- a/www/aws/files/patch-src_src.gpr
+++ b/www/aws/files/patch-src_src.gpr
@@ -1,6 +1,31 @@
---- src/src.gpr.orig	2011-01-09 15:47:58.000000000 +0100
-+++ src/src.gpr	2013-04-25 20:08:01.000000000 +0200
-@@ -77,7 +77,7 @@
+--- src/src.gpr.orig	2014-05-15 19:48:07.000000000 +0000
++++ 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;
+@@ -67,7 +68,7 @@ library project Src is
              when "Windows_NT" =>
                 for Library_Options use ("-lwsock32", "-lws2_32");
              when others =>
@@ -9,12 +34,30 @@
           end case;
  
           case Shared.LDAP is
-@@ -88,7 +88,7 @@
+@@ -78,7 +79,7 @@ library project Src 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" =>
-                null;
+@@ -123,17 +124,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-templates_parser__docs__gentexifile b/www/aws/files/patch-templates_parser__docs__gentexifile
deleted file mode 100644
index 6f46832ca970..000000000000
--- a/www/aws/files/patch-templates_parser__docs__gentexifile
+++ /dev/null
@@ -1,30 +0,0 @@
---- templates_parser/docs/gentexifile.orig	2011-01-09 15:48:02.000000000 +0100
-+++ templates_parser/docs/gentexifile	2011-07-17 16:14:44.000000000 +0200
-@@ -32,24 +32,17 @@
- TARGET=`basename ${SOURCE}`.texi
- TMPTAR=${TARGET}.tmp
- 
--awk=`type gawk 2>/dev/null`
--if [ x"$awk" = x ]; then
--   awk="awk"
--else
--   awk="gawk"
--fi
--
--$awk 'BEGIN{out=1}$1=="end"&&substr($0,1,1)=="e"{out=1}out==1{print}$1=="private"&&$2!="with"&&out==1{out=0; print "   --  implementation removed"}' ${SOURCE} > genout
-+${AWK} 'BEGIN{out=1}$1=="end"&&substr($0,1,1)=="e"{out=1}out==1{print}$1=="private"&&$2!="with"&&out==1{out=0; print "   --  implementation removed"}' ${SOURCE} > genout
- 
- rm -f ${TMPTAR}
- 
- if [ $# = 1 ]; then
- echo "@TPEXP{"           >>${TMPTAR}
--sed -f ada.sed genout    >>${TMPTAR}
-+sed -E -f ada.sed genout >>${TMPTAR}
- echo "}"                 >>${TMPTAR}
- else
- echo "@smallexample"     >>${TMPTAR}
--sed -f ada.sed genout    >>${TMPTAR}
-+sed -E -f ada.sed genout >>${TMPTAR}
- echo "@end smallexample" >>${TMPTAR}
- fi
- 
diff --git a/www/aws/files/patch-templates_parser__docs__makefile b/www/aws/files/patch-templates_parser__docs__makefile
deleted file mode 100644
index adcbd990485b..000000000000
--- a/www/aws/files/patch-templates_parser__docs__makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- templates_parser/docs/makefile.orig	2010-12-21 00:47:27.000000000 +0100
-+++ templates_parser/docs/makefile	2010-12-21 00:49:10.000000000 +0100
-@@ -50,7 +50,7 @@
- GFLAGS	  = -I../src -I../include
- 
- DOCS	  = templates_parser.info templates_parser.html \
--		templates_parser.txt templates_parser.pdf
-+	    templates_parser.txt
- 
- APIFILES    = ../src/templates_parser.ads.texi \
- 	      ../src/templates_parser-debug.ads.texi \
-@@ -146,5 +146,5 @@
- 		*.aux *.cp* *.fn *.ky *.pg *.toc *.tp *.vr *.dvi *.log \
- 		*.exe templates_parser*.ads.texi ada.sed \
- 		templates_parser.tar.gz
--	-rm -f templates_parser.html templates_parser.pdf \
-+	-rm -f templates_parser.html \
- 		templates_parser.info* templates_parser.txt
diff --git a/www/aws/files/patch-tools_tools.gpr b/www/aws/files/patch-tools_tools.gpr
new file mode 100644
index 000000000000..66e5397f3178
--- /dev/null
+++ b/www/aws/files/patch-tools_tools.gpr
@@ -0,0 +1,12 @@
+--- tools/tools.gpr.orig	2014-05-15 19:48:07.000000000 +0000
++++ tools/tools.gpr
+@@ -29,8 +29,7 @@ project Tools is
+      (".", "../templates_parser/tools",
+       "../" & Shared.Target_Dir & "/setup/tsrc");
+ 
+-   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/files/temparse.gpr.in b/www/aws/files/temparse.gpr.in
new file mode 100644
index 000000000000..1ef48a5a5eed
--- /dev/null
+++ b/www/aws/files/temparse.gpr.in
@@ -0,0 +1,33 @@
+--  This is a workaround for the nasty habit gprlib has of using
+--  ${LOCALBASE}/lib/templates_parser as the OBJECT_DIR, dumping .lexch
+--  files there which is a build violation.  By copying the prebuilt
+--  library and ali files over to the project object directory and using
+--  a custom gpr file restricts the libaws.lexch generation there.
+
+with "../shared";
+
+project TemParse is
+
+   for Library_Name use "templates_parser";
+   for Library_Kind use Shared.Library_Type;
+   case Shared.Library_Type is
+      when "relocatable" =>
+         for Library_Version use "libtemplates_parser.so";
+         for Source_Dirs use ("@PREFIX@/include/templates_parser.relocatable");
+      when others =>
+         for Source_Dirs use ("@PREFIX@/include/templates_parser");
+   end case;
+   for Object_Dir use "../" & Shared'Object_Dir & "/temparse";
+   for Library_Dir use "../" & Shared'Library_Dir & "/temparse";
+   for Externally_Built use "true";
+
+   package Naming is
+      --  for Specification ("Templates_Parser.Configuration")
+      --    use "templates_parser-configuration__aws.ads";
+      for Implementation ("Templates_Parser.Input")
+        use "templates_parser-input__standalone.adb";
+      for Implementation ("Templates_Parser_Tasking")
+        use "templates_parser_tasking__standard_tasking.adb";
+   end Naming;
+
+end TemParse;