Changes to make amanda* work nicely on Linux:

 - do not depend on gtar; GNU/Linux tar is gtar, obviously
 - set AMANDA_GROUP as on NetBSD and Darwin

4 files changed, 19 insertions, 13 deletions

diff --git a/sysutils/amanda-client/Makefile b/sysutils/amanda-client/Makefile
index 68b5cb8af56..436a8c15837 100644
--- a/sysutils/amanda-client/Makefile
+++ b/sysutils/amanda-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2002/06/25 15:42:21 taca Exp $
+# $NetBSD: Makefile,v 1.29 2002/09/05 18:07:52 jschauma Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
 #
 
@@ -12,7 +12,6 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.amanda.org/
 COMMENT=		Client part of Amanda, a network backup system
 
-DEPENDS+=		{gtar,gtar-base}>=1.12:../../archivers/gtar-base
 DEPENDS+=		amanda-common-2.4.2p2:../../sysutils/amanda-common
 
 GNU_CONFIGURE=		yes
@@ -21,6 +20,10 @@ GNU_CONFIGURE=		yes
 .include "../../sysutils/amanda-common/Makefile.common"
 .include "../../devel/readline/buildlink.mk"
 
+.if ${OPSYS} != "Linux"
+DEPENDS+=		{gtar,gtar-base}>=1.12:../../archivers/gtar-base
+.endif
+
 CONFIGURE_ARGS+=	--without-server --without-restore
 
 # Prevent configure script from finding unnecessary libraries.  We'll patch
diff --git a/sysutils/amanda-common/Makefile.common b/sysutils/amanda-common/Makefile.common
index a42a48ce5e6..61ec3897c3c 100644
--- a/sysutils/amanda-common/Makefile.common
+++ b/sysutils/amanda-common/Makefile.common
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile.common,v 1.8 2002/08/25 21:50:54 jlam Exp $
+# $NetBSD: Makefile.common,v 1.9 2002/09/05 18:07:54 jschauma Exp $
 #
 # common make file fragment shared by all amanda-* pkgs.
 #
 
-.if ${OPSYS} == "NetBSD"
-AMANDA_GROUP?=		operator
-.elif ${OPSYS} == "SunOS"
+.if ${OPSYS} == "SunOS"
 AMANDA_GROUP?=		sysadmin
-.elif ${OPSYS} == "Darwin"
+.else
+# NetBSD, Linux and Darwin
 AMANDA_GROUP?=		operator
 .endif
 
diff --git a/sysutils/amanda-dev-client/Makefile b/sysutils/amanda-dev-client/Makefile
index cf05f421545..431c78234f4 100644
--- a/sysutils/amanda-dev-client/Makefile
+++ b/sysutils/amanda-dev-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/06/25 15:42:21 taca Exp $
+# $NetBSD: Makefile,v 1.3 2002/09/05 18:07:54 jschauma Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
 #
 
@@ -7,7 +7,6 @@ SVR4_PKGNAME=		amacl
 
 COMMENT=		Client part of Amanda, a network backup system
 
-DEPENDS+=		gtar-1.12:../../archivers/gtar
 DEPENDS+=		amanda-common-${VERS}:../../sysutils/amanda-dev-common
 
 GNU_CONFIGURE=		yes
@@ -16,6 +15,10 @@ GNU_CONFIGURE=		yes
 .include "../../sysutils/amanda-dev-common/Makefile.common"
 .include "../../devel/readline/buildlink.mk"
 
+.if ${OPSYS} != "Linux"
+DEPENDS+=		gtar-1.12:../../archivers/gtar
+.endif
+
 CONFIGURE_ARGS+=	--without-server --without-restore
 
 # Prevent configure script from finding unnecessary libraries.  We'll patch
diff --git a/sysutils/amanda-dev-common/Makefile.common b/sysutils/amanda-dev-common/Makefile.common
index b6147f2470e..1223b14f006 100644
--- a/sysutils/amanda-dev-common/Makefile.common
+++ b/sysutils/amanda-dev-common/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $
+# $NetBSD: Makefile.common,v 1.2 2002/09/05 18:07:54 jschauma Exp $
 #
 # common make file fragment shared by all amanda-* pkgs.
 #
@@ -11,10 +11,11 @@ MASTER_SITES?=		http://download.sourceforge.net/amanda/
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.amanda.org/
 
-.if ${OPSYS} == "NetBSD"
-AMANDA_GROUP?=		operator
-.elif ${OPSYS} == "SunOS"
+.if ${OPSYS} == "SunOS"
 AMANDA_GROUP?=		sysadmin
+.else
+# NetBSD, Linux and Darwin
+AMANDA_GROUP?=		operator
 .endif
 
 AMANDA_USER?=		backup