summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorsbd <sbd@pkgsrc.org>2012-07-05 06:57:44 +0000
committersbd <sbd@pkgsrc.org>2012-07-05 06:57:44 +0000
commit649851200192a8f5d0f41243a10aa180fab0f39a (patch)
treed26d5e3916eb2dc5bafdaf4c21256a838c387379 /sysutils
parent0078d9b909f451fd2c4e1721c19212668fbf90d2 (diff)
downloadpkgsrc-649851200192a8f5d0f41243a10aa180fab0f39a.tar.gz
Move the amanda-client option definitions to the common options.mk so
that 'PKG_OPTIONS.amanda' works properly.
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/amanda-client/Makefile7
-rw-r--r--sysutils/amanda-common/options.mk7
2 files changed, 7 insertions, 7 deletions
diff --git a/sysutils/amanda-client/Makefile b/sysutils/amanda-client/Makefile
index decc32a5133..d4ceb6ad673 100644
--- a/sysutils/amanda-client/Makefile
+++ b/sysutils/amanda-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2012/05/21 04:27:09 sbd Exp $
+# $NetBSD: Makefile,v 1.50 2012/07/05 06:57:44 sbd Exp $
#
PKGNAME= amanda-client-${VERS}
@@ -12,11 +12,6 @@ PKG_DESTDIR_SUPPORT= destdir
GNU_CONFIGURE= yes
USE_TOOLS+= awk:run perl:run
-PKG_SUPPORTED_OPTIONS+= amanda-smb amanda-dump-snap
-
-PKG_OPTIONS_LEGACY_VARS+= AMANDA_SMB:amanda-smb
-PKG_OPTIONS_LEGACY_VARS+= AMANDA_DUMP_SNAP:amanda-dump-snap
-
.include "../../mk/bsd.prefs.mk"
.include "../../sysutils/amanda-common/Makefile.common"
.include "../../sysutils/amanda-common/buildlink3.mk"
diff --git a/sysutils/amanda-common/options.mk b/sysutils/amanda-common/options.mk
index b82d60e1e21..593c6619673 100644
--- a/sysutils/amanda-common/options.mk
+++ b/sysutils/amanda-common/options.mk
@@ -1,13 +1,18 @@
-# $NetBSD: options.mk,v 1.5 2012/06/12 15:46:03 wiz Exp $
+# $NetBSD: options.mk,v 1.6 2012/07/05 06:57:45 sbd Exp $
# Since amanda's ipv6 usage is broken, turn it off by default.
PKG_OPTIONS_VAR= PKG_OPTIONS.amanda
+# Common options.
PKG_SUPPORTED_OPTIONS+= inet6 amanda-fqdn amanda-ssh
PKG_SUGGESTED_OPTIONS+= inet6 amanda-ssh
+# Client options.
+PKG_SUPPORTED_OPTIONS+= amanda-smb amanda-dump-snap
PKG_OPTIONS_LEGACY_VARS+= AMANDA_FQDN:amanda-fqdn
PKG_OPTIONS_LEGACY_VARS+= AMANDA_SSH:amanda-ssh
+PKG_OPTIONS_LEGACY_VARS+= AMANDA_SMB:amanda-smb
+PKG_OPTIONS_LEGACY_VARS+= AMANDA_DUMP_SNAP:amanda-dump-snap
.include "../../mk/bsd.options.mk"