Add a version.mk file with AMANDA_VERSION in it and use that in all amanda

packages (including the meta-package) and in the buildlink.

8 files changed, 26 insertions, 22 deletions

diff --git a/sysutils/amanda-client/Makefile b/sysutils/amanda-client/Makefile
index d4ceb6ad673..bf682a90613 100644
--- a/sysutils/amanda-client/Makefile
+++ b/sysutils/amanda-client/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2012/07/05 06:57:44 sbd Exp $
+# $NetBSD: Makefile,v 1.51 2012/07/30 06:57:21 sbd Exp $
 #
 
-PKGNAME=		amanda-client-${VERS}
+PKGNAME=		amanda-client-${AMANDA_VERSION}
 PKGREVISION=		2
 SVR4_PKGNAME=		amacl
 
diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile
index 49358c502b4..33a311eee0d 100644
--- a/sysutils/amanda-common/Makefile
+++ b/sysutils/amanda-common/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.49 2009/12/22 20:58:54 joerg Exp $
+# $NetBSD: Makefile,v 1.50 2012/07/30 06:57:21 sbd Exp $
 
-PKGNAME=		amanda-common-${VERS}
+PKGNAME=		amanda-common-${AMANDA_VERSION}
 SVR4_PKGNAME=		amaco
 PKGREVISION=		2
 
diff --git a/sysutils/amanda-common/Makefile.common b/sysutils/amanda-common/Makefile.common
index 7d6532bf4fd..d31f37a0202 100644
--- a/sysutils/amanda-common/Makefile.common
+++ b/sysutils/amanda-common/Makefile.common
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile.common,v 1.31 2012/07/19 07:30:55 sbd Exp $
+# $NetBSD: Makefile.common,v 1.32 2012/07/30 06:57:21 sbd Exp $
 
 # used by sysutils/amanda-common/Makefile
 # used by sysutils/amanda-client/Makefile
 # used by sysutils/amanda-server/Makefile
 # used by sysutils/amanda-plot/Makefile
 
-VERS=			2.5.2p1
-DISTNAME?=		amanda-${VERS}
+COMMONDIR=		../../sysutils/amanda-common
+.include		"${COMMONDIR}/version.mk"
+
+DISTNAME=		amanda-${AMANDA_VERSION}
 CATEGORIES=		sysutils
 MASTER_SITES?=		${MASTER_SITE_SOURCEFORGE:=amanda/}
 
diff --git a/sysutils/amanda-common/buildlink3.mk b/sysutils/amanda-common/buildlink3.mk
index aa3f70cdc00..1f22f0ca554 100644
--- a/sysutils/amanda-common/buildlink3.mk
+++ b/sysutils/amanda-common/buildlink3.mk
@@ -1,12 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:23 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2012/07/30 06:57:21 sbd Exp $
 
 BUILDLINK_TREE+=	amanda-common
 
 .if !defined(AMANDA_COMMON_BUILDLINK3_MK)
 AMANDA_COMMON_BUILDLINK3_MK:=
+.include "version.mk"
 
-BUILDLINK_API_DEPENDS.amanda-common+=	amanda-common>=2.5.2p1
-BUILDLINK_ABI_DEPENDS.amanda-common+=	amanda-common>=2.5.2p1
+BUILDLINK_API_DEPENDS.amanda-common+=	amanda-common>=${AMANDA_VERSION}
+BUILDLINK_ABI_DEPENDS.amanda-common+=	amanda-common>=${AMANDA_VERSION}
 BUILDLINK_PKGSRCDIR.amanda-common?=	../../sysutils/amanda-common
 .endif # AMANDA_COMMON_BUILDLINK3_MK
 
diff --git a/sysutils/amanda-common/version.mk b/sysutils/amanda-common/version.mk
new file mode 100644
index 00000000000..2b6ec92d3e4
--- /dev/null
+++ b/sysutils/amanda-common/version.mk
@@ -0,0 +1,2 @@
+# $NetBSD: version.mk,v 1.1 2012/07/30 06:57:21 sbd Exp $
+AMANDA_VERSION=	2.5.2p1
diff --git a/sysutils/amanda-plot/Makefile b/sysutils/amanda-plot/Makefile
index e7f48c598a2..22b666d004d 100644
--- a/sysutils/amanda-plot/Makefile
+++ b/sysutils/amanda-plot/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2010/06/28 10:09:26 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2012/07/30 06:57:22 sbd Exp $
 #
 
-PKGNAME=		amanda-plot-${VERS}
+PKGNAME=		amanda-plot-${AMANDA_VERSION}
 PKGREVISION=		1
 SVR4_PKGNAME=		amapl
 
@@ -10,7 +10,7 @@ COMMENT=		Visualizes the behavior of Amanda, a network backup system
 PKG_DESTDIR_SUPPORT=	destdir
 
 DEPENDS+=		gnuplot>=3.7:../../graphics/gnuplot
-DEPENDS+=		amanda-server-2.5.2p1{,nb[0-9]*}:../../sysutils/amanda-server
+DEPENDS+=		amanda-server-${AMANDA_VERSION}{,nb[0-9]*}:../../sysutils/amanda-server
 
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/sysutils/amanda-server/Makefile b/sysutils/amanda-server/Makefile
index 1b7c236e102..3f6d0400d04 100644
--- a/sysutils/amanda-server/Makefile
+++ b/sysutils/amanda-server/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2012/05/20 11:21:34 sbd Exp $
+# $NetBSD: Makefile,v 1.49 2012/07/30 06:57:22 sbd Exp $
 
-PKGNAME=		amanda-server-${VERS}
+PKGNAME=		amanda-server-${AMANDA_VERSION}
 PKGREVISION=		2
 SVR4_PKGNAME=		amase
 
diff --git a/sysutils/amanda/Makefile b/sysutils/amanda/Makefile
index 2bbdf3048c4..a9a3be88d89 100644
--- a/sysutils/amanda/Makefile
+++ b/sysutils/amanda/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.45 2009/02/24 14:53:08 gdt Exp $
+# $NetBSD: Makefile,v 1.46 2012/07/30 06:57:21 sbd Exp $
 #
 
-# XXX get this from ../../sysutils/amanda-common/Makefile.common
-VERSION=2.5.2p1
+.include	"../../sysutils/amanda-common/version.mk"
 
-DISTNAME=	amanda-${VERSION}
+DISTNAME=	amanda-${AMANDA_VERSION}
 CATEGORIES=	sysutils
 MASTER_SITES=	# empty
 
@@ -17,8 +16,8 @@ META_PACKAGE=	yes
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	amanda-client-${VERSION}{,nb[0-9]*}:../../sysutils/amanda-client
-DEPENDS+=	amanda-server-${VERSION}{,nb[0-9]*}:../../sysutils/amanda-server
-DEPENDS+=	amanda-plot-${VERSION}{,nb[0-9]*}:../../sysutils/amanda-plot
+DEPENDS+=	amanda-client-${AMANDA_VERSION}{,nb[0-9]*}:../../sysutils/amanda-client
+DEPENDS+=	amanda-server-${AMANDA_VERSION}{,nb[0-9]*}:../../sysutils/amanda-server
+DEPENDS+=	amanda-plot-${AMANDA_VERSION}{,nb[0-9]*}:../../sysutils/amanda-plot
 
 .include "../../mk/bsd.pkg.mk"