Upgrade for 2.4.0 release. I wish this could have coincided better with our 2.2.6 release. Leave NO_LATEST_LINK for a bit longer while we test.

44 files changed, 143 insertions, 154 deletions

diff --git a/misc/amanda-client/Makefile b/misc/amanda-client/Makefile
index beeb4334c3c6..2a207cdb76eb 100644
--- a/misc/amanda-client/Makefile
+++ b/misc/amanda-client/Makefile
@@ -3,11 +3,10 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.13 1998/03/03 09:32:00 asami Exp $
+# $Id: Makefile,v 1.14 1998/03/20 02:06:07 cwt Exp $
 #
 
-DISTNAME=	amanda-2.4.0-980319
-PKGNAME=	amanda-2.4.0.980319
+DISTNAME=	amanda-2.4.0
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.amanda.org/pub/amanda/
 
diff --git a/misc/amanda-client/distinfo b/misc/amanda-client/distinfo
index 894fb6b4c4ed..0c8c35d47425 100644
--- a/misc/amanda-client/distinfo
+++ b/misc/amanda-client/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.0-980319.tar.gz) = d7e5c906f6ef79bdea3bb6a7f9ef0900
+MD5 (amanda-2.4.0.tar.gz) = b0c29c9b1b1fd0c8fcddfdecb2b8b2a8
diff --git a/misc/amanda-client/pkg-descr b/misc/amanda-client/pkg-descr
index 5b33b9939e25..0ce8f8fe8b02 100644
--- a/misc/amanda-client/pkg-descr
+++ b/misc/amanda-client/pkg-descr
@@ -1,7 +1,7 @@
 
 ** CAUTION **
  
-THIS BETA RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
+THE RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
 EARLIER AMANDA CLIENTS (PER CHANGES FILE IN THE DISTRIBUTION.) 
 
 WHAT IS AMANDA?
diff --git a/misc/amanda-client/pkg-plist b/misc/amanda-client/pkg-plist
index 7d2d4e6e45f5..aa810922aeea 100644
--- a/misc/amanda-client/pkg-plist
+++ b/misc/amanda-client/pkg-plist
@@ -1,14 +1,14 @@
-lib/amanda/amanda-2.4.0-980319/examples/amanda.conf
-lib/amanda/amanda-2.4.0-980319/examples/chg-multi.conf
-lib/amanda/amanda-2.4.0-980319/examples/disklist
+lib/amanda/amanda-2.4.0/examples/amanda.conf
+lib/amanda/amanda-2.4.0/examples/chg-multi.conf
+lib/amanda/amanda-2.4.0/examples/disklist
 lib/libamanda.a
 lib/libamanda.la
 lib/libamanda.so
-lib/libamanda.so.4.1
+lib/libamanda.so.5.0
 lib/libamclient.a
 lib/libamclient.la
 lib/libamclient.so
-lib/libamclient.so.0.3
+lib/libamclient.so.0.4
 lib/libamnolog.a
 lib/libamnolog.la
 lib/libamnolog.so
@@ -16,11 +16,11 @@ lib/libamnolog.so.0.0
 lib/libamserver.a
 lib/libamserver.la
 lib/libamserver.so
-lib/libamserver.so.2.1
+lib/libamserver.so.3.0
 lib/libamtape.a
 lib/libamtape.la
 lib/libamtape.so
-lib/libamtape.so.1.0
+lib/libamtape.so.1.1
 @exec /sbin/ldconfig -m %B
 libexec/amanda/amandad
 libexec/amanda/amcat.awk
@@ -81,7 +81,7 @@ sbin/amrmtape
 sbin/amtape
 sbin/amtoc
 sbin/amverify
-@dirrm lib/amanda/amanda-2.4.0-980319/examples
-@dirrm lib/amanda/amanda-2.4.0-980319
+@dirrm lib/amanda/amanda-2.4.0/examples
+@dirrm lib/amanda/amanda-2.4.0
 @dirrm lib/amanda
 @dirrm libexec/amanda
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index beeb4334c3c6..2a207cdb76eb 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -3,11 +3,10 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.13 1998/03/03 09:32:00 asami Exp $
+# $Id: Makefile,v 1.14 1998/03/20 02:06:07 cwt Exp $
 #
 
-DISTNAME=	amanda-2.4.0-980319
-PKGNAME=	amanda-2.4.0.980319
+DISTNAME=	amanda-2.4.0
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.amanda.org/pub/amanda/
 
diff --git a/misc/amanda-server/distinfo b/misc/amanda-server/distinfo
index 894fb6b4c4ed..0c8c35d47425 100644
--- a/misc/amanda-server/distinfo
+++ b/misc/amanda-server/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.0-980319.tar.gz) = d7e5c906f6ef79bdea3bb6a7f9ef0900
+MD5 (amanda-2.4.0.tar.gz) = b0c29c9b1b1fd0c8fcddfdecb2b8b2a8
diff --git a/misc/amanda-server/pkg-descr b/misc/amanda-server/pkg-descr
index 5b33b9939e25..0ce8f8fe8b02 100644
--- a/misc/amanda-server/pkg-descr
+++ b/misc/amanda-server/pkg-descr
@@ -1,7 +1,7 @@
 
 ** CAUTION **
  
-THIS BETA RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
+THE RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
 EARLIER AMANDA CLIENTS (PER CHANGES FILE IN THE DISTRIBUTION.) 
 
 WHAT IS AMANDA?
diff --git a/misc/amanda-server/pkg-plist b/misc/amanda-server/pkg-plist
index 7d2d4e6e45f5..aa810922aeea 100644
--- a/misc/amanda-server/pkg-plist
+++ b/misc/amanda-server/pkg-plist
@@ -1,14 +1,14 @@
-lib/amanda/amanda-2.4.0-980319/examples/amanda.conf
-lib/amanda/amanda-2.4.0-980319/examples/chg-multi.conf
-lib/amanda/amanda-2.4.0-980319/examples/disklist
+lib/amanda/amanda-2.4.0/examples/amanda.conf
+lib/amanda/amanda-2.4.0/examples/chg-multi.conf
+lib/amanda/amanda-2.4.0/examples/disklist
 lib/libamanda.a
 lib/libamanda.la
 lib/libamanda.so
-lib/libamanda.so.4.1
+lib/libamanda.so.5.0
 lib/libamclient.a
 lib/libamclient.la
 lib/libamclient.so
-lib/libamclient.so.0.3
+lib/libamclient.so.0.4
 lib/libamnolog.a
 lib/libamnolog.la
 lib/libamnolog.so
@@ -16,11 +16,11 @@ lib/libamnolog.so.0.0
 lib/libamserver.a
 lib/libamserver.la
 lib/libamserver.so
-lib/libamserver.so.2.1
+lib/libamserver.so.3.0
 lib/libamtape.a
 lib/libamtape.la
 lib/libamtape.so
-lib/libamtape.so.1.0
+lib/libamtape.so.1.1
 @exec /sbin/ldconfig -m %B
 libexec/amanda/amandad
 libexec/amanda/amcat.awk
@@ -81,7 +81,7 @@ sbin/amrmtape
 sbin/amtape
 sbin/amtoc
 sbin/amverify
-@dirrm lib/amanda/amanda-2.4.0-980319/examples
-@dirrm lib/amanda/amanda-2.4.0-980319
+@dirrm lib/amanda/amanda-2.4.0/examples
+@dirrm lib/amanda/amanda-2.4.0
 @dirrm lib/amanda
 @dirrm libexec/amanda
diff --git a/misc/amanda24-client/Makefile b/misc/amanda24-client/Makefile
index beeb4334c3c6..2a207cdb76eb 100644
--- a/misc/amanda24-client/Makefile
+++ b/misc/amanda24-client/Makefile
@@ -3,11 +3,10 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.13 1998/03/03 09:32:00 asami Exp $
+# $Id: Makefile,v 1.14 1998/03/20 02:06:07 cwt Exp $
 #
 
-DISTNAME=	amanda-2.4.0-980319
-PKGNAME=	amanda-2.4.0.980319
+DISTNAME=	amanda-2.4.0
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.amanda.org/pub/amanda/
 
diff --git a/misc/amanda24-client/distinfo b/misc/amanda24-client/distinfo
index 894fb6b4c4ed..0c8c35d47425 100644
--- a/misc/amanda24-client/distinfo
+++ b/misc/amanda24-client/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.0-980319.tar.gz) = d7e5c906f6ef79bdea3bb6a7f9ef0900
+MD5 (amanda-2.4.0.tar.gz) = b0c29c9b1b1fd0c8fcddfdecb2b8b2a8
diff --git a/misc/amanda24-client/pkg-descr b/misc/amanda24-client/pkg-descr
index 5b33b9939e25..0ce8f8fe8b02 100644
--- a/misc/amanda24-client/pkg-descr
+++ b/misc/amanda24-client/pkg-descr
@@ -1,7 +1,7 @@
 
 ** CAUTION **
  
-THIS BETA RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
+THE RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
 EARLIER AMANDA CLIENTS (PER CHANGES FILE IN THE DISTRIBUTION.) 
 
 WHAT IS AMANDA?
diff --git a/misc/amanda24-client/pkg-plist b/misc/amanda24-client/pkg-plist
index 7d2d4e6e45f5..aa810922aeea 100644
--- a/misc/amanda24-client/pkg-plist
+++ b/misc/amanda24-client/pkg-plist
@@ -1,14 +1,14 @@
-lib/amanda/amanda-2.4.0-980319/examples/amanda.conf
-lib/amanda/amanda-2.4.0-980319/examples/chg-multi.conf
-lib/amanda/amanda-2.4.0-980319/examples/disklist
+lib/amanda/amanda-2.4.0/examples/amanda.conf
+lib/amanda/amanda-2.4.0/examples/chg-multi.conf
+lib/amanda/amanda-2.4.0/examples/disklist
 lib/libamanda.a
 lib/libamanda.la
 lib/libamanda.so
-lib/libamanda.so.4.1
+lib/libamanda.so.5.0
 lib/libamclient.a
 lib/libamclient.la
 lib/libamclient.so
-lib/libamclient.so.0.3
+lib/libamclient.so.0.4
 lib/libamnolog.a
 lib/libamnolog.la
 lib/libamnolog.so
@@ -16,11 +16,11 @@ lib/libamnolog.so.0.0
 lib/libamserver.a
 lib/libamserver.la
 lib/libamserver.so
-lib/libamserver.so.2.1
+lib/libamserver.so.3.0
 lib/libamtape.a
 lib/libamtape.la
 lib/libamtape.so
-lib/libamtape.so.1.0
+lib/libamtape.so.1.1
 @exec /sbin/ldconfig -m %B
 libexec/amanda/amandad
 libexec/amanda/amcat.awk
@@ -81,7 +81,7 @@ sbin/amrmtape
 sbin/amtape
 sbin/amtoc
 sbin/amverify
-@dirrm lib/amanda/amanda-2.4.0-980319/examples
-@dirrm lib/amanda/amanda-2.4.0-980319
+@dirrm lib/amanda/amanda-2.4.0/examples
+@dirrm lib/amanda/amanda-2.4.0
 @dirrm lib/amanda
 @dirrm libexec/amanda
diff --git a/misc/amanda24-server/Makefile b/misc/amanda24-server/Makefile
index beeb4334c3c6..2a207cdb76eb 100644
--- a/misc/amanda24-server/Makefile
+++ b/misc/amanda24-server/Makefile
@@ -3,11 +3,10 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.13 1998/03/03 09:32:00 asami Exp $
+# $Id: Makefile,v 1.14 1998/03/20 02:06:07 cwt Exp $
 #
 
-DISTNAME=	amanda-2.4.0-980319
-PKGNAME=	amanda-2.4.0.980319
+DISTNAME=	amanda-2.4.0
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.amanda.org/pub/amanda/
 
diff --git a/misc/amanda24-server/distinfo b/misc/amanda24-server/distinfo
index 894fb6b4c4ed..0c8c35d47425 100644
--- a/misc/amanda24-server/distinfo
+++ b/misc/amanda24-server/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.0-980319.tar.gz) = d7e5c906f6ef79bdea3bb6a7f9ef0900
+MD5 (amanda-2.4.0.tar.gz) = b0c29c9b1b1fd0c8fcddfdecb2b8b2a8
diff --git a/misc/amanda24-server/pkg-descr b/misc/amanda24-server/pkg-descr
index 5b33b9939e25..0ce8f8fe8b02 100644
--- a/misc/amanda24-server/pkg-descr
+++ b/misc/amanda24-server/pkg-descr
@@ -1,7 +1,7 @@
 
 ** CAUTION **
  
-THIS BETA RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
+THE RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
 EARLIER AMANDA CLIENTS (PER CHANGES FILE IN THE DISTRIBUTION.) 
 
 WHAT IS AMANDA?
diff --git a/misc/amanda24-server/pkg-plist b/misc/amanda24-server/pkg-plist
index 7d2d4e6e45f5..aa810922aeea 100644
--- a/misc/amanda24-server/pkg-plist
+++ b/misc/amanda24-server/pkg-plist
@@ -1,14 +1,14 @@
-lib/amanda/amanda-2.4.0-980319/examples/amanda.conf
-lib/amanda/amanda-2.4.0-980319/examples/chg-multi.conf
-lib/amanda/amanda-2.4.0-980319/examples/disklist
+lib/amanda/amanda-2.4.0/examples/amanda.conf
+lib/amanda/amanda-2.4.0/examples/chg-multi.conf
+lib/amanda/amanda-2.4.0/examples/disklist
 lib/libamanda.a
 lib/libamanda.la
 lib/libamanda.so
-lib/libamanda.so.4.1
+lib/libamanda.so.5.0
 lib/libamclient.a
 lib/libamclient.la
 lib/libamclient.so
-lib/libamclient.so.0.3
+lib/libamclient.so.0.4
 lib/libamnolog.a
 lib/libamnolog.la
 lib/libamnolog.so
@@ -16,11 +16,11 @@ lib/libamnolog.so.0.0
 lib/libamserver.a
 lib/libamserver.la
 lib/libamserver.so
-lib/libamserver.so.2.1
+lib/libamserver.so.3.0
 lib/libamtape.a
 lib/libamtape.la
 lib/libamtape.so
-lib/libamtape.so.1.0
+lib/libamtape.so.1.1
 @exec /sbin/ldconfig -m %B
 libexec/amanda/amandad
 libexec/amanda/amcat.awk
@@ -81,7 +81,7 @@ sbin/amrmtape
 sbin/amtape
 sbin/amtoc
 sbin/amverify
-@dirrm lib/amanda/amanda-2.4.0-980319/examples
-@dirrm lib/amanda/amanda-2.4.0-980319
+@dirrm lib/amanda/amanda-2.4.0/examples
+@dirrm lib/amanda/amanda-2.4.0
 @dirrm lib/amanda
 @dirrm libexec/amanda
diff --git a/misc/amanda24/Makefile b/misc/amanda24/Makefile
index beeb4334c3c6..2a207cdb76eb 100644
--- a/misc/amanda24/Makefile
+++ b/misc/amanda24/Makefile
@@ -3,11 +3,10 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.13 1998/03/03 09:32:00 asami Exp $
+# $Id: Makefile,v 1.14 1998/03/20 02:06:07 cwt Exp $
 #
 
-DISTNAME=	amanda-2.4.0-980319
-PKGNAME=	amanda-2.4.0.980319
+DISTNAME=	amanda-2.4.0
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.amanda.org/pub/amanda/
 
diff --git a/misc/amanda24/distinfo b/misc/amanda24/distinfo
index 894fb6b4c4ed..0c8c35d47425 100644
--- a/misc/amanda24/distinfo
+++ b/misc/amanda24/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.0-980319.tar.gz) = d7e5c906f6ef79bdea3bb6a7f9ef0900
+MD5 (amanda-2.4.0.tar.gz) = b0c29c9b1b1fd0c8fcddfdecb2b8b2a8
diff --git a/misc/amanda24/pkg-descr b/misc/amanda24/pkg-descr
index 5b33b9939e25..0ce8f8fe8b02 100644
--- a/misc/amanda24/pkg-descr
+++ b/misc/amanda24/pkg-descr
@@ -1,7 +1,7 @@
 
 ** CAUTION **
  
-THIS BETA RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
+THE RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
 EARLIER AMANDA CLIENTS (PER CHANGES FILE IN THE DISTRIBUTION.) 
 
 WHAT IS AMANDA?
diff --git a/misc/amanda24/pkg-plist b/misc/amanda24/pkg-plist
index 7d2d4e6e45f5..aa810922aeea 100644
--- a/misc/amanda24/pkg-plist
+++ b/misc/amanda24/pkg-plist
@@ -1,14 +1,14 @@
-lib/amanda/amanda-2.4.0-980319/examples/amanda.conf
-lib/amanda/amanda-2.4.0-980319/examples/chg-multi.conf
-lib/amanda/amanda-2.4.0-980319/examples/disklist
+lib/amanda/amanda-2.4.0/examples/amanda.conf
+lib/amanda/amanda-2.4.0/examples/chg-multi.conf
+lib/amanda/amanda-2.4.0/examples/disklist
 lib/libamanda.a
 lib/libamanda.la
 lib/libamanda.so
-lib/libamanda.so.4.1
+lib/libamanda.so.5.0
 lib/libamclient.a
 lib/libamclient.la
 lib/libamclient.so
-lib/libamclient.so.0.3
+lib/libamclient.so.0.4
 lib/libamnolog.a
 lib/libamnolog.la
 lib/libamnolog.so
@@ -16,11 +16,11 @@ lib/libamnolog.so.0.0
 lib/libamserver.a
 lib/libamserver.la
 lib/libamserver.so
-lib/libamserver.so.2.1
+lib/libamserver.so.3.0
 lib/libamtape.a
 lib/libamtape.la
 lib/libamtape.so
-lib/libamtape.so.1.0
+lib/libamtape.so.1.1
 @exec /sbin/ldconfig -m %B
 libexec/amanda/amandad
 libexec/amanda/amcat.awk
@@ -81,7 +81,7 @@ sbin/amrmtape
 sbin/amtape
 sbin/amtoc
 sbin/amverify
-@dirrm lib/amanda/amanda-2.4.0-980319/examples
-@dirrm lib/amanda/amanda-2.4.0-980319
+@dirrm lib/amanda/amanda-2.4.0/examples
+@dirrm lib/amanda/amanda-2.4.0
 @dirrm lib/amanda
 @dirrm libexec/amanda
diff --git a/misc/amanda25-client/Makefile b/misc/amanda25-client/Makefile
index beeb4334c3c6..2a207cdb76eb 100644
--- a/misc/amanda25-client/Makefile
+++ b/misc/amanda25-client/Makefile
@@ -3,11 +3,10 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.13 1998/03/03 09:32:00 asami Exp $
+# $Id: Makefile,v 1.14 1998/03/20 02:06:07 cwt Exp $
 #
 
-DISTNAME=	amanda-2.4.0-980319
-PKGNAME=	amanda-2.4.0.980319
+DISTNAME=	amanda-2.4.0
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.amanda.org/pub/amanda/
 
diff --git a/misc/amanda25-client/distinfo b/misc/amanda25-client/distinfo
index 894fb6b4c4ed..0c8c35d47425 100644
--- a/misc/amanda25-client/distinfo
+++ b/misc/amanda25-client/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.0-980319.tar.gz) = d7e5c906f6ef79bdea3bb6a7f9ef0900
+MD5 (amanda-2.4.0.tar.gz) = b0c29c9b1b1fd0c8fcddfdecb2b8b2a8
diff --git a/misc/amanda25-client/pkg-descr b/misc/amanda25-client/pkg-descr
index 5b33b9939e25..0ce8f8fe8b02 100644
--- a/misc/amanda25-client/pkg-descr
+++ b/misc/amanda25-client/pkg-descr
@@ -1,7 +1,7 @@
 
 ** CAUTION **
  
-THIS BETA RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
+THE RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
 EARLIER AMANDA CLIENTS (PER CHANGES FILE IN THE DISTRIBUTION.) 
 
 WHAT IS AMANDA?
diff --git a/misc/amanda25-client/pkg-plist b/misc/amanda25-client/pkg-plist
index 7d2d4e6e45f5..aa810922aeea 100644
--- a/misc/amanda25-client/pkg-plist
+++ b/misc/amanda25-client/pkg-plist
@@ -1,14 +1,14 @@
-lib/amanda/amanda-2.4.0-980319/examples/amanda.conf
-lib/amanda/amanda-2.4.0-980319/examples/chg-multi.conf
-lib/amanda/amanda-2.4.0-980319/examples/disklist
+lib/amanda/amanda-2.4.0/examples/amanda.conf
+lib/amanda/amanda-2.4.0/examples/chg-multi.conf
+lib/amanda/amanda-2.4.0/examples/disklist
 lib/libamanda.a
 lib/libamanda.la
 lib/libamanda.so
-lib/libamanda.so.4.1
+lib/libamanda.so.5.0
 lib/libamclient.a
 lib/libamclient.la
 lib/libamclient.so
-lib/libamclient.so.0.3
+lib/libamclient.so.0.4
 lib/libamnolog.a
 lib/libamnolog.la
 lib/libamnolog.so
@@ -16,11 +16,11 @@ lib/libamnolog.so.0.0
 lib/libamserver.a
 lib/libamserver.la
 lib/libamserver.so
-lib/libamserver.so.2.1
+lib/libamserver.so.3.0
 lib/libamtape.a
 lib/libamtape.la
 lib/libamtape.so
-lib/libamtape.so.1.0
+lib/libamtape.so.1.1
 @exec /sbin/ldconfig -m %B
 libexec/amanda/amandad
 libexec/amanda/amcat.awk
@@ -81,7 +81,7 @@ sbin/amrmtape
 sbin/amtape
 sbin/amtoc
 sbin/amverify
-@dirrm lib/amanda/amanda-2.4.0-980319/examples
-@dirrm lib/amanda/amanda-2.4.0-980319
+@dirrm lib/amanda/amanda-2.4.0/examples
+@dirrm lib/amanda/amanda-2.4.0
 @dirrm lib/amanda
 @dirrm libexec/amanda
diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile
index beeb4334c3c6..2a207cdb76eb 100644
--- a/misc/amanda25-server/Makefile
+++ b/misc/amanda25-server/Makefile
@@ -3,11 +3,10 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.13 1998/03/03 09:32:00 asami Exp $
+# $Id: Makefile,v 1.14 1998/03/20 02:06:07 cwt Exp $
 #
 
-DISTNAME=	amanda-2.4.0-980319
-PKGNAME=	amanda-2.4.0.980319
+DISTNAME=	amanda-2.4.0
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.amanda.org/pub/amanda/
 
diff --git a/misc/amanda25-server/distinfo b/misc/amanda25-server/distinfo
index 894fb6b4c4ed..0c8c35d47425 100644
--- a/misc/amanda25-server/distinfo
+++ b/misc/amanda25-server/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.0-980319.tar.gz) = d7e5c906f6ef79bdea3bb6a7f9ef0900
+MD5 (amanda-2.4.0.tar.gz) = b0c29c9b1b1fd0c8fcddfdecb2b8b2a8
diff --git a/misc/amanda25-server/pkg-descr b/misc/amanda25-server/pkg-descr
index 5b33b9939e25..0ce8f8fe8b02 100644
--- a/misc/amanda25-server/pkg-descr
+++ b/misc/amanda25-server/pkg-descr
@@ -1,7 +1,7 @@
 
 ** CAUTION **
  
-THIS BETA RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
+THE RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
 EARLIER AMANDA CLIENTS (PER CHANGES FILE IN THE DISTRIBUTION.) 
 
 WHAT IS AMANDA?
diff --git a/misc/amanda25-server/pkg-plist b/misc/amanda25-server/pkg-plist
index 7d2d4e6e45f5..aa810922aeea 100644
--- a/misc/amanda25-server/pkg-plist
+++ b/misc/amanda25-server/pkg-plist
@@ -1,14 +1,14 @@
-lib/amanda/amanda-2.4.0-980319/examples/amanda.conf
-lib/amanda/amanda-2.4.0-980319/examples/chg-multi.conf
-lib/amanda/amanda-2.4.0-980319/examples/disklist
+lib/amanda/amanda-2.4.0/examples/amanda.conf
+lib/amanda/amanda-2.4.0/examples/chg-multi.conf
+lib/amanda/amanda-2.4.0/examples/disklist
 lib/libamanda.a
 lib/libamanda.la
 lib/libamanda.so
-lib/libamanda.so.4.1
+lib/libamanda.so.5.0
 lib/libamclient.a
 lib/libamclient.la
 lib/libamclient.so
-lib/libamclient.so.0.3
+lib/libamclient.so.0.4
 lib/libamnolog.a
 lib/libamnolog.la
 lib/libamnolog.so
@@ -16,11 +16,11 @@ lib/libamnolog.so.0.0
 lib/libamserver.a
 lib/libamserver.la
 lib/libamserver.so
-lib/libamserver.so.2.1
+lib/libamserver.so.3.0
 lib/libamtape.a
 lib/libamtape.la
 lib/libamtape.so
-lib/libamtape.so.1.0
+lib/libamtape.so.1.1
 @exec /sbin/ldconfig -m %B
 libexec/amanda/amandad
 libexec/amanda/amcat.awk
@@ -81,7 +81,7 @@ sbin/amrmtape
 sbin/amtape
 sbin/amtoc
 sbin/amverify
-@dirrm lib/amanda/amanda-2.4.0-980319/examples
-@dirrm lib/amanda/amanda-2.4.0-980319
+@dirrm lib/amanda/amanda-2.4.0/examples
+@dirrm lib/amanda/amanda-2.4.0
 @dirrm lib/amanda
 @dirrm libexec/amanda
diff --git a/misc/amanda26-client/Makefile b/misc/amanda26-client/Makefile
index beeb4334c3c6..2a207cdb76eb 100644
--- a/misc/amanda26-client/Makefile
+++ b/misc/amanda26-client/Makefile
@@ -3,11 +3,10 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.13 1998/03/03 09:32:00 asami Exp $
+# $Id: Makefile,v 1.14 1998/03/20 02:06:07 cwt Exp $
 #
 
-DISTNAME=	amanda-2.4.0-980319
-PKGNAME=	amanda-2.4.0.980319
+DISTNAME=	amanda-2.4.0
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.amanda.org/pub/amanda/
 
diff --git a/misc/amanda26-client/distinfo b/misc/amanda26-client/distinfo
index 894fb6b4c4ed..0c8c35d47425 100644
--- a/misc/amanda26-client/distinfo
+++ b/misc/amanda26-client/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.0-980319.tar.gz) = d7e5c906f6ef79bdea3bb6a7f9ef0900
+MD5 (amanda-2.4.0.tar.gz) = b0c29c9b1b1fd0c8fcddfdecb2b8b2a8
diff --git a/misc/amanda26-client/pkg-descr b/misc/amanda26-client/pkg-descr
index 5b33b9939e25..0ce8f8fe8b02 100644
--- a/misc/amanda26-client/pkg-descr
+++ b/misc/amanda26-client/pkg-descr
@@ -1,7 +1,7 @@
 
 ** CAUTION **
  
-THIS BETA RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
+THE RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
 EARLIER AMANDA CLIENTS (PER CHANGES FILE IN THE DISTRIBUTION.) 
 
 WHAT IS AMANDA?
diff --git a/misc/amanda26-client/pkg-plist b/misc/amanda26-client/pkg-plist
index 7d2d4e6e45f5..aa810922aeea 100644
--- a/misc/amanda26-client/pkg-plist
+++ b/misc/amanda26-client/pkg-plist
@@ -1,14 +1,14 @@
-lib/amanda/amanda-2.4.0-980319/examples/amanda.conf
-lib/amanda/amanda-2.4.0-980319/examples/chg-multi.conf
-lib/amanda/amanda-2.4.0-980319/examples/disklist
+lib/amanda/amanda-2.4.0/examples/amanda.conf
+lib/amanda/amanda-2.4.0/examples/chg-multi.conf
+lib/amanda/amanda-2.4.0/examples/disklist
 lib/libamanda.a
 lib/libamanda.la
 lib/libamanda.so
-lib/libamanda.so.4.1
+lib/libamanda.so.5.0
 lib/libamclient.a
 lib/libamclient.la
 lib/libamclient.so
-lib/libamclient.so.0.3
+lib/libamclient.so.0.4
 lib/libamnolog.a
 lib/libamnolog.la
 lib/libamnolog.so
@@ -16,11 +16,11 @@ lib/libamnolog.so.0.0
 lib/libamserver.a
 lib/libamserver.la
 lib/libamserver.so
-lib/libamserver.so.2.1
+lib/libamserver.so.3.0
 lib/libamtape.a
 lib/libamtape.la
 lib/libamtape.so
-lib/libamtape.so.1.0
+lib/libamtape.so.1.1
 @exec /sbin/ldconfig -m %B
 libexec/amanda/amandad
 libexec/amanda/amcat.awk
@@ -81,7 +81,7 @@ sbin/amrmtape
 sbin/amtape
 sbin/amtoc
 sbin/amverify
-@dirrm lib/amanda/amanda-2.4.0-980319/examples
-@dirrm lib/amanda/amanda-2.4.0-980319
+@dirrm lib/amanda/amanda-2.4.0/examples
+@dirrm lib/amanda/amanda-2.4.0
 @dirrm lib/amanda
 @dirrm libexec/amanda
diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile
index beeb4334c3c6..2a207cdb76eb 100644
--- a/misc/amanda26-server/Makefile
+++ b/misc/amanda26-server/Makefile
@@ -3,11 +3,10 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.13 1998/03/03 09:32:00 asami Exp $
+# $Id: Makefile,v 1.14 1998/03/20 02:06:07 cwt Exp $
 #
 
-DISTNAME=	amanda-2.4.0-980319
-PKGNAME=	amanda-2.4.0.980319
+DISTNAME=	amanda-2.4.0
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.amanda.org/pub/amanda/
 
diff --git a/misc/amanda26-server/distinfo b/misc/amanda26-server/distinfo
index 894fb6b4c4ed..0c8c35d47425 100644
--- a/misc/amanda26-server/distinfo
+++ b/misc/amanda26-server/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.0-980319.tar.gz) = d7e5c906f6ef79bdea3bb6a7f9ef0900
+MD5 (amanda-2.4.0.tar.gz) = b0c29c9b1b1fd0c8fcddfdecb2b8b2a8
diff --git a/misc/amanda26-server/pkg-descr b/misc/amanda26-server/pkg-descr
index 5b33b9939e25..0ce8f8fe8b02 100644
--- a/misc/amanda26-server/pkg-descr
+++ b/misc/amanda26-server/pkg-descr
@@ -1,7 +1,7 @@
 
 ** CAUTION **
  
-THIS BETA RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
+THE RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
 EARLIER AMANDA CLIENTS (PER CHANGES FILE IN THE DISTRIBUTION.) 
 
 WHAT IS AMANDA?
diff --git a/misc/amanda26-server/pkg-plist b/misc/amanda26-server/pkg-plist
index 7d2d4e6e45f5..aa810922aeea 100644
--- a/misc/amanda26-server/pkg-plist
+++ b/misc/amanda26-server/pkg-plist
@@ -1,14 +1,14 @@
-lib/amanda/amanda-2.4.0-980319/examples/amanda.conf
-lib/amanda/amanda-2.4.0-980319/examples/chg-multi.conf
-lib/amanda/amanda-2.4.0-980319/examples/disklist
+lib/amanda/amanda-2.4.0/examples/amanda.conf
+lib/amanda/amanda-2.4.0/examples/chg-multi.conf
+lib/amanda/amanda-2.4.0/examples/disklist
 lib/libamanda.a
 lib/libamanda.la
 lib/libamanda.so
-lib/libamanda.so.4.1
+lib/libamanda.so.5.0
 lib/libamclient.a
 lib/libamclient.la
 lib/libamclient.so
-lib/libamclient.so.0.3
+lib/libamclient.so.0.4
 lib/libamnolog.a
 lib/libamnolog.la
 lib/libamnolog.so
@@ -16,11 +16,11 @@ lib/libamnolog.so.0.0
 lib/libamserver.a
 lib/libamserver.la
 lib/libamserver.so
-lib/libamserver.so.2.1
+lib/libamserver.so.3.0
 lib/libamtape.a
 lib/libamtape.la
 lib/libamtape.so
-lib/libamtape.so.1.0
+lib/libamtape.so.1.1
 @exec /sbin/ldconfig -m %B
 libexec/amanda/amandad
 libexec/amanda/amcat.awk
@@ -81,7 +81,7 @@ sbin/amrmtape
 sbin/amtape
 sbin/amtoc
 sbin/amverify
-@dirrm lib/amanda/amanda-2.4.0-980319/examples
-@dirrm lib/amanda/amanda-2.4.0-980319
+@dirrm lib/amanda/amanda-2.4.0/examples
+@dirrm lib/amanda/amanda-2.4.0
 @dirrm lib/amanda
 @dirrm libexec/amanda
diff --git a/misc/amanda32-client/Makefile b/misc/amanda32-client/Makefile
index beeb4334c3c6..2a207cdb76eb 100644
--- a/misc/amanda32-client/Makefile
+++ b/misc/amanda32-client/Makefile
@@ -3,11 +3,10 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.13 1998/03/03 09:32:00 asami Exp $
+# $Id: Makefile,v 1.14 1998/03/20 02:06:07 cwt Exp $
 #
 
-DISTNAME=	amanda-2.4.0-980319
-PKGNAME=	amanda-2.4.0.980319
+DISTNAME=	amanda-2.4.0
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.amanda.org/pub/amanda/
 
diff --git a/misc/amanda32-client/distinfo b/misc/amanda32-client/distinfo
index 894fb6b4c4ed..0c8c35d47425 100644
--- a/misc/amanda32-client/distinfo
+++ b/misc/amanda32-client/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.0-980319.tar.gz) = d7e5c906f6ef79bdea3bb6a7f9ef0900
+MD5 (amanda-2.4.0.tar.gz) = b0c29c9b1b1fd0c8fcddfdecb2b8b2a8
diff --git a/misc/amanda32-client/pkg-descr b/misc/amanda32-client/pkg-descr
index 5b33b9939e25..0ce8f8fe8b02 100644
--- a/misc/amanda32-client/pkg-descr
+++ b/misc/amanda32-client/pkg-descr
@@ -1,7 +1,7 @@
 
 ** CAUTION **
  
-THIS BETA RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
+THE RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
 EARLIER AMANDA CLIENTS (PER CHANGES FILE IN THE DISTRIBUTION.) 
 
 WHAT IS AMANDA?
diff --git a/misc/amanda32-client/pkg-plist b/misc/amanda32-client/pkg-plist
index 7d2d4e6e45f5..aa810922aeea 100644
--- a/misc/amanda32-client/pkg-plist
+++ b/misc/amanda32-client/pkg-plist
@@ -1,14 +1,14 @@
-lib/amanda/amanda-2.4.0-980319/examples/amanda.conf
-lib/amanda/amanda-2.4.0-980319/examples/chg-multi.conf
-lib/amanda/amanda-2.4.0-980319/examples/disklist
+lib/amanda/amanda-2.4.0/examples/amanda.conf
+lib/amanda/amanda-2.4.0/examples/chg-multi.conf
+lib/amanda/amanda-2.4.0/examples/disklist
 lib/libamanda.a
 lib/libamanda.la
 lib/libamanda.so
-lib/libamanda.so.4.1
+lib/libamanda.so.5.0
 lib/libamclient.a
 lib/libamclient.la
 lib/libamclient.so
-lib/libamclient.so.0.3
+lib/libamclient.so.0.4
 lib/libamnolog.a
 lib/libamnolog.la
 lib/libamnolog.so
@@ -16,11 +16,11 @@ lib/libamnolog.so.0.0
 lib/libamserver.a
 lib/libamserver.la
 lib/libamserver.so
-lib/libamserver.so.2.1
+lib/libamserver.so.3.0
 lib/libamtape.a
 lib/libamtape.la
 lib/libamtape.so
-lib/libamtape.so.1.0
+lib/libamtape.so.1.1
 @exec /sbin/ldconfig -m %B
 libexec/amanda/amandad
 libexec/amanda/amcat.awk
@@ -81,7 +81,7 @@ sbin/amrmtape
 sbin/amtape
 sbin/amtoc
 sbin/amverify
-@dirrm lib/amanda/amanda-2.4.0-980319/examples
-@dirrm lib/amanda/amanda-2.4.0-980319
+@dirrm lib/amanda/amanda-2.4.0/examples
+@dirrm lib/amanda/amanda-2.4.0
 @dirrm lib/amanda
 @dirrm libexec/amanda
diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile
index beeb4334c3c6..2a207cdb76eb 100644
--- a/misc/amanda32-server/Makefile
+++ b/misc/amanda32-server/Makefile
@@ -3,11 +3,10 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.13 1998/03/03 09:32:00 asami Exp $
+# $Id: Makefile,v 1.14 1998/03/20 02:06:07 cwt Exp $
 #
 
-DISTNAME=	amanda-2.4.0-980319
-PKGNAME=	amanda-2.4.0.980319
+DISTNAME=	amanda-2.4.0
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.amanda.org/pub/amanda/
 
diff --git a/misc/amanda32-server/distinfo b/misc/amanda32-server/distinfo
index 894fb6b4c4ed..0c8c35d47425 100644
--- a/misc/amanda32-server/distinfo
+++ b/misc/amanda32-server/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.0-980319.tar.gz) = d7e5c906f6ef79bdea3bb6a7f9ef0900
+MD5 (amanda-2.4.0.tar.gz) = b0c29c9b1b1fd0c8fcddfdecb2b8b2a8
diff --git a/misc/amanda32-server/pkg-descr b/misc/amanda32-server/pkg-descr
index 5b33b9939e25..0ce8f8fe8b02 100644
--- a/misc/amanda32-server/pkg-descr
+++ b/misc/amanda32-server/pkg-descr
@@ -1,7 +1,7 @@
 
 ** CAUTION **
  
-THIS BETA RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
+THE RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
 EARLIER AMANDA CLIENTS (PER CHANGES FILE IN THE DISTRIBUTION.) 
 
 WHAT IS AMANDA?
diff --git a/misc/amanda32-server/pkg-plist b/misc/amanda32-server/pkg-plist
index 7d2d4e6e45f5..aa810922aeea 100644
--- a/misc/amanda32-server/pkg-plist
+++ b/misc/amanda32-server/pkg-plist
@@ -1,14 +1,14 @@
-lib/amanda/amanda-2.4.0-980319/examples/amanda.conf
-lib/amanda/amanda-2.4.0-980319/examples/chg-multi.conf
-lib/amanda/amanda-2.4.0-980319/examples/disklist
+lib/amanda/amanda-2.4.0/examples/amanda.conf
+lib/amanda/amanda-2.4.0/examples/chg-multi.conf
+lib/amanda/amanda-2.4.0/examples/disklist
 lib/libamanda.a
 lib/libamanda.la
 lib/libamanda.so
-lib/libamanda.so.4.1
+lib/libamanda.so.5.0
 lib/libamclient.a
 lib/libamclient.la
 lib/libamclient.so
-lib/libamclient.so.0.3
+lib/libamclient.so.0.4
 lib/libamnolog.a
 lib/libamnolog.la
 lib/libamnolog.so
@@ -16,11 +16,11 @@ lib/libamnolog.so.0.0
 lib/libamserver.a
 lib/libamserver.la
 lib/libamserver.so
-lib/libamserver.so.2.1
+lib/libamserver.so.3.0
 lib/libamtape.a
 lib/libamtape.la
 lib/libamtape.so
-lib/libamtape.so.1.0
+lib/libamtape.so.1.1
 @exec /sbin/ldconfig -m %B
 libexec/amanda/amandad
 libexec/amanda/amcat.awk
@@ -81,7 +81,7 @@ sbin/amrmtape
 sbin/amtape
 sbin/amtoc
 sbin/amverify
-@dirrm lib/amanda/amanda-2.4.0-980319/examples
-@dirrm lib/amanda/amanda-2.4.0-980319
+@dirrm lib/amanda/amanda-2.4.0/examples
+@dirrm lib/amanda/amanda-2.4.0
 @dirrm lib/amanda
 @dirrm libexec/amanda