[pkgsrc/trunk]: pkgsrc/www/aws-demos www/aws-demos: Follow update of www/aws

[marino <marino%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/333a1fdd99fd
branches:  trunk
changeset: 621386:333a1fdd99fd
user:      marino <marino%pkgsrc.org@localhost>
date:      Sun Jul 07 23:47:40 2013 +0000

description:
www/aws-demos: Follow update of www/aws

The www/aws-demos builds off of www/aws, but it required several changes
after www/aws was updated to version 3.1.0.

Five new demos were also added.

diffstat:

 www/aws-demos/Makefile |  32 +++++++++++++++++++++++---------
 www/aws-demos/PLIST    |   8 +++++++-
 2 files changed, 30 insertions(+), 10 deletions(-)

diffs (135 lines):

diff -r 4b554058801e -r 333a1fdd99fd www/aws-demos/Makefile
--- a/www/aws-demos/Makefile    Sun Jul 07 23:46:50 2013 +0000
+++ b/www/aws-demos/Makefile    Sun Jul 07 23:47:40 2013 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2013/04/27 13:02:48 marino Exp $
+# $NetBSD: Makefile,v 1.9 2013/07/07 23:47:40 marino Exp $
 #
 
 DISTNAME=      aws-${AWS_VERSION}
 PKGNAME=       aws-demos-${AWS_VERSION}
-PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  http://downloads.dragonlace.net/src/
 EXTRACT_SUFX=  .tar.bz2
@@ -13,9 +12,9 @@
 COMMENT=       Adacore Ada Web Server demonstration programs
 LICENSE=       gnu-gpl-v2
 
-AWS_VERSION=           2.10.0.1
-USE_TOOLS+=            gmake makeinfo sed gawk
-USE_LANGUAGES=         c ada
+AWS_VERSION=           3.1.0.0
+USE_TOOLS+=            gmake makeinfo sed awk
+USE_LANGUAGES=         c ada c++ fortran
 PATCHDIR=              ${.CURDIR}/../../www/aws/patches
 DISTINFO_FILE=         ${.CURDIR}/../../www/aws/distinfo
 CONFIGURE_ARGS+=       GCC=ada
@@ -23,8 +22,11 @@
 CONFIGURE_ARGS+=       PYTHON=python${PYVERSSUFFIX}
 CONFIGURE_ARGS+=       XMLADA=true
 CONFIGURE_ARGS+=       prefix=${PREFIX}
+CONFIGURE_ARGS+=       DEBUG=true
 
-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
 
 SUBST_CLASSES+=        lpath
 SUBST_STAGE.lpath=     post-patch
@@ -33,8 +35,11 @@
 SUBST_SED.lpath=       -e 's|@PREFIX@|${PREFIX}|g'
 
 DEMO_DIRS+=    auth
+DEMO_DIRS+=    autobahn
+DEMO_DIRS+=    cert
 DEMO_DIRS+=    com
 DEMO_DIRS+=    dispatch
+DEMO_DIRS+=    dowload_manager
 DEMO_DIRS+=    hello_world
 DEMO_DIRS+=    hotplug
 DEMO_DIRS+=    jabber_demo
@@ -46,12 +51,14 @@
 DEMO_DIRS+=    split
 DEMO_DIRS+=    test_mail
 DEMO_DIRS+=    text_input
+DEMO_DIRS+=    upload
 DEMO_DIRS+=    vh_demo
 DEMO_DIRS+=    web_block
 DEMO_DIRS+=    web_block_ajax
 DEMO_DIRS+=    web_block_ajax_templates
 DEMO_DIRS+=    web_elements
 DEMO_DIRS+=    web_mail
+DEMO_DIRS+=    websockets
 DEMO_DIRS+=    wps
 DEMO_DIRS+=    ws
 DEMO_DIRS+=    zdemo
@@ -78,8 +85,17 @@
 PLIST.ssl=             yes
 .endif
 
+.if !empty(BUILT_AWS:Mgnutls)
+.include "../../security/libgcrypt/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
+CONFIGURE_ARGS+=       SOCKET=gnutls
+DEMO_DIRS+=            agent
+DEMO_DIRS+=            runme
+PLIST.ssl=             yes
+.endif
+
 do-configure:
-       ${MKDIR} ${WRKSRC}/.build/native/debug/static/obj
        cd ${WRKSRC} && ${GMAKE} setup ${CONFIGURE_ARGS}
 
 do-build:
@@ -95,8 +111,6 @@
 .endfor
 
 .include "../../www/aws/buildlink3.mk"
-.include "../../lang/python/pyversion.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../devel/gnatpython/buildlink3.mk"
 .include "../../devel/gprbuild-aux/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 4b554058801e -r 333a1fdd99fd www/aws-demos/PLIST
--- a/www/aws-demos/PLIST       Sun Jul 07 23:46:50 2013 +0000
+++ b/www/aws-demos/PLIST       Sun Jul 07 23:47:40 2013 +0000
@@ -1,9 +1,12 @@
-@comment $NetBSD: PLIST,v 1.2 2013/04/27 11:52:43 marino Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/07/07 23:47:40 marino Exp $
 ${PLIST.ssl}share/examples/aws/demos/agent
 share/examples/aws/demos/auth
+share/examples/aws/demos/autobahn
+share/examples/aws/demos/cert
 share/examples/aws/demos/com_1
 share/examples/aws/demos/com_2
 share/examples/aws/demos/dispatch
+share/examples/aws/demos/download_manager
 share/examples/aws/demos/hello_world
 share/examples/aws/demos/hotplug
 @comment broken share/examples/aws/demos/interoplab_main
@@ -12,6 +15,7 @@
 share/examples/aws/demos/multiple_sessions
 share/examples/aws/demos/res_demo
 ${PLIST.ssl}share/examples/aws/demos/runme
+share/examples/aws/demos/run.sh
 share/examples/aws/demos/soap_client
 share/examples/aws/demos/soap_cvs
 share/examples/aws/demos/soap_server
@@ -21,12 +25,14 @@
 ${PLIST.ldap}share/examples/aws/demos/test_ldap
 share/examples/aws/demos/test_mail
 share/examples/aws/demos/text_input
+share/examples/aws/demos/upload
 share/examples/aws/demos/vh_demo
 share/examples/aws/demos/web_block
 share/examples/aws/demos/web_block_ajax
 share/examples/aws/demos/web_block_ajax_templates
 share/examples/aws/demos/web_elements
 share/examples/aws/demos/web_mail
+share/examples/aws/demos/websock
 share/examples/aws/demos/wps
 share/examples/aws/demos/ws
 @comment broken share/examples/aws/demos/wsdl_demo_client