In amanda*, reduce default options.

Add an 'ndmp' option, disabled by default.
Disable kerberos option by default.

These two changes allow amanda to build again on OS X.  My belief,
posited on pkgsrc-users without contradiction, is that no pkgsrc users
use these features anyway.  Normal amanda usage these days is over ssh
(which gets one PFS).  NDMP is for direct dumping of NAS: usage is
probably rare and also in large installations where rebuilding is not
hard.

All in all, I thought it better for the pkgsrc/amanda universe to have
consistent options across platforms than to selectively disable on OS
X.

6 files changed, 30 insertions, 18 deletions

diff --git a/sysutils/amanda-client/Makefile b/sysutils/amanda-client/Makefile
index e807a3897b7..1975f2f7dcb 100644
--- a/sysutils/amanda-client/Makefile
+++ b/sysutils/amanda-client/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.59 2014/10/09 13:44:56 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2015/02/09 18:35:12 gdt Exp $
 #
 
 PKGNAME=		amanda-client-${AMANDA_VERSION}
-PKGREVISION=		1
+PKGREVISION=		2
 
 COMMENT=		Client part of Amanda, a network backup system
 
diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile
index b152dd2569b..6b96013463f 100644
--- a/sysutils/amanda-common/Makefile
+++ b/sysutils/amanda-common/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.68 2014/10/09 13:44:56 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2015/02/09 18:35:12 gdt Exp $
 
 PKGNAME=		amanda-common-${AMANDA_VERSION}
-PKGREVISION=		6
+PKGREVISION=		7
 
 COMMENT=		Common libraries and binaries for Amanda
 
diff --git a/sysutils/amanda-common/PLIST b/sysutils/amanda-common/PLIST
index d156b9a36d4..3b1db9c70e7 100644
--- a/sysutils/amanda-common/PLIST
+++ b/sysutils/amanda-common/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2012/07/30 07:21:11 sbd Exp $
+@comment $NetBSD: PLIST,v 1.8 2015/02/09 18:35:12 gdt Exp $
 ${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Archive.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Amanda/BigIntCompat.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Amanda/ClientService.pm
@@ -11,7 +11,7 @@ ${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Header.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Amanda/IPC/Binary.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Amanda/IPC/LineProtocol.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Amanda/MainLoop.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Amanda/NDMP.pm
+${PLIST.ndmp}${PERL5_SUB_INSTALLVENDORLIB}/Amanda/NDMP.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Paths.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Process.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Script.pm
@@ -26,7 +26,7 @@ ${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/Feature/libFeature.la
 ${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/Header/libHeader.la
 ${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/IPC/Binary/libBinary.la
 ${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/MainLoop/libMainLoop.la
-${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/NDMP/libNDMP.la
+${PLIST.ndmp}${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/NDMP/libNDMP.la
 ${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/Tests/libTests.la
 ${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/Util/libUtil.la
 ${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/Xfer/libXfer.la
@@ -35,11 +35,11 @@ lib/amanda/libamandad.la
 lib/amanda/libamar.la
 lib/amanda/libamglue.la
 lib/amanda/libamxfer.la
-lib/amanda/libndmjob.la
-lib/amanda/libndmlib.la
+${PLIST.ndmp}lib/amanda/libndmjob.la
+${PLIST.ndmp}lib/amanda/libndmlib.la
 libexec/amanda/amanda-sh-lib.sh
-libexec/amanda/amndmjob
-libexec/amanda/ndmjob
+${PLIST.ndmp}libexec/amanda/amndmjob
+${PLIST.ndmp}libexec/amanda/ndmjob
 man/man5/amanda-archive-format.5
 man/man5/amanda-client.conf.5
 man/man5/amanda.conf.5
diff --git a/sysutils/amanda-common/options.mk b/sysutils/amanda-common/options.mk
index 1a03524fabd..25699ae63c8 100644
--- a/sysutils/amanda-common/options.mk
+++ b/sysutils/amanda-common/options.mk
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.10 2013/12/13 12:42:12 jperkin Exp $
+# $NetBSD: options.mk,v 1.11 2015/02/09 18:35:12 gdt Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.amanda
 # Common options.
-PKG_SUPPORTED_OPTIONS+=	inet6 amanda-fqdn amanda-ssh kerberos
-PKG_SUGGESTED_OPTIONS+=	inet6 amanda-fqdn amanda-ssh kerberos
+PKG_SUPPORTED_OPTIONS+=	inet6 amanda-fqdn amanda-ssh kerberos ndmp
+PKG_SUGGESTED_OPTIONS+=	inet6 amanda-fqdn amanda-ssh
 # Client options.
 PKG_SUPPORTED_OPTIONS+=	amanda-smb amanda-dump-snap
 PKG_SUGGESTED_OPTIONS+=	amanda-dump-snap
@@ -43,3 +43,15 @@ USE_BUILTIN.mit-krb5=	no
 CONFIGURE_ARGS+=	--with-krb5-security=${KRB5BASE:Q}
 .  include "../../mk/krb5.buildlink3.mk"
 .endif
+
+# The ndmp code fails to build on OS X >= 10.9, and upstream questions why
+# it is enabled.  So it is a disabled-by-default option.
+# http://www.redhat.com/archives/libvir-list/2013-October/msg01153.html
+PLIST_VARS+=		ndmp
+CONFIGURE_ARGS+=	--without-ndmp
+.if !empty(PKG_OPTIONS:Mndmp)
+CONFIGURE_ARGS+=	--with-ndmp
+PLIST.ndmp=		yes
+.else
+CONFIGURE_ARGS+=	--without-ndmp
+.endif
diff --git a/sysutils/amanda-plot/Makefile b/sysutils/amanda-plot/Makefile
index be3ecf8c4f7..fb6af9aca3c 100644
--- a/sysutils/amanda-plot/Makefile
+++ b/sysutils/amanda-plot/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2014/10/09 13:44:56 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2015/02/09 18:35:12 gdt Exp $
 #
 
 PKGNAME=		amanda-plot-${AMANDA_VERSION}
-PKGREVISION=		1
+PKGREVISION=		2
 
 COMMENT=		Visualizes the behavior of Amanda, a network backup system
 
diff --git a/sysutils/amanda-server/Makefile b/sysutils/amanda-server/Makefile
index 09b8e81cde9..98080f1ab26 100644
--- a/sysutils/amanda-server/Makefile
+++ b/sysutils/amanda-server/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2014/10/09 13:44:56 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2015/02/09 18:35:13 gdt Exp $
 
 PKGNAME=		amanda-server-${AMANDA_VERSION}
-PKGREVISION=		1
+PKGREVISION=		2
 
 COMMENT=		Server part of Amanda, a network backup system