summaryrefslogtreecommitdiff
path: root/sysutils/amanda-common
diff options
context:
space:
mode:
authorpgoyette <pgoyette>2008-07-29 17:21:39 +0000
committerpgoyette <pgoyette>2008-07-29 17:21:39 +0000
commit402915f314b7651157bd9715ad76bddda49f7e47 (patch)
treed0d5d9a4fa8a25faabdc2ece268325bdda240578 /sysutils/amanda-common
parentfdef5e305d44e123f4ea517ef6165b04cb4ac1bc (diff)
downloadpkgsrc-402915f314b7651157bd9715ad76bddda49f7e47.tar.gz
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@
Diffstat (limited to 'sysutils/amanda-common')
-rw-r--r--sysutils/amanda-common/Makefile4
-rw-r--r--sysutils/amanda-common/Makefile.common4
-rw-r--r--sysutils/amanda-common/options.mk14
3 files changed, 19 insertions, 3 deletions
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