+ 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.diff -r1.54 -r1.55 pkgsrc/sysutils/amanda-common/Makefile
(sbd)
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
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 | |||
3 | PKGNAME= amanda-common-${AMANDA_VERSION} | 3 | PKGNAME= amanda-common-${AMANDA_VERSION} | |
4 | SVR4_PKGNAME= amaco | 4 | SVR4_PKGNAME= amaco | |
5 | PKGREVISION= 2 | 5 | PKGREVISION= 2 | |
6 | 6 | |||
7 | COMMENT= Common libraries and binaries for Amanda | 7 | COMMENT= Common libraries and binaries for Amanda | |
8 | 8 | |||
9 | PKG_DESTDIR_SUPPORT= user-destdir | 9 | PKG_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" | |
14 | CPPFLAGS+= -D_LARGEFILE64_SOURCE | 14 | CPPFLAGS+= -D_LARGEFILE64_SOURCE | |
@@ -17,23 +17,24 @@ CPPFLAGS+= -D_LARGEFILE64_SOURCE | @@ -17,23 +17,24 @@ CPPFLAGS+= -D_LARGEFILE64_SOURCE | |||
17 | CONFIGURE_ARGS+= --without-server --without-client --without-gnuplot | 17 | CONFIGURE_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 | # | |
21 | CONFIGURE_ENV+= ac_cv_lib_intl_main=no | 21 | CONFIGURE_ENV+= ac_cv_lib_intl_main=no | |
22 | CONFIGURE_ENV+= ac_cv_lib_termcap_tgetent=no | 22 | CONFIGURE_ENV+= ac_cv_lib_termcap_tgetent=no | |
23 | CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no | 23 | CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no | |
24 | CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no | 24 | CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no | |
25 | CONFIGURE_ENV+= ac_cv_lib_readline_readline=no | 25 | CONFIGURE_ENV+= ac_cv_lib_readline_readline=no | |
26 | 26 | |||
27 | PKG_GROUPS= ${AMANDA_GROUP} | 27 | PKG_GROUPS= ${AMANDA_GROUP} | |
28 | PKG_USERS= ${AMANDA_USER}:${AMANDA_GROUP} | 28 | PKG_USERS= ${AMANDA_USER}:${AMANDA_GROUP} | |
29 | 29 | |||
30 | PKG_GECOS.${AMANDA_USER}= Amanda pseudo-user | 30 | PKG_GECOS.${AMANDA_USER}= Amanda backup user | |
31 | PKG_SHELL.${AMANDA_USER}= ${SH} | 31 | PKG_SHELL.${AMANDA_USER}= ${SH} | |
32 | PKG_HOME.${AMANDA_USER}= ${AMANDA_VAR} | |||
32 | 33 | |||
33 | OWN_DIRS_PERMS= ${AMANDA_VAR} ${AMANDA_USER} ${AMANDA_GROUP} 0750 | 34 | OWN_DIRS_PERMS= ${AMANDA_VAR} ${AMANDA_USER} ${AMANDA_GROUP} 0750 | |
34 | OWN_DIRS_PERMS+= ${AMANDA_VAR}/gnutar-lists ${AMANDA_USER} ${AMANDA_GROUP} 0750 | 35 | OWN_DIRS_PERMS+= ${AMANDA_VAR}/gnutar-lists ${AMANDA_USER} ${AMANDA_GROUP} 0750 | |
35 | OWN_DIRS_PERMS+= ${VARBASE}/log/amanda ${AMANDA_USER} ${AMANDA_GROUP} 0750 | 36 | OWN_DIRS_PERMS+= ${VARBASE}/log/amanda ${AMANDA_USER} ${AMANDA_GROUP} 0750 | |
36 | 37 | |||
37 | INSTALL_MAKE_FLAGS+= SETUID_GROUP=${ROOT_GROUP} | 38 | INSTALL_MAKE_FLAGS+= SETUID_GROUP=${ROOT_GROUP} | |
38 | 39 | |||
39 | .include "../../mk/bsd.pkg.mk" | 40 | .include "../../mk/bsd.pkg.mk" |
@@ -1,41 +1,41 @@ | @@ -1,41 +1,41 @@ | |||
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 | |||
8 | COMMONDIR= ../../sysutils/amanda-common | 8 | COMMONDIR= ../../sysutils/amanda-common | |
9 | .include "${COMMONDIR}/version.mk" | 9 | .include "${COMMONDIR}/version.mk" | |
10 | 10 | |||
11 | DISTNAME= amanda-${AMANDA_VERSION} | 11 | DISTNAME= amanda-${AMANDA_VERSION} | |
12 | CATEGORIES= sysutils | 12 | CATEGORIES= sysutils | |
13 | MASTER_SITES?= ${MASTER_SITE_SOURCEFORGE:=amanda/} | 13 | MASTER_SITES?= ${MASTER_SITE_SOURCEFORGE:=amanda/} | |
14 | 14 | |||
15 | MAINTAINER= pkgsrc-users@NetBSD.org | 15 | MAINTAINER= pkgsrc-users@NetBSD.org | |
16 | HOMEPAGE= http://www.amanda.org/ | 16 | HOMEPAGE= http://www.amanda.org/ | |
17 | LICENSE= modified-bsd AND gnu-gpl-v2 | 17 | LICENSE= 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" | |
22 | AMANDA_GROUP?= sysadmin | 22 | AMANDA_GROUP?= sysadmin | |
23 | .else | 23 | .else | |
24 | # NetBSD, Linux and Darwin | 24 | # NetBSD, Linux and Darwin | |
25 | AMANDA_GROUP?= operator | 25 | AMANDA_GROUP?= operator | |
26 | .endif | 26 | .endif | |
27 | 27 | |||
28 | AMANDA_USER?= backup | 28 | AMANDA_USER?= amandabackup | |
29 | AMANDA_TMP?= /tmp/amanda | 29 | AMANDA_TMP?= /tmp/amanda | |
30 | AMANDA_VAR?= ${VARBASE}/amanda | 30 | AMANDA_VAR?= ${VARBASE}/amanda | |
31 | 31 | |||
32 | PKG_GROUPS_VARS+= AMANDA_GROUP | 32 | PKG_GROUPS_VARS+= AMANDA_GROUP | |
33 | PKG_USERS_VARS+= AMANDA_USER | 33 | PKG_USERS_VARS+= AMANDA_USER | |
34 | BUILD_DEFS+= AMANDA_TMP AMANDA_USER AMANDA_GROUP AMANDA_VAR VARBASE | 34 | BUILD_DEFS+= AMANDA_TMP AMANDA_USER AMANDA_GROUP AMANDA_VAR VARBASE | |
35 | 35 | |||
36 | USE_LIBTOOL= yes | 36 | USE_LIBTOOL= yes | |
37 | USE_TOOLS+= gzip:run gtar:run | 37 | USE_TOOLS+= gzip:run gtar:run | |
38 | 38 | |||
39 | GNU_CONFIGURE= yes | 39 | GNU_CONFIGURE= yes | |
40 | CONFIGURE_ENV+= ac_cv_path_GZIP=${TOOLS_GZIP_CMD:Q} | 40 | CONFIGURE_ENV+= ac_cv_path_GZIP=${TOOLS_GZIP_CMD:Q} | |
41 | CONFIGURE_ENV+= GNUTAR=${TOOLS_GTAR:Q} | 41 | CONFIGURE_ENV+= GNUTAR=${TOOLS_GTAR:Q} |