-disable the "pre-configure" step which turned out to be unnecessary

 and could cause problems when building as non-root, from John Marino
-put the build of demo programs (which was optionally, not switched
 on per default) into its own pkg, to avoid builds in the "install"
 phase and conditional PLIST entries
-misc cleanup, fix a DESTDIR glitch

3 files changed, 138 insertions, 0 deletions

diff --git a/www/aws-demos/DESCR b/www/aws-demos/DESCR
new file mode 100644
index 00000000000..ee6aeff83ff
--- /dev/null
+++ b/www/aws-demos/DESCR
@@ -0,0 +1,21 @@
+AWS stands for Ada Web Server, but it is more than just another webserver...
+
+AWS is a complete framework to develop web based applications.  The main
+part of the framework is the embedded web server.  This small yet powerful
+web server can be embedded into your application so your application will be
+able to talk with a standard web browser such as Microsoft Internet Explorer
+or Netscape Communicator.  Around this web server, a lot of services have
+been developed.
+
+The framework includes:
+  * seb parameters module         * session server
+  * SOAP support                  * WSDL generation from Ada
+  * template parser               * AJAX support
+  * HTTPS/SSL support             * large server support
+  * virtual hosting support       * server push
+  * directory browser             * status page
+  * log module                    * hotplug module
+  * light communications API      * configuration API
+  * client API                    * web page service
+  * SMTP support                  * LDAP support
+  * Jabber support
diff --git a/www/aws-demos/Makefile b/www/aws-demos/Makefile
new file mode 100644
index 00000000000..d30fbd36d48
--- /dev/null
+++ b/www/aws-demos/Makefile
@@ -0,0 +1,86 @@
+# $NetBSD: Makefile,v 1.1 2011/03/02 10:14:32 drochner Exp $
+#
+
+DISTNAME=	aws-${AWS_VERSION}
+PKGNAME=	aws-demos-${AWS_VERSION}
+CATEGORIES=	www
+MASTER_SITES=	http://downloads.dragonlace.net/src/ \
+		http://dragonlace.mirrors.ada.cx/src/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	draco@marino.st
+HOMEPAGE=	http://libre.adacore.com/libre/tools/aws/
+COMMENT=	Adacore Ada Web Server and framework
+LICENSE=	gnu-gpl-v2
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+AWS_VERSION=		2.10.0.1
+USE_TOOLS+=		gmake makeinfo sed
+BUILD_DEPENDS+=		gawk:../../lang/gawk
+PATCHDIR=	${.CURDIR}/../../www/aws/patches
+DISTINFO_FILE=	${.CURDIR}/../../www/aws/distinfo
+
+MAKE_ENV+=	ADA_PROJECT_PATH=${PREFIX}/lib/gnat
+
+DEMO_DIRS+=	agent
+DEMO_DIRS+=	auth
+DEMO_DIRS+=	com
+DEMO_DIRS+=	dispatch
+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
+DEMO_DIRS+=	runme
+DEMO_DIRS+=	soap_demo
+DEMO_DIRS+=	soap_disp
+DEMO_DIRS+=	soap_vs
+DEMO_DIRS+=	split
+DEMO_DIRS+=	test_mail
+DEMO_DIRS+=	text_input
+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+=	wps
+DEMO_DIRS+=	ws
+DEMO_DIRS+=	zdemo
+# untested
+#PLIST_VARS+=	ldap
+#pkgbase := aws
+#.include "../../mk/pkg-build-options.mk"
+#.if !empty(PKG_BUILD_OPTIONS.aws:Mldap)
+#DEMO_DIRS+=	test_ldap
+#PLIST.ldap=	yes
+#.endif
+
+post-wrapper:
+	# We disable at least the wrapper binaries on all GNAT AUX to
+	# avoid potential linkage problems
+	${RM} ${WRKDIR}/.wrapper/bin/*
+
+do-configure:
+	cd ${WRKSRC} && ${SETENV} CC=gnatgcc \
+	${GMAKE} setup ${CONFIGURE_ARGS}
+
+do-build:
+.for dd in ${DEMO_DIRS}
+	cd ${WRKSRC}/demos/${dd} && ${GMAKE}
+.endfor
+
+do-install:
+	${MKDIR} ${DESTDIR}${PREFIX}/share/examples/aws/demos
+.for dd in ${DEMO_DIRS}
+	${FIND} ${WRKSRC}/demos/${dd} -type f -perm -0001 \
+	-exec ${INSTALL} {} ${DESTDIR}${PREFIX}/share/examples/aws/demos/ \;
+.endfor
+
+.include "../../www/aws/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../devel/gnatpython/buildlink3.mk"
+.include "../../devel/gprbuild-aux/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/aws-demos/PLIST b/www/aws-demos/PLIST
new file mode 100644
index 00000000000..29de36147a5
--- /dev/null
+++ b/www/aws-demos/PLIST
@@ -0,0 +1,31 @@
+@comment $NetBSD: PLIST,v 1.1 2011/03/02 10:14:32 drochner Exp $
+share/examples/aws/demos/auth
+share/examples/aws/demos/com_1
+share/examples/aws/demos/com_2
+share/examples/aws/demos/dispatch
+share/examples/aws/demos/hello_world
+share/examples/aws/demos/hotplug
+share/examples/aws/demos/interoplab_main
+share/examples/aws/demos/jabber_demo
+share/examples/aws/demos/main
+share/examples/aws/demos/multiple_sessions
+share/examples/aws/demos/res_demo
+share/examples/aws/demos/soap_client
+share/examples/aws/demos/soap_cvs
+share/examples/aws/demos/soap_server
+share/examples/aws/demos/soap_server_disp
+share/examples/aws/demos/soap_svs
+share/examples/aws/demos/split
+share/examples/aws/demos/test_mail
+share/examples/aws/demos/text_input
+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/wps
+share/examples/aws/demos/ws
+share/examples/aws/demos/wsdl_demo_client
+share/examples/aws/demos/wsdl_demo_server
+share/examples/aws/demos/zdemo