www/aws: Update to from version 2.10.0 to 3.1.0

There is no dedicated change log but version 2.10 was introduced to
pkgsrc 2.5 years ago.  The current capability is described by
http://docs.adacore.com/aws-docs/aws.html

This is roughly equivalent to Adacore release 2013 of aws.
The "gnutls" option was added as an alternative to ssl.

30 files changed, 195 insertions, 452 deletions

diff --git a/www/aws/MESSAGE_NETBSD_SSL b/www/aws/MESSAGE_NETBSD_SSL
deleted file mode 100644
index d52c03ca7c7..00000000000
--- a/www/aws/MESSAGE_NETBSD_SSL
+++ /dev/null
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE_NETBSD_SSL,v 1.1.1.1 2011/02/11 16:48:52 drochner Exp $
-Due to the combination of an old version of the gcc library in NetBSD 5+
-(/usr/lib/libgcc.*) and a recently discovered bug in gnatmake/gprbuild,
-it is not possible to build the Ada Web Server with SSL support at this
-time.  This means https:// will not function.  Sorry!
-===========================================================================
diff --git a/www/aws/Makefile b/www/aws/Makefile
index bb951edc4c4..dd3e11c0d44 100644
--- a/www/aws/Makefile
+++ b/www/aws/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2013/06/16 23:09:50 asau Exp $
+# $NetBSD: Makefile,v 1.12 2013/07/07 23:46:50 marino Exp $
 #
 
 DISTNAME=	aws-${AWS_VERSION}
-PKGREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 EXTRACT_SUFX=	.tar.bz2
@@ -12,9 +11,9 @@ HOMEPAGE=	http://libre.adacore.com/libre/tools/aws/
 COMMENT=	Adacore Ada Web Server and framework
 LICENSE=	gnu-gpl-v2
 
-AWS_VERSION=		2.10.0.1
-USE_TOOLS+=		gmake makeinfo sed gawk
-USE_LANGUAGES=  	c ada c++
+AWS_VERSION=		3.1.0.0
+USE_TOOLS+=		gmake makeinfo sed awk
+USE_LANGUAGES=  	c ada c++ fortran
 
 # Note: c++ and fortran aren't used, but gprconfig probes for them.
 # When that happens, pkgsrc wrapper emits a warning message which causes
@@ -23,7 +22,9 @@ USE_LANGUAGES=  	c ada c++
 
 .include "options.mk"
 
-MAKE_ENV+=	ADA_PROJECT_PATH=${PREFIX}/lib/gnat
+MAKE_ENV+=		ADA_PROJECT_PATH=${PREFIX}/lib/gnat
+MAKE_ENV+=		AWK=awk
+CONFIGURE_ARGS+=	LPATH=${PREFIX}/lib ZPATH=/usr/lib
 
 # Link options were added for the aws library
 # "-R" option disables all rpaths except adalib and compiler libs.  This is
@@ -38,26 +39,10 @@ SUBST_FILES.rpath=	src/src.gpr include/include.gpr \
 			demos/test_ldap/test_ldap.gpr
 SUBST_SED.rpath=	-e "s,@ADDITIONAL_RPATH@,${ADDITIONAL_RPATH}," \
 			-e "s,@PREFIX@,${PREFIX},g"
-ADDITIONAL_RPATH=	${PREFIX}/lib:${PREFIX}/lib/aws/native/relocatable
+ADDITIONAL_RPATH=	${PREFIX}/lib:${PREFIX}/lib/aws/relocatable
 
 GENERATE_PLIST=  cd ${DESTDIR}${PREFIX};
-GENERATE_PLIST+= ${FIND} bin/aws_password;
-GENERATE_PLIST+= ${FIND} bin/awsres;
-GENERATE_PLIST+= ${FIND} bin/templates2ada;
-GENERATE_PLIST+= ${FIND} bin/templatespp;
-GENERATE_PLIST+= ${FIND} bin/webxref;
-GENERATE_PLIST+= ${FIND} bin/wsdl2aws;
-GENERATE_PLIST+= ${FIND} include/aws/        -name \* -type f | ${SORT} -dr;
-GENERATE_PLIST+= ${FIND} lib/aws/            -name \* -type f | ${SORT} -dr;
-GENERATE_PLIST+= ${FIND} lib/gnat/aws/       -name \* -type f | ${SORT};
-GENERATE_PLIST+= ${FIND} lib/gnat/aws.gpr;
-GENERATE_PLIST+= ${FIND} share/doc/aws/      -name \* -type f | ${SORT};
-GENERATE_PLIST+= ${FIND} share/examples/aws/ -name \* -type f | ${SORT} -dr;
-GENERATE_PLIST+= ${FIND} share/gps/plug-ins/ada2wsdl.xml;
-GENERATE_PLIST+= ${FIND} share/gps/plug-ins/aws.py;
-GENERATE_PLIST+= ${FIND} share/gps/plug-ins/aws.xml;
-GENERATE_PLIST+= ${FIND} share/gps/plug-ins/aws_api.xml;
-GENERATE_PLIST+= ${FIND} share/gps/plug-ins/wsdl2aws.xml;
+GENERATE_PLIST+= ${FIND} * -type f | ${SORT};
 
 do-configure:
 	cd ${WRKSRC} && ${GMAKE} setup ${CONFIGURE_ARGS}
@@ -66,11 +51,12 @@ do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} build build_doc
 
 do-test: install
-	cd ${WRKSRC}/regtests && python${PYVERSSUFFIX} testsuite.py
+	cd ${WRKSRC}/regtests && ${SETENV} ${MAKE_ENV} \
+		python${PYVERSSUFFIX} testsuite.py
 
 do-install:
 	cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${GMAKE} install
-	${TOUCH} ${DESTDIR}${PREFIX}/share/examples/aws/bin/IGNORE.ME
+	@cd ${DESTDIR}/${PREFIX} && ${FIND} * -type d -empty -exec rmdir {} \;
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/python/pyversion.mk"
diff --git a/www/aws/distinfo b/www/aws/distinfo
index cf1dc610edf..7054016fb7c 100644
--- a/www/aws/distinfo
+++ b/www/aws/distinfo
@@ -1,26 +1,17 @@
-$NetBSD: distinfo,v 1.6 2013/04/27 13:02:48 marino Exp $
+$NetBSD: distinfo,v 1.7 2013/07/07 23:46:50 marino Exp $
 
-SHA1 (aws-2.10.0.1.tar.bz2) = 3ea20d4328951089f93caa3693eb24d67cf76594
-RMD160 (aws-2.10.0.1.tar.bz2) = 8d6c2e9e681f18b16bbd79e76e6b65bb8f07a871
-Size (aws-2.10.0.1.tar.bz2) = 1386481 bytes
-SHA1 (patch-ac) = 1985aca4185538590cea3d939f095b69495eb0fa
-SHA1 (patch-ad) = 6bfa89f2837cc0dca4f5c391b7e05e74a3d85181
-SHA1 (patch-ae) = 44f66219a999b90d626f8f581942ae4f406e6c18
-SHA1 (patch-af) = b3f6ca145cede4df4e101c9cd0fd255e2ad23d3f
-SHA1 (patch-ag) = 5c5122daa913cc541fcd05d61f5b67a989a00b4d
-SHA1 (patch-ba) = 334c40657793f0a6bcec295cc07329ca96bc8372
-SHA1 (patch-bb) = e2db43dd317b01b9d0e97c481b2851b19469667b
-SHA1 (patch-bc) = b4f9926351a0ab3c5e5c73601093266f0d8efaaa
-SHA1 (patch-bd) = b640a61fe75e9bfd06ea6a546ba827a71631517c
-SHA1 (patch-be) = c07e84b8f669e1aec7368a5be0fbcb91b37b32fe
-SHA1 (patch-bf) = 22fe61a2441649cf2bb2c9b6b22008562ca7127f
-SHA1 (patch-bg) = ebbba6439c4cdbeb2f0e1afaec9c46f429e408b9
-SHA1 (patch-bh) = 59f370db7e47d5fb18fa239dfc3396703f7251c8
-SHA1 (patch-bi) = 3878eb24a44a23f119d78aad5b0c5bcfce1fc4a2
-SHA1 (patch-bj) = 6e138dbe344600ea870e33b030662422cadf6cbc
-SHA1 (patch-bk) = 7be4ff0eefa89a24d942fc38c55f81864dd483de
-SHA1 (patch-demos_test__ldap_test__ldap.gpr) = 0271d8c429f8fd3014ff169ded61f4b282243a38
+SHA1 (aws-3.1.0.0.tar.bz2) = a8135b10bad5a751840858acb305cbb01b5558db
+RMD160 (aws-3.1.0.0.tar.bz2) = d7c8dc904a0a91a8754aae8d07eb8b015fbf3b1f
+Size (aws-3.1.0.0.tar.bz2) = 1529933 bytes
+SHA1 (patch-config__projects__aws.gpr) = 3a93507e35c30bb6cf376409b681303bf7e39d7a
+SHA1 (patch-demos_test__ldap_test__ldap.gpr) = eeb126ab85442cc47b6a8844c4c4eea1b697be72
+SHA1 (patch-docs__gentexifile) = 0613450bb248a17659ae0a435a3e8ca64d29cd0c
+SHA1 (patch-docs__makefile) = 6f36ef4688b542ec100882014d3c1842c1d00dd8
 SHA1 (patch-docs_docs.gpr) = acbe31da756c0cc3ee86132eedd0f0cc0ae6dd0e
-SHA1 (patch-include_include.gpr) = 8e65a8238077df79fedaafa8b95eb51c8897b6c0
-SHA1 (patch-src_soap_soap-message-xml.adb) = d7b84968c615c017fb33536d177ce8b4557e29dc
-SHA1 (patch-src_src.gpr) = 18480f2478c6fa3a1a7939f2a9fbdc4bd09178e3
+SHA1 (patch-include_include.gpr) = 1c407b9769e10106cd521241986f569146879af1
+SHA1 (patch-makefile) = 31a316463838c7ab38edcd92ee2a376043065832
+SHA1 (patch-regtests__0043_check_mem__test.opt) = abe81a8c9aeb10faac6ea9469408dd89b1c85a65
+SHA1 (patch-src_src.gpr) = 6b7d6732724dbcc5da5e917ee2f2f5d597b3441b
+SHA1 (patch-ssl__crypto_lib.gpr) = e6624d49c72e3dea73ad2b66044f0da5e7ef0a99
+SHA1 (patch-templates_parser__docs__gentexifile) = d9019f7ee865d38e3cf3f4fb08d942e1a6bb1367
+SHA1 (patch-templates_parser__docs__makefile) = a26ea46580397c06c7a1148cdf9be44545bb124e
diff --git a/www/aws/options.mk b/www/aws/options.mk
index 716a15632b7..d2465db1ab8 100644
--- a/www/aws/options.mk
+++ b/www/aws/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2013/04/27 13:02:48 marino Exp $
+# $NetBSD: options.mk,v 1.7 2013/07/07 23:46:50 marino Exp $
 
 
 # xmlada is built-in (not optional) due to gprbuild dependency
@@ -10,7 +10,9 @@
 # support IPv6. For that reason, the option name is not "inet6".
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.aws
-PKG_SUPPORTED_OPTIONS=	ssl ldap ipv6 debug disable-shared-rt relocatable
+PKG_OPTIONS_OPTIONAL_GROUPS=	slayer
+PKG_OPTIONS_GROUP.slayer=	ssl gnutls
+PKG_SUPPORTED_OPTIONS=	ldap inet6 debug disable-shared-rt relocatable
 PKG_SUGGESTED_OPTIONS=	ssl
 
 .include "../../mk/bsd.prefs.mk"
@@ -44,14 +46,18 @@ CONFIGURE_ARGS+=	ZLIB=true
 ###################
 
 .if !empty(PKG_OPTIONS:Mssl)
-.if $(OPSYS) == "NetBSD"
-MESSAGE_SRC=	MESSAGE_NETBSD_SSL
-.else
 .include "../../security/openssl/buildlink3.mk"
 CONFIGURE_ARGS+= SOCKET=openssl
 .endif
+
+.if !empty(PKG_OPTIONS:Mgnutls)
+.include "../../security/libgcrypt/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
+CONFIGURE_ARGS+= SOCKET=gnutls
 .endif
 
+
 ####################
 ##  LDAP Support  ##
 ####################
@@ -68,9 +74,6 @@ CONFIGURE_ARGS+= LDAP=true
 PLIST_VARS+= ipv6 noipv6
 .if !empty(PKG_OPTIONS:Mipv6)
 CONFIGURE_ARGS+= IPv6=true
-PLIST.ipv6= yes
-.else
-PLIST.noipv6= yes
 .endif
 
 #####################
diff --git a/www/aws/patches/patch-ad b/www/aws/patches/patch-ad
deleted file mode 100644
index b1b40a9cf18..00000000000
--- a/www/aws/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2011/02/11 16:48:53 drochner Exp $
-
---- config/projects/aws.gpr.orig	2010-12-20 12:38:25 +0000
-+++ config/projects/aws.gpr
-@@ -31,7 +31,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/patches/patch-af b/www/aws/patches/patch-af
deleted file mode 100644
index 231b841f642..00000000000
--- a/www/aws/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2011/07/19 19:56:37 drochner Exp $
-
---- docs/gentexifile.orig	2011-07-10 18:18:29.252301000 +0000
-+++ docs/gentexifile
-@@ -51,7 +51,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/patches/patch-ag b/www/aws/patches/patch-ag
deleted file mode 100644
index a6cf4418396..00000000000
--- a/www/aws/patches/patch-ag
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2011/07/19 19:56:37 drochner Exp $
-
---- templates_parser/docs/gentexifile.orig	2011-07-10 18:22:36.151053000 +0000
-+++ templates_parser/docs/gentexifile
-@@ -45,11 +45,11 @@ 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/patches/patch-ba b/www/aws/patches/patch-ba
deleted file mode 100644
index a5694d7ea5a..00000000000
--- a/www/aws/patches/patch-ba
+++ /dev/null
@@ -1,80 +0,0 @@
-$NetBSD: patch-ba,v 1.2 2011/03/02 10:14:31 drochner Exp $
-
---- makefile.orig	2011-01-25 20:53:19.000000000 +0000
-+++ makefile
-@@ -416,46 +416,46 @@ setup_tp:
- 	$(MAKE) -C templates_parser setup $(GALL_OPTIONS)
- 
- install_clean:
--	$(RM) -fr $(I_INC)/$(PLATFORM)
--	$(RM) -fr $(I_LIB)
--	$(RM) -fr $(I_AGP)
--	$(RM) -fr $(prefix)/share/examples/aws
--	$(RM) -fr $(I_DOC)
--	$(RM) -f $(I_GPR)/aws.gpr
-+	$(RM) -fr $(DESTDIR)$(I_INC)/$(PLATFORM)
-+	$(RM) -fr $(DESTDIR)$(I_LIB)
-+	$(RM) -fr $(DESTDIR)$(I_AGP)
-+	$(RM) -fr $(DESTDIR)$(prefix)/share/examples/aws
-+	$(RM) -fr $(DESTDIR)$(I_DOC)
-+	$(RM) -f $(DESTDIR)$(I_GPR)/aws.gpr
- 
- install_dirs: install_clean
--	$(MKDIR) -p $(I_BIN)
--	$(MKDIR) -p $(I_INC)
--	$(MKDIR) -p $(TI_INC)
--	$(MKDIR) -p $(I_CPN)
--	$(MKDIR) -p $(I_LIB)/static
-+	$(MKDIR) -p $(DESTDIR)$(I_BIN)
-+	$(MKDIR) -p $(DESTDIR)$(I_INC)
-+	$(MKDIR) -p $(DESTDIR)$(TI_INC)
-+	$(MKDIR) -p $(DESTDIR)$(I_CPN)
-+	$(MKDIR) -p $(DESTDIR)$(I_LIB)/static
- ifeq (${ENABLE_SHARED}, true)
--	$(MKDIR) -p $(I_LIB)/relocatable
-+	$(MKDIR) -p $(DESTDIR)$(I_LIB)/relocatable
- endif
--	$(MKDIR) -p $(I_DOC)
--	$(MKDIR) -p $(I_GPR)
--	$(MKDIR) -p $(I_AGP)
--	$(MKDIR) -p $(I_TPL)
--	$(MKDIR) -p $(I_IMG)
--	$(MKDIR) -p $(I_SBN)
--	$(MKDIR) -p $(I_PLG)
--	$(MKDIR) -p $(I_WEL)
-+	$(MKDIR) -p $(DESTDIR)$(I_DOC)
-+	$(MKDIR) -p $(DESTDIR)$(I_GPR)
-+	$(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)
- 
- install: install_dirs $(MODULES_INSTALL)
--	$(CP) templates_parser/src/t*.ad[sb] $(I_INC)
-+	$(CP) templates_parser/src/t*.ad[sb] $(DESTDIR)$(I_INC)
- ifeq ($(XMLADA),true)
--	$(CP) templates_parser/xsrc/*.ad[sb] $(I_INC)
-+	$(CP) templates_parser/xsrc/*.ad[sb] $(DESTDIR)$(I_INC)
- endif
--	$(CP) templates_parser/tools/templates.tads $(I_TPL)
--	$(CP) $(CONFADC) $(I_LIB)/static
--	$(CP) $(CONFGPR) $(I_AGP)
--	$(CP) $(PRJDIR)/aws_xmlada.gpr $(I_AGP)
-+	$(CP) templates_parser/tools/templates.tads $(DESTDIR)$(I_TPL)
-+	$(CP) $(CONFADC) $(DESTDIR)$(I_LIB)/static
-+	$(CP) $(CONFGPR) $(DESTDIR)$(I_AGP)
-+	$(CP) $(PRJDIR)/aws_xmlada.gpr $(DESTDIR)$(I_AGP)
- #  Copy all shared libraries into the main bin directory
- ifeq (${ENABLE_SHARED}, true)
- ifeq ($(OS), Windows_NT)
- 	$(CP) $(I_LIB)/relocatable/*$(SOEXT) $(I_BIN)
- endif
--	$(CP) $(CONFADC) $(I_LIB)/relocatable
--	-$(CHMOD) a-w $(I_LIB)/relocatable/*
-+	$(CP) $(CONFADC) $(DESTDIR)$(I_LIB)/relocatable
-+	-$(CHMOD) a-w $(DESTDIR)$(I_LIB)/relocatable/*
- endif
--	-$(CHMOD) a-w $(I_LIB)/static/*
-+	-$(CHMOD) a-w $(DESTDIR)$(I_LIB)/static/*
diff --git a/www/aws/patches/patch-bb b/www/aws/patches/patch-bb
deleted file mode 100644
index 9d709c44a0f..00000000000
--- a/www/aws/patches/patch-bb
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-bb,v 1.1.1.1 2011/02/11 16:48:53 drochner Exp $
-
---- config/makefile.orig	2011-02-11 11:06:48.000000000 +0000
-+++ config/makefile
-@@ -98,18 +98,18 @@ else
- endif
- 
- install:
--	$(CP) $(SDIR)/src/aws-os_lib.ads $(TI_INC)
--	$(CP) src/aws-net-std__* $(I_INC)
--	$(CP) src/aws-net-ssl__* $(I_INC)
--	$(CP) src/aws-net-ssl-certificate__* $(I_INC)
--	$(CP) src/ssl-thin__* $(I_INC)
--	$(CP) src/templates_parser-* $(I_INC)
--	$(CP) projects/aws_components.gpr $(I_AGP)
--	$(CP) projects/aws.gpr $(I_GPR)
--	$(CP) projects/*_lib.gpr $(I_AGP)
--	$(CP) projects/aws_shared.gpr $(I_AGP)
--	$(CP) projects/aws_libz.gpr $(I_AGP)
--	$(CP) projects/aws_ssl_support.gpr $(I_AGP)
--	$(CP) $(LIBGPR) $(I_AGP)
-+	$(CP) $(SDIR)/src/aws-os_lib.ads $(DESTDIR)$(TI_INC)
-+	$(CP) src/aws-net-std__* $(DESTDIR)$(I_INC)
-+	$(CP) src/aws-net-ssl__* $(DESTDIR)$(I_INC)
-+	$(CP) src/aws-net-ssl-certificate__* $(DESTDIR)$(I_INC)
-+	$(CP) src/ssl-thin__* $(DESTDIR)$(I_INC)
-+	$(CP) src/templates_parser-* $(DESTDIR)$(I_INC)
-+	$(CP) projects/aws_components.gpr $(DESTDIR)$(I_AGP)
-+	$(CP) projects/aws.gpr $(DESTDIR)$(I_GPR)
-+	$(CP) projects/*_lib.gpr $(DESTDIR)$(I_AGP)
-+	$(CP) projects/aws_shared.gpr $(DESTDIR)$(I_AGP)
-+	$(CP) projects/aws_libz.gpr $(DESTDIR)$(I_AGP)
-+	$(CP) projects/aws_ssl_support.gpr $(DESTDIR)$(I_AGP)
-+	$(CP) $(LIBGPR) $(DESTDIR)$(I_AGP)
- 
- check:
diff --git a/www/aws/patches/patch-bc b/www/aws/patches/patch-bc
deleted file mode 100644
index 08518af4076..00000000000
--- a/www/aws/patches/patch-bc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-bc,v 1.1.1.1 2011/02/11 16:48:53 drochner Exp $
-
---- include/makefile.orig	2011-02-11 11:09:01.000000000 +0000
-+++ include/makefile
-@@ -30,10 +30,10 @@
- setup:
- 
- install:
--	$(CP) *.ad? $(I_CPN)
--	-$(CP) ../$(BDIR)/static/lib/include/* $(I_LIB)/static
-+	$(CP) *.ad? $(DESTDIR)$(I_CPN)
-+	-$(CP) ../$(BDIR)/static/lib/include/* $(DESTDIR)$(I_LIB)/static
- ifeq (${ENABLE_SHARED}, true)
--	-$(CP) ../$(BDIR)/relocatable/lib/include/* $(I_LIB)/relocatable
-+	-$(CP) ../$(BDIR)/relocatable/lib/include/* $(DESTDIR)$(I_LIB)/relocatable
- endif
- 	${MAKE} -C zlib install $(GALL_OPTIONS)
- 
diff --git a/www/aws/patches/patch-bd b/www/aws/patches/patch-bd
deleted file mode 100644
index db128efd50d..00000000000
--- a/www/aws/patches/patch-bd
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bd,v 1.1.1.1 2011/02/11 16:48:53 drochner Exp $
-
---- include/zlib/makefile.orig	2011-02-11 11:10:06.000000000 +0000
-+++ include/zlib/makefile
-@@ -35,8 +35,8 @@ LIBZ_shared = $(LDIR_R)/libz$(SOEXT)
- 
- install:
- ifeq ($(ZLIB), false)
--	$(CP) $(LIBZ_static) $(I_LIB)/static
-+	$(CP) $(LIBZ_static) $(DESTDIR)$(I_LIB)/static
- ifeq (${ENABLE_SHARED}, true)
--	$(CP) $(LIBZ_shared) $(I_LIB)/relocatable
-+	$(CP) $(LIBZ_shared) $(DESTDIR)$(I_LIB)/relocatable
- endif
- endif
diff --git a/www/aws/patches/patch-be b/www/aws/patches/patch-be
deleted file mode 100644
index 42abf55dbe8..00000000000
--- a/www/aws/patches/patch-be
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-be,v 1.1.1.1 2011/02/11 16:48:53 drochner Exp $
-
---- ssl/makefile.orig	2011-02-11 11:11:02.000000000 +0000
-+++ ssl/makefile
-@@ -33,8 +33,8 @@ check:
- setup:
- 
- install:
--	$(CP) *.ad[sb] $(I_INC)
--	$(CP) ../$(BDIR)/static/lib/ssl/* $(I_LIB)/static
-+	$(CP) *.ad[sb] $(DESTDIR)$(I_INC)
-+	$(CP) ../$(BDIR)/static/lib/ssl/* $(DESTDIR)$(I_LIB)/static
- ifeq (${ENABLE_SHARED}, true)
--	$(CP) ../$(BDIR)/relocatable/lib/ssl/* $(I_LIB)/relocatable
-+	$(CP) ../$(BDIR)/relocatable/lib/ssl/* $(DESTDIR)$(I_LIB)/relocatable
- endif
diff --git a/www/aws/patches/patch-bf b/www/aws/patches/patch-bf
deleted file mode 100644
index a8e5eb6972e..00000000000
--- a/www/aws/patches/patch-bf
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-bf,v 1.1.1.1 2011/02/11 16:48:53 drochner Exp $
-
---- src/makefile.orig	2011-02-11 11:12:22.000000000 +0000
-+++ src/makefile
-@@ -30,17 +30,17 @@
- setup:
- 
- install:
--	$(CP) core/*.ad[sb] extended/*.ad[sb] $(I_INC)
--	$(CP) ../$(BDIR)/static/lib/src/* $(I_LIB)/static
-+	$(CP) core/*.ad[sb] extended/*.ad[sb] $(DESTDIR)$(I_INC)
-+	$(CP) ../$(BDIR)/static/lib/src/* $(DESTDIR)$(I_LIB)/static
- ifeq (${ENABLE_SHARED}, true)
--	$(CP) ../$(BDIR)/relocatable/lib/src/* $(I_LIB)/relocatable
-+	$(CP) ../$(BDIR)/relocatable/lib/src/* $(DESTDIR)$(I_LIB)/relocatable
- endif
- ifeq ($(XMLADA),true)
--	$(CP) soap/*.ad[sb] $(I_INC)
--	$(CP) xsrc/*.ad[sb] $(I_INC)
-+	$(CP) soap/*.ad[sb] $(DESTDIR)$(I_INC)
-+	$(CP) xsrc/*.ad[sb] $(DESTDIR)$(I_INC)
- endif
- ifeq ($(LDAP),true)
--	$(CP) ldap/*.ad[sb] $(I_INC)
-+	$(CP) ldap/*.ad[sb] $(DESTDIR)$(I_INC)
- endif
- 
- check:
diff --git a/www/aws/patches/patch-bg b/www/aws/patches/patch-bg
deleted file mode 100644
index 01dcd483293..00000000000
--- a/www/aws/patches/patch-bg
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-bg,v 1.1.1.1 2011/02/11 16:48:53 drochner Exp $
-
---- tools/makefile.orig	2011-02-11 11:13:37.000000000 +0000
-+++ tools/makefile
-@@ -57,16 +57,16 @@ setup: setup_dir $(GEN)
- 
- install:
- ifeq ($(PLATFORM),native)
--	-$(CP) ../$(BDIR)/static/tools/awsres${EXEEXT} $(I_BIN)
--	-$(CP) ../$(BDIR)/static/tools/aws_password${EXEEXT} $(I_BIN)
--	-$(CP) ../$(BDIR)/static/tools/templates2ada${EXEEXT} $(I_BIN)
--	-$(CP) ../$(BDIR)/static/tools/templatespp${EXEEXT} $(I_BIN)
--	-$(CP) ../$(BDIR)/static/tools/webxref${EXEEXT} $(I_BIN)
-+	-$(CP) ../$(BDIR)/static/tools/awsres${EXEEXT} $(DESTDIR)$(I_BIN)
-+	-$(CP) ../$(BDIR)/static/tools/aws_password${EXEEXT} $(DESTDIR)$(I_BIN)
-+	-$(CP) ../$(BDIR)/static/tools/templates2ada${EXEEXT} $(DESTDIR)$(I_BIN)
-+	-$(CP) ../$(BDIR)/static/tools/templatespp${EXEEXT} $(DESTDIR)$(I_BIN)
-+	-$(CP) ../$(BDIR)/static/tools/webxref${EXEEXT} $(DESTDIR)$(I_BIN)
- ifeq ($(XMLADA),true)
--	$(CP) ../$(BDIR)/static/tools/wsdl2aws${EXEEXT} $(I_BIN)
-+	$(CP) ../$(BDIR)/static/tools/wsdl2aws${EXEEXT} $(DESTDIR)$(I_BIN)
- endif
- ifeq (${ASIS},true)
--	$(CP) ../$(BDIR)/static/tools/ada2wsdl${EXEEXT} $(I_BIN)
-+	$(CP) ../$(BDIR)/static/tools/ada2wsdl${EXEEXT} $(DESTDIR)$(I_BIN)
- endif
- endif
- 
diff --git a/www/aws/patches/patch-bh b/www/aws/patches/patch-bh
deleted file mode 100644
index 64ab2651757..00000000000
--- a/www/aws/patches/patch-bh
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-bh,v 1.2 2011/07/19 19:56:37 drochner Exp $
-
---- docs/makefile.orig	2011-02-11 11:14:58.000000000 +0000
-+++ docs/makefile
-@@ -209,14 +209,16 @@ check_texi:
- aws.texi: gen_texi check_texi
- 
- install:
--	-$(CP) aws.pdf $(I_DOC)
--	-$(CP) aws.html $(I_DOC)
--	-$(CP) aws.txt $(I_DOC)
--	-$(CP) aws*.info* $(I_DOC)
--	-$(CP) ../templates_parser/docs/templates_parser.pdf $(I_DOC)
--	-$(CP) ../templates_parser/docs/templates_parser.html $(I_DOC)
--	-$(CP) ../templates_parser/docs/templates_parser.txt $(I_DOC)
--	-$(CP) ../templates_parser/docs/templates_parser.info* $(I_DOC)
-+	if [ -f aws.pdf ]; then \
-+	   $(CP) aws.pdf $(DESTDIR)$(I_DOC); \
-+	   $(CP) ../templates_parser/docs/templates_parser.pdf $(DESTDIR)$(I_DOC); \
-+	fi;
-+	-$(CP) aws.html $(DESTDIR)$(I_DOC)
-+	-$(CP) aws.txt $(DESTDIR)$(I_DOC)
-+	-$(CP) aws*.info* $(DESTDIR)$(I_DOC)
-+	-$(CP) ../templates_parser/docs/templates_parser.html $(DESTDIR)$(I_DOC)
-+	-$(CP) ../templates_parser/docs/templates_parser.txt $(DESTDIR)$(I_DOC)
-+	-$(CP) ../templates_parser/docs/templates_parser.info* $(DESTDIR)$(I_DOC)
- 
- clean:
- 	-$(GNAT) clean -XLIBRARY_TYPE=static -Pdocs
diff --git a/www/aws/patches/patch-bi b/www/aws/patches/patch-bi
deleted file mode 100644
index 6e85ace1379..00000000000
--- a/www/aws/patches/patch-bi
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-bi,v 1.1.1.1 2011/02/11 16:48:53 drochner Exp $
-
---- gps/makefile.orig	2011-02-11 11:16:14.000000000 +0000
-+++ gps/makefile
-@@ -34,11 +34,11 @@ ALL_API = $(sort $(shell ls ../src/core/
- setup:
- 
- install:
--	-$(CP) aws_api.xml $(I_PLG)
--	$(CP) aws.py $(I_PLG)
--	$(CP) aws.xml $(I_PLG)
--	$(CP) ada2wsdl.xml $(I_PLG)
--	$(CP) wsdl2aws.xml $(I_PLG)
-+	-$(CP) aws_api.xml $(DESTDIR)$(I_PLG)
-+	$(CP) aws.py $(DESTDIR)$(I_PLG)
-+	$(CP) aws.xml $(DESTDIR)$(I_PLG)
-+	$(CP) ada2wsdl.xml $(DESTDIR)$(I_PLG)
-+	$(CP) wsdl2aws.xml $(DESTDIR)$(I_PLG)
- 
- check:
- 
diff --git a/www/aws/patches/patch-bj b/www/aws/patches/patch-bj
deleted file mode 100644
index 96d3df303f3..00000000000
--- a/www/aws/patches/patch-bj
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-bj,v 1.1.1.1 2011/02/11 16:48:53 drochner Exp $
-
---- web_elements/makefile.orig	2011-02-11 11:17:58.000000000 +0000
-+++ web_elements/makefile
-@@ -36,13 +36,13 @@ build:
- clean:
- 
- init:
--	$(CP) readme.txt $(I_WEL)
--	$(CP) mime.types $(I_WEL)
-+	$(CP) readme.txt $(DESTDIR)$(I_WEL)
-+	$(CP) mime.types $(DESTDIR)$(I_WEL)
- 
- force:
- 
- $(DIRS): force
--	$(MKDIR) $(I_WEL)/$@
--	$(CP) $@/*.* $(I_WEL)/$@
-+	$(MKDIR) $(DESTDIR)$(I_WEL)/$@
-+	$(CP) $@/*.* $(DESTDIR)$(I_WEL)/$@
- 
- install: init $(DIRS)
diff --git a/www/aws/patches/patch-bk b/www/aws/patches/patch-bk
deleted file mode 100644
index 3f58bb02adf..00000000000
--- a/www/aws/patches/patch-bk
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bk,v 1.1.1.1 2011/02/11 16:48:53 drochner Exp $
-
---- demos/makefile.orig	2011-02-11 11:19:10.000000000 +0000
-+++ demos/makefile
-@@ -30,8 +30,8 @@ MAKEFILES = $(wildcard */makefile)
- setup:
- 
- install:
--	$(CP) web_mail/*html $(I_TPL)
--	$(CP) runme/aws_*.png $(I_IMG)
-+	$(CP) web_mail/*html $(DESTDIR)$(I_TPL)
-+	$(CP) runme/aws_*.png $(DESTDIR)$(I_IMG)
- 
- build: $(MAKEFILES)
- 
diff --git a/www/aws/patches/patch-config__projects__aws.gpr b/www/aws/patches/patch-config__projects__aws.gpr
new file mode 100644
index 00000000000..b0636a5e3cc
--- /dev/null
+++ b/www/aws/patches/patch-config__projects__aws.gpr
@@ -0,0 +1,14 @@
+$NetBSD: patch-config__projects__aws.gpr,v 1.1 2013/07/07 23:46:50 marino Exp $
+
+BSD doesn't use libdl although DragonFly will tolerate it.
+
+--- 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/patches/patch-demos_test__ldap_test__ldap.gpr b/www/aws/patches/patch-demos_test__ldap_test__ldap.gpr
index 0423a453a07..ec2d65efec5 100644
--- a/www/aws/patches/patch-demos_test__ldap_test__ldap.gpr
+++ b/www/aws/patches/patch-demos_test__ldap_test__ldap.gpr
@@ -1,11 +1,16 @@
---- demos/test_ldap/test_ldap.gpr.orig	2011-01-25 20:53:15.000000000 +0000
+$NetBSD: patch-demos_test__ldap_test__ldap.gpr,v 1.3 2013/07/07 23:46:50 marino Exp $
+
+Add -L$PREFIX/lib to linker flags to fix build.
+
+--- demos/test_ldap/test_ldap.gpr.orig	2013-07-03 01:11:54.000000000 +0000
 +++ demos/test_ldap/test_ldap.gpr
-@@ -42,7 +42,7 @@ project Test_LDAP is
+@@ -35,7 +35,8 @@ project Test_LDAP is
           when "Windows_NT" =>
              for Default_Switches ("Ada") use ("-lwldap32");
           when others =>
--            for Default_Switches ("Ada") use ("-lldap");
-+            for Default_Switches ("Ada") use ("-L@PREFIX@/lib", "-lldap", "-llber");
+-            for Default_Switches ("Ada") use ("-lldap", "-llber");
++            for Default_Switches ("Ada") use ("-L@PREFIX@/lib",
++               "-lldap", "-llber");
        end case;
     end Linker;
  
diff --git a/www/aws/patches/patch-docs__gentexifile b/www/aws/patches/patch-docs__gentexifile
new file mode 100644
index 00000000000..55036e0bea9
--- /dev/null
+++ b/www/aws/patches/patch-docs__gentexifile
@@ -0,0 +1,29 @@
+$NetBSD: patch-docs__gentexifile,v 1.1 2013/07/07 23:46:50 marino Exp $
+
+Always use native awk, passed though MAKE_ENV
+
+--- 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/patches/patch-docs__makefile b/www/aws/patches/patch-docs__makefile
new file mode 100644
index 00000000000..43ee4e10c3a
--- /dev/null
+++ b/www/aws/patches/patch-docs__makefile
@@ -0,0 +1,19 @@
+$NetBSD: patch-docs__makefile,v 1.1 2013/07/07 23:46:50 marino Exp $
+
+Disable PDF documentation generation; it pulls way too much in.
+
+--- 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/patches/patch-include_include.gpr b/www/aws/patches/patch-include_include.gpr
index 04e4aa0782a..83badab8e03 100644
--- a/www/aws/patches/patch-include_include.gpr
+++ b/www/aws/patches/patch-include_include.gpr
@@ -1,4 +1,6 @@
-$NetBSD: patch-include_include.gpr,v 1.1 2012/07/08 20:14:28 marino Exp $
+$NetBSD: patch-include_include.gpr,v 1.2 2013/07/07 23:46:50 marino Exp $
+
+Fix RUNPATH on libraries
 
 --- include/include.gpr.orig	2011-01-25 20:52:57.000000000 +0000
 +++ include/include.gpr
diff --git a/www/aws/patches/patch-makefile b/www/aws/patches/patch-makefile
new file mode 100644
index 00000000000..f9d97c1956d
--- /dev/null
+++ b/www/aws/patches/patch-makefile
@@ -0,0 +1,14 @@
+$NetBSD: patch-makefile,v 1.1 2013/07/07 23:46:50 marino Exp $
+
+Prevent empty ${EXAMPLESDIR}/bin directory from being created
+
+--- makefile.orig	2013-07-03 01:11:54.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)
+ 
diff --git a/www/aws/patches/patch-ac b/www/aws/patches/patch-regtests__0043_check_mem__test.opt
index 369fd697fc0..fd17cea44ab 100644
--- a/www/aws/patches/patch-ac
+++ b/www/aws/patches/patch-regtests__0043_check_mem__test.opt
@@ -1,4 +1,6 @@
-$NetBSD: patch-ac,v 1.1.1.1 2011/02/11 16:48:53 drochner Exp $
+$NetBSD: patch-regtests__0043_check_mem__test.opt,v 1.1 2013/07/07 23:46:50 marino Exp $
+
+Disable unsupported memory test for BSD
 
 --- regtests/0043_check_mem/test.opt.orig	2010-12-13 14:42:37 +0000
 +++ regtests/0043_check_mem/test.opt
diff --git a/www/aws/patches/patch-src_soap_soap-message-xml.adb b/www/aws/patches/patch-src_soap_soap-message-xml.adb
deleted file mode 100644
index ca5e4c8c35c..00000000000
--- a/www/aws/patches/patch-src_soap_soap-message-xml.adb
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_soap_soap-message-xml.adb,v 1.1 2012/07/08 20:14:28 marino Exp $
-
---- src/soap/soap-message-xml.adb.orig	2012-07-05 03:56:08.000000000 +0000
-+++ src/soap/soap-message-xml.adb
-@@ -437,7 +437,8 @@ package body SOAP.Message.XML is
-             Faultstring => SOAP.Parameters.Get (S.Parameters, "faultstring"));
-       else
-          return Message.Response.Object'
--           (S.Name_Space, S.Wrapper_Name, S.Parameters);
-+           (Message.Object'(S.Name_Space, S.Wrapper_Name, S.Parameters)
-+            with null record);
-       end if;
- 
-    exception
-@@ -483,7 +484,8 @@ package body SOAP.Message.XML is
-             Faultstring => SOAP.Parameters.Get (S.Parameters, "faultstring"));
-       else
-          return Message.Response.Object'
--           (S.Name_Space, S.Wrapper_Name, S.Parameters);
-+           (Message.Object'(S.Name_Space, S.Wrapper_Name, S.Parameters)
-+            with null record);
-       end if;
- 
-    exception
diff --git a/www/aws/patches/patch-src_src.gpr b/www/aws/patches/patch-src_src.gpr
index 856917f0d1b..2007cd7588b 100644
--- a/www/aws/patches/patch-src_src.gpr
+++ b/www/aws/patches/patch-src_src.gpr
@@ -1,8 +1,10 @@
-$NetBSD: patch-src_src.gpr,v 1.2 2013/04/27 11:49:56 marino Exp $
+$NetBSD: patch-src_src.gpr,v 1.3 2013/07/07 23:46:50 marino Exp $
 
---- src/src.gpr.orig	2011-01-25 20:52:57.000000000 +0000
+Fix RUNPATH
+
+--- src/src.gpr.orig	2013-07-03 01:11:54.000000000 +0000
 +++ src/src.gpr
-@@ -77,7 +77,7 @@ project Src is
+@@ -67,7 +67,7 @@ library project Src is
              when "Windows_NT" =>
                 for Library_Options use ("-lwsock32", "-lws2_32");
              when others =>
@@ -11,12 +13,12 @@ $NetBSD: patch-src_src.gpr,v 1.2 2013/04/27 11:49:56 marino Exp $
           end case;
  
           case Shared.LDAP is
-@@ -88,7 +88,7 @@ project Src is
+@@ -78,7 +78,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;
diff --git a/www/aws/patches/patch-ae b/www/aws/patches/patch-ssl__crypto_lib.gpr
index 1d28693d59d..13f5337cde9 100644
--- a/www/aws/patches/patch-ae
+++ b/www/aws/patches/patch-ssl__crypto_lib.gpr
@@ -1,4 +1,6 @@
-$NetBSD: patch-ae,v 1.1.1.1 2011/02/11 16:48:53 drochner Exp $
+$NetBSD: patch-ssl__crypto_lib.gpr,v 1.1 2013/07/07 23:46:50 marino Exp $
+
+BSD doesn't use libdl although DragonFly will tolerate it.
 
 --- ssl/crypto_lib.gpr.orig	2010-12-20 12:41:17 +0000
 +++ ssl/crypto_lib.gpr
diff --git a/www/aws/patches/patch-templates_parser__docs__gentexifile b/www/aws/patches/patch-templates_parser__docs__gentexifile
new file mode 100644
index 00000000000..3c4ce23e210
--- /dev/null
+++ b/www/aws/patches/patch-templates_parser__docs__gentexifile
@@ -0,0 +1,34 @@
+$NetBSD: patch-templates_parser__docs__gentexifile,v 1.1 2013/07/07 23:46:50 marino Exp $
+
+Always use native awk, passed though MAKE_ENV
+
+--- 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/patches/patch-templates_parser__docs__makefile b/www/aws/patches/patch-templates_parser__docs__makefile
new file mode 100644
index 00000000000..d1c359c8aaa
--- /dev/null
+++ b/www/aws/patches/patch-templates_parser__docs__makefile
@@ -0,0 +1,22 @@
+$NetBSD: patch-templates_parser__docs__makefile,v 1.1 2013/07/07 23:46:50 marino Exp $
+
+Remove PDF documentation to avoid pulling in many dependencies.
+
+--- templates_parser/docs/makefile.orig	2013-07-03 01:13:24.000000000 +0000
++++ templates_parser/docs/makefile
+@@ -43,7 +43,7 @@ GFLAGS	  = -I../src -I../include
+ GNATMAKE_FLAGS ?= -q
+ 
+ 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 \
+@@ -139,5 +139,5 @@ endif
+ 		*.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