1 files changed, 176 insertions, 13 deletions
diff --git a/sysutils/amanda-server/patches/patch-ad b/sysutils/amanda-server/patches/patch-ad
index 5144c9c2dbc..5cdd157be31 100644
--- a/sysutils/amanda-server/patches/patch-ad
+++ b/sysutils/amanda-server/patches/patch-ad
@@ -1,17 +1,180 @@
-$NetBSD: patch-ad,v 1.4 1999/09/06 18:16:34 bad Exp $
+$NetBSD: patch-ad,v 1.5 2001/01/16 21:59:39 cjones Exp $
 
---- man/Makefile.in.orig	Sat Nov 21 18:34:50 1998
-+++ man/Makefile.in	Sat Sep  4 03:26:17 1999
-@@ -158,10 +158,10 @@
+--- server-src/Makefile.in.orig	Sat Nov 25 07:01:58 2000
++++ server-src/Makefile.in	Mon Jan 15 14:18:34 2001
+@@ -180,9 +180,7 @@
  
- transform =	s,x,x,;
+ libamserver_a_SOURCES = $(libamserver_la_SOURCES)
  
--man_MANS =	amadmin.8	amanda.8	amcheck.8	\
-+man_MANS =	amadmin.8	amcheck.8	\
- 		amcheckdb.8	amcleanup.8	amdump.8	\
- 		amflush.8	amlabel.8	amoverview.8	\
--		amplot.8	amrecover.8	amrestore.8	\
-+						amrestore.8	\
- 		amrmtape.8	amtape.8	amtoc.8		\
- 		amverify.8	amstatus.8	amreport.8
+-LDADD = libamserver.$(LIB_EXTENSION) \
+-	../tape-src/libamtape.$(LIB_EXTENSION) \
+-	../common-src/libamanda.$(LIB_EXTENSION)
++LDADD = libamserver.$(LIB_EXTENSION)
+ 
+ 
+ SUFFIXES = .sh .pl
+@@ -221,7 +219,7 @@
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../config
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ -lamtape -lamanda
+ libamserver_a_AR = $(AR) cru
+ libamserver_a_LIBADD = 
+ am_libamserver_a_OBJECTS =  amindex.$(OBJEXT) changer.$(OBJEXT) \
+@@ -247,136 +245,98 @@
+ amadmin_SOURCES = amadmin.c
+ amadmin_OBJECTS =  amadmin.$(OBJEXT)
+ amadmin_LDADD = $(LDADD)
+-amadmin_DEPENDENCIES =  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 =  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 =  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 =  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 =  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 =  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 =  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 =  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 =  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 =  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 =  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 =  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 =  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 =  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 =  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 =  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 =  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 =  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 =  libamserver.$(LIB_EXTENSION) \
+-../tape-src/libamtape.$(LIB_EXTENSION) \
+-../common-src/libamanda.$(LIB_EXTENSION)
++taper_DEPENDENCIES =  libamserver.$(LIB_EXTENSION)
+ taper_LDFLAGS = 
+ SCRIPTS =  $(sbin_SCRIPTS)