diff options
| author | agc <agc@pkgsrc.org> | 1999-04-21 14:14:32 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 1999-04-21 14:14:32 +0000 |
| commit | 0cc1018e6ba7a8995e0cfc36b2418ba6690f5e24 (patch) | |
| tree | b6d2695718a8d13f1a3bbaf745692067f5ea76ac /sysutils/amanda-common | |
| parent | 2ad58442ab9bd500a6f2d916fb5ec78622fc71ef (diff) | |
| download | pkgsrc-0cc1018e6ba7a8995e0cfc36b2418ba6690f5e24.tar.gz | |
Fix for correct operation on Solaris.
Diffstat (limited to 'sysutils/amanda-common')
| -rw-r--r-- | sysutils/amanda-common/Makefile | 21 | ||||
| -rw-r--r-- | sysutils/amanda-common/patches/patch-ad | 22 |
2 files changed, 39 insertions, 4 deletions
diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile index f5ddd51653c..fc8fd8e1e70 100644 --- a/sysutils/amanda-common/Makefile +++ b/sysutils/amanda-common/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 1999/04/04 23:34:45 tron Exp $ +# $NetBSD: Makefile,v 1.4 1999/04/21 14:14:32 agc Exp $ # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp # @@ -10,11 +10,19 @@ MASTER_SITES= ftp://ftp.cs.umd.edu/pub/amanda/ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.amanda.org/ +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "NetBSD" DEPENDS+= addnerd-1.6:../../sysutils/addnerd +ADDUSER_PROG= addnerd +AMANDA_GROUP= operator +.elif ${OPSYS} == "SunOS" +ADDUSER_PROG= useradd +MAKE_ENV+= CPPFLAGS=-D_LARGEFILE64_SOURCE +AMANDA_GROUP= sysadmin +.endif -.include "../../mk/bsd.prefs.mk" AMANDA_USER?= backup -AMANDA_GROUP= operator AMANDA_VAR?= /var/amanda USE_LIBTOOL= yes @@ -31,8 +39,13 @@ CONFIGURE_ARGS+= --with-user=${AMANDA_USER} \ --without-server --without-restore --without-client CONFIGURE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}" +CPPFLAGS= pre-install: - @${SETENV} ${MAKE_ENV} addnerd -g ${AMANDA_GROUP} ${AMANDA_USER} + case `${GREP} -c '^${AMANDA_USER}:' /etc/passwd || ${TRUE}` in \ + 0) \ + ${SETENV} ${MAKE_ENV} ${ADDUSER_PROG} -g ${AMANDA_GROUP} ${AMANDA_USER} \ + ;; \ + esac .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/amanda-common/patches/patch-ad b/sysutils/amanda-common/patches/patch-ad new file mode 100644 index 00000000000..1318d6dc0d9 --- /dev/null +++ b/sysutils/amanda-common/patches/patch-ad @@ -0,0 +1,22 @@ +$NetBSD: patch-ad,v 1.1 1999/04/21 14:14:33 agc Exp $ + +Use the correct name for the statvfs struct. + +--- common-src/statfs.c 1999/04/21 13:24:31 1.1 ++++ common-src/statfs.c 1999/04/21 13:47:22 +@@ -55,7 +55,15 @@ + */ + # include <sys/statvfs.h> + # define STATFS_TYP "SVR4 (Irix-5, Solaris-2)" ++#if defined(__sun__) && defined(__svr4__) ++#if defined(_LARGEFILE64_SOURCE) ++# define STATFS_STRUCT statvfs64_t ++#else ++# define STATFS_STRUCT statvfs_t ++#endif /* largefile source */ ++#else + # define STATFS_STRUCT struct statvfs ++#endif /* !Solaris */ + # define STATFS_TOTAL(buf) (buf).f_blocks + # define STATFS_AVAIL(buf) (buf).f_bavail + # define STATFS_FREE(buf) (buf).f_bfree |