Split out the common code in the amanda make files into

amanda-common/Makefile.common.

5 files changed, 37 insertions, 82 deletions

diff --git a/sysutils/amanda-client/Makefile b/sysutils/amanda-client/Makefile
index fc1d35befe4..fe91e30e7b9 100644
--- a/sysutils/amanda-client/Makefile
+++ b/sysutils/amanda-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1999/09/04 01:08:53 bad Exp $
+# $NetBSD: Makefile,v 1.11 1999/09/06 19:30:19 bad Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
 #
 
@@ -18,26 +18,9 @@ USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
 .include "../../mk/bsd.prefs.mk"
+.include "../../sysutils/amanda-common/Makefile.common"
 
-.if ${OPSYS} == "NetBSD"
-AMANDA_GROUP=		operator
-.elif ${OPSYS} == "SunOS"
-AMANDA_GROUP=		sysadmin
-.endif
-
-AMANDA_USER?=		backup
-AMANDA_VAR?=		/var/amanda
-
-CONFIGURE_ARGS+=	--with-user=${AMANDA_USER} \
-			--with-group=${AMANDA_GROUP} \
-			--with-owner=root \
-			--with-mmap --with-amandahosts \
-			--with-includes=${PREFIX}/include \
-			--with-libraries=${PREFIX}/lib \
-			--localstatedir=${AMANDA_VAR} \
-			--with-gnutar-listdir=${AMANDA_VAR}/gnutar-lists \
-			--with-dump-honor-nodump \
-			--without-server --without-restore
+CONFIGURE_ARGS+=	--without-server --without-restore
 
 BUILD_DEFS+=		AMANDA_USER AMANDA_SMB AMANDA_VAR
 
diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile
index 2596668aa79..130ee3267c2 100644
--- a/sysutils/amanda-common/Makefile
+++ b/sysutils/amanda-common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/08/20 06:21:29 garbled Exp $
+# $NetBSD: Makefile,v 1.8 1999/09/06 19:30:20 bad Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
 #
 
@@ -11,32 +11,17 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.amanda.org/
 
 .include "../../mk/bsd.prefs.mk"
+.include "../../sysutils/amanda-common/Makefile.common"
 
 .if ${OPSYS} == "NetBSD"
 DEPENDS+=		addnerd-1.6:../../sysutils/addnerd
 ADDUSER_PROG=		${PREFIX}/sbin/addnerd
-AMANDA_GROUP=		operator
 .elif ${OPSYS} == "SunOS"
 ADDUSER_PROG=		useradd
 MAKE_ENV+=		CPPFLAGS=-D_LARGEFILE64_SOURCE
-AMANDA_GROUP=		sysadmin
 .endif
 
-AMANDA_USER?=		backup
-AMANDA_VAR?=		/var/amanda
-
-USE_LIBTOOL=		yes
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-user=${AMANDA_USER} \
-			--with-group=${AMANDA_GROUP} \
-			--with-owner=root \
-			--with-mmap --with-amandahosts \
-			--with-includes=${PREFIX}/include \
-			--with-libraries=${PREFIX}/lib \
-			--localstatedir=${AMANDA_VAR} \
-			--with-gnutar-listdir=${AMANDA_VAR}/gnutar-lists \
-			--with-dump-honor-nodump \
-			--without-server --without-restore --without-client
+CONFIGURE_ARGS+=	--without-server --without-restore --without-client
 
 CPPFLAGS=		
 
diff --git a/sysutils/amanda-common/Makefile.common b/sysutils/amanda-common/Makefile.common
new file mode 100644
index 00000000000..9fd4b9192c9
--- /dev/null
+++ b/sysutils/amanda-common/Makefile.common
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile.common,v 1.1 1999/09/06 19:30:20 bad Exp $
+#
+# common make file fragment shared by all amanda-* pkgs.
+#
+
+.if ${OPSYS} == "NetBSD"
+AMANDA_GROUP=		operator
+.elif ${OPSYS} == "SunOS"
+AMANDA_GROUP=		sysadmin
+.endif
+
+AMANDA_USER?=		backup
+AMANDA_VAR?=		/var/amanda
+
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-user=${AMANDA_USER} \
+			--with-group=${AMANDA_GROUP} \
+			--with-owner=root \
+			--with-mmap --with-amandahosts \
+			--with-includes=${PREFIX}/include \
+			--with-libraries=${PREFIX}/lib \
+			--localstatedir=${AMANDA_VAR} \
+			--with-gnutar-listdir=${AMANDA_VAR}/gnutar-lists \
+			--with-dump-honor-nodump
diff --git a/sysutils/amanda-plot/Makefile b/sysutils/amanda-plot/Makefile
index 9851aaee3cc..797c1e04ecb 100644
--- a/sysutils/amanda-plot/Makefile
+++ b/sysutils/amanda-plot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/09/06 18:11:22 bad Exp $
+# $NetBSD: Makefile,v 1.2 1999/09/06 19:30:20 bad Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
 #
 
@@ -16,28 +16,9 @@ DEPENDS+=		amanda-server-2.4.1p1:../../sysutils/amanda-server
 USE_X11=		yes
 
 .include "../../mk/bsd.prefs.mk"
+.include "../../sysutils/amanda-common/Makefile.common"
 
-.if ${OPSYS} == "NetBSD"
-AMANDA_GROUP=		operator
-.elif ${OPSYS} == "SunOS"
-AMANDA_GROUP=		sysadmin
-.endif
-
-AMANDA_USER?=		backup
-AMANDA_VAR?=		/var/amanda
-
-USE_LIBTOOL=		yes
-GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--without-client --without-restore
 CONFIGURE_ENV+=		GNUPLOT="${LOCALBASE}/gnuplot"
-CONFIGURE_ARGS+=	--with-user=${AMANDA_USER} \
-			--with-group=${AMANDA_GROUP} \
-			--with-owner=root \
-			--with-mmap --with-amandahosts \
-			--with-includes=${PREFIX}/include \
-			--with-libraries=${PREFIX}/lib \
-			--localstatedir=${AMANDA_VAR} \
-			--with-gnutar-listdir=${AMANDA_VAR}/gnutar-lists \
-			--with-dump-honor-nodump \
-			--without-client
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/amanda-server/Makefile b/sysutils/amanda-server/Makefile
index 991a25fda84..afd701d2e36 100644
--- a/sysutils/amanda-server/Makefile
+++ b/sysutils/amanda-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1999/09/06 18:16:34 bad Exp $
+# $NetBSD: Makefile,v 1.12 1999/09/06 19:30:21 bad Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
 #
 
@@ -17,28 +17,9 @@ USE_X11=		yes
 USE_PERL5=		yes
 
 .include "../../mk/bsd.prefs.mk"
+.include "../../sysutils/amanda-common/Makefile.common"
 
-.if ${OPSYS} == "NetBSD"
-AMANDA_GROUP=		operator
-.elif ${OPSYS} == "SunOS"
-AMANDA_GROUP=		sysadmin
-.endif
-
-AMANDA_USER?=		backup
-AMANDA_VAR?=		/var/amanda
-
-USE_LIBTOOL=		yes
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-user=${AMANDA_USER} \
-			--with-group=${AMANDA_GROUP} \
-			--with-owner=root \
-			--with-mmap --with-amandahosts \
-			--with-includes=${PREFIX}/include \
-			--with-libraries=${PREFIX}/lib \
-			--localstatedir=${AMANDA_VAR} \
-			--with-gnutar-listdir=${AMANDA_VAR}/gnutar-lists \
-			--with-dump-honor-nodump \
-			--without-client
+CONFIGURE_ARGS+=	--without-client
 
 BUILD_DEFS+=		AMANDA_USER AMANDA_SMB AMANDA_VAR