Thu Jul 5 06:57:45 2012 UTC ()
Move the amanda-client option definitions to the common options.mk so
that 'PKG_OPTIONS.amanda' works properly.


(sbd)
diff -r1.49 -r1.50 pkgsrc/sysutils/amanda-client/Makefile
diff -r1.5 -r1.6 pkgsrc/sysutils/amanda-common/options.mk
cvs diff -r1.49 -r1.50 pkgsrc/sysutils/amanda-client/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/amanda-client/Makefile 2012/05/21 04:27:09 1.49
+++ pkgsrc/sysutils/amanda-client/Makefile 2012/07/05 06:57:44 1.50
@@ -1,32 +1,27 @@ @@ -1,32 +1,27 @@
1# $NetBSD: Makefile,v 1.49 2012/05/21 04:27:09 sbd Exp $ 1# $NetBSD: Makefile,v 1.50 2012/07/05 06:57:44 sbd Exp $
2# 2#
3 3
4PKGNAME= amanda-client-${VERS} 4PKGNAME= amanda-client-${VERS}
5PKGREVISION= 2 5PKGREVISION= 2
6SVR4_PKGNAME= amacl 6SVR4_PKGNAME= amacl
7 7
8COMMENT= Client part of Amanda, a network backup system 8COMMENT= Client part of Amanda, a network backup system
9 9
10PKG_DESTDIR_SUPPORT= destdir 10PKG_DESTDIR_SUPPORT= destdir
11 11
12GNU_CONFIGURE= yes 12GNU_CONFIGURE= yes
13USE_TOOLS+= awk:run perl:run 13USE_TOOLS+= awk:run perl:run
14 14
15PKG_SUPPORTED_OPTIONS+= amanda-smb amanda-dump-snap 
16 
17PKG_OPTIONS_LEGACY_VARS+= AMANDA_SMB:amanda-smb 
18PKG_OPTIONS_LEGACY_VARS+= AMANDA_DUMP_SNAP:amanda-dump-snap 
19 
20.include "../../mk/bsd.prefs.mk" 15.include "../../mk/bsd.prefs.mk"
21.include "../../sysutils/amanda-common/Makefile.common" 16.include "../../sysutils/amanda-common/Makefile.common"
22.include "../../sysutils/amanda-common/buildlink3.mk" 17.include "../../sysutils/amanda-common/buildlink3.mk"
23#.include "../../devel/readline/buildlink3.mk" 18#.include "../../devel/readline/buildlink3.mk"
24 19
25CONFIGURE_ARGS+= --without-server 20CONFIGURE_ARGS+= --without-server
26 21
27.if !empty(PKG_OPTIONS:Mamanda-smb) 22.if !empty(PKG_OPTIONS:Mamanda-smb)
28CONFIGURE_ARGS+= --with-smbclient 23CONFIGURE_ARGS+= --with-smbclient
29DEPENDS+= {samba>=2.0,ja-samba>=2.0}:../../net/samba 24DEPENDS+= {samba>=2.0,ja-samba>=2.0}:../../net/samba
30.endif 25.endif
31 26
32.if !empty(PKG_OPTIONS:Mamanda-dump-snap) 27.if !empty(PKG_OPTIONS:Mamanda-dump-snap)
cvs diff -r1.5 -r1.6 pkgsrc/sysutils/amanda-common/options.mk (expand / switch to unified diff)

--- pkgsrc/sysutils/amanda-common/options.mk 2012/06/12 15:46:03 1.5
+++ pkgsrc/sysutils/amanda-common/options.mk 2012/07/05 06:57:45 1.6
@@ -1,23 +1,28 @@ @@ -1,23 +1,28 @@
1# $NetBSD: options.mk,v 1.5 2012/06/12 15:46:03 wiz Exp $ 1# $NetBSD: options.mk,v 1.6 2012/07/05 06:57:45 sbd Exp $
2 2
3# Since amanda's ipv6 usage is broken, turn it off by default. 3# Since amanda's ipv6 usage is broken, turn it off by default.
4 4
5PKG_OPTIONS_VAR= PKG_OPTIONS.amanda 5PKG_OPTIONS_VAR= PKG_OPTIONS.amanda
 6# Common options.
6PKG_SUPPORTED_OPTIONS+= inet6 amanda-fqdn amanda-ssh 7PKG_SUPPORTED_OPTIONS+= inet6 amanda-fqdn amanda-ssh
7PKG_SUGGESTED_OPTIONS+= inet6 amanda-ssh 8PKG_SUGGESTED_OPTIONS+= inet6 amanda-ssh
 9# Client options.
 10PKG_SUPPORTED_OPTIONS+= amanda-smb amanda-dump-snap
8 11
9PKG_OPTIONS_LEGACY_VARS+= AMANDA_FQDN:amanda-fqdn 12PKG_OPTIONS_LEGACY_VARS+= AMANDA_FQDN:amanda-fqdn
10PKG_OPTIONS_LEGACY_VARS+= AMANDA_SSH:amanda-ssh 13PKG_OPTIONS_LEGACY_VARS+= AMANDA_SSH:amanda-ssh
 14PKG_OPTIONS_LEGACY_VARS+= AMANDA_SMB:amanda-smb
 15PKG_OPTIONS_LEGACY_VARS+= AMANDA_DUMP_SNAP:amanda-dump-snap
11 16
12.include "../../mk/bsd.options.mk" 17.include "../../mk/bsd.options.mk"
13 18
14.if !empty(PKG_OPTIONS:Minet6) 19.if !empty(PKG_OPTIONS:Minet6)
15CONFIGURE_ARGS+= --with-ipv6 20CONFIGURE_ARGS+= --with-ipv6
16.else 21.else
17CONFIGURE_ARGS+= --without-ipv6 22CONFIGURE_ARGS+= --without-ipv6
18.endif 23.endif
19 24
20.if !empty(PKG_OPTIONS:Mamanda-fqdn) 25.if !empty(PKG_OPTIONS:Mamanda-fqdn)
21CONFIGURE_ARGS+= --with-fqdn 26CONFIGURE_ARGS+= --with-fqdn
22.endif 27.endif
23 28