Fixe patches to apply cleanly on 2.4.4p2

4 files changed, 31 insertions, 21 deletions

diff --git a/sysutils/amanda-plot/distinfo b/sysutils/amanda-plot/distinfo
index c30a1c74683..0c2157f2e94 100644
--- a/sysutils/amanda-plot/distinfo
+++ b/sysutils/amanda-plot/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2004/05/12 20:53:51 bouyer Exp $
+$NetBSD: distinfo,v 1.6 2004/05/15 12:15:22 bouyer Exp $
 
 SHA1 (amanda-2.4.4p2.tar.gz) = c14510260941a3915f4068e6b7e3f91698ab099e
 Size (amanda-2.4.4p2.tar.gz) = 1263075 bytes
-SHA1 (patch-aa) = 12ff93eea6d9f443ce2f236492d9e0362fd2d9ff
-SHA1 (patch-ab) = ba184b284ae72a3fd822cce722436955ca242b2f
-SHA1 (patch-ac) = c8487962b38b339acc34631eb1f495f184ad6308
+SHA1 (patch-aa) = 207efbc13033b10309d4194db7e180f50a53a76d
+SHA1 (patch-ab) = daa1d60888ec3e78eb4a88a4979f0a563e1a49f3
+SHA1 (patch-ac) = 44663863416fc81be5311c027482c494903a90b9
diff --git a/sysutils/amanda-plot/patches/patch-aa b/sysutils/amanda-plot/patches/patch-aa
index e3e11acd54e..6567f557c44 100644
--- a/sysutils/amanda-plot/patches/patch-aa
+++ b/sysutils/amanda-plot/patches/patch-aa
@@ -1,15 +1,15 @@
-$NetBSD: patch-aa,v 1.2 2001/01/16 21:59:33 cjones Exp $
+$NetBSD: patch-aa,v 1.3 2004/05/15 12:15:22 bouyer Exp $
 
---- configure~	Sat Nov 25 06:59:40 2000
-+++ configure	Mon Jan 15 16:27:32 2001
-@@ -4924,8 +4924,10 @@
+--- configure.orig	2004-01-08 19:21:36.000000000 +0100
++++ configure	2004-05-15 13:46:46.000000000 +0200
+@@ -11399,8 +11399,10 @@
  # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+ LIBTOOL_DEPS="$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.
+ # Prevent multiple expansion
+ 
diff --git a/sysutils/amanda-plot/patches/patch-ab b/sysutils/amanda-plot/patches/patch-ab
index 496a65daa7c..450fdc14e2e 100644
--- a/sysutils/amanda-plot/patches/patch-ab
+++ b/sysutils/amanda-plot/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.5 2004/05/12 20:53:51 bouyer Exp $
+$NetBSD: patch-ab,v 1.6 2004/05/15 12:15:22 bouyer Exp $
 
---- Makefile.in.orig	2004-05-12 22:51:17.000000000 +0200
-+++ Makefile.in	2004-05-12 21:53:57.000000000 +0200
+--- Makefile.in.orig	2004-01-08 19:21:29.000000000 +0100
++++ Makefile.in	2004-05-15 14:05:39.000000000 +0200
 @@ -168,20 +168,14 @@
  # order is significant, don't change it arbitrarily
  SUBDIRS = \
@@ -25,12 +25,22 @@ $NetBSD: patch-ab,v 1.5 2004/05/12 20:53:51 bouyer Exp $
  
  
  EXTRA_DIST = $(SNAPSHOT_STAMP) \
-@@ -506,7 +500,7 @@
+@@ -243,8 +237,7 @@
+ 	uninstall-recursive check-recursive installcheck-recursive
+ DIST_COMMON = README AUTHORS ChangeLog INSTALL Makefile.am Makefile.in \
+ 	NEWS acinclude.m4 aclocal.m4 configure configure.in
+-DIST_SUBDIRS = config common-src client-src tape-src server-src \
+-	changer-src restore-src recover-src amplot man docs example
++DIST_SUBDIRS = config amplot man
+ all: all-recursive
+ 
+ .SUFFIXES:
+@@ -506,7 +499,7 @@
  uninstall: uninstall-recursive
  
  install-am: all-am
--	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-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-plot/patches/patch-ac b/sysutils/amanda-plot/patches/patch-ac
index 67ebc7bc39a..9a202fc1088 100644
--- a/sysutils/amanda-plot/patches/patch-ac
+++ b/sysutils/amanda-plot/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.5 2004/05/12 20:53:51 bouyer Exp $
+$NetBSD: patch-ac,v 1.6 2004/05/15 12:15:22 bouyer Exp $
 
---- man/Makefile.in.orig	2004-01-08 10:23:42.000000000 -0800
-+++ man/Makefile.in	2004-02-24 08:15:51.000000000 -0800
+--- man/Makefile.in.orig	2004-05-15 14:07:19.000000000 +0200
++++ man/Makefile.in	2004-05-15 14:07:34.000000000 +0200
 @@ -188,11 +188,7 @@
  # not autoconf-generated:
  EXTRA_DIST = amplot.8 amrestore.8 amtape.8 amdd.8 ammt.8
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.5 2004/05/12 20:53:51 bouyer Exp $
 -	   $(SERVER_MAN_PAGES) \
 -	   $(RECOVER_MAN_PAGES) \
 -	   $(RESTORE_MAN_PAGES)
-+man_MANS = $(AMPLOT_MAN_PAGES)
++man_MANS = $(AMPLOT_MAN_PAGES) 
  
  subdir = man
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs