www/aws: Fix build for different zlib and libssl locations

The configuration for the location of libz and libssl both were wrong,
and they were corrected with their respective BUILDLINK_PREFIX.

In addition, regardless of where libssl is located, the standard location
(/usr/include) was searched instead of relative to the library.  This
required a patch to the GPR build in order to pass -I<loc> to the
compilation of C files.

The unnecessary removal of empty directories was removed as SunOS find
does not support the -empty switch.

Tested on Joyent dev area where both libz and libssl are not at /usr/lib.

4 files changed, 43 insertions, 6 deletions

diff --git a/www/aws/Makefile b/www/aws/Makefile
index de94f0e169f..8ef084a43df 100644
--- a/www/aws/Makefile
+++ b/www/aws/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2014/04/30 16:30:33 marino Exp $
+# $NetBSD: Makefile,v 1.17 2014/05/09 22:45:15 marino Exp $
 #
 
 DISTNAME=	aws-${AWS_VERSION}
@@ -27,7 +27,8 @@ MY_MAKE_ENV+=		ADA_PROJECT_PATH=${PREFIX}/lib/gnat
 MY_MAKE_ENV+=		AWK=awk
 MY_MAKE_ENV+=		PATH=${PREFIX}/gcc-aux/bin:${PATH}
 MY_CONF_ENV+=		PATH=${PREFIX}/gcc-aux/bin:${PATH}
-CONFIGURE_ARGS+=	LPATH=${PREFIX}/lib ZPATH=/usr/lib
+CONFIGURE_ARGS+=	LPATH=${BUILDLINK_PREFIX.openssl}/lib
+CONFIGURE_ARGS+=	ZPATH=${BUILDLINK_PREFIX.zlib}/lib
 
 # Link options were added for the aws library
 # "-R" option disables all rpaths except adalib and compiler libs.  This is
@@ -61,7 +62,6 @@ do-test: install
 
 do-install:
 	cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${GMAKE} install
-	@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 7054016fb7c..bd176341a14 100644
--- a/www/aws/distinfo
+++ b/www/aws/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2013/07/07 23:46:50 marino Exp $
+$NetBSD: distinfo,v 1.8 2014/05/09 22:45:15 marino Exp $
 
 SHA1 (aws-3.1.0.0.tar.bz2) = a8135b10bad5a751840858acb305cbb01b5558db
 RMD160 (aws-3.1.0.0.tar.bz2) = d7c8dc904a0a91a8754aae8d07eb8b015fbf3b1f
@@ -13,5 +13,6 @@ 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-ssl_ssl.gpr) = c605957c0c77b90ba82573a230e1cec52d9cceae
 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 b2d035fe4d7..f443fcf714a 100644
--- a/www/aws/options.mk
+++ b/www/aws/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2014/04/30 16:30:33 marino Exp $
+# $NetBSD: options.mk,v 1.10 2014/05/09 22:45:15 marino Exp $
 
 
 # xmlada is built-in (not optional) due to gprbuild dependency
@@ -35,7 +35,7 @@ DOTBUILD=		release
 # NetBSD until NetBSD upgrades it's libgcc or until a new GNAT and GPRBuild
 # are delivered that don't have this bug.
 
-.if $(OPSYS) == "NetBSD"
+.if $(OPSYS) == NetBSD
 CONFIGURE_ARGS+=	ZLIB=false
 .else
 CONFIGURE_ARGS+=	ZLIB=true
diff --git a/www/aws/patches/patch-ssl_ssl.gpr b/www/aws/patches/patch-ssl_ssl.gpr
new file mode 100644
index 00000000000..8d47dfd8c02
--- /dev/null
+++ b/www/aws/patches/patch-ssl_ssl.gpr
@@ -0,0 +1,36 @@
+$NetBSD: patch-ssl_ssl.gpr,v 1.1 2014/05/09 22:45:15 marino Exp $
+
+ The vendor SSL gpr file does not support header inclusion at all.  No
+ matter what location is provided for SSL library, only standard header
+ locations (e.g. /usr/include) are searched.  This adds
+ "-I${SSL_LIB_LOCATION}/../include" to the compilation of C files.  The
+ problem was seen on SmartOS where SSL headers are not in the standard
+ locations.
+
+--- ssl/ssl.gpr.orig	2013-07-03 01:11:54.000000000 +0000
++++ ssl/ssl.gpr
+@@ -52,7 +52,23 @@ library project SSL is
+    -- Compiler --
+    --------------
+ 
+-   package Compiler renames Shared.Compiler;
++   Incs := ("-I" & SSL_Lib'Library_Dir & "/../include");
++
++   package Compiler is
++
++      case Shared.Build is
++         when "Debug" =>
++            for Default_Switches ("Ada") use Shared.Common_Options &
++               Shared.Debug_Options;
++            for Default_Switches ("C") use ("-g") & Incs;
++
++         when "Release" =>
++            for Default_Switches ("Ada") use Shared.Common_Options &
++               Shared.Release_Options;
++            for Default_Switches ("C") use ("-O2") & Incs;
++      end case;
++
++   end Compiler;
+ 
+    ------------
+    -- Naming --