[pkgsrc/trunk]: pkgsrc/sysutils Prevent paths of the build directories from b...

[seb <seb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/71dbe1bcc42e
branches:  trunk
changeset: 497677:71dbe1bcc42e
user:      seb <seb%pkgsrc.org@localhost>
date:      Tue Aug 02 09:26:06 2005 +0000

description:
Prevent paths of the build directories from being included in all amanda
packages. Set runtime dependencies on GNU tar and gzip for all amanda
packages.

Bump PKGREVISIONs to 1 for amanda-client and amanda-plot, to 2 for
amanda-common and amanda-server.

diffstat:

 sysutils/amanda-client/Makefile        |  8 ++------
 sysutils/amanda-common/Makefile        |  7 ++-----
 sysutils/amanda-common/Makefile.common |  7 ++++++-
 sysutils/amanda-common/buildlink3.mk   |  6 +++---
 sysutils/amanda-plot/Makefile          |  3 ++-
 sysutils/amanda-server/Makefile        |  7 +++----
 6 files changed, 18 insertions(+), 20 deletions(-)

diffs (127 lines):

diff -r 693c3e433052 -r 71dbe1bcc42e sysutils/amanda-client/Makefile
--- a/sysutils/amanda-client/Makefile   Tue Aug 02 08:33:31 2005 +0000
+++ b/sysutils/amanda-client/Makefile   Tue Aug 02 09:26:06 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2005/04/11 21:47:22 tv Exp $
+# $NetBSD: Makefile,v 1.39 2005/08/02 09:26:06 seb Exp $
 #
 
 PKGNAME=               amanda-client-${VERS}
-# PKGREVISION=         1
+PKGREVISION=           1
 SVR4_PKGNAME=          amacl
 
 COMMENT=               Client part of Amanda, a network backup system
@@ -14,10 +14,6 @@
 .include "../../sysutils/amanda-common/buildlink3.mk"
 #.include "../../devel/readline/buildlink3.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 -r 693c3e433052 -r 71dbe1bcc42e sysutils/amanda-common/Makefile
--- a/sysutils/amanda-common/Makefile   Tue Aug 02 08:33:31 2005 +0000
+++ b/sysutils/amanda-common/Makefile   Tue Aug 02 09:26:06 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2005/07/15 22:19:11 kristerw Exp $
+# $NetBSD: Makefile,v 1.35 2005/08/02 09:26:06 seb Exp $
 
 PKGNAME=               amanda-common-${VERS}
-PKGREVISION=           1
+PKGREVISION=           2
 SVR4_PKGNAME=          amaco
 
 COMMENT=               Common libraries and binaries for Amanda
@@ -27,9 +27,6 @@
 CONFIGURE_ENV+=                ac_cv_lib_ncurses_tgetent=no
 CONFIGURE_ENV+=                ac_cv_lib_readline_readline=no
 
-CONFIGURE_ENV+=                GNUTAR=${TOOLS_TAR}
-USE_TOOLS+=            tar
-
 PKG_GROUPS=            ${AMANDA_GROUP}
 PKG_USERS=             ${AMANDA_USER}:${AMANDA_GROUP}::Amanda\\ user::${SH}
 
diff -r 693c3e433052 -r 71dbe1bcc42e sysutils/amanda-common/Makefile.common
--- a/sysutils/amanda-common/Makefile.common    Tue Aug 02 08:33:31 2005 +0000
+++ b/sysutils/amanda-common/Makefile.common    Tue Aug 02 09:26:06 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2004/12/28 09:10:50 minskim Exp $
+# $NetBSD: Makefile.common,v 1.17 2005/08/02 09:26:06 seb Exp $
 #
 # common make file fragment shared by all amanda-* pkgs.
 #
@@ -28,6 +28,11 @@
 USE_LIBTOOL=           yes
 LTCONFIG_OVERRIDE=     ${WRKSRC}/config/ltconfig
 
+USE_TOOLS+=            gzip:run gtar:run
+CONFIGURE_ENV+=                ac_cv_path_GZIP=${TOOLS_GZIP_CMD}
+CONFIGURE_ENV+=                GNUTAR=${TOOLS_GTAR}
+TOOLS_DEPENDS.gtar=    {gtar,gtar-base}>=1.12:../../archivers/gtar-base
+
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-user=${AMANDA_USER}
 CONFIGURE_ARGS+=       --with-group=${AMANDA_GROUP}
diff -r 693c3e433052 -r 71dbe1bcc42e sysutils/amanda-common/buildlink3.mk
--- a/sysutils/amanda-common/buildlink3.mk      Tue Aug 02 08:33:31 2005 +0000
+++ b/sysutils/amanda-common/buildlink3.mk      Tue Aug 02 09:26:06 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/11/12 12:13:45 mjl Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2005/08/02 09:26:06 seb Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 AMANDA_COMMON_BUILDLINK3_MK:=  ${AMANDA_COMMON_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=   amanda-common
 
 .if !empty(AMANDA_COMMON_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.amanda-common+=      amanda-common>=2.4.4p4
-BUILDLINK_RECOMMENDED.amanda-common+=  amanda-common>=2.4.4p4
+BUILDLINK_DEPENDS.amanda-common+=      amanda-common>=2.4.4p4nb2
+BUILDLINK_RECOMMENDED.amanda-common+=  amanda-common>=2.4.4p4nb2
 BUILDLINK_PKGSRCDIR.amanda-common?=    ../../sysutils/amanda-common
 .endif # AMANDA_COMMON_BUILDLINK3_MK
 
diff -r 693c3e433052 -r 71dbe1bcc42e sysutils/amanda-plot/Makefile
--- a/sysutils/amanda-plot/Makefile     Tue Aug 02 08:33:31 2005 +0000
+++ b/sysutils/amanda-plot/Makefile     Tue Aug 02 09:26:06 2005 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:47:22 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/08/02 09:26:06 seb Exp $
 #
 
 PKGNAME=               amanda-plot-${VERS}
+PKGREVISION=           1
 SVR4_PKGNAME=          amapl
 
 COMMENT=               Visualizes the behavior of Amanda, a network backup system
diff -r 693c3e433052 -r 71dbe1bcc42e sysutils/amanda-server/Makefile
--- a/sysutils/amanda-server/Makefile   Tue Aug 02 08:33:31 2005 +0000
+++ b/sysutils/amanda-server/Makefile   Tue Aug 02 09:26:06 2005 +0000
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.35 2005/07/24 18:06:44 kristerw Exp $
+# $NetBSD: Makefile,v 1.36 2005/08/02 09:26:06 seb Exp $
 
 PKGNAME=               amanda-server-${VERS}
-PKGREVISION=           1
+PKGREVISION=           2
 SVR4_PKGNAME=          amase
 
 COMMENT=               Server part of Amanda, a network backup system
 
-USE_TOOLS+=            gmake perl:run tar
+USE_TOOLS+=            gmake perl:run
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../sysutils/amanda-common/Makefile.common"
 
 CONFIGURE_ARGS+=       --without-client
-CONFIGURE_ARGS+=       --with-gnutar=${TOOLS_TAR}
 
 # Prevent configure script from finding unnecessary libraries.
 #