CVS commit: pkgsrc/sysutils

["Manuel Bouyer" <bouyer%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bouyer
Date:           Tue Mar 28 12:50:26 UTC 2017

Modified Files:
        pkgsrc/sysutils/amanda-client: Makefile
        pkgsrc/sysutils/amanda-common: options.mk

Log Message:
Remove amanda-dump-snap from suggested options for NetBSD <= 6.x, as
a workaround for PR kern/52120.
Bump amanda-client PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 pkgsrc/sysutils/amanda-client/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/amanda-common/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/amanda-client/Makefile
diff -u pkgsrc/sysutils/amanda-client/Makefile:1.61 pkgsrc/sysutils/amanda-client/Makefile:1.62
--- pkgsrc/sysutils/amanda-client/Makefile:1.61 Mon Feb 29 05:50:40 2016
+++ pkgsrc/sysutils/amanda-client/Makefile      Tue Mar 28 12:50:26 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.61 2016/02/29 05:50:40 mlelstv Exp $
+# $NetBSD: Makefile,v 1.62 2017/03/28 12:50:26 bouyer Exp $
 #
 
 PKGNAME=               amanda-client-${AMANDA_VERSION}
-PKGREVISION=           3
+PKGREVISION=           4
 
 COMMENT=               Client part of Amanda, a network backup system
 

Index: pkgsrc/sysutils/amanda-common/options.mk
diff -u pkgsrc/sysutils/amanda-common/options.mk:1.12 pkgsrc/sysutils/amanda-common/options.mk:1.13
--- pkgsrc/sysutils/amanda-common/options.mk:1.12       Wed Nov 25 12:53:29 2015
+++ pkgsrc/sysutils/amanda-common/options.mk    Tue Mar 28 12:50:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2015/11/25 12:53:29 jperkin Exp $
+# $NetBSD: options.mk,v 1.13 2017/03/28 12:50:26 bouyer Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.amanda
 # Common options.
@@ -6,7 +6,10 @@ PKG_SUPPORTED_OPTIONS+=        inet6 amanda-fqd
 PKG_SUGGESTED_OPTIONS+=        inet6 amanda-fqdn amanda-ssh
 # Client options.
 PKG_SUPPORTED_OPTIONS+=        amanda-smb amanda-dump-snap
+.if (${OPSYS} != "NetBSD" || \
+    (!empty(OS_VERSION:M[7-9].*)))
 PKG_SUGGESTED_OPTIONS+=        amanda-dump-snap
+.endif
 
 PKG_OPTIONS_LEGACY_VARS+=      AMANDA_FQDN:amanda-fqdn
 PKG_OPTIONS_LEGACY_VARS+=      AMANDA_SSH:amanda-ssh