From 83e5f05a9f332bc667f3deb3731edc1fb8244685 Mon Sep 17 00:00:00 2001 From: cjones Date: Tue, 16 Jan 2001 21:59:29 +0000 Subject: Upgrade of the amanda packages from 2.4.1p1 to 2.4.2. --- sysutils/amanda-plot/Makefile | 11 ++++++----- sysutils/amanda-plot/files/md5 | 4 ++-- sysutils/amanda-plot/files/patch-sum | 8 ++++---- sysutils/amanda-plot/patches/patch-aa | 19 +++++++----------- sysutils/amanda-plot/patches/patch-ab | 37 +++++++++++++++++++++++------------ sysutils/amanda-plot/patches/patch-ac | 28 ++++++++++++-------------- sysutils/amanda-plot/pkg/DESCR | 9 +++++---- 7 files changed, 61 insertions(+), 55 deletions(-) (limited to 'sysutils/amanda-plot') diff --git a/sysutils/amanda-plot/Makefile b/sysutils/amanda-plot/Makefile index 797c1e04ecb..9a13c5a37b0 100644 --- a/sysutils/amanda-plot/Makefile +++ b/sysutils/amanda-plot/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.2 1999/09/06 19:30:20 bad Exp $ +# $NetBSD: Makefile,v 1.3 2001/01/16 21:59:32 cjones Exp $ # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp # -DISTNAME= amanda-2.4.1p1 -PKGNAME= amanda-plot-2.4.1p1 +DISTNAME= amanda-2.4.2 +PKGNAME= amanda-plot-2.4.2 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.cs.umd.edu/pub/amanda/ @@ -11,14 +11,15 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.amanda.org/ DEPENDS+= gnuplot-3.7:../../graphics/gnuplot -DEPENDS+= amanda-server-2.4.1p1:../../sysutils/amanda-server +DEPENDS+= amanda-server-2.4.2:../../sysutils/amanda-server USE_X11= yes .include "../../mk/bsd.prefs.mk" .include "../../sysutils/amanda-common/Makefile.common" -CONFIGURE_ARGS+= --without-client --without-restore +CONFIGURE_ARGS+= --without-client --without-restore \ + --without-restore --without-amrecover CONFIGURE_ENV+= GNUPLOT="${LOCALBASE}/gnuplot" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/amanda-plot/files/md5 b/sysutils/amanda-plot/files/md5 index 09681483d1c..6ffd3e99c27 100644 --- a/sysutils/amanda-plot/files/md5 +++ b/sysutils/amanda-plot/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 1999/09/06 18:11:23 bad Exp $ +$NetBSD: md5,v 1.2 2001/01/16 21:59:32 cjones Exp $ -MD5 (amanda-2.4.1p1.tar.gz) = 13f34dc97c35f85f88e54ca25b2009ed +MD5 (amanda-2.4.2.tar.gz) = b10c0ada724694d0bbc46a0d3ebee3c9 diff --git a/sysutils/amanda-plot/files/patch-sum b/sysutils/amanda-plot/files/patch-sum index bd745babb49..656a1393b66 100644 --- a/sysutils/amanda-plot/files/patch-sum +++ b/sysutils/amanda-plot/files/patch-sum @@ -1,5 +1,5 @@ -$NetBSD: patch-sum,v 1.2 1999/09/06 18:13:46 bad Exp $ +$NetBSD: patch-sum,v 1.3 2001/01/16 21:59:33 cjones Exp $ -MD5 (patch-aa) = 2c6f6d14adffe3ad55a9cec566a91125 -MD5 (patch-ab) = c01bd9611048b06decca26e773df572f -MD5 (patch-ac) = c2bfa675b407558e3a0ea1cfd9e2ccda +MD5 (patch-aa) = 4d879cd2f155873ded3f7c16d92c10b2 +MD5 (patch-ab) = f7ecfd02cf176b3ac57d1849305dc2ac +MD5 (patch-ac) = b9b2de429e5d82b8851949ce95c66133 diff --git a/sysutils/amanda-plot/patches/patch-aa b/sysutils/amanda-plot/patches/patch-aa index 821f4b8ff38..e3e11acd54e 100644 --- a/sysutils/amanda-plot/patches/patch-aa +++ b/sysutils/amanda-plot/patches/patch-aa @@ -1,19 +1,14 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/09/06 18:11:22 bad Exp $ +$NetBSD: patch-aa,v 1.2 2001/01/16 21:59:33 cjones Exp $ ---- configure.orig Sat Nov 21 18:12:59 1998 -+++ configure Sat Sep 4 03:35:27 1999 -@@ -4457,6 +4457,7 @@ - echo "$ac_t""no" 1>&6 - fi +--- configure~ Sat Nov 25 06:59:40 2000 ++++ configure Mon Jan 15 16:27:32 2001 +@@ -4924,8 +4924,10 @@ + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh" -+if false; then ++if false ; then # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' - -@@ -4502,6 +4503,7 @@ - ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ - $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ - || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } +fi # Redirect the config.log output again, so that the ltconfig log is not diff --git a/sysutils/amanda-plot/patches/patch-ab b/sysutils/amanda-plot/patches/patch-ab index 7c8bebf1f5c..14d42e4a129 100644 --- a/sysutils/amanda-plot/patches/patch-ab +++ b/sysutils/amanda-plot/patches/patch-ab @@ -1,16 +1,27 @@ -$NetBSD: patch-ab,v 1.1.1.1 1999/09/06 18:11:22 bad Exp $ +$NetBSD: patch-ab,v 1.2 2001/01/16 21:59:33 cjones Exp $ ---- Makefile.in.orig Sat Nov 21 18:32:54 1998 -+++ Makefile.in Sat Sep 4 02:53:32 1999 -@@ -157,10 +157,7 @@ - AUTOCONF = @AUTOCONF@ --localdir=config +--- Makefile.in.orig Sat Nov 25 07:01:53 2000 ++++ Makefile.in Mon Jan 15 16:32:14 2001 +@@ -162,20 +162,14 @@ + # order is significant, don't change it arbitrarily + SUBDIRS = \ + config \ +- common-src \ + $(CLIENT_SUBDIRS) \ +- $(TAPE_SUBDIRS) \ +- $(SERVER_SUBDIRS) \ + $(RESTORE_SUBDIRS) \ + $(RECOVER_SUBDIRS) \ + $(PLOT_SUBDIRS) \ +- man docs example ++ man - SUBDIRS=config \ -- common-src client-src tape-src \ -- server-src restore-src recover-src \ -- changer-src amplot man \ -- example -+ amplot man - EXTRA_DIST = \ - COPYRIGHT \ +-pkgdata_DATA = \ +- COPYRIGHT \ +- COPYRIGHT-APACHE \ +- COPYRIGHT-REGEX ++pkgdata_DATA = + + + EXTRA_DIST = $(SNAPSHOT_STAMP) \ diff --git a/sysutils/amanda-plot/patches/patch-ac b/sysutils/amanda-plot/patches/patch-ac index ac74211149d..8bd4ac39014 100644 --- a/sysutils/amanda-plot/patches/patch-ac +++ b/sysutils/amanda-plot/patches/patch-ac @@ -1,19 +1,17 @@ -$NetBSD: patch-ac,v 1.1.1.1 1999/09/06 18:11:22 bad Exp $ +$NetBSD: patch-ac,v 1.2 2001/01/16 21:59:33 cjones Exp $ ---- man/Makefile.in.orig Sat Nov 21 18:34:50 1998 -+++ man/Makefile.in Sat Sep 4 02:58:45 1999 -@@ -158,12 +158,8 @@ - - transform = s,x,x,; +--- man/Makefile.in~ Sat Nov 25 07:02:01 2000 ++++ man/Makefile.in Mon Jan 15 16:31:20 2001 +@@ -176,11 +176,7 @@ + # not autoconf-generated: + EXTRA_DIST = amplot.8 amrestore.8 amtape.8 --man_MANS = amadmin.8 amanda.8 amcheck.8 \ -- amcheckdb.8 amcleanup.8 amdump.8 \ -- amflush.8 amlabel.8 amoverview.8 \ -- amplot.8 amrecover.8 amrestore.8 \ -- amrmtape.8 amtape.8 amtoc.8 \ -- amverify.8 amstatus.8 amreport.8 -+man_MANS = \ -+ amplot.8 +-man_MANS = $(AMPLOT_MAN_PAGES) \ +- $(COMMON_MAN_PAGES) \ +- $(SERVER_MAN_PAGES) \ +- $(RECOVER_MAN_PAGES) \ +- $(RESTORE_MAN_PAGES) ++man_MANS = $(AMPLOT_MAN_PAGES) - EXTRA_DIST = amplot.8 amrestore.8 amtape.8 + subdir = man mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs diff --git a/sysutils/amanda-plot/pkg/DESCR b/sysutils/amanda-plot/pkg/DESCR index 447b0759853..4b14085e122 100644 --- a/sysutils/amanda-plot/pkg/DESCR +++ b/sysutils/amanda-plot/pkg/DESCR @@ -96,21 +96,22 @@ Amanda should run on any modern Unix system that supports dump or GNU tar, has sockets and inetd, and either system V shared memory, or BSD mmap implemented. -In particular, Amanda 2.4.0 has been compiled, and the client side tested +In particular, Amanda 2.4.1p1 has been compiled, and the client side tested on the following systems: AIX 3.2 and 4.1 BSDI BSD/OS 2.1 and 3.1 DEC OSF/1 3.2 and 4.0 FreeBSD 2.2.5 IRIX 5.2 and 6.3 - Linux/GNU on x86, alpha and sparc + GNU/Linux on x86, alpha, sparc, arm and powerpc NetBSD 1.0 Nextstep 3 (*) - SunOS 4.1.x (x >= 1) and 5.[56] + OpenBSD 2.5 x86, sparc, etc (ports available) + SunOS 4.1.x (x >= 1) and 5.[567] Ultrix 4.2 HP-UX 9.x and 10.x (x >= 01) -The Amanda 2.4.0 server side is known to run on all of the other +The Amanda 2.4.1p1 server side is known to run on all of the other machines except on those marked with an asterisk. If you know of any system that is not listed here on which amanda -- cgit v1.2.3