From d3d2c759786e2bbf740a782c581cacac84a83c25 Mon Sep 17 00:00:00 2001 From: shattered Date: Sat, 8 Sep 2012 12:36:57 +0000 Subject: Tell configure to not look for OpenSSL if not enabled via option. --- sysutils/bacula-clientonly/Makefile | 4 +++- sysutils/bacula-clientonly/options.mk | 4 +++- sysutils/bacula/Makefile | 4 ++-- sysutils/bacula/options.mk | 4 +++- 4 files changed, 11 insertions(+), 5 deletions(-) (limited to 'sysutils') diff --git a/sysutils/bacula-clientonly/Makefile b/sysutils/bacula-clientonly/Makefile index 9c5db9bf34b..f345b1cbd76 100644 --- a/sysutils/bacula-clientonly/Makefile +++ b/sysutils/bacula-clientonly/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.17 2010/03/09 07:06:00 adam Exp $ +# $NetBSD: Makefile,v 1.18 2012/09/08 12:36:57 shattered Exp $ PKGNAME= ${DISTNAME:S/-/-clientonly-/} COMMENT= The Network Backup Solution (client only) +PKGREVISION= 1 + CONFLICTS= bacula-[0-9]* bacula-client-[0-9]* PKG_DESTDIR_SUPPORT= user-destdir diff --git a/sysutils/bacula-clientonly/options.mk b/sysutils/bacula-clientonly/options.mk index 203114c4544..4ba8455a8e9 100644 --- a/sysutils/bacula-clientonly/options.mk +++ b/sysutils/bacula-clientonly/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2012/02/23 12:16:32 shattered Exp $ +# $NetBSD: options.mk,v 1.8 2012/09/08 12:36:57 shattered Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.bacula-clientonly # bacula-static is broken -- see PR 42954 @@ -21,4 +21,6 @@ PLIST_SUBST+= STATIC="@comment " .if !empty(PKG_OPTIONS:Mssl) . include "../../security/openssl/buildlink3.mk" CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} +.else +CONFIGURE_ARGS+= --without-openssl .endif diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile index 8b021be63e1..463b7b535ed 100644 --- a/sysutils/bacula/Makefile +++ b/sysutils/bacula/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.39 2012/04/27 12:32:03 obache Exp $ +# $NetBSD: Makefile,v 1.40 2012/09/08 12:36:57 shattered Exp $ -PKGREVISION= 2 +PKGREVISION= 3 CONFLICTS+= bacula-client-[0-9]* bacula-clientonly-[0-9]* diff --git a/sysutils/bacula/options.mk b/sysutils/bacula/options.mk index b78c527087a..aea73434265 100644 --- a/sysutils/bacula/options.mk +++ b/sysutils/bacula/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.18 2012/02/23 12:16:31 shattered Exp $ +# $NetBSD: options.mk,v 1.19 2012/09/08 12:36:57 shattered Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.bacula # bacula-static is broken -- see PR 42954 @@ -51,4 +51,6 @@ PLIST_SUBST+= STATIC="@comment " .if !empty(PKG_OPTIONS:Mssl) . include "../../security/openssl/buildlink3.mk" CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} +.else +CONFIGURE_ARGS+= --without-openssl .endif -- cgit v1.2.3