www/aws-demos: Several fixes

1) Removed backup master site which is going away
2) Fixed ldap linkage problem
3) Removed two demos that don't build
4) Added three demos conditional on ssl/ldap (ssl demos was always built
   before but would have failed if aws wasn't built with ssl)

2 files changed, 36 insertions, 20 deletions

diff --git a/www/aws-demos/Makefile b/www/aws-demos/Makefile
index 196ae612bda..3d147cda40a 100644
--- a/www/aws-demos/Makefile
+++ b/www/aws-demos/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2012/10/28 06:30:10 asau Exp $
+# $NetBSD: Makefile,v 1.7 2013/04/27 11:52:43 marino Exp $
 #
 
 DISTNAME=	aws-${AWS_VERSION}
 PKGNAME=	aws-demos-${AWS_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
-MASTER_SITES=	http://downloads.dragonlace.net/src/ \
-		http://dragonlace.mirrors.ada.cx/src/
+MASTER_SITES=	http://downloads.dragonlace.net/src/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	draco@marino.st
@@ -27,18 +26,20 @@ CONFIGURE_ARGS+=	prefix=${PREFIX}
 
 MAKE_ENV+=	ADA_PROJECT_PATH=${PREFIX}/lib/gnat
 
-DEMO_DIRS+=	agent
+SUBST_CLASSES+= 	lpath
+SUBST_STAGE.lpath=	pre-configure
+SUBST_MESSAGE.lpath=	Add library path for ldap
+SUBST_FILES.lpath=	demos/test_ldap/test_ldap.gpr
+SUBST_SED.lpath=	-e "s,@PREFIX@,${PREFIX},g"
+
 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
@@ -54,14 +55,26 @@ 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
+
+# These don't build, fail finding "aws.ini"
+#DEMO_DIRS+=	interoplab
+#DEMO_DIRS+=	hello_wsdl
+
+PLIST_VARS+=	ldap ssl
+BUILT_AWS !=	pkg_info -Q PKG_OPTIONS aws 2>/dev/null || echo
+
+.if !empty(BUILT_AWS:Mldap)
+CONFIGURE_ARGS+=	LDAP=true
+DEMO_DIRS+=		test_ldap
+PLIST.ldap=		yes
+.endif
+
+.if !empty(BUILT_AWS:Mssl)
+CONFIGURE_ARGS+=	SOCKET=openssl
+DEMO_DIRS+=		agent
+DEMO_DIRS+=		runme
+PLIST.ssl=		yes
+.endif
 
 do-configure:
 	cd ${WRKSRC} && ${GMAKE} setup ${CONFIGURE_ARGS}
diff --git a/www/aws-demos/PLIST b/www/aws-demos/PLIST
index 29de36147a5..69feb269ce8 100644
--- a/www/aws-demos/PLIST
+++ b/www/aws-demos/PLIST
@@ -1,21 +1,24 @@
-@comment $NetBSD: PLIST,v 1.1 2011/03/02 10:14:32 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/04/27 11:52:43 marino Exp $
+${PLIST.ssl}share/examples/aws/demos/agent
 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
+@comment broken 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
+${PLIST.ssl}share/examples/aws/demos/runme
 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
+${PLIST.ldap}share/examples/aws/demos/test_ldap
 share/examples/aws/demos/test_mail
 share/examples/aws/demos/text_input
 share/examples/aws/demos/vh_demo
@@ -26,6 +29,6 @@ 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
+@comment broken share/examples/aws/demos/wsdl_demo_client
+@comment broken share/examples/aws/demos/wsdl_demo_server
 share/examples/aws/demos/zdemo