diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/aws-demos/Makefile | 9 | ||||
| -rw-r--r-- | www/aws/distinfo | 4 | ||||
| -rw-r--r-- | www/aws/options.mk | 4 | ||||
| -rw-r--r-- | www/aws/patches/patch-demos_test__ldap_test__ldap.gpr | 2 |
4 files changed, 11 insertions, 8 deletions
diff --git a/www/aws-demos/Makefile b/www/aws-demos/Makefile index 3d147cda40a..81f4b4df885 100644 --- a/www/aws-demos/Makefile +++ b/www/aws-demos/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2013/04/27 11:52:43 marino Exp $ +# $NetBSD: Makefile,v 1.8 2013/04/27 13:02:48 marino Exp $ # DISTNAME= aws-${AWS_VERSION} @@ -27,10 +27,10 @@ CONFIGURE_ARGS+= prefix=${PREFIX} MAKE_ENV+= ADA_PROJECT_PATH=${PREFIX}/lib/gnat SUBST_CLASSES+= lpath -SUBST_STAGE.lpath= pre-configure +SUBST_STAGE.lpath= post-patch 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" +SUBST_SED.lpath= -e 's|@PREFIX@|${PREFIX}|g' DEMO_DIRS+= auth DEMO_DIRS+= com @@ -64,12 +64,14 @@ PLIST_VARS+= ldap ssl BUILT_AWS != pkg_info -Q PKG_OPTIONS aws 2>/dev/null || echo .if !empty(BUILT_AWS:Mldap) +.include "../../databases/openldap-client/buildlink3.mk" CONFIGURE_ARGS+= LDAP=true DEMO_DIRS+= test_ldap PLIST.ldap= yes .endif .if !empty(BUILT_AWS:Mssl) +.include "../../security/openssl/buildlink3.mk" CONFIGURE_ARGS+= SOCKET=openssl DEMO_DIRS+= agent DEMO_DIRS+= runme @@ -77,6 +79,7 @@ PLIST.ssl= yes .endif do-configure: + ${MKDIR} ${WRKSRC}/.build/native/debug/static/obj cd ${WRKSRC} && ${GMAKE} setup ${CONFIGURE_ARGS} do-build: diff --git a/www/aws/distinfo b/www/aws/distinfo index c487a772342..cf1dc610edf 100644 --- a/www/aws/distinfo +++ b/www/aws/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2013/04/27 11:49:55 marino Exp $ +$NetBSD: distinfo,v 1.6 2013/04/27 13:02:48 marino Exp $ SHA1 (aws-2.10.0.1.tar.bz2) = 3ea20d4328951089f93caa3693eb24d67cf76594 RMD160 (aws-2.10.0.1.tar.bz2) = 8d6c2e9e681f18b16bbd79e76e6b65bb8f07a871 @@ -19,7 +19,7 @@ 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-demos_test__ldap_test__ldap.gpr) = 0271d8c429f8fd3014ff169ded61f4b282243a38 SHA1 (patch-docs_docs.gpr) = acbe31da756c0cc3ee86132eedd0f0cc0ae6dd0e SHA1 (patch-include_include.gpr) = 8e65a8238077df79fedaafa8b95eb51c8897b6c0 SHA1 (patch-src_soap_soap-message-xml.adb) = d7b84968c615c017fb33536d177ce8b4557e29dc diff --git a/www/aws/options.mk b/www/aws/options.mk index 6251fae003b..716a15632b7 100644 --- a/www/aws/options.mk +++ b/www/aws/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2013/04/27 11:49:56 marino Exp $ +# $NetBSD: options.mk,v 1.6 2013/04/27 13:02:48 marino Exp $ # xmlada is built-in (not optional) due to gprbuild dependency @@ -58,7 +58,7 @@ CONFIGURE_ARGS+= SOCKET=openssl .if !empty(PKG_OPTIONS:Mldap) CONFIGURE_ARGS+= LDAP=true -DEPENDS+= openldap>=2.4:../../databases/openldap +.include "../../databases/openldap-client/buildlink3.mk" .endif #################### diff --git a/www/aws/patches/patch-demos_test__ldap_test__ldap.gpr b/www/aws/patches/patch-demos_test__ldap_test__ldap.gpr index b9a02633c2b..0423a453a07 100644 --- a/www/aws/patches/patch-demos_test__ldap_test__ldap.gpr +++ b/www/aws/patches/patch-demos_test__ldap_test__ldap.gpr @@ -5,7 +5,7 @@ for Default_Switches ("Ada") use ("-lwldap32"); when others => - for Default_Switches ("Ada") use ("-lldap"); -+ for Default_Switches ("Ada") use ("-L@PREFIX@/lib", "-lldap"); ++ for Default_Switches ("Ada") use ("-L@PREFIX@/lib", "-lldap", "-llber"); end case; end Linker; |