diff options
41 files changed, 967 insertions, 905 deletions
diff --git a/sysutils/amanda-client/Makefile b/sysutils/amanda-client/Makefile index a7e715b860f..4d9e4efeb79 100644 --- a/sysutils/amanda-client/Makefile +++ b/sysutils/amanda-client/Makefile @@ -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 -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 --git a/sysutils/amanda-client/PLIST b/sysutils/amanda-client/PLIST index 3010d9766a7..206ac7c76be 100644 --- a/sysutils/amanda-client/PLIST +++ b/sysutils/amanda-client/PLIST @@ -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 --git a/sysutils/amanda-client/distinfo b/sysutils/amanda-client/distinfo index 5a2baf95a0b..539e585294e 100644 --- a/sysutils/amanda-client/distinfo +++ b/sysutils/amanda-client/distinfo @@ -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 --git a/sysutils/amanda-client/patches/patch-aa b/sysutils/amanda-client/patches/patch-aa index 6df75402b21..ccdc82ce35e 100644 --- a/sysutils/amanda-client/patches/patch-aa +++ b/sysutils/amanda-client/patches/patch-aa @@ -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" - -+if false ; then - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+fi - - # Redirect the config.log output again, so that the ltconfig log is not - # clobbered by the next message. +--- 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 + + +-pkgdata_DATA = \ +- COPYRIGHT \ +- COPYRIGHT-APACHE \ +- COPYRIGHT-REGEX ++pkgdata_DATA = + + + 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 --git a/sysutils/amanda-client/patches/patch-ab b/sysutils/amanda-client/patches/patch-ab index af550f9f6a0..0b4b7d5ba4b 100644 --- a/sysutils/amanda-client/patches/patch-ab +++ b/sysutils/amanda-client/patches/patch-ab @@ -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 @@ - - 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/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 + +-man_MANS = $(AMPLOT_MAN_PAGES) \ +- $(COMMON_MAN_PAGES) \ +- $(SERVER_MAN_PAGES) \ ++man_MANS = $(SERVER_MAN_PAGES) \ + $(RECOVER_MAN_PAGES) \ + $(RESTORE_MAN_PAGES) diff --git a/sysutils/amanda-client/patches/patch-ac b/sysutils/amanda-client/patches/patch-ac index c5740498e6d..cdf70b81f88 100644 --- a/sysutils/amanda-client/patches/patch-ac +++ b/sysutils/amanda-client/patches/patch-ac @@ -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) + 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 = + am_sendbackup_OBJECTS = sendbackup.$(OBJEXT) sendbackup-dump.$(OBJEXT) \ + sendbackup-gnutar.$(OBJEXT) + sendbackup_OBJECTS = $(am_sendbackup_OBJECTS) + 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) - - EXTRA_DIST = $(SNAPSHOT_STAMP) $(pkgdata_DATA) contrib/README contrib/dbbackup.README contrib/dbbackup.ksh contrib/dbbackup.sql contrib/dbbackup.tcl contrib/set_prod_link.pl contrib/sst/Makefile contrib/sst/README contrib/sst/README.Amanda contrib/sst/sst.c contrib/sst/sst.conf contrib/sst/sst_def.h contrib/sst/sstest.c patches/regex-3.6alpha.patch patches/samba-largefs.patch patches/tar-1.12.patch regex-src/COPYRIGHT regex-src/Makefile regex-src/README regex-src/WHATSNEW regex-src/cclass.h regex-src/cname.h regex-src/debug.c regex-src/engine.c regex-src/main.c regex-src/mkh regex-src/regcomp.c regex-src/regerror.c regex-src/regex.3 regex-src/regex.7 regex-src/regex2.h regex-src/regexec.c regex-src/regfree.c regex-src/split.c regex-src/tests regex-src/utils.h regex-src/fake/limits.h regex-src/fake/memmove.c regex-src/fake/stdlib.h diff --git a/sysutils/amanda-client/patches/patch-ad b/sysutils/amanda-client/patches/patch-ad index 74d45935cef..8cb19cd4512 100644 --- a/sysutils/amanda-client/patches/patch-ad +++ b/sysutils/amanda-client/patches/patch-ad @@ -1,13 +1,28 @@ -$NetBSD: patch-ad,v 1.5 2001/06/26 03:14:11 christos Exp $ +$NetBSD: patch-ad,v 1.6 2004/05/12 18:45:25 bouyer Exp $ ---- man/Makefile.in.orig Tue Apr 3 15:55:45 2001 -+++ man/Makefile.in Mon Jun 25 22:09:13 2001 -@@ -159,7 +159,7 @@ - # not autoconf-generated: - EXTRA_DIST = amplot.8 amrestore.8 amtape.8 +--- recover-src/Makefile.in.orig 2004-01-08 10:23:34.000000000 -0800 ++++ recover-src/Makefile.in 2004-02-23 12:49:20.000000000 -0800 +@@ -172,10 +172,9 @@ + # 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) \ +- @LEXLIB@ \ ++LDADD = @LEXLIB@ \ + ../client-src/libamclient.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ ++ -lamanda \ + $(READLINE_LIBS) --man_MANS = $(AMPLOT_MAN_PAGES) $(COMMON_MAN_PAGES) $(SERVER_MAN_PAGES) $(RECOVER_MAN_PAGES) $(RESTORE_MAN_PAGES) -+man_MANS = $(SERVER_MAN_PAGES) $(RECOVER_MAN_PAGES) $(RESTORE_MAN_PAGES) - mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs - CONFIG_HEADER = ../config/config.h +@@ -200,9 +199,7 @@ + uparse.$(OBJEXT) uscan.$(OBJEXT) + amrecover_OBJECTS = $(am_amrecover_OBJECTS) + amrecover_LDADD = $(LDADD) +-amrecover_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- ../client-src/libamclient.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amrecover_DEPENDENCIES = ../client-src/libamclient.$(LIB_EXTENSION) + amrecover_LDFLAGS = + + DEFS = @DEFS@ diff --git a/sysutils/amanda-client/patches/patch-ae b/sysutils/amanda-client/patches/patch-ae deleted file mode 100644 index 72660900711..00000000000 --- a/sysutils/amanda-client/patches/patch-ae +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ae,v 1.6 2001/06/26 03:14:11 christos Exp $ - ---- recover-src/Makefile.in.orig Tue Apr 3 15:55:45 2001 -+++ recover-src/Makefile.in Mon Jun 25 22:23:26 2001 -@@ -159,7 +159,7 @@ - # routines, and second to pick up any references in the other libraries. - ### - --LDADD = ../common-src/libamanda.$(LIB_EXTENSION) @LEXLIB@ ../client-src/libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION) -+LDADD = @LEXLIB@ ../client-src/libamclient.$(LIB_EXTENSION) -lamanda - - - amrecover_SOURCES = amrecover.c display_commands.c extract_list.c help.c set_commands.c uparse.y uscan.l -@@ -183,9 +183,7 @@ - extract_list.$(OBJEXT) help.$(OBJEXT) set_commands.$(OBJEXT) \ - uparse.$(OBJEXT) uscan.$(OBJEXT) - amrecover_LDADD = $(LDADD) --amrecover_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ --../client-src/libamclient.$(LIB_EXTENSION) \ --../common-src/libamanda.$(LIB_EXTENSION) -+amrecover_DEPENDENCIES = ../client-src/libamclient.$(LIB_EXTENSION) - amrecover_LDFLAGS = - LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ - LEXLIB = @LEXLIB@ diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile index 79e6e021cc8..be4496f17c5 100644 --- a/sysutils/amanda-common/Makefile +++ b/sysutils/amanda-common/Makefile @@ -1,15 +1,10 @@ -# $NetBSD: Makefile,v 1.28 2004/05/04 03:40:50 snj Exp $ +# $NetBSD: Makefile,v 1.29 2004/05/12 18:45:25 bouyer Exp $ # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp # -DISTNAME= amanda-2.4.2p2 -PKGNAME= amanda-common-2.4.2p2 +PKGNAME= amanda-common-${VERS} SVR4_PKGNAME= amaco -CATEGORIES= sysutils -MASTER_SITES= ftp://ftp.cs.umd.edu/pub/amanda/ -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://www.amanda.org/ COMMENT= Common libraries and binaries for Amanda USE_BUILDLINK3= YES diff --git a/sysutils/amanda-common/Makefile.common b/sysutils/amanda-common/Makefile.common index 74e3d81b608..52111c31b51 100644 --- a/sysutils/amanda-common/Makefile.common +++ b/sysutils/amanda-common/Makefile.common @@ -1,8 +1,16 @@ -# $NetBSD: Makefile.common,v 1.11 2004/02/14 15:29:15 jlam Exp $ +# $NetBSD: Makefile.common,v 1.12 2004/05/12 18:45:25 bouyer Exp $ # # common make file fragment shared by all amanda-* pkgs. # +VERS= 2.4.4p2 +DISTNAME?= amanda-${VERS} +CATEGORIES= sysutils +MASTER_SITES?= http://download.sourceforge.net/amanda/ + +MAINTAINER= tech-pkg@NetBSD.org +HOMEPAGE= http://www.amanda.org/ + .if ${OPSYS} == "SunOS" AMANDA_GROUP?= sysadmin .else diff --git a/sysutils/amanda-common/PLIST b/sysutils/amanda-common/PLIST index 63ea81f6ffa..e247e8f995a 100644 --- a/sysutils/amanda-common/PLIST +++ b/sysutils/amanda-common/PLIST @@ -1,10 +1,15 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:52:48 zuntum Exp $ -lib/libamanda-2.4.2p2.so +@comment $NetBSD: PLIST,v 1.2 2004/05/12 18:45:25 bouyer Exp $ +lib/libamanda-2.4.4p2.so lib/libamanda.a lib/libamanda.la lib/libamanda.so -lib/libamtape-2.4.2p2.so +lib/libamtape-2.4.4p2.so lib/libamtape.a lib/libamtape.la lib/libamtape.so man/man8/amanda.8 +share/doc/amanda/COPYRIGHT +share/doc/amanda/COPYRIGHT-APACHE +share/doc/amanda/COPYRIGHT-REGEX +@dirrm share/doc/amanda + diff --git a/sysutils/amanda-common/buildlink3.mk b/sysutils/amanda-common/buildlink3.mk index 6febc5c6fb3..502f46973ef 100644 --- a/sysutils/amanda-common/buildlink3.mk +++ b/sysutils/amanda-common/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/05/04 03:40:50 snj Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/05/12 18:45:25 bouyer Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ AMANDA_COMMON_BUILDLINK3_MK:= ${AMANDA_COMMON_BUILDLINK3_MK}+ @@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Namanda-common} BUILDLINK_PACKAGES+= amanda-common .if !empty(AMANDA_COMMON_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.amanda-common+= amanda-common>=2.4.2p2 +BUILDLINK_DEPENDS.amanda-common+= amanda-common>=2.4.4p2 BUILDLINK_PKGSRCDIR.amanda-common?= ../../sysutils/amanda-common .endif # AMANDA_COMMON_BUILDLINK3_MK diff --git a/sysutils/amanda-common/distinfo b/sysutils/amanda-common/distinfo index 795c3682798..08dc8cfd4ad 100644 --- a/sysutils/amanda-common/distinfo +++ b/sysutils/amanda-common/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.3 2001/06/26 03:15:16 christos Exp $ +$NetBSD: distinfo,v 1.4 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) = 2e208f279d4818bd7c4781f9d497a230a45594c7 -SHA1 (patch-ab) = 2049fa69571358e91598bfe257a1a6cff1a493d7 -SHA1 (patch-ac) = 1568881a280e08e4e0bd708234f6bbef04f7f1ed +SHA1 (amanda-2.4.4p2.tar.gz) = c14510260941a3915f4068e6b7e3f91698ab099e +Size (amanda-2.4.4p2.tar.gz) = 1263075 bytes +SHA1 (patch-aa) = 6338b1e138ea34e2f9de27da3edf850c4923df5d +SHA1 (patch-ab) = dae2eedc8672d7137cf528ca5e52462288a7241b +SHA1 (patch-ac) = 481bb5e79f3cc587e90cf872ae05c9b5461e84d4 SHA1 (patch-ad) = 510e650c9e9976323b1d27a7895cee6281b89dcd -SHA1 (patch-ba) = 7c2b47e1239bc2d0e31f8336a85ea058d8fb07b4 -SHA1 (patch-bb) = c8c91b848e669f2ccd3a753cfa7aba64e47d2166 +SHA1 (patch-ae) = 0aaaf8752727ace218668ab0cb14abad6f2e17ca diff --git a/sysutils/amanda-common/patches/patch-aa b/sysutils/amanda-common/patches/patch-aa index f4f596fe002..c9090ae94ef 100644 --- a/sysutils/amanda-common/patches/patch-aa +++ b/sysutils/amanda-common/patches/patch-aa @@ -1,19 +1,17 @@ -$NetBSD: patch-aa,v 1.6 2001/06/26 03:14:12 christos Exp $ +$NetBSD: patch-aa,v 1.7 2004/05/12 18:45:25 bouyer Exp $ ---- client-src/Makefile.in.orig Mon Jun 25 21:44:46 2001 -+++ client-src/Makefile.in Mon Jun 25 22:29:03 2001 -@@ -281,11 +281,10 @@ - sendsize_LDFLAGS = +--- client-src/Makefile.in.orig 2004-01-08 10:22:34.000000000 -0800 ++++ client-src/Makefile.in 2004-02-23 16:26:20.000000000 -0800 +@@ -307,10 +307,8 @@ + sendsize_LDFLAGS = versionsuffix_SOURCES = versionsuffix.c - versionsuffix_OBJECTS = versionsuffix.$(OBJEXT) + versionsuffix_OBJECTS = versionsuffix.$(OBJEXT) -versionsuffix_LDADD = $(LDADD) --versionsuffix_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ --libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION) +-versionsuffix_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamclient.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) +versionsuffix_LDADD = ../common-src/libamanda.$(LIB_EXTENSION) +versionsuffix_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) - versionsuffix_LDFLAGS = --SCRIPTS = $(libexec_SCRIPTS) $(sbin_SCRIPTS) -+SCRIPTS = $(libexec_S:RIPTS) $(sbin_SCRIPTS) + versionsuffix_LDFLAGS = + SCRIPTS = $(libexec_SCRIPTS) $(sbin_SCRIPTS) - CFLAGS = @CFLAGS@ - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/sysutils/amanda-common/patches/patch-ab b/sysutils/amanda-common/patches/patch-ab index 922dee6dd84..c91b5def0b3 100644 --- a/sysutils/amanda-common/patches/patch-ab +++ b/sysutils/amanda-common/patches/patch-ab @@ -1,32 +1,36 @@ -$NetBSD: patch-ab,v 1.5 2001/06/26 03:14:12 christos Exp $ +$NetBSD: patch-ab,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 21:50:51 2001 -@@ -151,11 +151,11 @@ +--- Makefile.in.orig 2004-01-08 10:21:29.000000000 -0800 ++++ Makefile.in 2004-02-23 16:30:27.000000000 -0800 +@@ -33,7 +33,7 @@ + mandir = @mandir@ + includedir = @includedir@ + oldincludedir = /usr/include +-pkgdatadir = $(datadir)/@PACKAGE@ ++pkgdatadir = $(datadir)/doc/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = . +@@ -160,11 +160,11 @@ ACINCLUDE_M4_DEPS = $(ACINCLUDE_M4I) $(LIBTOOL_M4I) @WANT_CLIENT_TRUE@CLIENT_SUBDIRS = client-src -@WANT_TAPE_TRUE@TAPE_SUBDIRS = tape-src +TAPE_SUBDIRS = tape-src @WANT_SERVER_TRUE@SERVER_SUBDIRS = server-src changer-src - @WANT_RESTORE_TRUE@RESTORE_SUBDIRS = restore-src - @WANT_RECOVER_TRUE@RECOVER_SUBDIRS = recover-src --@WANT_AMPLOT_TRUE@PLOT_SUBDIRS = amplot -+# PLOT_SUBDIRS = amplot + @WANT_RESTORE_TRUE@RESTORE_SUBDIRS = restore-src + @WANT_RECOVER_TRUE@RECOVER_SUBDIRS = recover-src +-@WANT_AMPLOT_TRUE@PLOT_SUBDIRS = amplot ++#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 \ +@@ -175,7 +175,7 @@ + $(RESTORE_SUBDIRS) \ + $(RECOVER_SUBDIRS) \ + $(PLOT_SUBDIRS) \ +- man docs example ++ man -@@ -381,11 +381,11 @@ - install-exec-am: - install-exec: install-exec-recursive --install-data-am: install-pkgdataDATA -+#install-data-am: install-pkgdataDATA - install-data: install-data-recursive - - install-am: all-am -- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am - install: install-recursive - uninstall-am: uninstall-pkgdataDATA - uninstall: uninstall-recursive + pkgdata_DATA = \ diff --git a/sysutils/amanda-common/patches/patch-ac b/sysutils/amanda-common/patches/patch-ac index 5d3a9d89c08..6bb89a5211f 100644 --- a/sysutils/amanda-common/patches/patch-ac +++ b/sysutils/amanda-common/patches/patch-ac @@ -1,13 +1,10 @@ -$NetBSD: patch-ac,v 1.5 2001/06/26 03:14:12 christos Exp $ +$NetBSD: patch-ac,v 1.6 2004/05/12 18:45:25 bouyer Exp $ ---- man/Makefile.in.orig Tue Apr 3 15:55:45 2001 -+++ man/Makefile.in Mon Jun 25 21:52:30 2001 -@@ -146,7 +146,7 @@ - - transform = s,x,x,; +--- man/Makefile.in.orig 2004-01-08 10:23:42.000000000 -0800 ++++ man/Makefile.in 2004-02-23 16:32:57.000000000 -0800 +@@ -156,5 +156,5 @@ + am__quote = @am__quote@ + install_sh = @install_sh@ -@WANT_AMPLOT_TRUE@AMPLOT_MAN_PAGES = amplot.8 +#AMPLOT_MAN_PAGES = amplot.8 - - COMMON_MAN_PAGES = amanda.8 - diff --git a/sysutils/amanda-common/patches/patch-ba b/sysutils/amanda-common/patches/patch-ba deleted file mode 100644 index 9cd5764a8de..00000000000 --- a/sysutils/amanda-common/patches/patch-ba +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ba,v 1.1 2001/03/15 20:08:46 mjl Exp $ - ---- common-src/token.h.orig Thu Mar 15 20:30:31 2001 -+++ common-src/token.h Thu Mar 15 20:30:43 2001 -@@ -42,7 +42,7 @@ - extern char *quotef P((char *sep, char *format, ...)); - extern char *quote P((char *sep, char *str)); - extern char *rxquote P((char *str)); --extern char *shquote P((char *str)); -+extern char *am_shquote P((char *str)); - extern int table_lookup P((table_t *table, char *str)); - extern char *table_lookup_r P((table_t *table, int val)); - diff --git a/sysutils/amanda-common/patches/patch-bb b/sysutils/amanda-common/patches/patch-bb deleted file mode 100644 index 51635532dd7..00000000000 --- a/sysutils/amanda-common/patches/patch-bb +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bb,v 1.1 2001/03/15 20:08:46 mjl Exp $ - ---- common-src/token.c.orig Thu Mar 15 20:30:23 2001 -+++ common-src/token.c Thu Mar 15 20:30:56 2001 -@@ -295,7 +295,7 @@ - } - - /* Quote a string so that it can be safely passed to a shell */ --char *shquote(str) -+char *am_shquote(str) - char *str; /* the string to quote */ - { - char *pi, *po; diff --git a/sysutils/amanda-plot/Makefile b/sysutils/amanda-plot/Makefile index 8f1cb1bfaf5..89f894cd34b 100644 --- a/sysutils/amanda-plot/Makefile +++ b/sysutils/amanda-plot/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.14 2004/05/04 03:40:50 snj Exp $ +# $NetBSD: Makefile,v 1.15 2004/05/12 18:45:25 bouyer Exp $ # -DISTNAME= amanda-2.4.2p2 -PKGNAME= amanda-plot-2.4.2p2 +DISTNAME= amanda-2.4.4p2 +PKGNAME= amanda-plot-2.4.4p2 SVR4_PKGNAME= amapl CATEGORIES= sysutils MASTER_SITES= ftp://ftp.cs.umd.edu/pub/amanda/ @@ -12,7 +12,7 @@ HOMEPAGE= http://www.amanda.org/ COMMENT= Visualizes the behavior of Amanda, a network backup system DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot -DEPENDS+= amanda-server-2.4.2p2:../../sysutils/amanda-server +DEPENDS+= amanda-server-2.4.4p2:../../sysutils/amanda-server USE_BUILDLINK3= yes diff --git a/sysutils/amanda-plot/distinfo b/sysutils/amanda-plot/distinfo index 9462569f444..7d70fd73f65 100644 --- a/sysutils/amanda-plot/distinfo +++ b/sysutils/amanda-plot/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.3 2001/06/26 03:15:17 christos Exp $ +$NetBSD: distinfo,v 1.4 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) = 12ff93eea6d9f443ce2f236492d9e0362fd2d9ff -SHA1 (patch-ab) = ff753e70a41d53ce296001a346fd7093312f31b4 -SHA1 (patch-ac) = 74dadd333fefc4d244d50b52b4a16c6b0df1fbba +SHA1 (amanda-2.4.4p2.tar.gz) = c14510260941a3915f4068e6b7e3f91698ab099e +Size (amanda-2.4.4p2.tar.gz) = 1263075 bytes +SHA1 (patch-ab) = c6b1ab0f273a2832abe57b97cb63b96fd76e633d +SHA1 (patch-ac) = 9b4fda0170f16a50220d751f69045c91b1eba4c4 diff --git a/sysutils/amanda-plot/patches/patch-ab b/sysutils/amanda-plot/patches/patch-ab index 43e71f2943e..0166496a270 100644 --- a/sysutils/amanda-plot/patches/patch-ab +++ b/sysutils/amanda-plot/patches/patch-ab @@ -1,17 +1,25 @@ -$NetBSD: patch-ab,v 1.3 2001/06/26 03:14:12 christos Exp $ - ---- Makefile.in.orig Tue Apr 3 15:55:47 2001 -+++ Makefile.in Mon Jun 25 23:00:36 2001 -@@ -157,10 +157,10 @@ - @WANT_RECOVER_TRUE@RECOVER_SUBDIRS = recover-src - @WANT_AMPLOT_TRUE@PLOT_SUBDIRS = amplot +--- Makefile.in.orig 2004-01-08 10:21:29.000000000 -0800 ++++ Makefile.in 2004-02-24 08:26:13.000000000 -0800 +@@ -168,20 +168,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 -+SUBDIRS = config $(CLIENT_SUBDIRS) $(RESTORE_SUBDIRS) $(RECOVER_SUBDIRS) $(PLOT_SUBDIRS) man + SUBDIRS = \ + config \ +- common-src \ + $(CLIENT_SUBDIRS) \ +- $(TAPE_SUBDIRS) \ +- $(SERVER_SUBDIRS) \ + $(RESTORE_SUBDIRS) \ + $(RECOVER_SUBDIRS) \ + $(PLOT_SUBDIRS) \ +- man docs example ++ man --pkgdata_DATA = COPYRIGHT COPYRIGHT-APACHE COPYRIGHT-REGEX +-pkgdata_DATA = \ +- COPYRIGHT \ +- COPYRIGHT-APACHE \ +- COPYRIGHT-REGEX +pkgdata_DATA = - EXTRA_DIST = $(SNAPSHOT_STAMP) $(pkgdata_DATA) contrib/README contrib/dbbackup.README contrib/dbbackup.ksh contrib/dbbackup.sql contrib/dbbackup.tcl contrib/set_prod_link.pl contrib/sst/Makefile contrib/sst/README contrib/sst/README.Amanda contrib/sst/sst.c contrib/sst/sst.conf contrib/sst/sst_def.h contrib/sst/sstest.c patches/regex-3.6alpha.patch patches/samba-largefs.patch patches/tar-1.12.patch regex-src/COPYRIGHT regex-src/Makefile regex-src/README regex-src/WHATSNEW regex-src/cclass.h regex-src/cname.h regex-src/debug.c regex-src/engine.c regex-src/main.c regex-src/mkh regex-src/regcomp.c regex-src/regerror.c regex-src/regex.3 regex-src/regex.7 regex-src/regex2.h regex-src/regexec.c regex-src/regfree.c regex-src/split.c regex-src/tests regex-src/utils.h regex-src/fake/limits.h regex-src/fake/memmove.c regex-src/fake/stdlib.h + EXTRA_DIST = $(SNAPSHOT_STAMP) \ diff --git a/sysutils/amanda-plot/patches/patch-ac b/sysutils/amanda-plot/patches/patch-ac index 540b209692e..fc2b6f214b2 100644 --- a/sysutils/amanda-plot/patches/patch-ac +++ b/sysutils/amanda-plot/patches/patch-ac @@ -1,13 +1,15 @@ -$NetBSD: patch-ac,v 1.3 2001/06/26 03:14:12 christos Exp $ - ---- man/Makefile.in.orig Tue Apr 3 15:55:45 2001 -+++ man/Makefile.in Mon Jun 25 23:02:22 2001 -@@ -159,7 +159,7 @@ +--- man/Makefile.in.orig 2004-01-08 10:23:42.000000000 -0800 ++++ man/Makefile.in 2004-02-24 08:15:51.000000000 -0800 +@@ -188,11 +188,7 @@ # not autoconf-generated: - EXTRA_DIST = amplot.8 amrestore.8 amtape.8 + EXTRA_DIST = amplot.8 amrestore.8 amtape.8 amdd.8 ammt.8 --man_MANS = $(AMPLOT_MAN_PAGES) $(COMMON_MAN_PAGES) $(SERVER_MAN_PAGES) $(RECOVER_MAN_PAGES) $(RESTORE_MAN_PAGES) +-man_MANS = $(AMPLOT_MAN_PAGES) \ +- $(COMMON_MAN_PAGES) \ +- $(SERVER_MAN_PAGES) \ +- $(RECOVER_MAN_PAGES) \ +- $(RESTORE_MAN_PAGES) +man_MANS = $(AMPLOT_MAN_PAGES) + subdir = man mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs - CONFIG_HEADER = ../config/config.h diff --git a/sysutils/amanda-server/Makefile b/sysutils/amanda-server/Makefile index f50792493d7..afde8b991ff 100644 --- a/sysutils/amanda-server/Makefile +++ b/sysutils/amanda-server/Makefile @@ -1,15 +1,10 @@ -# $NetBSD: Makefile,v 1.27 2004/05/04 03:40:50 snj Exp $ +# $NetBSD: Makefile,v 1.28 2004/05/12 18:45:25 bouyer Exp $ # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp # -DISTNAME= amanda-2.4.2p2 -PKGNAME= amanda-server-2.4.2p2 +PKGNAME= amanda-server-${VERS} SVR4_PKGNAME= amase -CATEGORIES= sysutils -MASTER_SITES= ftp://ftp.cs.umd.edu/pub/amanda/ -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://www.amanda.org/ COMMENT= Server part of Amanda, a network backup system USE_PERL5= yes diff --git a/sysutils/amanda-server/PLIST b/sysutils/amanda-server/PLIST index 44ef633fe1e..488398a0206 100644 --- a/sysutils/amanda-server/PLIST +++ b/sysutils/amanda-server/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:52:50 zuntum Exp $ -lib/libamserver-2.4.2p2.so +@comment $NetBSD: PLIST,v 1.2 2004/05/12 18:45:25 bouyer Exp $ +lib/libamserver-2.4.4p2.so lib/libamserver.a lib/libamserver.la lib/libamserver.so @@ -11,9 +11,14 @@ libexec/amtrmidx libexec/amtrmlog libexec/chg-chio libexec/chg-chs +libexec/chg-disk +libexec/chg-juke libexec/chg-manual +libexec/chg-mcutil libexec/chg-mtx libexec/chg-multi +libexec/chg-null +libexec/chg-rait libexec/chg-rth libexec/chg-scsi libexec/chg-zd-mtx @@ -25,45 +30,56 @@ man/man8/amadmin.8 man/man8/amcheck.8 man/man8/amcheckdb.8 man/man8/amcleanup.8 +man/man8/amdd.8 man/man8/amdump.8 man/man8/amflush.8 man/man8/amgetconf.8 man/man8/amlabel.8 +man/man8/ammt.8 man/man8/amoverview.8 man/man8/amreport.8 man/man8/amrestore.8 man/man8/amrmtape.8 man/man8/amstatus.8 man/man8/amtape.8 +man/man8/amtapetype.8 man/man8/amtoc.8 man/man8/amverify.8 +man/man8/amverifyrun.8 sbin/amadmin sbin/amcheck sbin/amcheckdb sbin/amcleanup +sbin/amdd sbin/amdump sbin/amflush sbin/amgetconf sbin/amlabel +sbin/ammt sbin/amoverview sbin/amreport sbin/amrestore sbin/amrmtape sbin/amstatus sbin/amtape +sbin/amtapetype sbin/amtoc sbin/amverify -share/doc/amanda/COPYRIGHT -share/doc/amanda/COPYRIGHT-APACHE -share/doc/amanda/COPYRIGHT-REGEX +sbin/amverifyrun share/doc/amanda/DUMPER-API +share/doc/amanda/EXCLUDE share/doc/amanda/FAQ +share/doc/amanda/HOWTO-AFS +share/doc/amanda/HOWTO-CYGWIN.html +share/doc/amanda/HOWTO-FILE-DRIVER share/doc/amanda/INDEXING share/doc/amanda/INSTALL share/doc/amanda/INTERNALS share/doc/amanda/KERBEROS share/doc/amanda/LABEL.PRINTING share/doc/amanda/MULTITAPE +share/doc/amanda/PORT.USAGE +share/doc/amanda/RAIT share/doc/amanda/RESTORE share/doc/amanda/SAMBA share/doc/amanda/SECURITY @@ -71,10 +87,12 @@ share/doc/amanda/SYSTEM.NOTES share/doc/amanda/TAPE.CHANGERS share/doc/amanda/TAPETYPES share/doc/amanda/UPGRADE +share/doc/amanda/VTAPE-API share/doc/amanda/WHATS.NEW share/doc/amanda/WISHLIST share/doc/amanda/YEAR2000 share/doc/amanda/ZFTAPE +share/doc/amanda/chg-scsi.notes share/examples/amanda/3hole.ps share/examples/amanda/8.5x11.ps share/examples/amanda/DIN-A4.ps @@ -83,9 +101,9 @@ share/examples/amanda/EXB-8500.ps share/examples/amanda/HP-DAT.ps share/examples/amanda/amanda.conf share/examples/amanda/amanda.conf.chg-scsi +share/examples/amanda/chg-mcutil.conf share/examples/amanda/chg-multi.conf share/examples/amanda/chg-scsi.conf share/examples/amanda/config.site share/examples/amanda/disklist @dirrm share/examples/amanda -@dirrm share/doc/amanda diff --git a/sysutils/amanda-server/distinfo b/sysutils/amanda-server/distinfo index be8a4335150..5d8135213d3 100644 --- a/sysutils/amanda-server/distinfo +++ b/sysutils/amanda-server/distinfo @@ -1,19 +1,15 @@ -$NetBSD: distinfo,v 1.4 2002/06/06 01:38:41 simonb 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) = a9ffd6acad2c01da0f4707575ec311a5280bf48d -SHA1 (patch-ab) = 8d99598899b52c9d99994ed831021648fff8a5f9 -SHA1 (patch-ac) = c353f92d692813b81858d55cf55fa28a9ee98355 -SHA1 (patch-ad) = 0ad5ec57b29948ea5b15a43ae2e7a4d3be2a2d40 -SHA1 (patch-ae) = fd831036b9ac3365d304d9e25c0eb1dd515a849e -SHA1 (patch-af) = af41269882c8dfdb45bc177a45aa86122443d8df -SHA1 (patch-ag) = 4397a7c6bde844d80781e1ffd8fb81c289e92fe0 -SHA1 (patch-ah) = ba156adca49704c23d04601c98ed14f3e0b206c1 -SHA1 (patch-ai) = 977d9249db26ecc26bdc0ebf3bd86131132ccda4 -SHA1 (patch-aj) = 912ec89bf8cca2f602a90621dfd818d21145f02b -SHA1 (patch-ak) = d5036ee96d05dce8091209130da1747f0d6e5867 -SHA1 (patch-al) = 44b239e7ecff95472f012a6ee6ac6f5d8a41b62c -SHA1 (patch-ba) = 7c2b47e1239bc2d0e31f8336a85ea058d8fb07b4 -SHA1 (patch-bb) = c8c91b848e669f2ccd3a753cfa7aba64e47d2166 -SHA1 (patch-bc) = a4268be6e5d70963f111de2a58d59417c2b33a0a +SHA1 (amanda-2.4.4p2.tar.gz) = c14510260941a3915f4068e6b7e3f91698ab099e +Size (amanda-2.4.4p2.tar.gz) = 1263075 bytes +SHA1 (patch-aa) = af41269882c8dfdb45bc177a45aa86122443d8df +SHA1 (patch-ab) = 19121fbc6ccc05b6e07c87cdecf0c5e1423b05a5 +SHA1 (patch-ac) = 33283f04b90d8eb7943753a67c9fa62874bedca8 +SHA1 (patch-ad) = dfd33fa33eeb174d63d8f16d5203032c61a0c6d1 +SHA1 (patch-ae) = b8d744633076ed58c6e56afbecee00dd6e66c912 +SHA1 (patch-af) = 31ed247437c974e1c46d1ee45c9e931ec751df76 +SHA1 (patch-ag) = 3b7458cea6c11ff122f32d9205296bf3b82eecd3 +SHA1 (patch-ah) = 7b9d5c44a0f56d6592743c5a1442cfbd5da647a9 +SHA1 (patch-ai) = 1491d8cec537f04f31440f0c8933deec0f6c21cd +SHA1 (patch-aj) = a8b27da285097eb32a60895df2479a77b3dcab05 +SHA1 (patch-ak) = 203723bd242924a1fc10366eae3b1aac86d6886c diff --git a/sysutils/amanda-server/patches/patch-aa b/sysutils/amanda-server/patches/patch-aa index 35ce7e29f3e..9d8cbcd9e30 100644 --- a/sysutils/amanda-server/patches/patch-aa +++ b/sysutils/amanda-server/patches/patch-aa @@ -1,32 +1,165 @@ -$NetBSD: patch-aa,v 1.4 2001/01/16 21:59:39 cjones Exp $ +$NetBSD: patch-aa,v 1.5 2004/05/12 18:45:26 bouyer Exp $ ---- configure.orig Sat Nov 25 06:59:40 2000 -+++ configure Mon Jan 15 14:08:27 2001 -@@ -3268,6 +3268,7 @@ - done - - -+if false ;then - for ac_prog in gnuplot - do - # Extract the first word of "$ac_prog", so it can be a program name with args. -@@ -3307,6 +3308,8 @@ - - test -n "$GNUPLOT" && break - done -+fi -+GNUPLOT="" - - if test -z "$GNUPLOT"; then - NO_AMPLOT_MODE=true -@@ -4924,8 +4927,10 @@ - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh" - -+if false; then - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+fi - - # Redirect the config.log output again, so that the ltconfig log is not - # clobbered by the next message. +--- changer-src/scsi-chio.c.orig Thu Jun 17 12:33:19 1999 ++++ changer-src/scsi-chio.c Thu Jan 11 13:01:33 2001 +@@ -121,25 +121,41 @@ + */ + int isempty(int fd, int slot) + { ++#if defined(OCHIOGSTATUS) ++struct ochanger_element_status_request cesr; ++#else + struct changer_element_status ces; ++#endif ++ + int i,rc; + int type=CHET_ST; + + get_changer_info(fd); + ++#if defined(OCHIOGSTATUS) ++ cesr.cesr_type = type; ++ cesr.cesr_data = malloc(changer_info.cp_nslots); ++ rc = ioctl(fd, OCHIOGSTATUS, &cesr); ++#else + ces.ces_type = type; + ces.ces_data = malloc(changer_info.cp_nslots); +- + rc = ioctl(fd, CHIOGSTATUS, &ces); ++#endif ++ + if (rc) { + dbprintf(("%s: changer status query failed: 0x%x %s\n", + get_pname(), rc,strerror(errno))); + return -1; + } + ++#if defined(OCHIOGSTATUS) ++ i = cesr.cesr_data[slot] & CESTATUS_FULL; ++ free(cesr.cesr_data); ++#else + i = ces.ces_data[slot] & CESTATUS_FULL; +- + free(ces.ces_data); ++#endif ++ + return !i; + } + +@@ -148,16 +164,27 @@ + */ + int find_empty(int fd, int start, int count) + { ++#if defined(OCHIOGSTATUS) ++struct ochanger_element_status_request cesr; ++#else + struct changer_element_status ces; ++#endif ++ + int i,rc; + int type=CHET_ST; + + get_changer_info(fd); + ++#if defined(OCHIOGSTATUS) ++ cesr.cesr_type = type; ++ cesr.cesr_data = malloc(changer_info.cp_nslots); ++ rc = ioctl(fd, OCHIOGSTATUS, &cesr); ++#else + ces.ces_type = type; + ces.ces_data = malloc(changer_info.cp_nslots); ++ rc = ioctl(fd, CHIOGSTATUS, &ces); ++#endif + +- rc = ioctl(fd,CHIOGSTATUS,&ces); + if (rc) { + dbprintf(("%s: changer status query failed: 0x%x %s\n", + get_pname(), rc, strerror(errno))); +@@ -165,9 +192,17 @@ + } + + i = 0; ++ ++#if defined(OCHIOGSTATUS) ++ while ((i < changer_info.cp_nslots)&&(cesr.cesr_data[i] & CESTATUS_FULL)) ++ i++; ++ free(cesr.cesr_data); ++#else + while ((i < changer_info.cp_nslots)&&(ces.ces_data[i] & CESTATUS_FULL)) + i++; + free(ces.ces_data); ++#endif ++ + return i; + } + +@@ -176,25 +211,41 @@ + */ + int drive_loaded(int fd, int drivenum) + { ++#if defined(OCHIOGSTATUS) ++struct ochanger_element_status_request cesr; ++#else + struct changer_element_status ces; ++#endif ++ + int i,rc; + int type=CHET_DT; + + get_changer_info(fd); + ++#if defined(OCHIOGSTATUS) ++ cesr.cesr_type = type; ++ cesr.cesr_data = malloc(changer_info.cp_ndrives); ++ rc = ioctl(fd, OCHIOGSTATUS, &cesr); ++#else + ces.ces_type = type; + ces.ces_data = malloc(changer_info.cp_ndrives); +- + rc = ioctl(fd, CHIOGSTATUS, &ces); ++#endif ++ + if (rc) { + dbprintf(("%s: drive status query failed: 0x%x %s\n", + get_pname(), rc, strerror(errno))); + return -1; + } + ++#if defined(OCHIOGSTATUS) ++ i = (cesr.cesr_data[drivenum] & CESTATUS_FULL); ++ free(cesr.cesr_data); ++#else + i = (ces.ces_data[drivenum] & CESTATUS_FULL); +- + free(ces.ces_data); ++#endif ++ + return i; + } + +@@ -204,7 +255,12 @@ + */ + int unload(int fd, int drive, int slot) + { ++#if defined(OCHIOGSTATUS) ++struct changer_move_request move; ++#else + struct changer_move move; ++#endif ++ + int rc; + + dbprintf(("unload : fd = %d, drive = %d, slot =%d\n",fd, drive, slot)); +@@ -230,7 +286,12 @@ + */ + int load(int fd, int drive, int slot) + { ++#if defined(OCHIOGSTATUS) ++struct changer_move_request move; ++#else + struct changer_move move; ++#endif ++ + int rc; + + dbprintf(("load : fd = %d, drive = %d, slot =%d\n",fd, drive, slot)); diff --git a/sysutils/amanda-server/patches/patch-ab b/sysutils/amanda-server/patches/patch-ab index 9cb9037d670..534621f3cda 100644 --- a/sysutils/amanda-server/patches/patch-ab +++ b/sysutils/amanda-server/patches/patch-ab @@ -1,29 +1,22 @@ -$NetBSD: patch-ab,v 1.5 2001/06/26 03:14:12 christos Exp $ +$NetBSD: patch-ab,v 1.6 2004/05/12 18:45:26 bouyer Exp $ ---- Makefile.in.orig Tue Apr 3 15:55:47 2001 -+++ Makefile.in Mon Jun 25 22:42:55 2001 -@@ -34,7 +34,7 @@ - - DESTDIR = - +--- Makefile.in.orig 2004-01-08 10:21:29.000000000 -0800 ++++ Makefile.in 2004-02-23 16:03:55.000000000 -0800 +@@ -33,7 +33,7 @@ + mandir = @mandir@ + includedir = @includedir@ + oldincludedir = /usr/include -pkgdatadir = $(datadir)/@PACKAGE@ +pkgdatadir = $(datadir)/doc/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = . +@@ -506,7 +506,7 @@ + uninstall: uninstall-recursive -@@ -151,13 +151,13 @@ - ACINCLUDE_M4_DEPS = $(ACINCLUDE_M4I) $(LIBTOOL_M4I) - - @WANT_CLIENT_TRUE@CLIENT_SUBDIRS = client-src --@WANT_TAPE_TRUE@TAPE_SUBDIRS = tape-src -+#TAPE_SUBDIRS = tape-src - @WANT_SERVER_TRUE@SERVER_SUBDIRS = server-src changer-src - @WANT_RESTORE_TRUE@RESTORE_SUBDIRS = restore-src - @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) $(PLOT_SUBDIRS) man docs example - + install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am - pkgdata_DATA = COPYRIGHT COPYRIGHT-APACHE COPYRIGHT-REGEX + installcheck: installcheck-recursive + install-strip: diff --git a/sysutils/amanda-server/patches/patch-ac b/sysutils/amanda-server/patches/patch-ac index 2e2931efcc0..079275711ce 100644 --- a/sysutils/amanda-server/patches/patch-ac +++ b/sysutils/amanda-server/patches/patch-ac @@ -1,19 +1,31 @@ -$NetBSD: patch-ac,v 1.5 2001/01/16 21:59:39 cjones Exp $ +$NetBSD: patch-ac,v 1.6 2004/05/12 18:45:26 bouyer Exp $ ---- example/amanda.conf.chg-scsi.in~ Thu Jun 17 12:33:43 1999 -+++ example/amanda.conf.chg-scsi.in Mon Jan 15 14:26:31 2001 -@@ -153,10 +153,10 @@ - # Note that, although the keyword below is infofile, it is only so for - # historic reasons, since now it is supposed to be a directory (unless - # you have selected some database format other than the `text' default) --infofile "/usr/adm/amanda/@DEFAULT_CONFIG@/curinfo" # database DIRECTORY --logdir "/usr/adm/amanda/@DEFAULT_CONFIG@" # log directory --indexdir "/usr/adm/amanda/@DEFAULT_CONFIG@/index" # index directory --#tapelist "/usr/adm/amanda/@DEFAULT_CONFIG@/tapelist" # list of used tapes -+infofile "@localstatedir@/@DEFAULT_CONFIG@/curinfo" # database DIRECTORY -+logdir "@localstatedir@/@DEFAULT_CONFIG@" # log directory -+indexdir "@localstatedir@/@DEFAULT_CONFIG@/index" # index directory -+#tapelist "@localstatedir@/@DEFAULT_CONFIG@/tapelist" # list of used tapes - # tapelist is stored, by default, in the directory that contains amanda.conf +--- example/Makefile.in.orig 2004-01-08 10:23:49.000000000 -0800 ++++ example/Makefile.in 2004-02-23 07:54:24.000000000 -0800 +@@ -35,7 +35,7 @@ + mandir = @mandir@ + includedir = @includedir@ + oldincludedir = /usr/include +-pkgdatadir = $(datadir)/@PACKAGE@ ++pkgdatadir = $(datadir)/examples/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = .. +@@ -278,7 +278,16 @@ + info-am: + +-install-data-am: ++install-data-am: $(noinst_DATA) $(EXTRA_DIST) ++ @$(NORMAL_INSTALL) ++ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) ++ @list='$(noinst_DATA) $(EXTRA_DIST)'; for p in $$list; do \ ++ if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \ ++ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \ ++ done ++ + + install-exec-am: diff --git a/sysutils/amanda-server/patches/patch-ad b/sysutils/amanda-server/patches/patch-ad index e69b02de5d6..01f5a076c26 100644 --- a/sysutils/amanda-server/patches/patch-ad +++ b/sysutils/amanda-server/patches/patch-ad @@ -1,173 +1,13 @@ -$NetBSD: patch-ad,v 1.6 2001/06/26 03:14:12 christos Exp $ +$NetBSD: patch-ad,v 1.7 2004/05/12 18:45:26 bouyer Exp $ ---- server-src/Makefile.in.orig Tue Apr 3 15:55:46 2001 -+++ server-src/Makefile.in Mon Jun 25 22:49:20 2001 -@@ -175,7 +175,7 @@ - # routines, and second to pick up any references in the other libraries. - ### - --LDADD = ../common-src/libamanda.$(LIB_EXTENSION) libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION) -+LDADD = libamserver.$(LIB_EXTENSION) - - - SUFFIXES = .sh .pl -@@ -210,7 +210,7 @@ - DEFS = @DEFS@ -I. -I$(srcdir) -I../config - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ --LIBS = @LIBS@ -+LIBS = @LIBS@ -lamtape -lamanda - libamserver_a_LIBADD = - libamserver_a_OBJECTS = amindex.$(OBJEXT) changer.$(OBJEXT) \ - clock.$(OBJEXT) conffile.$(OBJEXT) diskfile.$(OBJEXT) \ -@@ -232,131 +232,93 @@ - - diskfile_OBJECTS = diskfile.test.$(OBJEXT) - diskfile_LDADD = $(LDADD) --diskfile_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ --libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \ --../common-src/libamanda.$(LIB_EXTENSION) -+diskfile_DEPENDENCIES = libamserver.$(LIB_EXTENSION) - diskfile_LDFLAGS = - conffile_OBJECTS = conffile.test.$(OBJEXT) - conffile_LDADD = $(LDADD) --conffile_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ --libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \ --../common-src/libamanda.$(LIB_EXTENSION) -+conffile_DEPENDENCIES = libamserver.$(LIB_EXTENSION) - conffile_LDFLAGS = - infofile_OBJECTS = infofile.test.$(OBJEXT) - infofile_LDADD = $(LDADD) --infofile_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ --libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \ --../common-src/libamanda.$(LIB_EXTENSION) -+infofile_DEPENDENCIES = libamserver.$(LIB_EXTENSION) - infofile_LDFLAGS = - amindexd_OBJECTS = amindexd.$(OBJEXT) disk_history.$(OBJEXT) \ - list_dir.$(OBJEXT) - amindexd_LDADD = $(LDADD) --amindexd_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ --libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \ --../common-src/libamanda.$(LIB_EXTENSION) -+amindexd_DEPENDENCIES = libamserver.$(LIB_EXTENSION) - amindexd_LDFLAGS = - amlogroll_SOURCES = amlogroll.c - amlogroll_OBJECTS = amlogroll.$(OBJEXT) - amlogroll_LDADD = $(LDADD) --amlogroll_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ --libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \ --../common-src/libamanda.$(LIB_EXTENSION) -+amlogroll_DEPENDENCIES = libamserver.$(LIB_EXTENSION) - amlogroll_LDFLAGS = - amtrmidx_SOURCES = amtrmidx.c - amtrmidx_OBJECTS = amtrmidx.$(OBJEXT) - amtrmidx_LDADD = $(LDADD) --amtrmidx_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ --libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \ --../common-src/libamanda.$(LIB_EXTENSION) -+amtrmidx_DEPENDENCIES = libamserver.$(LIB_EXTENSION) - amtrmidx_LDFLAGS = - amtrmlog_SOURCES = amtrmlog.c - amtrmlog_OBJECTS = amtrmlog.$(OBJEXT) - amtrmlog_LDADD = $(LDADD) --amtrmlog_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ --libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \ --../common-src/libamanda.$(LIB_EXTENSION) -+amtrmlog_DEPENDENCIES = libamserver.$(LIB_EXTENSION) - amtrmlog_LDFLAGS = - driver_SOURCES = driver.c - driver_OBJECTS = driver.$(OBJEXT) - driver_LDADD = $(LDADD) --driver_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ --libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \ --../common-src/libamanda.$(LIB_EXTENSION) -+driver_DEPENDENCIES = libamserver.$(LIB_EXTENSION) - driver_LDFLAGS = - dumper_SOURCES = dumper.c - dumper_OBJECTS = dumper.$(OBJEXT) - dumper_LDADD = $(LDADD) --dumper_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ --libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \ --../common-src/libamanda.$(LIB_EXTENSION) -+dumper_DEPENDENCIES = libamserver.$(LIB_EXTENSION) - dumper_LDFLAGS = - planner_SOURCES = planner.c - planner_OBJECTS = planner.$(OBJEXT) - planner_LDADD = $(LDADD) --planner_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ --libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \ --../common-src/libamanda.$(LIB_EXTENSION) -+planner_DEPENDENCIES = libamserver.$(LIB_EXTENSION) - planner_LDFLAGS = - taper_SOURCES = taper.c - taper_OBJECTS = taper.$(OBJEXT) - taper_LDADD = $(LDADD) --taper_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ --libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \ --../common-src/libamanda.$(LIB_EXTENSION) -+taper_DEPENDENCIES = libamserver.$(LIB_EXTENSION) - taper_LDFLAGS = - amcleanupdisk_SOURCES = amcleanupdisk.c - amcleanupdisk_OBJECTS = amcleanupdisk.$(OBJEXT) - amcleanupdisk_LDADD = $(LDADD) --amcleanupdisk_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ --libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \ --../common-src/libamanda.$(LIB_EXTENSION) -+amcleanupdisk_DEPENDENCIES = libamserver.$(LIB_EXTENSION) - amcleanupdisk_LDFLAGS = - amadmin_SOURCES = amadmin.c - amadmin_OBJECTS = amadmin.$(OBJEXT) - amadmin_LDADD = $(LDADD) --amadmin_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ --libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \ --../common-src/libamanda.$(LIB_EXTENSION) -+amadmin_DEPENDENCIES = libamserver.$(LIB_EXTENSION) - amadmin_LDFLAGS = - amcheck_SOURCES = amcheck.c - amcheck_OBJECTS = amcheck.$(OBJEXT) - amcheck_LDADD = $(LDADD) --amcheck_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ --libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \ --../common-src/libamanda.$(LIB_EXTENSION) -+amcheck_DEPENDENCIES = libamserver.$(LIB_EXTENSION) - amcheck_LDFLAGS = - amflush_SOURCES = amflush.c - amflush_OBJECTS = amflush.$(OBJEXT) - amflush_LDADD = $(LDADD) --amflush_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ --libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \ --../common-src/libamanda.$(LIB_EXTENSION) -+amflush_DEPENDENCIES = libamserver.$(LIB_EXTENSION) - amflush_LDFLAGS = - amgetconf_OBJECTS = getconf.$(OBJEXT) - amgetconf_LDADD = $(LDADD) --amgetconf_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ --libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \ --../common-src/libamanda.$(LIB_EXTENSION) -+amgetconf_DEPENDENCIES = libamserver.$(LIB_EXTENSION) - amgetconf_LDFLAGS = - amlabel_SOURCES = amlabel.c - amlabel_OBJECTS = amlabel.$(OBJEXT) - amlabel_LDADD = $(LDADD) --amlabel_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ --libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \ --../common-src/libamanda.$(LIB_EXTENSION) -+amlabel_DEPENDENCIES = libamserver.$(LIB_EXTENSION) - amlabel_LDFLAGS = - amtape_SOURCES = amtape.c - amtape_OBJECTS = amtape.$(OBJEXT) - amtape_LDADD = $(LDADD) --amtape_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ --libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \ --../common-src/libamanda.$(LIB_EXTENSION) -+amtape_DEPENDENCIES = libamserver.$(LIB_EXTENSION) - amtape_LDFLAGS = - amreport_OBJECTS = reporter.$(OBJEXT) - amreport_LDADD = $(LDADD) --amreport_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ --libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \ --../common-src/libamanda.$(LIB_EXTENSION) -+amreport_DEPENDENCIES = libamserver.$(LIB_EXTENSION) - amreport_LDFLAGS = - SCRIPTS = $(sbin_SCRIPTS) - +--- docs/Makefile.in.orig 2004-01-08 10:23:48.000000000 -0800 ++++ docs/Makefile.in 2004-02-23 07:56:48.000000000 -0800 +@@ -33,7 +33,7 @@ + mandir = @mandir@ + includedir = @includedir@ + oldincludedir = /usr/include +-pkgdatadir = $(datadir)/@PACKAGE@ ++pkgdatadir = $(datadir)/doc/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = .. diff --git a/sysutils/amanda-server/patches/patch-ae b/sysutils/amanda-server/patches/patch-ae index b4953f66099..30d95b29be6 100644 --- a/sysutils/amanda-server/patches/patch-ae +++ b/sysutils/amanda-server/patches/patch-ae @@ -1,27 +1,20 @@ -$NetBSD: patch-ae,v 1.5 2001/06/26 03:14:12 christos Exp $ +$NetBSD: patch-ae,v 1.6 2004/05/12 18:45:26 bouyer Exp $ ---- changer-src/Makefile.in.orig Tue Apr 3 15:55:43 2001 -+++ changer-src/Makefile.in Mon Jun 25 22:51:37 2001 -@@ -163,7 +163,7 @@ - # routines, and second to pick up any references in the other libraries. - ### +--- changer-src/scsi-changer-driver.c.orig 2003-01-26 11:20:56.000000000 -0800 ++++ changer-src/scsi-changer-driver.c 2004-02-23 08:44:56.000000000 -0800 +@@ -1358,13 +1358,14 @@ + { + int ret = 0; + extern OpenFiles_T *pDev; ++ extern changer_t chg; /* Needed for the infos about havebarcode */ --LDADD = ../common-src/libamanda.$(LIB_EXTENSION) ../server-src/libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION) -+LDADD = ../server-src/libamserver.$(LIB_EXTENSION) + DebugPrint(DEBUG_INFO, SECTION_BARCODE,"##### START BarCode\n"); + DebugPrint(DEBUG_INFO, SECTION_BARCODE,"%-20s : fd %d\n", "BarCode", fd); - - SUFFIXES = .pl .sh -@@ -191,11 +191,8 @@ - scsi-irix.$(OBJEXT) scsi-linux.$(OBJEXT) scsi-solaris.$(OBJEXT) \ - scsi-bsd.$(OBJEXT) - chg_scsi_LDADD = $(LDADD) --chg_scsi_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ --../server-src/libamserver.$(LIB_EXTENSION) \ --../tape-src/libamtape.$(LIB_EXTENSION) \ --../common-src/libamanda.$(LIB_EXTENSION) --chg_scsi_LDFLAGS = -+chg_scsi_DEPENDENCIES = ../server-src/libamserver.$(LIB_EXTENSION) -+chg_scsi_LDFLAGS = -lamanda -lamtape - chg_scsi_chio_OBJECTS = chg-scsi-chio.$(OBJEXT) scsi-hpux.$(OBJEXT) \ - scsi-chio.$(OBJEXT) - chg_scsi_chio_LDADD = $(LDADD) + DebugPrint(DEBUG_INFO, SECTION_BARCODE,"Ident = [%s], function = [%s]\n", pDev[fd].ident, + pDev[fd].functions->ident); +- ret = pDev[fd].functions->function_barcode(fd); ++ ret = (pDev[fd].functions->function_barcode(fd) | chg.havebarcode); + DebugPrint(DEBUG_INFO, SECTION_BARCODE,"##### STOP BarCode (%d)\n",ret); + return(ret); + } diff --git a/sysutils/amanda-server/patches/patch-af b/sysutils/amanda-server/patches/patch-af index 2d62327eea2..bf08590ec21 100644 --- a/sysutils/amanda-server/patches/patch-af +++ b/sysutils/amanda-server/patches/patch-af @@ -1,165 +1,87 @@ -$NetBSD: patch-af,v 1.4 2001/01/16 21:59:40 cjones Exp $ +$NetBSD: patch-af,v 1.5 2004/05/12 18:45:26 bouyer Exp $ ---- changer-src/scsi-chio.c.orig Thu Jun 17 12:33:19 1999 -+++ changer-src/scsi-chio.c Thu Jan 11 13:01:33 2001 -@@ -121,25 +121,41 @@ - */ - int isempty(int fd, int slot) - { -+#if defined(OCHIOGSTATUS) -+struct ochanger_element_status_request cesr; -+#else - struct changer_element_status ces; -+#endif -+ - int i,rc; - int type=CHET_ST; +--- tape-src/Makefile.in.orig 2004-01-08 19:22:46.000000000 +0100 ++++ tape-src/Makefile.in 2004-05-12 15:41:15.000000000 +0200 +@@ -178,9 +178,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) \ +- libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++LDADD = libamtape.$(LIB_EXTENSION) -lamanda - get_changer_info(fd); -+#if defined(OCHIOGSTATUS) -+ cesr.cesr_type = type; -+ cesr.cesr_data = malloc(changer_info.cp_nslots); -+ rc = ioctl(fd, OCHIOGSTATUS, &cesr); -+#else - ces.ces_type = type; - ces.ces_data = malloc(changer_info.cp_nslots); -- - rc = ioctl(fd, CHIOGSTATUS, &ces); -+#endif -+ - if (rc) { - dbprintf(("%s: changer status query failed: 0x%x %s\n", - get_pname(), rc,strerror(errno))); - return -1; - } -+#if defined(OCHIOGSTATUS) -+ i = cesr.cesr_data[slot] & CESTATUS_FULL; -+ free(cesr.cesr_data); -+#else - i = ces.ces_data[slot] & CESTATUS_FULL; -- - free(ces.ces_data); -+#endif -+ - return !i; - } +@@ -202,9 +200,7 @@ -@@ -148,16 +164,27 @@ - */ - int find_empty(int fd, int start, int count) - { -+#if defined(OCHIOGSTATUS) -+struct ochanger_element_status_request cesr; -+#else - struct changer_element_status ces; -+#endif -+ - int i,rc; - int type=CHET_ST; - get_changer_info(fd); + amtapeio_SOURCES = amtapeio.test.c +-amtapeio_LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amtapeio_LDADD = libamtape.$(LIB_EXTENSION) -lamanda -+#if defined(OCHIOGSTATUS) -+ cesr.cesr_type = type; -+ cesr.cesr_data = malloc(changer_info.cp_nslots); -+ rc = ioctl(fd, OCHIOGSTATUS, &cesr); -+#else - ces.ces_type = type; - ces.ces_data = malloc(changer_info.cp_nslots); -+ rc = ioctl(fd, CHIOGSTATUS, &ces); -+#endif + subdir = tape-src + mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +@@ -223,29 +219,21 @@ + amdd_SOURCES = amdd.c + amdd_OBJECTS = amdd.$(OBJEXT) + amdd_LDADD = $(LDADD) +-amdd_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amdd_DEPENDENCIES = libamtape.$(LIB_EXTENSION) -lamanda + amdd_LDFLAGS = + ammt_SOURCES = ammt.c + ammt_OBJECTS = ammt.$(OBJEXT) + ammt_LDADD = $(LDADD) +-ammt_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++ammt_DEPENDENCIES = libamtape.$(LIB_EXTENSION) + ammt_LDFLAGS = + am_amtapeio_OBJECTS = amtapeio.test.$(OBJEXT) + amtapeio_OBJECTS = $(am_amtapeio_OBJECTS) +-amtapeio_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amtapeio_DEPENDENCIES = libamtape.$(LIB_EXTENSION) + amtapeio_LDFLAGS = + am_amtapetype_OBJECTS = tapetype.$(OBJEXT) + amtapetype_OBJECTS = $(am_amtapetype_OBJECTS) + amtapetype_LDADD = $(LDADD) +-amtapetype_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amtapetype_DEPENDENCIES = libamtape.$(LIB_EXTENSION) + amtapetype_LDFLAGS = -- rc = ioctl(fd,CHIOGSTATUS,&ces); - if (rc) { - dbprintf(("%s: changer status query failed: 0x%x %s\n", - get_pname(), rc, strerror(errno))); -@@ -165,9 +192,17 @@ - } + DEFS = @DEFS@ +@@ -469,7 +457,7 @@ + done + check-am: all-am + check: check-am +-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) ++all-am: Makefile $(PROGRAMS) $(HEADERS) - i = 0; -+ -+#if defined(OCHIOGSTATUS) -+ while ((i < changer_info.cp_nslots)&&(cesr.cesr_data[i] & CESTATUS_FULL)) -+ i++; -+ free(cesr.cesr_data); -+#else - while ((i < changer_info.cp_nslots)&&(ces.ces_data[i] & CESTATUS_FULL)) - i++; - free(ces.ces_data); -+#endif -+ - return i; - } + installdirs: + $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(sbindir) +@@ -519,7 +507,7 @@ -@@ -176,25 +211,41 @@ - */ - int drive_loaded(int fd, int drivenum) - { -+#if defined(OCHIOGSTATUS) -+struct ochanger_element_status_request cesr; -+#else - struct changer_element_status ces; -+#endif -+ - int i,rc; - int type=CHET_DT; + install-data-am: - get_changer_info(fd); +-install-exec-am: install-libLTLIBRARIES install-sbinPROGRAMS ++install-exec-am: install-sbinPROGRAMS + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-exec-hook -+#if defined(OCHIOGSTATUS) -+ cesr.cesr_type = type; -+ cesr.cesr_data = malloc(changer_info.cp_ndrives); -+ rc = ioctl(fd, OCHIOGSTATUS, &cesr); -+#else - ces.ces_type = type; - ces.ces_data = malloc(changer_info.cp_ndrives); -- - rc = ioctl(fd, CHIOGSTATUS, &ces); -+#endif -+ - if (rc) { - dbprintf(("%s: drive status query failed: 0x%x %s\n", - get_pname(), rc, strerror(errno))); - return -1; - } +@@ -538,7 +526,7 @@ + mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool -+#if defined(OCHIOGSTATUS) -+ i = (cesr.cesr_data[drivenum] & CESTATUS_FULL); -+ free(cesr.cesr_data); -+#else - i = (ces.ces_data[drivenum] & CESTATUS_FULL); -- - free(ces.ces_data); -+#endif -+ - return i; - } +-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \ ++uninstall-am: uninstall-info-am \ + uninstall-sbinPROGRAMS -@@ -204,7 +255,12 @@ - */ - int unload(int fd, int drive, int slot) - { -+#if defined(OCHIOGSTATUS) -+struct changer_move_request move; -+#else - struct changer_move move; -+#endif -+ - int rc; - - dbprintf(("unload : fd = %d, drive = %d, slot =%d\n",fd, drive, slot)); -@@ -230,7 +286,12 @@ - */ - int load(int fd, int drive, int slot) - { -+#if defined(OCHIOGSTATUS) -+struct changer_move_request move; -+#else - struct changer_move move; -+#endif -+ - int rc; - - dbprintf(("load : fd = %d, drive = %d, slot =%d\n",fd, drive, slot)); + .PHONY: GTAGS all all-am check check-am clean clean-generic \ diff --git a/sysutils/amanda-server/patches/patch-ag b/sysutils/amanda-server/patches/patch-ag index 942c30914de..453f2f9b940 100644 --- a/sysutils/amanda-server/patches/patch-ag +++ b/sysutils/amanda-server/patches/patch-ag @@ -1,23 +1,41 @@ -$NetBSD: patch-ag,v 1.3 1999/09/04 01:19:50 bad Exp $ +$NetBSD: patch-ag,v 1.4 2004/05/12 18:45:26 bouyer Exp $ ---- example/chg-scsi.conf.old Tue Feb 23 16:44:39 1999 -+++ example/chg-scsi.conf Tue Feb 23 16:46:38 1999 -@@ -2,6 +2,8 @@ - number_configs 2 - eject 1 # Tapedrives need an eject command - sleep 5 # Seconds to wait until the tape gets ready -+ # The driver first sleeps for <sleep>/2 seconds, -+ # then pool the drive every seconds. - cleanmax 10 # How many times could a cleaning tape get used - changerdev /dev/sch0 - # -@@ -13,7 +15,8 @@ - startuse 0 # The slots associated with the drive 0 - enduse 9 # - statfile /usr/local/etc/amanda/tape5-slot # The file where the actual slot is stored --cleancart 20 # the slot where the cleaningcartridge for drive 0 is located -+cleancart -1 # the slot where the cleaningcartridge for drive 0 is -+ # located. -1 means none. - cleanfile /usr/local/etc/amanda/tape0-clean # The file where the cleanings are recorded - usagecount /usr/local/etc/amanda/backup/totaltime +--- common-src/Makefile.in.orig 2004-01-08 10:22:20.000000000 -0800 ++++ common-src/Makefile.in 2004-02-23 14:11:45.000000000 -0800 +@@ -536,25 +536,19 @@ + done + check-am: all-am + check: check-am +-all-am: Makefile $(LTLIBRARIES) $(HEADERS) ++all-am: Makefile genversion.h + + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(libdir) + + install: install-am + install-exec: install-exec-am + install-data: install-data-am + uninstall: uninstall-am + +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++install-am: + + installcheck: installcheck-am + install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + mostlyclean-generic: + + clean-generic: +@@ -587,7 +581,7 @@ + + install-data-am: + +-install-exec-am: install-libLTLIBRARIES ++install-exec-am: + + install-info: install-info-am diff --git a/sysutils/amanda-server/patches/patch-ah b/sysutils/amanda-server/patches/patch-ah index a6f021ab4b8..05720ab58b2 100644 --- a/sysutils/amanda-server/patches/patch-ah +++ b/sysutils/amanda-server/patches/patch-ah @@ -1,30 +1,200 @@ -$NetBSD: patch-ah,v 1.4 2001/01/16 21:59:40 cjones Exp $ +$NetBSD: patch-ah,v 1.5 2004/05/12 18:45:26 bouyer Exp $ ---- example/amanda.conf.in.orig Tue Nov 7 18:44:50 2000 -+++ example/amanda.conf.in Mon Jan 15 14:19:56 2001 -@@ -71,8 +71,8 @@ - tpchanger "chg-manual" # the tape-changer glue script - tapedev "@DEFAULT_TAPE_DEVICE@" # the no-rewind tape device to be used - rawtapedev "@DEFAULT_RAW_TAPE_DEVICE@" # the raw device to be used (ftape only) --changerfile "/usr/adm/amanda/@DEFAULT_CONFIG@/changer" --changerfile "/usr/adm/amanda/@DEFAULT_CONFIG@/changer-status" -+changerfile "@CONFIG_DIR@/@DEFAULT_CONFIG@/changer" -+changerfile "@CONFIG_DIR@/@DEFAULT_CONFIG@/changer-status" - changerfile "@CONFIG_DIR@/@DEFAULT_CONFIG@/changer.conf" - changerdev "@DEFAULT_CHANGER_DEVICE@" +--- server-src/Makefile.in.orig 2004-01-08 10:22:53.000000000 -0800 ++++ server-src/Makefile.in 2004-02-23 14:25:45.000000000 -0800 +@@ -198,10 +198,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) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++LDADD = libamserver.$(LIB_EXTENSION) -@@ -159,10 +159,10 @@ - # Note that, although the keyword below is infofile, it is only so for - # historic reasons, since now it is supposed to be a directory (unless - # you have selected some database format other than the `text' default) --infofile "/usr/adm/amanda/@DEFAULT_CONFIG@/curinfo" # database DIRECTORY --logdir "/usr/adm/amanda/@DEFAULT_CONFIG@" # log directory --indexdir "/usr/adm/amanda/@DEFAULT_CONFIG@/index" # index directory --#tapelist "/usr/adm/amanda/@DEFAULT_CONFIG@/tapelist" # list of used tapes -+infofile "@localstatedir@/@DEFAULT_CONFIG@/curinfo" # database DIRECTORY -+logdir "@localstatedir@/@DEFAULT_CONFIG@" # log directory -+indexdir "@localstatedir@/@DEFAULT_CONFIG@/index" # index directory -+#tapelist "@localstatedir@/@DEFAULT_CONFIG@/tapelist" # list of used tapes - # tapelist is stored, by default, in the directory that contains amanda.conf + SUFFIXES = .sh .pl +@@ -259,155 +256,98 @@ + amadmin_SOURCES = amadmin.c + amadmin_OBJECTS = amadmin.$(OBJEXT) + amadmin_LDADD = $(LDADD) +-amadmin_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amadmin_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amadmin_LDFLAGS = + amcheck_SOURCES = amcheck.c + amcheck_OBJECTS = amcheck.$(OBJEXT) + amcheck_LDADD = $(LDADD) +-amcheck_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amcheck_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amcheck_LDFLAGS = + amcleanupdisk_SOURCES = amcleanupdisk.c + amcleanupdisk_OBJECTS = amcleanupdisk.$(OBJEXT) + amcleanupdisk_LDADD = $(LDADD) +-amcleanupdisk_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amcleanupdisk_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amcleanupdisk_LDFLAGS = + amflush_SOURCES = amflush.c + amflush_OBJECTS = amflush.$(OBJEXT) + amflush_LDADD = $(LDADD) +-amflush_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amflush_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amflush_LDFLAGS = + am_amgetconf_OBJECTS = getconf.$(OBJEXT) + amgetconf_OBJECTS = $(am_amgetconf_OBJECTS) + amgetconf_LDADD = $(LDADD) +-amgetconf_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amgetconf_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amgetconf_LDFLAGS = + am_amindexd_OBJECTS = amindexd.$(OBJEXT) disk_history.$(OBJEXT) \ + list_dir.$(OBJEXT) + amindexd_OBJECTS = $(am_amindexd_OBJECTS) + amindexd_LDADD = $(LDADD) +-amindexd_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amindexd_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amindexd_LDFLAGS = + amlabel_SOURCES = amlabel.c + amlabel_OBJECTS = amlabel.$(OBJEXT) + amlabel_LDADD = $(LDADD) +-amlabel_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amlabel_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amlabel_LDFLAGS = + amlogroll_SOURCES = amlogroll.c + amlogroll_OBJECTS = amlogroll.$(OBJEXT) + amlogroll_LDADD = $(LDADD) +-amlogroll_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amlogroll_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amlogroll_LDFLAGS = + am_amreport_OBJECTS = reporter.$(OBJEXT) + amreport_OBJECTS = $(am_amreport_OBJECTS) + amreport_LDADD = $(LDADD) +-amreport_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amreport_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amreport_LDFLAGS = + amtape_SOURCES = amtape.c + amtape_OBJECTS = amtape.$(OBJEXT) + amtape_LDADD = $(LDADD) +-amtape_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amtape_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amtape_LDFLAGS = + amtrmidx_SOURCES = amtrmidx.c + amtrmidx_OBJECTS = amtrmidx.$(OBJEXT) + amtrmidx_LDADD = $(LDADD) +-amtrmidx_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amtrmidx_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amtrmidx_LDFLAGS = + amtrmlog_SOURCES = amtrmlog.c + amtrmlog_OBJECTS = amtrmlog.$(OBJEXT) + amtrmlog_LDADD = $(LDADD) +-amtrmlog_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amtrmlog_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amtrmlog_LDFLAGS = + am_conffile_OBJECTS = conffile.test.$(OBJEXT) + conffile_OBJECTS = $(am_conffile_OBJECTS) + conffile_LDADD = $(LDADD) +-conffile_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++conffile_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + conffile_LDFLAGS = + am_diskfile_OBJECTS = diskfile.test.$(OBJEXT) + diskfile_OBJECTS = $(am_diskfile_OBJECTS) + diskfile_LDADD = $(LDADD) +-diskfile_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++diskfile_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + diskfile_LDFLAGS = + driver_SOURCES = driver.c + driver_OBJECTS = driver.$(OBJEXT) + driver_LDADD = $(LDADD) +-driver_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++driver_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + driver_LDFLAGS = + dumper_SOURCES = dumper.c + dumper_OBJECTS = dumper.$(OBJEXT) + dumper_LDADD = $(LDADD) +-dumper_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++dumper_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + dumper_LDFLAGS = + am_infofile_OBJECTS = infofile.test.$(OBJEXT) + infofile_OBJECTS = $(am_infofile_OBJECTS) + infofile_LDADD = $(LDADD) +-infofile_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++infofile_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + infofile_LDFLAGS = + planner_SOURCES = planner.c + planner_OBJECTS = planner.$(OBJEXT) + planner_LDADD = $(LDADD) +-planner_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++planner_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + planner_LDFLAGS = + taper_SOURCES = taper.c + taper_OBJECTS = taper.$(OBJEXT) + taper_LDADD = $(LDADD) +-taper_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++taper_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + taper_LDFLAGS = + SCRIPTS = $(sbin_SCRIPTS) +@@ -416,7 +356,7 @@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ +-LIBS = @LIBS@ ++LIBS = @LIBS@ -lamtape -lamanda + depcomp = $(SHELL) $(top_srcdir)/config/depcomp + am__depfiles_maybe = depfiles + @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/amadmin.Po ./$(DEPDIR)/amcheck.Po \ diff --git a/sysutils/amanda-server/patches/patch-ai b/sysutils/amanda-server/patches/patch-ai index c34afe8f6d5..f1a1bccf4fd 100644 --- a/sysutils/amanda-server/patches/patch-ai +++ b/sysutils/amanda-server/patches/patch-ai @@ -1,32 +1,38 @@ -$NetBSD: patch-ai,v 1.4 2001/06/26 03:14:12 christos Exp $ +$NetBSD: patch-ai,v 1.5 2004/05/12 18:45:26 bouyer Exp $ ---- restore-src/Makefile.in.orig Tue Apr 3 15:55:46 2001 -+++ restore-src/Makefile.in Mon Jun 25 22:53:37 2001 -@@ -160,7 +160,7 @@ +--- changer-src/Makefile.in.orig 2004-01-08 10:23:21.000000000 -0800 ++++ changer-src/Makefile.in 2004-02-23 15:25:39.000000000 -0800 +@@ -179,10 +179,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) \ +- ../server-src/libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++LDADD = ../server-src/libamserver.$(LIB_EXTENSION) --LDADD = ../common-src/libamanda.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION) -+LDADD = -lamtape -lamanda + SUFFIXES = .pl .sh +@@ -213,19 +210,13 @@ + scsi-bsd.$(OBJEXT) scsi-cam.$(OBJEXT) sense.$(OBJEXT) + chg_scsi_OBJECTS = $(am_chg_scsi_OBJECTS) + chg_scsi_LDADD = $(LDADD) +-chg_scsi_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- ../server-src/libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++chg_scsi_DEPENDENCIES = ../server-src/libamserver.$(LIB_EXTENSION) + chg_scsi_LDFLAGS = + am_chg_scsi_chio_OBJECTS = chg-scsi-chio.$(OBJEXT) scsi-hpux.$(OBJEXT) \ + scsi-chio.$(OBJEXT) + chg_scsi_chio_OBJECTS = $(am_chg_scsi_chio_OBJECTS) + chg_scsi_chio_LDADD = $(LDADD) +-chg_scsi_chio_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- ../server-src/libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++chg_scsi_chio_DEPENDENCIES = ../server-src/libamserver.$(LIB_EXTENSION) + chg_scsi_chio_LDFLAGS = + SCRIPTS = $(libexec_SCRIPTS) - amidxtaped_SOURCES = amidxtaped.c -@@ -178,16 +178,12 @@ - LIBS = @LIBS@ - amidxtaped_OBJECTS = amidxtaped.$(OBJEXT) - amidxtaped_LDADD = $(LDADD) --amidxtaped_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ --../tape-src/libamtape.$(LIB_EXTENSION) \ --../common-src/libamanda.$(LIB_EXTENSION) -+amidxtaped_DEPENDENCIES = - amidxtaped_LDFLAGS = - amrestore_SOURCES = amrestore.c - amrestore_OBJECTS = amrestore.$(OBJEXT) - amrestore_LDADD = $(LDADD) --amrestore_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ --../tape-src/libamtape.$(LIB_EXTENSION) \ --../common-src/libamanda.$(LIB_EXTENSION) -+amrestore_DEPENDENCIES = - amrestore_LDFLAGS = - CFLAGS = @CFLAGS@ - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/sysutils/amanda-server/patches/patch-aj b/sysutils/amanda-server/patches/patch-aj index de7789d4aed..0b0fa2a25d3 100644 --- a/sysutils/amanda-server/patches/patch-aj +++ b/sysutils/amanda-server/patches/patch-aj @@ -1,31 +1,43 @@ -$NetBSD: patch-aj,v 1.1 2001/01/16 21:59:40 cjones Exp $ +$NetBSD: patch-aj,v 1.2 2004/05/12 18:45:26 bouyer Exp $ ---- example/Makefile.in.orig Sat Nov 25 07:02:02 2000 -+++ example/Makefile.in Mon Jan 15 15:33:47 2001 -@@ -33,7 +33,7 @@ +--- restore-src/Makefile.in.orig 2004-01-08 10:23:31.000000000 -0800 ++++ restore-src/Makefile.in 2004-02-23 15:39:26.000000000 -0800 +@@ -170,16 +170,11 @@ + # 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) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++LDADD = -lamtape -lamanda - DESTDIR = --pkgdatadir = $(datadir)/@PACKAGE@ -+pkgdatadir = $(datadir)/examples/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ + amidxtaped_SOURCES = amidxtaped.c +-amidxtaped_LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \ +- ../server-src/libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amidxtaped_LDADD = ../server-src/libamserver.$(LIB_EXTENSION) -@@ -216,7 +216,16 @@ - install-exec-am: - install-exec: install-exec-am + subdir = restore-src + mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +@@ -191,17 +186,12 @@ --install-data-am: -+install-data-am: $(noinst_DATA) $(EXTRA_DIST) -+ @$(NORMAL_INSTALL) -+ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) -+ @list='$(noinst_DATA) $(EXTRA_DIST)'; for p in $$list; do \ -+ if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \ -+ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \ -+ done -+ - install-data: install-data-am + am_amidxtaped_OBJECTS = amidxtaped.$(OBJEXT) + amidxtaped_OBJECTS = $(am_amidxtaped_OBJECTS) +-amidxtaped_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- ../server-src/libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amidxtaped_DEPENDENCIES = ../server-src/libamserver.$(LIB_EXTENSION) + amidxtaped_LDFLAGS = + amrestore_SOURCES = amrestore.c + amrestore_OBJECTS = amrestore.$(OBJEXT) + amrestore_LDADD = $(LDADD) +-amrestore_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amrestore_DEPENDENCIES = + amrestore_LDFLAGS = - install-am: all-am + DEFS = @DEFS@ diff --git a/sysutils/amanda-server/patches/patch-ak b/sysutils/amanda-server/patches/patch-ak index c90054087ed..c364cf006ea 100644 --- a/sysutils/amanda-server/patches/patch-ak +++ b/sysutils/amanda-server/patches/patch-ak @@ -1,13 +1,12 @@ -$NetBSD: patch-ak,v 1.1 2001/01/16 21:59:40 cjones Exp $ +$NetBSD: patch-ak,v 1.2 2004/05/12 18:45:26 bouyer Exp $ ---- docs/Makefile.in.orig Sat Nov 25 07:02:01 2000 -+++ docs/Makefile.in Mon Jan 15 15:33:59 2001 -@@ -33,7 +33,7 @@ - - DESTDIR = - --pkgdatadir = $(datadir)/@PACKAGE@ -+pkgdatadir = $(datadir)/doc/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ +--- man/Makefile.in.orig 2004-01-08 10:23:42.000000000 -0800 ++++ man/Makefile.in 2004-02-23 15:57:35.000000000 -0800 +@@ -189,7 +189,6 @@ + EXTRA_DIST = amplot.8 amrestore.8 amtape.8 amdd.8 ammt.8 + man_MANS = $(AMPLOT_MAN_PAGES) \ +- $(COMMON_MAN_PAGES) \ + $(SERVER_MAN_PAGES) \ + $(RECOVER_MAN_PAGES) \ + $(RESTORE_MAN_PAGES) diff --git a/sysutils/amanda-server/patches/patch-al b/sysutils/amanda-server/patches/patch-al deleted file mode 100644 index e82d941fd6c..00000000000 --- a/sysutils/amanda-server/patches/patch-al +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-al,v 1.2 2001/06/26 03:14:12 christos Exp $ - ---- man/Makefile.in.orig Tue Apr 3 15:55:45 2001 -+++ man/Makefile.in Mon Jun 25 22:54:40 2001 -@@ -159,7 +159,7 @@ - # not autoconf-generated: - EXTRA_DIST = amplot.8 amrestore.8 amtape.8 - --man_MANS = $(AMPLOT_MAN_PAGES) $(COMMON_MAN_PAGES) $(SERVER_MAN_PAGES) $(RECOVER_MAN_PAGES) $(RESTORE_MAN_PAGES) -+man_MANS = $(AMPLOT_MAN_PAGES) $(SERVER_MAN_PAGES) $(RECOVER_MAN_PAGES) $(RESTORE_MAN_PAGES) - - mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs - CONFIG_HEADER = ../config/config.h diff --git a/sysutils/amanda-server/patches/patch-ba b/sysutils/amanda-server/patches/patch-ba deleted file mode 100644 index bbd7226500f..00000000000 --- a/sysutils/amanda-server/patches/patch-ba +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ba,v 1.1 2001/03/16 11:19:29 tron Exp $ - ---- common-src/token.h.orig Thu Mar 15 20:30:31 2001 -+++ common-src/token.h Thu Mar 15 20:30:43 2001 -@@ -42,7 +42,7 @@ - extern char *quotef P((char *sep, char *format, ...)); - extern char *quote P((char *sep, char *str)); - extern char *rxquote P((char *str)); --extern char *shquote P((char *str)); -+extern char *am_shquote P((char *str)); - extern int table_lookup P((table_t *table, char *str)); - extern char *table_lookup_r P((table_t *table, int val)); - diff --git a/sysutils/amanda-server/patches/patch-bb b/sysutils/amanda-server/patches/patch-bb deleted file mode 100644 index 6e099de9967..00000000000 --- a/sysutils/amanda-server/patches/patch-bb +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bb,v 1.1 2001/03/16 11:19:29 tron Exp $ - ---- common-src/token.c.orig Thu Mar 15 20:30:23 2001 -+++ common-src/token.c Thu Mar 15 20:30:56 2001 -@@ -295,7 +295,7 @@ - } - - /* Quote a string so that it can be safely passed to a shell */ --char *shquote(str) -+char *am_shquote(str) - char *str; /* the string to quote */ - { - char *pi, *po; diff --git a/sysutils/amanda-server/patches/patch-bc b/sysutils/amanda-server/patches/patch-bc deleted file mode 100644 index 5501efea5fa..00000000000 --- a/sysutils/amanda-server/patches/patch-bc +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-bc,v 1.1 2002/06/06 01:38:42 simonb Exp $ - ---- server-src/reporter.c.orig Sat Feb 3 06:07:57 2001 -+++ server-src/reporter.c -@@ -168,13 +168,13 @@ - { "HostName", 0, 12, 12, 0, "%-*.*s", "HOSTNAME" }, - { "Disk", 1, 11, 11, 0, "%-*.*s", "DISK" }, - { "Level", 1, 1, 1, 0, "%*.*d", "L" }, -- { "OrigKB", 1, 7, 0, 0, "%*.*f", "ORIG-KB" }, -- { "OutKB", 0, 7, 0, 0, "%*.*f", "OUT-KB" }, -+ { "OrigKB", 1, 9, 0, 0, "%*.*f", "ORIG-KB" }, -+ { "OutKB", 0, 9, 0, 0, "%*.*f", "OUT-KB" }, - { "Compress", 0, 6, 1, 0, "%*.*f", "COMP%" }, - { "DumpTime", 0, 7, 7, 0, "%*.*s", "MMM:SS" }, -- { "DumpRate", 0, 6, 1, 0, "%*.*f", "KB/s" }, -+ { "DumpRate", 0, 7, 1, 0, "%*.*f", "KB/s" }, - { "TapeTime", 1, 6, 6, 0, "%*.*s", "MMM:SS" }, -- { "TapeRate", 0, 6, 1, 0, "%*.*f", "KB/s" }, -+ { "TapeRate", 0, 7, 1, 0, "%*.*f", "KB/s" }, - { NULL, 0, 0, 0, 0, NULL, NULL } - }; - static char *ColumnSpec=""; /* filled from config */ diff --git a/sysutils/amanda/Makefile b/sysutils/amanda/Makefile index a626c6c9a87..f85b66edae1 100644 --- a/sysutils/amanda/Makefile +++ b/sysutils/amanda/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.35 2003/07/17 22:53:25 grant Exp $ +# $NetBSD: Makefile,v 1.36 2004/05/12 18:45:25 bouyer Exp $ # -DISTNAME= amanda-2.4.2p2 +DISTNAME= amanda-2.4.4p2 CATEGORIES= sysutils MASTER_SITES= # empty DISTFILES= # empty @@ -10,9 +10,9 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.amanda.org/ COMMENT= The "meta-package" for Amanda, a network backup system -DEPENDS+= amanda-client-2.4.2p2:../../sysutils/amanda-client -DEPENDS+= amanda-server-2.4.2p2:../../sysutils/amanda-server -DEPENDS+= amanda-plot-2.4.2p2:../../sysutils/amanda-plot +DEPENDS+= amanda-client-2.4.4p2:../../sysutils/amanda-client +DEPENDS+= amanda-server-2.4.4p2:../../sysutils/amanda-server +DEPENDS+= amanda-plot-2.4.4p2:../../sysutils/amanda-plot EXTRACT_ONLY= # empty NO_CHECKSUM= yes |