pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils Update the amanda packages to 2.4.4p2. From P...
details: https://anonhg.NetBSD.org/pkgsrc/rev/361bd94af474
branches: trunk
changeset: 475223:361bd94af474
user: bouyer <bouyer%pkgsrc.org@localhost>
date: Wed May 12 18:45:25 2004 +0000
description:
Update the amanda packages to 2.4.4p2. From Paul Shupak in pkg/24550,
with some additionnal fixes by me.
diffstat:
sysutils/amanda-client/Makefile | 11 +-
sysutils/amanda-client/PLIST | 6 +-
sysutils/amanda-client/distinfo | 15 +-
sysutils/amanda-client/patches/patch-aa | 45 ++++-
sysutils/amanda-client/patches/patch-ab | 95 +-----------
sysutils/amanda-client/patches/patch-ac | 116 ++++++++++++++-
sysutils/amanda-client/patches/patch-ad | 35 +++-
sysutils/amanda-client/patches/patch-ae | 24 ---
sysutils/amanda-common/Makefile | 9 +-
sysutils/amanda-common/Makefile.common | 10 +-
sysutils/amanda-common/PLIST | 11 +-
sysutils/amanda-common/buildlink3.mk | 4 +-
sysutils/amanda-common/distinfo | 15 +-
sysutils/amanda-common/patches/patch-aa | 24 +-
sysutils/amanda-common/patches/patch-ab | 48 +++---
sysutils/amanda-common/patches/patch-ac | 15 +-
sysutils/amanda-common/patches/patch-ba | 13 -
sysutils/amanda-common/patches/patch-bb | 13 -
sysutils/amanda-plot/Makefile | 8 +-
sysutils/amanda-plot/distinfo | 11 +-
sysutils/amanda-plot/patches/patch-ab | 30 ++-
sysutils/amanda-plot/patches/patch-ac | 18 +-
sysutils/amanda-server/Makefile | 9 +-
sysutils/amanda-server/PLIST | 30 +++-
sysutils/amanda-server/distinfo | 32 +--
sysutils/amanda-server/patches/patch-aa | 183 +++++++++++++++++++++---
sysutils/amanda-server/patches/patch-ab | 37 ++---
sysutils/amanda-server/patches/patch-ac | 44 +++--
sysutils/amanda-server/patches/patch-ad | 184 +-----------------------
sysutils/amanda-server/patches/patch-ae | 43 ++---
sysutils/amanda-server/patches/patch-af | 234 ++++++++++---------------------
sysutils/amanda-server/patches/patch-ag | 60 +++++--
sysutils/amanda-server/patches/patch-ah | 224 ++++++++++++++++++++++++++---
sysutils/amanda-server/patches/patch-ai | 60 ++++---
sysutils/amanda-server/patches/patch-aj | 62 +++++---
sysutils/amanda-server/patches/patch-ak | 21 +-
sysutils/amanda-server/patches/patch-al | 13 -
sysutils/amanda-server/patches/patch-ba | 13 -
sysutils/amanda-server/patches/patch-bb | 13 -
sysutils/amanda-server/patches/patch-bc | 22 ---
sysutils/amanda/Makefile | 10 +-
41 files changed, 966 insertions(+), 904 deletions(-)
diffs (truncated from 2285 to 300 lines):
diff -r ea30c6a7e23b -r 361bd94af474 sysutils/amanda-client/Makefile
--- a/sysutils/amanda-client/Makefile Wed May 12 18:38:07 2004 +0000
+++ b/sysutils/amanda-client/Makefile Wed May 12 18:45:25 2004 +0000
@@ -1,17 +1,12 @@
-# $NetBSD: Makefile,v 1.33 2004/05/04 03:40:50 snj Exp $
+# $NetBSD: Makefile,v 1.34 2004/05/12 18:45:25 bouyer Exp $
#
-DISTNAME= amanda-2.4.2p2
-PKGNAME= amanda-client-2.4.2p2
+PKGNAME= amanda-client-${VERS}
SVR4_PKGNAME= amacl
-CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.cs.umd.edu/pub/amanda/
-MAINTAINER= tech-pkg%NetBSD.org@localhost
-HOMEPAGE= http://www.amanda.org/
COMMENT= Client part of Amanda, a network backup system
-DEPENDS+= amanda-common-2.4.2p2:../../sysutils/amanda-common
+DEPENDS+= amanda-common-2.4.4p2:../../sysutils/amanda-common
USE_BUILDLINK3= yes
GNU_CONFIGURE= yes
diff -r ea30c6a7e23b -r 361bd94af474 sysutils/amanda-client/PLIST
--- a/sysutils/amanda-client/PLIST Wed May 12 18:38:07 2004 +0000
+++ b/sysutils/amanda-client/PLIST Wed May 12 18:45:25 2004 +0000
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:52:47 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/05/12 18:45:25 bouyer Exp $
lib/libamclient.a
lib/libamclient.la
-lib/libamclient-2.4.2p2.so
+lib/libamclient.so
+lib/libamclient-2.4.4p2.so
libexec/amandad
+libexec/amqde
libexec/calcsize
libexec/killpgrp
libexec/patch-system
diff -r ea30c6a7e23b -r 361bd94af474 sysutils/amanda-client/distinfo
--- a/sysutils/amanda-client/distinfo Wed May 12 18:38:07 2004 +0000
+++ b/sysutils/amanda-client/distinfo Wed May 12 18:45:25 2004 +0000
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.4 2001/06/26 03:15:16 christos Exp $
+$NetBSD: distinfo,v 1.5 2004/05/12 18:45:25 bouyer Exp $
-SHA1 (amanda-2.4.2p2.tar.gz) = 721060b1357e9b939d06773f91a20de1d507521b
-Size (amanda-2.4.2p2.tar.gz) = 922404 bytes
-SHA1 (patch-aa) = e4f33a5e1a26d41344e337d046389ab1a748d111
-SHA1 (patch-ab) = 2038d93f6be6258c3432b534de7c6bfd010f7ecc
-SHA1 (patch-ac) = 806cbd9e4fcea98bbba2907e33a7092e2e773c59
-SHA1 (patch-ad) = 3debabdc26ca1f03f6bf8ff32d99d45ee65d5cea
-SHA1 (patch-ae) = 76a6de436b868f424cbc1371fc1cce93cecf5b25
+SHA1 (amanda-2.4.4p2.tar.gz) = c14510260941a3915f4068e6b7e3f91698ab099e
+Size (amanda-2.4.4p2.tar.gz) = 1263075 bytes
+SHA1 (patch-aa) = afe34fae1d76f6adc7a48104a9a30fe12a4de925
+SHA1 (patch-ab) = 87c985ce2195c5305baa8b62f6fee26a07b99bd9
+SHA1 (patch-ac) = 90f21b449315f77f3933e0bf9b6fdd0f21320676
+SHA1 (patch-ad) = fa41e5ec65414bc0c68f51c0b892a374a16351e5
diff -r ea30c6a7e23b -r 361bd94af474 sysutils/amanda-client/patches/patch-aa
--- a/sysutils/amanda-client/patches/patch-aa Wed May 12 18:38:07 2004 +0000
+++ b/sysutils/amanda-client/patches/patch-aa Wed May 12 18:45:25 2004 +0000
@@ -1,15 +1,36 @@
-$NetBSD: patch-aa,v 1.4 2001/01/16 21:59:30 cjones Exp $
+$NetBSD: patch-aa,v 1.5 2004/05/12 18:45:25 bouyer Exp $
---- configure~ Sat Nov 25 06:59:40 2000
-+++ configure Mon Jan 15 16:39:41 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"
+--- Makefile.in.orig 2004-01-08 19:21:29.000000000 +0100
++++ Makefile.in 2004-05-12 15:21:00.000000000 +0200
+@@ -168,20 +168,16 @@
+ # 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
-+if false ; then
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+fi
+
+-pkgdata_DATA = \
+- COPYRIGHT \
+- COPYRIGHT-APACHE \
+- COPYRIGHT-REGEX
++pkgdata_DATA =
+
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
+ EXTRA_DIST = $(SNAPSHOT_STAMP) \
+@@ -506,7 +502,7 @@
+ uninstall: uninstall-recursive
+
+ install-am: all-am
+- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am
+
+ installcheck: installcheck-recursive
+ install-strip:
diff -r ea30c6a7e23b -r 361bd94af474 sysutils/amanda-client/patches/patch-ab
--- a/sysutils/amanda-client/patches/patch-ab Wed May 12 18:38:07 2004 +0000
+++ b/sysutils/amanda-client/patches/patch-ab Wed May 12 18:45:25 2004 +0000
@@ -1,86 +1,15 @@
-$NetBSD: patch-ab,v 1.5 2001/06/26 03:14:11 christos Exp $
+$NetBSD: patch-ab,v 1.6 2004/05/12 18:45:25 bouyer Exp $
---- client-src/Makefile.in.orig Tue Apr 3 15:55:44 2001
-+++ client-src/Makefile.in Mon Jun 25 22:05:53 2001
-@@ -174,7 +174,7 @@
- # routines, and second to pick up any references in the other libraries.
- ###
-
--LDADD = ../common-src/libamanda.$(LIB_EXTENSION) libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
-+LDADD = libamclient.$(LIB_EXTENSION) -lamanda
-
-
- SUFFIXES = .sh .pl
-@@ -228,62 +228,52 @@
+--- man/Makefile.in.orig 2004-01-08 10:23:42.000000000 -0800
++++ man/Makefile.in 2004-02-23 10:00:21.000000000 -0800
+@@ -188,9 +188,7 @@
+ # not autoconf-generated:
+ EXTRA_DIST = amplot.8 amrestore.8 amtape.8 amdd.8 ammt.8
- getfsent_OBJECTS = getfsent.test.$(OBJEXT)
- getfsent_LDADD = $(LDADD)
--getfsent_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
-+getfsent_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- getfsent_LDFLAGS =
- amandad_SOURCES = amandad.c
- amandad_OBJECTS = amandad.$(OBJEXT)
- amandad_LDADD = $(LDADD)
--amandad_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
-+amandad_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- amandad_LDFLAGS =
- calcsize_SOURCES = calcsize.c
- calcsize_OBJECTS = calcsize.$(OBJEXT)
- calcsize_LDADD = $(LDADD)
--calcsize_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
-+calcsize_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- calcsize_LDFLAGS =
- killpgrp_SOURCES = killpgrp.c
- killpgrp_OBJECTS = killpgrp.$(OBJEXT)
- killpgrp_LDADD = $(LDADD)
--killpgrp_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
-+killpgrp_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- killpgrp_LDFLAGS =
- rundump_SOURCES = rundump.c
- rundump_OBJECTS = rundump.$(OBJEXT)
- rundump_LDADD = $(LDADD)
--rundump_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
-+rundump_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- rundump_LDFLAGS =
- runtar_SOURCES = runtar.c
- runtar_OBJECTS = runtar.$(OBJEXT)
- runtar_LDADD = $(LDADD)
--runtar_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
-+runtar_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- runtar_LDFLAGS =
- selfcheck_SOURCES = selfcheck.c
- selfcheck_OBJECTS = selfcheck.$(OBJEXT)
- selfcheck_LDADD = $(LDADD)
--selfcheck_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
-+selfcheck_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- selfcheck_LDFLAGS =
- sendbackup_OBJECTS = sendbackup.$(OBJEXT) sendbackup-dump.$(OBJEXT) \
- sendbackup-gnutar.$(OBJEXT)
- sendbackup_LDADD = $(LDADD)
--sendbackup_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
-+sendbackup_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- sendbackup_LDFLAGS =
- sendsize_SOURCES = sendsize.c
- sendsize_OBJECTS = sendsize.$(OBJEXT)
- sendsize_LDADD = $(LDADD)
--sendsize_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
-+sendsize_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- sendsize_LDFLAGS =
- versionsuffix_SOURCES = versionsuffix.c
- versionsuffix_OBJECTS = versionsuffix.$(OBJEXT)
- versionsuffix_LDADD = $(LDADD)
--versionsuffix_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
-+versionsuffix_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- versionsuffix_LDFLAGS =
- SCRIPTS = $(libexec_SCRIPTS) $(sbin_SCRIPTS)
+-man_MANS = $(AMPLOT_MAN_PAGES) \
+- $(COMMON_MAN_PAGES) \
+- $(SERVER_MAN_PAGES) \
++man_MANS = $(SERVER_MAN_PAGES) \
+ $(RECOVER_MAN_PAGES) \
+ $(RESTORE_MAN_PAGES)
diff -r ea30c6a7e23b -r 361bd94af474 sysutils/amanda-client/patches/patch-ac
--- a/sysutils/amanda-client/patches/patch-ac Wed May 12 18:38:07 2004 +0000
+++ b/sysutils/amanda-client/patches/patch-ac Wed May 12 18:45:25 2004 +0000
@@ -1,17 +1,107 @@
-$NetBSD: patch-ac,v 1.5 2001/06/26 03:14:11 christos Exp $
+$NetBSD: patch-ac,v 1.6 2004/05/12 18:45:25 bouyer Exp $
---- Makefile.in.orig Tue Apr 3 15:55:47 2001
-+++ Makefile.in Mon Jun 25 22:16:50 2001
-@@ -157,10 +157,10 @@
- @WANT_RECOVER_TRUE@RECOVER_SUBDIRS = recover-src
- @WANT_AMPLOT_TRUE@PLOT_SUBDIRS = amplot
- # 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
-+SUBDIRS = config $(CLIENT_SUBDIRS) $(TAPE_SUBDIRS) $(SERVER_SUBDIRS) $(RESTORE_SUBDIRS) $(RECOVER_SUBDIRS) man
+--- client-src/Makefile.in.orig 2004-01-08 10:22:34.000000000 -0800
++++ client-src/Makefile.in 2004-02-23 12:42:44.000000000 -0800
+@@ -184,9 +184,7 @@
+ # need to list libamanda twice here, first to override the system library
+ # routines, and second to pick up any references in the other libraries.
+ ###
+-LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \
+- libamclient.$(LIB_EXTENSION) \
+- ../common-src/libamanda.$(LIB_EXTENSION)
++LDADD = libamclient.$(LIB_EXTENSION) -lamanda
--pkgdata_DATA = COPYRIGHT COPYRIGHT-APACHE COPYRIGHT-REGEX
-+pkgdata_DATA =
+ SUFFIXES = .sh .pl
+@@ -237,80 +235,58 @@
+ amandad_SOURCES = amandad.c
+ amandad_OBJECTS = amandad.$(OBJEXT)
+ amandad_LDADD = $(LDADD)
+-amandad_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
+- libamclient.$(LIB_EXTENSION) \
+- ../common-src/libamanda.$(LIB_EXTENSION)
++amandad_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
+ amandad_LDFLAGS =
+ amqde_SOURCES = amqde.c
+ amqde_OBJECTS = amqde.$(OBJEXT)
+ amqde_LDADD = $(LDADD)
+-amqde_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
+- libamclient.$(LIB_EXTENSION) \
+- ../common-src/libamanda.$(LIB_EXTENSION)
++amqde_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
+ amqde_LDFLAGS =
+ calcsize_SOURCES = calcsize.c
+ calcsize_OBJECTS = calcsize.$(OBJEXT)
+ calcsize_LDADD = $(LDADD)
+-calcsize_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
+- libamclient.$(LIB_EXTENSION) \
+- ../common-src/libamanda.$(LIB_EXTENSION)
++calcsize_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
+ calcsize_LDFLAGS =
+ am_getfsent_OBJECTS = getfsent.test.$(OBJEXT)
+ getfsent_OBJECTS = $(am_getfsent_OBJECTS)
+ getfsent_LDADD = $(LDADD)
+-getfsent_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
+- libamclient.$(LIB_EXTENSION) \
+- ../common-src/libamanda.$(LIB_EXTENSION)
++getfsent_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
+ getfsent_LDFLAGS =
+ killpgrp_SOURCES = killpgrp.c
+ killpgrp_OBJECTS = killpgrp.$(OBJEXT)
+ killpgrp_LDADD = $(LDADD)
+-killpgrp_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
+- libamclient.$(LIB_EXTENSION) \
+- ../common-src/libamanda.$(LIB_EXTENSION)
++killpgrp_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
+ killpgrp_LDFLAGS =
+ rundump_SOURCES = rundump.c
+ rundump_OBJECTS = rundump.$(OBJEXT)
+ rundump_LDADD = $(LDADD)
+-rundump_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
+- libamclient.$(LIB_EXTENSION) \
+- ../common-src/libamanda.$(LIB_EXTENSION)
++rundump_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
+ rundump_LDFLAGS =
+ runtar_SOURCES = runtar.c
+ runtar_OBJECTS = runtar.$(OBJEXT)
+ runtar_LDADD = $(LDADD)
+-runtar_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
+- libamclient.$(LIB_EXTENSION) \
+- ../common-src/libamanda.$(LIB_EXTENSION)
++runtar_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
Home |
Main Index |
Thread Index |
Old Index