summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2016-05-07 03:49:21 +0000
committerjoerg <joerg@pkgsrc.org>2016-05-07 03:49:21 +0000
commit2ad389dcc56cc26ebef8f317e7ab517d93214cff (patch)
treeec6aac29bf8982a70c2fac5874108fc2dabaee47
parent35ef8b7dfc2b43693032d1f2c46fd6ace83f7a0c (diff)
downloadpkgsrc-2ad389dcc56cc26ebef8f317e7ab517d93214cff.tar.gz
Use build option framework to not randomly vomit on the console.
-rw-r--r--www/aws-demos/Makefile12
-rw-r--r--www/aws/buildlink3.mk5
2 files changed, 10 insertions, 7 deletions
diff --git a/www/aws-demos/Makefile b/www/aws-demos/Makefile
index cf8570a7ef5..4160178f0db 100644
--- a/www/aws-demos/Makefile
+++ b/www/aws-demos/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2016/03/05 11:29:35 jperkin Exp $
+# $NetBSD: Makefile,v 1.16 2016/05/07 03:49:21 joerg Exp $
#
DISTNAME= aws-${AWS_VERSION}
@@ -72,16 +72,17 @@ DEMO_DIRS+= zdemo
#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)
+.include "../../www/aws/buildlink3.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.awk:Mldap)
.include "../../databases/openldap-client/buildlink3.mk"
CONFIGURE_ARGS+= LDAP=true
DEMO_DIRS+= test_ldap
PLIST.ldap= yes
.endif
-.if !empty(BUILT_AWS:Mssl)
+.if !empty(PKG_BUILD_OPTIONS.awk:Mssl)
.include "../../security/openssl/buildlink3.mk"
CONFIGURE_ARGS+= SOCKET=openssl
DEMO_DIRS+= agent
@@ -89,7 +90,7 @@ DEMO_DIRS+= runme
PLIST.ssl= yes
.endif
-.if !empty(BUILT_AWS:Mgnutls)
+.if !empty(PKG_BUILD_OPTIONS.awk:Mgnutls)
.include "../../security/libgcrypt/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../security/gnutls/buildlink3.mk"
@@ -115,7 +116,6 @@ do-install:
-exec ${INSTALL} {} ${DESTDIR}${PREFIX}/share/examples/aws/demos/ \;
.endfor
-.include "../../www/aws/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../devel/gprbuild-aux/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/aws/buildlink3.mk b/www/aws/buildlink3.mk
index 5fb410b5d46..7130cc7b0a7 100644
--- a/www/aws/buildlink3.mk
+++ b/www/aws/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2011/03/02 10:14:31 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2016/05/07 03:49:21 joerg Exp $
BUILDLINK_TREE+= aws
@@ -8,6 +8,9 @@ AWS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.aws+= aws>=2.10.0.1
BUILDLINK_PKGSRCDIR.aws?= ../../www/aws
+pkgbase := aws
+.include "../../mk/pkg-build-options.mk"
+
.include "../../devel/zlib/buildlink3.mk"
.include "../../devel/gnatpython/buildlink3.mk"
.include "../../devel/gprbuild-aux/buildlink3.mk"