Mon Jul 30 07:03:04 2012 UTC ()
+ Change the AMANADA_USER to 'amandabackup' to be consistent with other
  packages (and because I think its a good idea).
+ Set the AMANDA_USER's home directory to AMANDA_VAR.
+ Update the AMANDA_USER's gecos comment.


(sbd)
diff -r1.54 -r1.55 pkgsrc/sysutils/amanda-common/Makefile
diff -r1.34 -r1.35 pkgsrc/sysutils/amanda-common/Makefile.common
cvs diff -r1.54 -r1.55 pkgsrc/sysutils/amanda-common/Makefile (switch to unified diff)

--- pkgsrc/sysutils/amanda-common/Makefile 2012/07/30 07:02:17 1.54
+++ pkgsrc/sysutils/amanda-common/Makefile 2012/07/30 07:03:04 1.55
@@ -1,39 +1,40 @@ @@ -1,39 +1,40 @@
1# $NetBSD: Makefile,v 1.54 2012/07/30 07:02:17 sbd Exp $ 1# $NetBSD: Makefile,v 1.55 2012/07/30 07:03:04 sbd Exp $
2 2
3PKGNAME= amanda-common-${AMANDA_VERSION} 3PKGNAME= amanda-common-${AMANDA_VERSION}
4SVR4_PKGNAME= amaco 4SVR4_PKGNAME= amaco
5PKGREVISION= 2 5PKGREVISION= 2
6 6
7COMMENT= Common libraries and binaries for Amanda 7COMMENT= Common libraries and binaries for Amanda
8 8
9PKG_DESTDIR_SUPPORT= user-destdir 9PKG_DESTDIR_SUPPORT= user-destdir
10 10
11.include "../../sysutils/amanda-common/Makefile.common" 11.include "../../sysutils/amanda-common/Makefile.common"
12 12
13.if ${OPSYS} == "SunOS" 13.if ${OPSYS} == "SunOS"
14CPPFLAGS+= -D_LARGEFILE64_SOURCE 14CPPFLAGS+= -D_LARGEFILE64_SOURCE
15.endif 15.endif
16 16
17CONFIGURE_ARGS+= --without-server --without-client --without-gnuplot 17CONFIGURE_ARGS+= --without-server --without-client --without-gnuplot
18 18
19# Prevent configure script from finding unnecessary libraries. 19# Prevent configure script from finding unnecessary libraries.
20# 20#
21CONFIGURE_ENV+= ac_cv_lib_intl_main=no 21CONFIGURE_ENV+= ac_cv_lib_intl_main=no
22CONFIGURE_ENV+= ac_cv_lib_termcap_tgetent=no 22CONFIGURE_ENV+= ac_cv_lib_termcap_tgetent=no
23CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no 23CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no
24CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no 24CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no
25CONFIGURE_ENV+= ac_cv_lib_readline_readline=no 25CONFIGURE_ENV+= ac_cv_lib_readline_readline=no
26 26
27PKG_GROUPS= ${AMANDA_GROUP} 27PKG_GROUPS= ${AMANDA_GROUP}
28PKG_USERS= ${AMANDA_USER}:${AMANDA_GROUP} 28PKG_USERS= ${AMANDA_USER}:${AMANDA_GROUP}
29 29
30PKG_GECOS.${AMANDA_USER}= Amanda pseudo-user 30PKG_GECOS.${AMANDA_USER}= Amanda backup user
31PKG_SHELL.${AMANDA_USER}= ${SH} 31PKG_SHELL.${AMANDA_USER}= ${SH}
 32PKG_HOME.${AMANDA_USER}= ${AMANDA_VAR}
32 33
33OWN_DIRS_PERMS= ${AMANDA_VAR} ${AMANDA_USER} ${AMANDA_GROUP} 0750 34OWN_DIRS_PERMS= ${AMANDA_VAR} ${AMANDA_USER} ${AMANDA_GROUP} 0750
34OWN_DIRS_PERMS+= ${AMANDA_VAR}/gnutar-lists ${AMANDA_USER} ${AMANDA_GROUP} 0750 35OWN_DIRS_PERMS+= ${AMANDA_VAR}/gnutar-lists ${AMANDA_USER} ${AMANDA_GROUP} 0750
35OWN_DIRS_PERMS+= ${VARBASE}/log/amanda ${AMANDA_USER} ${AMANDA_GROUP} 0750 36OWN_DIRS_PERMS+= ${VARBASE}/log/amanda ${AMANDA_USER} ${AMANDA_GROUP} 0750
36 37
37INSTALL_MAKE_FLAGS+= SETUID_GROUP=${ROOT_GROUP} 38INSTALL_MAKE_FLAGS+= SETUID_GROUP=${ROOT_GROUP}
38 39
39.include "../../mk/bsd.pkg.mk" 40.include "../../mk/bsd.pkg.mk"
cvs diff -r1.34 -r1.35 pkgsrc/sysutils/amanda-common/Makefile.common (switch to unified diff)

--- pkgsrc/sysutils/amanda-common/Makefile.common 2012/07/30 07:02:17 1.34
+++ pkgsrc/sysutils/amanda-common/Makefile.common 2012/07/30 07:03:04 1.35
@@ -1,60 +1,60 @@ @@ -1,60 +1,60 @@
1# $NetBSD: Makefile.common,v 1.34 2012/07/30 07:02:17 sbd Exp $ 1# $NetBSD: Makefile.common,v 1.35 2012/07/30 07:03:04 sbd Exp $
2 2
3# used by sysutils/amanda-common/Makefile 3# used by sysutils/amanda-common/Makefile
4# used by sysutils/amanda-client/Makefile 4# used by sysutils/amanda-client/Makefile
5# used by sysutils/amanda-server/Makefile 5# used by sysutils/amanda-server/Makefile
6# used by sysutils/amanda-plot/Makefile 6# used by sysutils/amanda-plot/Makefile
7 7
8COMMONDIR= ../../sysutils/amanda-common 8COMMONDIR= ../../sysutils/amanda-common
9.include "${COMMONDIR}/version.mk" 9.include "${COMMONDIR}/version.mk"
10 10
11DISTNAME= amanda-${AMANDA_VERSION} 11DISTNAME= amanda-${AMANDA_VERSION}
12CATEGORIES= sysutils 12CATEGORIES= sysutils
13MASTER_SITES?= ${MASTER_SITE_SOURCEFORGE:=amanda/} 13MASTER_SITES?= ${MASTER_SITE_SOURCEFORGE:=amanda/}
14 14
15MAINTAINER= pkgsrc-users@NetBSD.org 15MAINTAINER= pkgsrc-users@NetBSD.org
16HOMEPAGE= http://www.amanda.org/ 16HOMEPAGE= http://www.amanda.org/
17LICENSE= modified-bsd AND gnu-gpl-v2 17LICENSE= modified-bsd AND gnu-gpl-v2
18 18
19.include "../../mk/bsd.prefs.mk" 19.include "../../mk/bsd.prefs.mk"
20 20
21.if ${OPSYS} == "SunOS" 21.if ${OPSYS} == "SunOS"
22AMANDA_GROUP?= sysadmin 22AMANDA_GROUP?= sysadmin
23.else 23.else
24# NetBSD, Linux and Darwin 24# NetBSD, Linux and Darwin
25AMANDA_GROUP?= operator 25AMANDA_GROUP?= operator
26.endif 26.endif
27 27
28AMANDA_USER?= backup 28AMANDA_USER?= amandabackup
29AMANDA_TMP?= /tmp/amanda 29AMANDA_TMP?= /tmp/amanda
30AMANDA_VAR?= ${VARBASE}/amanda 30AMANDA_VAR?= ${VARBASE}/amanda
31 31
32PKG_GROUPS_VARS+= AMANDA_GROUP 32PKG_GROUPS_VARS+= AMANDA_GROUP
33PKG_USERS_VARS+= AMANDA_USER 33PKG_USERS_VARS+= AMANDA_USER
34BUILD_DEFS+= AMANDA_TMP AMANDA_USER AMANDA_GROUP AMANDA_VAR VARBASE 34BUILD_DEFS+= AMANDA_TMP AMANDA_USER AMANDA_GROUP AMANDA_VAR VARBASE
35 35
36USE_LIBTOOL= yes 36USE_LIBTOOL= yes
37USE_TOOLS+= gzip:run gtar:run 37USE_TOOLS+= gzip:run gtar:run
38 38
39GNU_CONFIGURE= yes 39GNU_CONFIGURE= yes
40CONFIGURE_ENV+= ac_cv_path_GZIP=${TOOLS_GZIP_CMD:Q} 40CONFIGURE_ENV+= ac_cv_path_GZIP=${TOOLS_GZIP_CMD:Q}
41CONFIGURE_ENV+= GNUTAR=${TOOLS_GTAR:Q} 41CONFIGURE_ENV+= GNUTAR=${TOOLS_GTAR:Q}
42CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 42CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
43CONFIGURE_ARGS+= --localstatedir=${AMANDA_VAR:Q} 43CONFIGURE_ARGS+= --localstatedir=${AMANDA_VAR:Q}
44CONFIGURE_ARGS+= --with-tmpdir=${AMANDA_TMP:Q} 44CONFIGURE_ARGS+= --with-tmpdir=${AMANDA_TMP:Q}
45CONFIGURE_ARGS+= --with-gnutar-listdir=${AMANDA_VAR:Q}/gnutar-lists 45CONFIGURE_ARGS+= --with-gnutar-listdir=${AMANDA_VAR:Q}/gnutar-lists
46CONFIGURE_ARGS+= --with-debugging=${VARBASE:Q}/log/amanda 46CONFIGURE_ARGS+= --with-debugging=${VARBASE:Q}/log/amanda
47CONFIGURE_ARGS+= --with-user=${AMANDA_USER:Q} 47CONFIGURE_ARGS+= --with-user=${AMANDA_USER:Q}
48CONFIGURE_ARGS+= --with-group=${AMANDA_GROUP:Q} 48CONFIGURE_ARGS+= --with-group=${AMANDA_GROUP:Q}
49CONFIGURE_ARGS+= --with-owner=${REAL_ROOT_USER:Q} 49CONFIGURE_ARGS+= --with-owner=${REAL_ROOT_USER:Q}
50CONFIGURE_ARGS+= --with-mmap 50CONFIGURE_ARGS+= --with-mmap
51CONFIGURE_ARGS+= --with-index-server=localhost 51CONFIGURE_ARGS+= --with-index-server=localhost
52CONFIGURE_ARGS+= --with-tape-server=localhost 52CONFIGURE_ARGS+= --with-tape-server=localhost
53CONFIGURE_ARGS+= --with-assertions 53CONFIGURE_ARGS+= --with-assertions
54CONFIGURE_ARGS+= --with-amandahosts 54CONFIGURE_ARGS+= --with-amandahosts
55CONFIGURE_ARGS+= --with-bsd-security 55CONFIGURE_ARGS+= --with-bsd-security
56CONFIGURE_ARGS+= --with-bsdtcp-security 56CONFIGURE_ARGS+= --with-bsdtcp-security
57CONFIGURE_ARGS+= --with-bsdudp-security 57CONFIGURE_ARGS+= --with-bsdudp-security
58CONFIGURE_ARGS+= --with-dump-honor-nodump 58CONFIGURE_ARGS+= --with-dump-honor-nodump
59 59
60.include "../../sysutils/amanda-common/options.mk" 60.include "../../sysutils/amanda-common/options.mk"