Fri Dec 13 12:42:12 2013 UTC ()
Need -lsocket and mark package incompatible with builtin mit-krb5 on SunOS.


(jperkin)
diff -r1.62 -r1.63 pkgsrc/sysutils/amanda-common/Makefile
diff -r1.9 -r1.10 pkgsrc/sysutils/amanda-common/options.mk
cvs diff -r1.62 -r1.63 pkgsrc/sysutils/amanda-common/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/amanda-common/Makefile 2013/07/12 10:45:03 1.62
+++ pkgsrc/sysutils/amanda-common/Makefile 2013/12/13 12:42:12 1.63
@@ -1,26 +1,25 @@ @@ -1,26 +1,25 @@
1# $NetBSD: Makefile,v 1.62 2013/07/12 10:45:03 jperkin Exp $ 1# $NetBSD: Makefile,v 1.63 2013/12/13 12:42:12 jperkin Exp $
2 2
3PKGNAME= amanda-common-${AMANDA_VERSION} 3PKGNAME= amanda-common-${AMANDA_VERSION}
4PKGREVISION= 4 4PKGREVISION= 4
5SVR4_PKGNAME= amaco 5SVR4_PKGNAME= amaco
6 6
7COMMENT= Common libraries and binaries for Amanda 7COMMENT= Common libraries and binaries for Amanda
8 8
9.include "../../sysutils/amanda-common/Makefile.common" 9.include "../../sysutils/amanda-common/Makefile.common"
10 10
11.if ${OPSYS} == "SunOS" 11CPPFLAGS.SunOS+= -D_LARGEFILE64_SOURCE
12CPPFLAGS+= -D_LARGEFILE64_SOURCE 12LDFLAGS.SunOS+= -lsocket
13.endif 
14 13
15CONFIGURE_ARGS+= --without-server --without-client --without-gnuplot 14CONFIGURE_ARGS+= --without-server --without-client --without-gnuplot
16 15
17PKG_GROUPS= ${AMANDA_GROUP} 16PKG_GROUPS= ${AMANDA_GROUP}
18PKG_USERS= ${AMANDA_USER}:${AMANDA_GROUP} 17PKG_USERS= ${AMANDA_USER}:${AMANDA_GROUP}
19 18
20PKG_GECOS.${AMANDA_USER}= Amanda backup user 19PKG_GECOS.${AMANDA_USER}= Amanda backup user
21PKG_SHELL.${AMANDA_USER}= ${SH} 20PKG_SHELL.${AMANDA_USER}= ${SH}
22PKG_HOME.${AMANDA_USER}= ${AMANDA_VAR} 21PKG_HOME.${AMANDA_USER}= ${AMANDA_VAR}
23 22
24OWN_DIRS+= ${PKG_SYSCONFDIR}/amanda 23OWN_DIRS+= ${PKG_SYSCONFDIR}/amanda
25OWN_DIRS_PERMS= ${AMANDA_VAR} ${AMANDA_USER} ${AMANDA_GROUP} 0750 24OWN_DIRS_PERMS= ${AMANDA_VAR} ${AMANDA_USER} ${AMANDA_GROUP} 0750
26OWN_DIRS_PERMS+= ${AMANDA_VAR}/gnutar-lists ${AMANDA_USER} ${AMANDA_GROUP} 0750 25OWN_DIRS_PERMS+= ${AMANDA_VAR}/gnutar-lists ${AMANDA_USER} ${AMANDA_GROUP} 0750
cvs diff -r1.9 -r1.10 pkgsrc/sysutils/amanda-common/options.mk (expand / switch to unified diff)

--- pkgsrc/sysutils/amanda-common/options.mk 2012/07/30 07:21:11 1.9
+++ pkgsrc/sysutils/amanda-common/options.mk 2013/12/13 12:42:12 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.9 2012/07/30 07:21:11 sbd Exp $ 1# $NetBSD: options.mk,v 1.10 2013/12/13 12:42:12 jperkin Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.amanda 3PKG_OPTIONS_VAR= PKG_OPTIONS.amanda
4# Common options. 4# Common options.
5PKG_SUPPORTED_OPTIONS+= inet6 amanda-fqdn amanda-ssh kerberos 5PKG_SUPPORTED_OPTIONS+= inet6 amanda-fqdn amanda-ssh kerberos
6PKG_SUGGESTED_OPTIONS+= inet6 amanda-fqdn amanda-ssh kerberos 6PKG_SUGGESTED_OPTIONS+= inet6 amanda-fqdn amanda-ssh kerberos
7# Client options. 7# Client options.
8PKG_SUPPORTED_OPTIONS+= amanda-smb amanda-dump-snap 8PKG_SUPPORTED_OPTIONS+= amanda-smb amanda-dump-snap
9PKG_SUGGESTED_OPTIONS+= amanda-dump-snap 9PKG_SUGGESTED_OPTIONS+= amanda-dump-snap
10 10
11PKG_OPTIONS_LEGACY_VARS+= AMANDA_FQDN:amanda-fqdn 11PKG_OPTIONS_LEGACY_VARS+= AMANDA_FQDN:amanda-fqdn
12PKG_OPTIONS_LEGACY_VARS+= AMANDA_SSH:amanda-ssh 12PKG_OPTIONS_LEGACY_VARS+= AMANDA_SSH:amanda-ssh
13PKG_OPTIONS_LEGACY_VARS+= AMANDA_SMB:amanda-smb 13PKG_OPTIONS_LEGACY_VARS+= AMANDA_SMB:amanda-smb
14PKG_OPTIONS_LEGACY_VARS+= AMANDA_DUMP_SNAP:amanda-dump-snap 14PKG_OPTIONS_LEGACY_VARS+= AMANDA_DUMP_SNAP:amanda-dump-snap
@@ -27,16 +27,19 @@ CONFIGURE_ARGS+= --with-fqdn @@ -27,16 +27,19 @@ CONFIGURE_ARGS+= --with-fqdn
27 27
28.if !empty(PKG_OPTIONS:Mamanda-ssh) 28.if !empty(PKG_OPTIONS:Mamanda-ssh)
29CONFIGURE_ARGS+= --with-ssh-security 29CONFIGURE_ARGS+= --with-ssh-security
30 30
31. if !exists(/usr/bin/ssh) 31. if !exists(/usr/bin/ssh)
32DEPENDS+= openssh-[0-9]*:../../security/openssh 32DEPENDS+= openssh-[0-9]*:../../security/openssh
33FIND_PREFIX:= SSHPREFIX=openssh 33FIND_PREFIX:= SSHPREFIX=openssh
34.include "../../mk/find-prefix.mk" 34.include "../../mk/find-prefix.mk"
35CONFIGURE_ENV+= ac_cv_path_SSH=${SSHPREFIX}/bin/ssh 35CONFIGURE_ENV+= ac_cv_path_SSH=${SSHPREFIX}/bin/ssh
36. endif 36. endif
37.endif 37.endif
38 38
39.if !empty(PKG_OPTIONS:Mkerberos) 39.if !empty(PKG_OPTIONS:Mkerberos)
 40. if ${OPSYS} == "SunOS"
 41USE_BUILTIN.mit-krb5= no
 42. endif
40CONFIGURE_ARGS+= --with-krb5-security=${KRB5BASE:Q} 43CONFIGURE_ARGS+= --with-krb5-security=${KRB5BASE:Q}
41. include "../../mk/krb5.buildlink3.mk" 44. include "../../mk/krb5.buildlink3.mk"
42.endif 45.endif