www/aws: Fix ldap and multijob support

1) Remove backup master site which will disappear
2) Fixed ldap linkage issue (for aws-demos too)
3) Added multijob support

5 files changed, 33 insertions, 11 deletions

diff --git a/www/aws/Makefile b/www/aws/Makefile
index deba9cd1b5e..31d1428e2a6 100644
--- a/www/aws/Makefile
+++ b/www/aws/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2013/02/06 23:23:58 jperkin Exp $
+# $NetBSD: Makefile,v 1.10 2013/04/27 11:49:55 marino Exp $
 #
 
 DISTNAME=	aws-${AWS_VERSION}
-PKGREVISION=	4
+PKGREVISION=	5
 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
@@ -35,8 +34,10 @@ MAKE_ENV+=	ADA_PROJECT_PATH=${PREFIX}/lib/gnat
 SUBST_CLASSES+= 	rpath
 SUBST_STAGE.rpath=	pre-configure
 SUBST_MESSAGE.rpath=	Adjust rpaths of shared libraries
-SUBST_FILES.rpath=	src/src.gpr include/include.gpr
-SUBST_SED.rpath=	-e "s,@ADDITIONAL_RPATH@,${ADDITIONAL_RPATH},"
+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
 
 GENERATE_PLIST=  cd ${DESTDIR}${PREFIX};
diff --git a/www/aws/distinfo b/www/aws/distinfo
index c90150fe5e0..c487a772342 100644
--- a/www/aws/distinfo
+++ b/www/aws/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2012/07/08 20:14:28 marino Exp $
+$NetBSD: distinfo,v 1.5 2013/04/27 11:49:55 marino Exp $
 
 SHA1 (aws-2.10.0.1.tar.bz2) = 3ea20d4328951089f93caa3693eb24d67cf76594
 RMD160 (aws-2.10.0.1.tar.bz2) = 8d6c2e9e681f18b16bbd79e76e6b65bb8f07a871
@@ -19,7 +19,8 @@ SHA1 (patch-bh) = 59f370db7e47d5fb18fa239dfc3396703f7251c8
 SHA1 (patch-bi) = 3878eb24a44a23f119d78aad5b0c5bcfce1fc4a2
 SHA1 (patch-bj) = 6e138dbe344600ea870e33b030662422cadf6cbc
 SHA1 (patch-bk) = 7be4ff0eefa89a24d942fc38c55f81864dd483de
+SHA1 (patch-demos_test__ldap_test__ldap.gpr) = 4505d0b596eeb725a4e14355b72d8aa7d182c2a0
 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) = 500bb473414253696c43dfa8b5999681accdb6ca
+SHA1 (patch-src_src.gpr) = 18480f2478c6fa3a1a7939f2a9fbdc4bd09178e3
diff --git a/www/aws/options.mk b/www/aws/options.mk
index 8d5fb32ee0d..6251fae003b 100644
--- a/www/aws/options.mk
+++ b/www/aws/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2012/07/08 20:14:28 marino Exp $
+# $NetBSD: options.mk,v 1.5 2013/04/27 11:49:56 marino Exp $
 
 
 # xmlada is built-in (not optional) due to gprbuild dependency
@@ -17,7 +17,7 @@ PKG_SUGGESTED_OPTIONS=	ssl
 .include "../../mk/bsd.options.mk"
 
 CONFIGURE_ARGS+=	GCC=ada
-CONFIGURE_ARGS+=	PROCESSORS=1
+CONFIGURE_ARGS+=	PROCESSORS=${MAKE_JOBS}
 CONFIGURE_ARGS+=	PYTHON=python${PYVERSSUFFIX}
 CONFIGURE_ARGS+=	XMLADA=true
 CONFIGURE_ARGS+=	prefix=${PREFIX}
diff --git a/www/aws/patches/patch-demos_test__ldap_test__ldap.gpr b/www/aws/patches/patch-demos_test__ldap_test__ldap.gpr
new file mode 100644
index 00000000000..b9a02633c2b
--- /dev/null
+++ b/www/aws/patches/patch-demos_test__ldap_test__ldap.gpr
@@ -0,0 +1,11 @@
+--- demos/test_ldap/test_ldap.gpr.orig	2011-01-25 20:53:15.000000000 +0000
++++ demos/test_ldap/test_ldap.gpr
+@@ -42,7 +42,7 @@ 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");
+       end case;
+    end Linker;
+ 
diff --git a/www/aws/patches/patch-src_src.gpr b/www/aws/patches/patch-src_src.gpr
index a7a7fba931e..856917f0d1b 100644
--- a/www/aws/patches/patch-src_src.gpr
+++ b/www/aws/patches/patch-src_src.gpr
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_src.gpr,v 1.1 2012/07/08 20:14:28 marino Exp $
+$NetBSD: patch-src_src.gpr,v 1.2 2013/04/27 11:49:56 marino Exp $
 
 --- src/src.gpr.orig	2011-01-25 20:52:57.000000000 +0000
 +++ src/src.gpr
@@ -11,3 +11,12 @@ $NetBSD: patch-src_src.gpr,v 1.1 2012/07/08 20:14:28 marino Exp $
           end case;
  
           case Shared.LDAP is
+@@ -88,7 +88,7 @@ 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;