Disable IPv6 by default, since this doesn't work on systems which are

configured for IPv4 only.  IPv6 can still be enabled via PKG_OPTIONS.

Fixes my PR pkg/38957

ok gdt@

6 files changed, 25 insertions, 6 deletions

diff --git a/sysutils/amanda-client/Makefile b/sysutils/amanda-client/Makefile
index a9c19e467fc..89353503c45 100644
--- a/sysutils/amanda-client/Makefile
+++ b/sysutils/amanda-client/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2008/02/15 16:23:09 gdt Exp $
+# $NetBSD: Makefile,v 1.46 2008/07/29 17:21:39 pgoyette Exp $
 #
 
 PKGNAME=		amanda-client-${VERS}
+PKGREVISION=		1
 SVR4_PKGNAME=		amacl
 
 COMMENT=		Client part of Amanda, a network backup system
diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile
index 1b6a8584faa..3f657d8db70 100644
--- a/sysutils/amanda-common/Makefile
+++ b/sysutils/amanda-common/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2008/03/08 01:10:27 gdt Exp $
+# $NetBSD: Makefile,v 1.46 2008/07/29 17:21:39 pgoyette Exp $
 
 PKGNAME=		amanda-common-${VERS}
 SVR4_PKGNAME=		amaco
-PKGREVISION=		1
+PKGREVISION=		2
 
 COMMENT=		Common libraries and binaries for Amanda
 
diff --git a/sysutils/amanda-common/Makefile.common b/sysutils/amanda-common/Makefile.common
index df0252a3f86..d294e2b011c 100644
--- a/sysutils/amanda-common/Makefile.common
+++ b/sysutils/amanda-common/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2008/02/15 16:23:09 gdt Exp $
+# $NetBSD: Makefile.common,v 1.27 2008/07/29 17:21:39 pgoyette Exp $
 
 # used by sysutils/amanda-common/Makefile
 # used by sysutils/amanda-client/Makefile
@@ -57,3 +57,5 @@ CONFIGURE_ARGS+=	--with-fqdn
 .if defined(AMANDA_SSH) && !empty(AMANDA_SSH:M[yY][eE][sS])
 CONFIGURE_ARGS+=	--with-ssh-security
 .endif
+
+.include "../../sysutils/amanda-common/options.mk"
diff --git a/sysutils/amanda-common/options.mk b/sysutils/amanda-common/options.mk
new file mode 100644
index 00000000000..904d8ecf25d
--- /dev/null
+++ b/sysutils/amanda-common/options.mk
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1 2008/07/29 17:21:39 pgoyette Exp $
+
+# Since amanda's ipv6 usage is broken, turn it off by default.
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.amanda
+PKG_SUPPORTED_OPTIONS=	inet6
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--with-ipv6
+.else
+CONFIGURE_ARGS+=	--without-ipv6
+.endif
diff --git a/sysutils/amanda-plot/Makefile b/sysutils/amanda-plot/Makefile
index 80d84615a4b..b8285ab10af 100644
--- a/sysutils/amanda-plot/Makefile
+++ b/sysutils/amanda-plot/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2008/02/15 16:23:09 gdt Exp $
+# $NetBSD: Makefile,v 1.25 2008/07/29 17:21:39 pgoyette Exp $
 #
 
 PKGNAME=		amanda-plot-${VERS}
+PKGREVISION=		1
 SVR4_PKGNAME=		amapl
 
 COMMENT=		Visualizes the behavior of Amanda, a network backup system
diff --git a/sysutils/amanda-server/Makefile b/sysutils/amanda-server/Makefile
index 686c1fcb18d..1d91e2df3f9 100644
--- a/sysutils/amanda-server/Makefile
+++ b/sysutils/amanda-server/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2008/04/12 22:43:12 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2008/07/29 17:21:39 pgoyette Exp $
 
 PKGNAME=		amanda-server-${VERS}
+PKGREVISION=		1
 SVR4_PKGNAME=		amase
 
 COMMENT=		Server part of Amanda, a network backup system