Prepare for 2.4.2p2

This is a bug fix release.
Improve debugging support, fix some fd leaks and add barcode reader support.
For more details, refer to the Changelog.

2 files changed, 16 insertions, 30 deletions

diff --git a/sysutils/amanda-plot/patches/patch-ab b/sysutils/amanda-plot/patches/patch-ab
index 14d42e4a129..43e71f2943e 100644
--- a/sysutils/amanda-plot/patches/patch-ab
+++ b/sysutils/amanda-plot/patches/patch-ab
@@ -1,27 +1,17 @@
-$NetBSD: patch-ab,v 1.2 2001/01/16 21:59:33 cjones Exp $
+$NetBSD: patch-ab,v 1.3 2001/06/26 03:14:12 christos Exp $
 
---- Makefile.in.orig	Sat Nov 25 07:01:53 2000
-+++ Makefile.in	Mon Jan 15 16:32:14 2001
-@@ -162,20 +162,14 @@
+--- 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
  # order is significant, don't change it arbitrarily
- SUBDIRS = \
- 	config \
--	common-src \
- 	$(CLIENT_SUBDIRS) \
--	$(TAPE_SUBDIRS) \
--	$(SERVER_SUBDIRS) \
- 	$(RESTORE_SUBDIRS) \
- 	$(RECOVER_SUBDIRS) \
- 	$(PLOT_SUBDIRS) \
--	man docs example
-+	man
+-SUBDIRS =  	config 	common-src 	$(CLIENT_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
  
  
--pkgdata_DATA = \
--	COPYRIGHT			\
--	COPYRIGHT-APACHE		\
--	COPYRIGHT-REGEX
+-pkgdata_DATA =  	COPYRIGHT				COPYRIGHT-APACHE			COPYRIGHT-REGEX
 +pkgdata_DATA =
  
  
- EXTRA_DIST = $(SNAPSHOT_STAMP) \
+ 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-plot/patches/patch-ac b/sysutils/amanda-plot/patches/patch-ac
index 8bd4ac39014..540b209692e 100644
--- a/sysutils/amanda-plot/patches/patch-ac
+++ b/sysutils/amanda-plot/patches/patch-ac
@@ -1,17 +1,13 @@
-$NetBSD: patch-ac,v 1.2 2001/01/16 21:59:33 cjones Exp $
+$NetBSD: patch-ac,v 1.3 2001/06/26 03:14:12 christos Exp $
 
---- man/Makefile.in~	Sat Nov 25 07:02:01 2000
-+++ man/Makefile.in	Mon Jan 15 16:31:20 2001
-@@ -176,11 +176,7 @@
+--- 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 @@
  # 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) 	   $(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