Complete upgrade to 2.4.0p1

22 files changed, 55 insertions, 77 deletions

diff --git a/misc/amanda-client/distinfo b/misc/amanda-client/distinfo
index 0c8c35d..1716520 100644
--- a/misc/amanda-client/distinfo
+++ b/misc/amanda-client/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.0.tar.gz) = b0c29c9b1b1fd0c8fcddfdecb2b8b2a8
+MD5 (amanda-2.4.0p1.tar.gz) = bda875acd382ea92cfaf7750ce8ce7bd
diff --git a/misc/amanda-client/pkg-plist b/misc/amanda-client/pkg-plist
index c859fe6..81b466a 100644
--- a/misc/amanda-client/pkg-plist
+++ b/misc/amanda-client/pkg-plist
@@ -1,6 +1,3 @@
-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
@@ -82,7 +79,8 @@ sbin/amrmtape
 sbin/amtape
 sbin/amtoc
 sbin/amverify
-@dirrm lib/amanda/amanda-2.4.0/examples
-@dirrm lib/amanda/amanda-2.4.0
-@dirrm lib/amanda
+share/examples/amanda/amanda.conf
+share/examples/amanda/chg-multi.conf
+share/examples/amanda/disklist
+@dirrm share/examples/amanda
 @dirrm libexec/amanda
diff --git a/misc/amanda-server/distinfo b/misc/amanda-server/distinfo
index 0c8c35d..1716520 100644
--- a/misc/amanda-server/distinfo
+++ b/misc/amanda-server/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.0.tar.gz) = b0c29c9b1b1fd0c8fcddfdecb2b8b2a8
+MD5 (amanda-2.4.0p1.tar.gz) = bda875acd382ea92cfaf7750ce8ce7bd
diff --git a/misc/amanda-server/pkg-plist b/misc/amanda-server/pkg-plist
index c859fe6..81b466a 100644
--- a/misc/amanda-server/pkg-plist
+++ b/misc/amanda-server/pkg-plist
@@ -1,6 +1,3 @@
-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
@@ -82,7 +79,8 @@ sbin/amrmtape
 sbin/amtape
 sbin/amtoc
 sbin/amverify
-@dirrm lib/amanda/amanda-2.4.0/examples
-@dirrm lib/amanda/amanda-2.4.0
-@dirrm lib/amanda
+share/examples/amanda/amanda.conf
+share/examples/amanda/chg-multi.conf
+share/examples/amanda/disklist
+@dirrm share/examples/amanda
 @dirrm libexec/amanda
diff --git a/misc/amanda24-client/distinfo b/misc/amanda24-client/distinfo
index 0c8c35d..1716520 100644
--- a/misc/amanda24-client/distinfo
+++ b/misc/amanda24-client/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.0.tar.gz) = b0c29c9b1b1fd0c8fcddfdecb2b8b2a8
+MD5 (amanda-2.4.0p1.tar.gz) = bda875acd382ea92cfaf7750ce8ce7bd
diff --git a/misc/amanda24-client/pkg-plist b/misc/amanda24-client/pkg-plist
index c859fe6..81b466a 100644
--- a/misc/amanda24-client/pkg-plist
+++ b/misc/amanda24-client/pkg-plist
@@ -1,6 +1,3 @@
-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
@@ -82,7 +79,8 @@ sbin/amrmtape
 sbin/amtape
 sbin/amtoc
 sbin/amverify
-@dirrm lib/amanda/amanda-2.4.0/examples
-@dirrm lib/amanda/amanda-2.4.0
-@dirrm lib/amanda
+share/examples/amanda/amanda.conf
+share/examples/amanda/chg-multi.conf
+share/examples/amanda/disklist
+@dirrm share/examples/amanda
 @dirrm libexec/amanda
diff --git a/misc/amanda24-server/distinfo b/misc/amanda24-server/distinfo
index 0c8c35d..1716520 100644
--- a/misc/amanda24-server/distinfo
+++ b/misc/amanda24-server/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.0.tar.gz) = b0c29c9b1b1fd0c8fcddfdecb2b8b2a8
+MD5 (amanda-2.4.0p1.tar.gz) = bda875acd382ea92cfaf7750ce8ce7bd
diff --git a/misc/amanda24-server/pkg-plist b/misc/amanda24-server/pkg-plist
index c859fe6..81b466a 100644
--- a/misc/amanda24-server/pkg-plist
+++ b/misc/amanda24-server/pkg-plist
@@ -1,6 +1,3 @@
-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
@@ -82,7 +79,8 @@ sbin/amrmtape
 sbin/amtape
 sbin/amtoc
 sbin/amverify
-@dirrm lib/amanda/amanda-2.4.0/examples
-@dirrm lib/amanda/amanda-2.4.0
-@dirrm lib/amanda
+share/examples/amanda/amanda.conf
+share/examples/amanda/chg-multi.conf
+share/examples/amanda/disklist
+@dirrm share/examples/amanda
 @dirrm libexec/amanda
diff --git a/misc/amanda24/distinfo b/misc/amanda24/distinfo
index 0c8c35d..1716520 100644
--- a/misc/amanda24/distinfo
+++ b/misc/amanda24/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.0.tar.gz) = b0c29c9b1b1fd0c8fcddfdecb2b8b2a8
+MD5 (amanda-2.4.0p1.tar.gz) = bda875acd382ea92cfaf7750ce8ce7bd
diff --git a/misc/amanda24/pkg-plist b/misc/amanda24/pkg-plist
index c859fe6..81b466a 100644
--- a/misc/amanda24/pkg-plist
+++ b/misc/amanda24/pkg-plist
@@ -1,6 +1,3 @@
-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
@@ -82,7 +79,8 @@ sbin/amrmtape
 sbin/amtape
 sbin/amtoc
 sbin/amverify
-@dirrm lib/amanda/amanda-2.4.0/examples
-@dirrm lib/amanda/amanda-2.4.0
-@dirrm lib/amanda
+share/examples/amanda/amanda.conf
+share/examples/amanda/chg-multi.conf
+share/examples/amanda/disklist
+@dirrm share/examples/amanda
 @dirrm libexec/amanda
diff --git a/misc/amanda25-client/distinfo b/misc/amanda25-client/distinfo
index 0c8c35d..1716520 100644
--- a/misc/amanda25-client/distinfo
+++ b/misc/amanda25-client/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.0.tar.gz) = b0c29c9b1b1fd0c8fcddfdecb2b8b2a8
+MD5 (amanda-2.4.0p1.tar.gz) = bda875acd382ea92cfaf7750ce8ce7bd
diff --git a/misc/amanda25-client/pkg-plist b/misc/amanda25-client/pkg-plist
index c859fe6..81b466a 100644
--- a/misc/amanda25-client/pkg-plist
+++ b/misc/amanda25-client/pkg-plist
@@ -1,6 +1,3 @@
-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
@@ -82,7 +79,8 @@ sbin/amrmtape
 sbin/amtape
 sbin/amtoc
 sbin/amverify
-@dirrm lib/amanda/amanda-2.4.0/examples
-@dirrm lib/amanda/amanda-2.4.0
-@dirrm lib/amanda
+share/examples/amanda/amanda.conf
+share/examples/amanda/chg-multi.conf
+share/examples/amanda/disklist
+@dirrm share/examples/amanda
 @dirrm libexec/amanda
diff --git a/misc/amanda25-server/distinfo b/misc/amanda25-server/distinfo
index 0c8c35d..1716520 100644
--- a/misc/amanda25-server/distinfo
+++ b/misc/amanda25-server/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.0.tar.gz) = b0c29c9b1b1fd0c8fcddfdecb2b8b2a8
+MD5 (amanda-2.4.0p1.tar.gz) = bda875acd382ea92cfaf7750ce8ce7bd
diff --git a/misc/amanda25-server/pkg-plist b/misc/amanda25-server/pkg-plist
index c859fe6..81b466a 100644
--- a/misc/amanda25-server/pkg-plist
+++ b/misc/amanda25-server/pkg-plist
@@ -1,6 +1,3 @@
-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
@@ -82,7 +79,8 @@ sbin/amrmtape
 sbin/amtape
 sbin/amtoc
 sbin/amverify
-@dirrm lib/amanda/amanda-2.4.0/examples
-@dirrm lib/amanda/amanda-2.4.0
-@dirrm lib/amanda
+share/examples/amanda/amanda.conf
+share/examples/amanda/chg-multi.conf
+share/examples/amanda/disklist
+@dirrm share/examples/amanda
 @dirrm libexec/amanda
diff --git a/misc/amanda26-client/distinfo b/misc/amanda26-client/distinfo
index 0c8c35d..1716520 100644
--- a/misc/amanda26-client/distinfo
+++ b/misc/amanda26-client/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.0.tar.gz) = b0c29c9b1b1fd0c8fcddfdecb2b8b2a8
+MD5 (amanda-2.4.0p1.tar.gz) = bda875acd382ea92cfaf7750ce8ce7bd
diff --git a/misc/amanda26-client/pkg-plist b/misc/amanda26-client/pkg-plist
index c859fe6..81b466a 100644
--- a/misc/amanda26-client/pkg-plist
+++ b/misc/amanda26-client/pkg-plist
@@ -1,6 +1,3 @@
-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
@@ -82,7 +79,8 @@ sbin/amrmtape
 sbin/amtape
 sbin/amtoc
 sbin/amverify
-@dirrm lib/amanda/amanda-2.4.0/examples
-@dirrm lib/amanda/amanda-2.4.0
-@dirrm lib/amanda
+share/examples/amanda/amanda.conf
+share/examples/amanda/chg-multi.conf
+share/examples/amanda/disklist
+@dirrm share/examples/amanda
 @dirrm libexec/amanda
diff --git a/misc/amanda26-server/distinfo b/misc/amanda26-server/distinfo
index 0c8c35d..1716520 100644
--- a/misc/amanda26-server/distinfo
+++ b/misc/amanda26-server/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.0.tar.gz) = b0c29c9b1b1fd0c8fcddfdecb2b8b2a8
+MD5 (amanda-2.4.0p1.tar.gz) = bda875acd382ea92cfaf7750ce8ce7bd
diff --git a/misc/amanda26-server/pkg-plist b/misc/amanda26-server/pkg-plist
index c859fe6..81b466a 100644
--- a/misc/amanda26-server/pkg-plist
+++ b/misc/amanda26-server/pkg-plist
@@ -1,6 +1,3 @@
-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
@@ -82,7 +79,8 @@ sbin/amrmtape
 sbin/amtape
 sbin/amtoc
 sbin/amverify
-@dirrm lib/amanda/amanda-2.4.0/examples
-@dirrm lib/amanda/amanda-2.4.0
-@dirrm lib/amanda
+share/examples/amanda/amanda.conf
+share/examples/amanda/chg-multi.conf
+share/examples/amanda/disklist
+@dirrm share/examples/amanda
 @dirrm libexec/amanda
diff --git a/misc/amanda32-client/distinfo b/misc/amanda32-client/distinfo
index 0c8c35d..1716520 100644
--- a/misc/amanda32-client/distinfo
+++ b/misc/amanda32-client/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.0.tar.gz) = b0c29c9b1b1fd0c8fcddfdecb2b8b2a8
+MD5 (amanda-2.4.0p1.tar.gz) = bda875acd382ea92cfaf7750ce8ce7bd
diff --git a/misc/amanda32-client/pkg-plist b/misc/amanda32-client/pkg-plist
index c859fe6..81b466a 100644
--- a/misc/amanda32-client/pkg-plist
+++ b/misc/amanda32-client/pkg-plist
@@ -1,6 +1,3 @@
-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
@@ -82,7 +79,8 @@ sbin/amrmtape
 sbin/amtape
 sbin/amtoc
 sbin/amverify
-@dirrm lib/amanda/amanda-2.4.0/examples
-@dirrm lib/amanda/amanda-2.4.0
-@dirrm lib/amanda
+share/examples/amanda/amanda.conf
+share/examples/amanda/chg-multi.conf
+share/examples/amanda/disklist
+@dirrm share/examples/amanda
 @dirrm libexec/amanda
diff --git a/misc/amanda32-server/distinfo b/misc/amanda32-server/distinfo
index 0c8c35d..1716520 100644
--- a/misc/amanda32-server/distinfo
+++ b/misc/amanda32-server/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.0.tar.gz) = b0c29c9b1b1fd0c8fcddfdecb2b8b2a8
+MD5 (amanda-2.4.0p1.tar.gz) = bda875acd382ea92cfaf7750ce8ce7bd
diff --git a/misc/amanda32-server/pkg-plist b/misc/amanda32-server/pkg-plist
index c859fe6..81b466a 100644
--- a/misc/amanda32-server/pkg-plist
+++ b/misc/amanda32-server/pkg-plist
@@ -1,6 +1,3 @@
-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
@@ -82,7 +79,8 @@ sbin/amrmtape
 sbin/amtape
 sbin/amtoc
 sbin/amverify
-@dirrm lib/amanda/amanda-2.4.0/examples
-@dirrm lib/amanda/amanda-2.4.0
-@dirrm lib/amanda
+share/examples/amanda/amanda.conf
+share/examples/amanda/chg-multi.conf
+share/examples/amanda/disklist
+@dirrm share/examples/amanda
 @dirrm libexec/amanda