[pkgsrc/trunk]: pkgsrc/sysutils In amanda*, reduce default options.

[gdt <gdt%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7e598ed74a50
branches:  trunk
changeset: 646494:7e598ed74a50
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Mon Feb 09 18:35:12 2015 +0000

description:
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.

diffstat:

 sysutils/amanda-client/Makefile   |   4 ++--
 sysutils/amanda-common/Makefile   |   4 ++--
 sysutils/amanda-common/PLIST      |  14 +++++++-------
 sysutils/amanda-common/options.mk |  18 +++++++++++++++---
 sysutils/amanda-plot/Makefile     |   4 ++--
 sysutils/amanda-server/Makefile   |   4 ++--
 6 files changed, 30 insertions(+), 18 deletions(-)

diffs (129 lines):

diff -r cd5c5c71674d -r 7e598ed74a50 sysutils/amanda-client/Makefile
--- a/sysutils/amanda-client/Makefile   Mon Feb 09 16:55:01 2015 +0000
+++ b/sysutils/amanda-client/Makefile   Mon Feb 09 18:35:12 2015 +0000
@@ -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 -r cd5c5c71674d -r 7e598ed74a50 sysutils/amanda-common/Makefile
--- a/sysutils/amanda-common/Makefile   Mon Feb 09 16:55:01 2015 +0000
+++ b/sysutils/amanda-common/Makefile   Mon Feb 09 18:35:12 2015 +0000
@@ -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 -r cd5c5c71674d -r 7e598ed74a50 sysutils/amanda-common/PLIST
--- a/sysutils/amanda-common/PLIST      Mon Feb 09 16:55:01 2015 +0000
+++ b/sysutils/amanda-common/PLIST      Mon Feb 09 18:35:12 2015 +0000
@@ -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/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/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/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 -r cd5c5c71674d -r 7e598ed74a50 sysutils/amanda-common/options.mk
--- a/sysutils/amanda-common/options.mk Mon Feb 09 16:55:01 2015 +0000
+++ b/sysutils/amanda-common/options.mk Mon Feb 09 18:35:12 2015 +0000
@@ -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 @@
 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 -r cd5c5c71674d -r 7e598ed74a50 sysutils/amanda-plot/Makefile
--- a/sysutils/amanda-plot/Makefile     Mon Feb 09 16:55:01 2015 +0000
+++ b/sysutils/amanda-plot/Makefile     Mon Feb 09 18:35:12 2015 +0000
@@ -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 -r cd5c5c71674d -r 7e598ed74a50 sysutils/amanda-server/Makefile
--- a/sysutils/amanda-server/Makefile   Mon Feb 09 16:55:01 2015 +0000
+++ b/sysutils/amanda-server/Makefile   Mon Feb 09 18:35:12 2015 +0000
@@ -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