Update to version 2.4.4p2. Base loosely on patches submitted by

Jun Kuriyama

16 files changed, 72 insertions, 28 deletions

diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index 3f688977227c..7f088b4ed7ad 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	${MASTERPORTNAME}
-PORTVERSION=	2.4.4
-PORTREVISION?=	7
+PORTVERSION=	2.4.4p2
+PORTREVISION?=	0
 PORTEPOCH=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/misc/amanda-server/distinfo b/misc/amanda-server/distinfo
index a6420367a8f7..f0fdc886458b 100644
--- a/misc/amanda-server/distinfo
+++ b/misc/amanda-server/distinfo
@@ -1 +1,2 @@
-MD5 (amanda-2.4.4.tar.gz) = 1f5f0c636707994eb7b5e74b19528323
+MD5 (amanda-2.4.4p2.tar.gz) = 95f772203801999bd4b96606859f8910
+SIZE (amanda-2.4.4p2.tar.gz) = 1263075
diff --git a/misc/amanda-server/pkg-plist b/misc/amanda-server/pkg-plist
index 8fab84c20263..a8d761929fa0 100644
--- a/misc/amanda-server/pkg-plist
+++ b/misc/amanda-server/pkg-plist
@@ -1,8 +1,8 @@
-lib/libamserver-2.4.4.so
+lib/libamserver-2.4.4p2.so
 lib/libamserver.so
 lib/libamserver.la
 lib/libamserver.a
-lib/libamtape-2.4.4.so
+lib/libamtape-2.4.4p2.so
 lib/libamtape.so
 lib/libamtape.la
 lib/libamtape.a
@@ -17,10 +17,13 @@ libexec/amanda/amtrmidx
 libexec/amanda/amtrmlog
 libexec/amanda/chg-chio
 libexec/amanda/chg-chs
+libexec/amanda/chg-disk
 libexec/amanda/chg-juke
 libexec/amanda/chg-manual
+libexec/amanda/chg-mcutil
 libexec/amanda/chg-mtx
 libexec/amanda/chg-multi
+libexec/amanda/chg-null
 libexec/amanda/chg-rait
 libexec/amanda/chg-rth
 %%SCSICHG%%libexec/amanda/chg-scsi
diff --git a/misc/amanda-server/pkg-plist.client b/misc/amanda-server/pkg-plist.client
index 126fbdfa43ac..2e7306c851f5 100644
--- a/misc/amanda-server/pkg-plist.client
+++ b/misc/amanda-server/pkg-plist.client
@@ -1,12 +1,13 @@
-lib/libamanda-2.4.4.so
+lib/libamanda-2.4.4p2.so
 lib/libamanda.so
 lib/libamanda.la
 lib/libamanda.a
-lib/libamclient-2.4.4.so
+lib/libamclient-2.4.4p2.so
 lib/libamclient.so
 lib/libamclient.la
 lib/libamclient.a
 libexec/amanda/amandad
+libexec/amanda/amqde
 libexec/amanda/calcsize
 libexec/amanda/killpgrp
 libexec/amanda/patch-system
@@ -23,7 +24,9 @@ share/amanda/COPYRIGHT-REGEX
 share/amanda/DUMPER-API
 share/amanda/EXCLUDE
 share/amanda/FAQ
+share/amanda/HOWTO-AFS
 share/amanda/HOWTO-CYGWIN.html
+share/amanda/HOWTO-FILE-DRIVER
 share/amanda/INDEXING
 share/amanda/INSTALL
 share/amanda/INTERNALS
@@ -44,10 +47,14 @@ share/amanda/WHATS.NEW
 share/amanda/WISHLIST
 share/amanda/YEAR2000
 share/amanda/ZFTAPE
+share/amanda/chg-scsi.notes
 share/examples/amanda/amanda.conf
 share/examples/amanda/chg-multi.conf
 share/examples/amanda/chg-scsi.conf
 share/examples/amanda/disklist
+@dirrm var/amanda/gnutar-lists
+@dirrm var/amanda
+@dirrm var
 @dirrm share/examples/amanda
 @dirrm share/amanda
 @dirrm libexec/amanda
diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile
index 3f688977227c..7f088b4ed7ad 100644
--- a/misc/amanda25-server/Makefile
+++ b/misc/amanda25-server/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	${MASTERPORTNAME}
-PORTVERSION=	2.4.4
-PORTREVISION?=	7
+PORTVERSION=	2.4.4p2
+PORTREVISION?=	0
 PORTEPOCH=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/misc/amanda25-server/distinfo b/misc/amanda25-server/distinfo
index a6420367a8f7..f0fdc886458b 100644
--- a/misc/amanda25-server/distinfo
+++ b/misc/amanda25-server/distinfo
@@ -1 +1,2 @@
-MD5 (amanda-2.4.4.tar.gz) = 1f5f0c636707994eb7b5e74b19528323
+MD5 (amanda-2.4.4p2.tar.gz) = 95f772203801999bd4b96606859f8910
+SIZE (amanda-2.4.4p2.tar.gz) = 1263075
diff --git a/misc/amanda25-server/pkg-plist b/misc/amanda25-server/pkg-plist
index 8fab84c20263..a8d761929fa0 100644
--- a/misc/amanda25-server/pkg-plist
+++ b/misc/amanda25-server/pkg-plist
@@ -1,8 +1,8 @@
-lib/libamserver-2.4.4.so
+lib/libamserver-2.4.4p2.so
 lib/libamserver.so
 lib/libamserver.la
 lib/libamserver.a
-lib/libamtape-2.4.4.so
+lib/libamtape-2.4.4p2.so
 lib/libamtape.so
 lib/libamtape.la
 lib/libamtape.a
@@ -17,10 +17,13 @@ libexec/amanda/amtrmidx
 libexec/amanda/amtrmlog
 libexec/amanda/chg-chio
 libexec/amanda/chg-chs
+libexec/amanda/chg-disk
 libexec/amanda/chg-juke
 libexec/amanda/chg-manual
+libexec/amanda/chg-mcutil
 libexec/amanda/chg-mtx
 libexec/amanda/chg-multi
+libexec/amanda/chg-null
 libexec/amanda/chg-rait
 libexec/amanda/chg-rth
 %%SCSICHG%%libexec/amanda/chg-scsi
diff --git a/misc/amanda25-server/pkg-plist.client b/misc/amanda25-server/pkg-plist.client
index 126fbdfa43ac..2e7306c851f5 100644
--- a/misc/amanda25-server/pkg-plist.client
+++ b/misc/amanda25-server/pkg-plist.client
@@ -1,12 +1,13 @@
-lib/libamanda-2.4.4.so
+lib/libamanda-2.4.4p2.so
 lib/libamanda.so
 lib/libamanda.la
 lib/libamanda.a
-lib/libamclient-2.4.4.so
+lib/libamclient-2.4.4p2.so
 lib/libamclient.so
 lib/libamclient.la
 lib/libamclient.a
 libexec/amanda/amandad
+libexec/amanda/amqde
 libexec/amanda/calcsize
 libexec/amanda/killpgrp
 libexec/amanda/patch-system
@@ -23,7 +24,9 @@ share/amanda/COPYRIGHT-REGEX
 share/amanda/DUMPER-API
 share/amanda/EXCLUDE
 share/amanda/FAQ
+share/amanda/HOWTO-AFS
 share/amanda/HOWTO-CYGWIN.html
+share/amanda/HOWTO-FILE-DRIVER
 share/amanda/INDEXING
 share/amanda/INSTALL
 share/amanda/INTERNALS
@@ -44,10 +47,14 @@ share/amanda/WHATS.NEW
 share/amanda/WISHLIST
 share/amanda/YEAR2000
 share/amanda/ZFTAPE
+share/amanda/chg-scsi.notes
 share/examples/amanda/amanda.conf
 share/examples/amanda/chg-multi.conf
 share/examples/amanda/chg-scsi.conf
 share/examples/amanda/disklist
+@dirrm var/amanda/gnutar-lists
+@dirrm var/amanda
+@dirrm var
 @dirrm share/examples/amanda
 @dirrm share/amanda
 @dirrm libexec/amanda
diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile
index 3f688977227c..7f088b4ed7ad 100644
--- a/misc/amanda26-server/Makefile
+++ b/misc/amanda26-server/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	${MASTERPORTNAME}
-PORTVERSION=	2.4.4
-PORTREVISION?=	7
+PORTVERSION=	2.4.4p2
+PORTREVISION?=	0
 PORTEPOCH=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/misc/amanda26-server/distinfo b/misc/amanda26-server/distinfo
index a6420367a8f7..f0fdc886458b 100644
--- a/misc/amanda26-server/distinfo
+++ b/misc/amanda26-server/distinfo
@@ -1 +1,2 @@
-MD5 (amanda-2.4.4.tar.gz) = 1f5f0c636707994eb7b5e74b19528323
+MD5 (amanda-2.4.4p2.tar.gz) = 95f772203801999bd4b96606859f8910
+SIZE (amanda-2.4.4p2.tar.gz) = 1263075
diff --git a/misc/amanda26-server/pkg-plist b/misc/amanda26-server/pkg-plist
index 8fab84c20263..a8d761929fa0 100644
--- a/misc/amanda26-server/pkg-plist
+++ b/misc/amanda26-server/pkg-plist
@@ -1,8 +1,8 @@
-lib/libamserver-2.4.4.so
+lib/libamserver-2.4.4p2.so
 lib/libamserver.so
 lib/libamserver.la
 lib/libamserver.a
-lib/libamtape-2.4.4.so
+lib/libamtape-2.4.4p2.so
 lib/libamtape.so
 lib/libamtape.la
 lib/libamtape.a
@@ -17,10 +17,13 @@ libexec/amanda/amtrmidx
 libexec/amanda/amtrmlog
 libexec/amanda/chg-chio
 libexec/amanda/chg-chs
+libexec/amanda/chg-disk
 libexec/amanda/chg-juke
 libexec/amanda/chg-manual
+libexec/amanda/chg-mcutil
 libexec/amanda/chg-mtx
 libexec/amanda/chg-multi
+libexec/amanda/chg-null
 libexec/amanda/chg-rait
 libexec/amanda/chg-rth
 %%SCSICHG%%libexec/amanda/chg-scsi
diff --git a/misc/amanda26-server/pkg-plist.client b/misc/amanda26-server/pkg-plist.client
index 126fbdfa43ac..2e7306c851f5 100644
--- a/misc/amanda26-server/pkg-plist.client
+++ b/misc/amanda26-server/pkg-plist.client
@@ -1,12 +1,13 @@
-lib/libamanda-2.4.4.so
+lib/libamanda-2.4.4p2.so
 lib/libamanda.so
 lib/libamanda.la
 lib/libamanda.a
-lib/libamclient-2.4.4.so
+lib/libamclient-2.4.4p2.so
 lib/libamclient.so
 lib/libamclient.la
 lib/libamclient.a
 libexec/amanda/amandad
+libexec/amanda/amqde
 libexec/amanda/calcsize
 libexec/amanda/killpgrp
 libexec/amanda/patch-system
@@ -23,7 +24,9 @@ share/amanda/COPYRIGHT-REGEX
 share/amanda/DUMPER-API
 share/amanda/EXCLUDE
 share/amanda/FAQ
+share/amanda/HOWTO-AFS
 share/amanda/HOWTO-CYGWIN.html
+share/amanda/HOWTO-FILE-DRIVER
 share/amanda/INDEXING
 share/amanda/INSTALL
 share/amanda/INTERNALS
@@ -44,10 +47,14 @@ share/amanda/WHATS.NEW
 share/amanda/WISHLIST
 share/amanda/YEAR2000
 share/amanda/ZFTAPE
+share/amanda/chg-scsi.notes
 share/examples/amanda/amanda.conf
 share/examples/amanda/chg-multi.conf
 share/examples/amanda/chg-scsi.conf
 share/examples/amanda/disklist
+@dirrm var/amanda/gnutar-lists
+@dirrm var/amanda
+@dirrm var
 @dirrm share/examples/amanda
 @dirrm share/amanda
 @dirrm libexec/amanda
diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile
index 3f688977227c..7f088b4ed7ad 100644
--- a/misc/amanda32-server/Makefile
+++ b/misc/amanda32-server/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	${MASTERPORTNAME}
-PORTVERSION=	2.4.4
-PORTREVISION?=	7
+PORTVERSION=	2.4.4p2
+PORTREVISION?=	0
 PORTEPOCH=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/misc/amanda32-server/distinfo b/misc/amanda32-server/distinfo
index a6420367a8f7..f0fdc886458b 100644
--- a/misc/amanda32-server/distinfo
+++ b/misc/amanda32-server/distinfo
@@ -1 +1,2 @@
-MD5 (amanda-2.4.4.tar.gz) = 1f5f0c636707994eb7b5e74b19528323
+MD5 (amanda-2.4.4p2.tar.gz) = 95f772203801999bd4b96606859f8910
+SIZE (amanda-2.4.4p2.tar.gz) = 1263075
diff --git a/misc/amanda32-server/pkg-plist b/misc/amanda32-server/pkg-plist
index 8fab84c20263..a8d761929fa0 100644
--- a/misc/amanda32-server/pkg-plist
+++ b/misc/amanda32-server/pkg-plist
@@ -1,8 +1,8 @@
-lib/libamserver-2.4.4.so
+lib/libamserver-2.4.4p2.so
 lib/libamserver.so
 lib/libamserver.la
 lib/libamserver.a
-lib/libamtape-2.4.4.so
+lib/libamtape-2.4.4p2.so
 lib/libamtape.so
 lib/libamtape.la
 lib/libamtape.a
@@ -17,10 +17,13 @@ libexec/amanda/amtrmidx
 libexec/amanda/amtrmlog
 libexec/amanda/chg-chio
 libexec/amanda/chg-chs
+libexec/amanda/chg-disk
 libexec/amanda/chg-juke
 libexec/amanda/chg-manual
+libexec/amanda/chg-mcutil
 libexec/amanda/chg-mtx
 libexec/amanda/chg-multi
+libexec/amanda/chg-null
 libexec/amanda/chg-rait
 libexec/amanda/chg-rth
 %%SCSICHG%%libexec/amanda/chg-scsi
diff --git a/misc/amanda32-server/pkg-plist.client b/misc/amanda32-server/pkg-plist.client
index 126fbdfa43ac..2e7306c851f5 100644
--- a/misc/amanda32-server/pkg-plist.client
+++ b/misc/amanda32-server/pkg-plist.client
@@ -1,12 +1,13 @@
-lib/libamanda-2.4.4.so
+lib/libamanda-2.4.4p2.so
 lib/libamanda.so
 lib/libamanda.la
 lib/libamanda.a
-lib/libamclient-2.4.4.so
+lib/libamclient-2.4.4p2.so
 lib/libamclient.so
 lib/libamclient.la
 lib/libamclient.a
 libexec/amanda/amandad
+libexec/amanda/amqde
 libexec/amanda/calcsize
 libexec/amanda/killpgrp
 libexec/amanda/patch-system
@@ -23,7 +24,9 @@ share/amanda/COPYRIGHT-REGEX
 share/amanda/DUMPER-API
 share/amanda/EXCLUDE
 share/amanda/FAQ
+share/amanda/HOWTO-AFS
 share/amanda/HOWTO-CYGWIN.html
+share/amanda/HOWTO-FILE-DRIVER
 share/amanda/INDEXING
 share/amanda/INSTALL
 share/amanda/INTERNALS
@@ -44,10 +47,14 @@ share/amanda/WHATS.NEW
 share/amanda/WISHLIST
 share/amanda/YEAR2000
 share/amanda/ZFTAPE
+share/amanda/chg-scsi.notes
 share/examples/amanda/amanda.conf
 share/examples/amanda/chg-multi.conf
 share/examples/amanda/chg-scsi.conf
 share/examples/amanda/disklist
+@dirrm var/amanda/gnutar-lists
+@dirrm var/amanda
+@dirrm var
 @dirrm share/examples/amanda
 @dirrm share/amanda
 @dirrm libexec/amanda