Fix PLIST errors.

- only build and install amdd & ammt in the server
- add amdd.8 and ammt.8
Bump PORTREVISION to 1

20 files changed, 132 insertions, 32 deletions

diff --git a/misc/amanda-client/Makefile b/misc/amanda-client/Makefile
index 16388333d255..91b7b1457fa4 100644
--- a/misc/amanda-client/Makefile
+++ b/misc/amanda-client/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
-PORTREVISION=	0
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../amanda-server
 COMMENT=	${PKGDIR}/pkg-comment.client
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index 18d5e310128e..b216905c2202 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	2.4.3b1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	amanda
@@ -55,9 +55,10 @@ CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-user=operator --with-group=operator \
 		--without-client
 
-MAN8=		amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdump.8 \
-		amflush.8 amgetconf.8 amlabel.8 amoverview.8 amreport.8 \
-		amrmtape.8 amstatus.8 amtape.8 amtoc.8 amverify.8
+MAN8=		amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdd.8 \
+		amdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 \
+		amoverview.8 amreport.8 amrmtape.8 amstatus.8 \
+		amtape.8 amtoc.8 amverify.8
 
 .if defined (WITH_PLOT)
 BUILD_DEPENDS+=	gnuplot:${PORTSDIR}/math/gnuplot
diff --git a/misc/amanda-server/files/patch-ac b/misc/amanda-server/files/patch-ac
index aa763df6c0ef..a9be81de184d 100644
--- a/misc/amanda-server/files/patch-ac
+++ b/misc/amanda-server/files/patch-ac
@@ -1,6 +1,26 @@
---- tape-src/Makefile.in	Fri Nov 30 11:33:56 2001
-+++ tape-src/Makefile.in.new	Fri Nov 30 18:16:35 2001
-@@ -524,7 +524,11 @@
+--- tape-src/Makefile.in.orig	Fri Nov 30 14:33:56 2001
++++ tape-src/Makefile.in	Tue Dec  4 08:04:12 2001
+@@ -162,7 +162,8 @@
+ @WANT_LIBTOOL_FALSE@LIB_EXTENSION = a
+ @WANT_LIBTOOL_FALSE@noinst_LIBRARIES = libamtape.a
+ 
+-sbin_PROGRAMS = ammt amdd
++@WANT_SERVER_TRUE@sbin_PROGRAMS = ammt amdd
++@WANT_CLIENT_TRUE@sbin_PROGRAMS = 
+ 
+ libamtape_la_SOURCES = output-file.c \
+ 			output-null.c \
+@@ -241,7 +242,8 @@
+ output-tape.lo tapeio.lo
+ libamtape_la_OBJECTS = $(am_libamtape_la_OBJECTS)
+ EXTRA_PROGRAMS = tapetype$(EXEEXT) amtapeio$(EXEEXT)
+-sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT)
++@WANT_SERVER_TRUE@sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT)
++@WANT_CLIENT_TRUE@sbin_PROGRAMS = 
+ PROGRAMS = $(sbin_PROGRAMS)
+ 
+ amdd_SOURCES = amdd.c
+@@ -524,7 +526,11 @@
  
  install-data-am:
  
diff --git a/misc/amanda-server/pkg-plist b/misc/amanda-server/pkg-plist
index 68910673977c..6eb1159ad008 100644
--- a/misc/amanda-server/pkg-plist
+++ b/misc/amanda-server/pkg-plist
@@ -24,10 +24,12 @@ sbin/amadmin
 sbin/amcheck
 sbin/amcheckdb
 sbin/amcleanup
+sbin/amdd
 sbin/amdump
 sbin/amflush
 sbin/amgetconf
 sbin/amlabel
+sbin/ammt
 sbin/amoverview
 %%PLOT%%sbin/amplot
 sbin/amreport
diff --git a/misc/amanda-server/pkg-plist.client b/misc/amanda-server/pkg-plist.client
index 4f109899c777..5c6b60570375 100644
--- a/misc/amanda-server/pkg-plist.client
+++ b/misc/amanda-server/pkg-plist.client
@@ -18,6 +18,7 @@ share/amanda/COPYRIGHT
 share/amanda/COPYRIGHT-APACHE
 share/amanda/COPYRIGHT-REGEX
 share/amanda/DUMPER-API
+share/amanda/EXCLUDE
 share/amanda/FAQ
 share/amanda/INDEXING
 share/amanda/INSTALL
@@ -25,6 +26,7 @@ share/amanda/INTERNALS
 share/amanda/KERBEROS
 share/amanda/LABEL.PRINTING
 share/amanda/MULTITAPE
+share/amanda/PORT.USAGE
 share/amanda/RESTORE
 share/amanda/SAMBA
 share/amanda/SECURITY
diff --git a/misc/amanda25-client/Makefile b/misc/amanda25-client/Makefile
index 16388333d255..91b7b1457fa4 100644
--- a/misc/amanda25-client/Makefile
+++ b/misc/amanda25-client/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
-PORTREVISION=	0
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../amanda-server
 COMMENT=	${PKGDIR}/pkg-comment.client
diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile
index 18d5e310128e..b216905c2202 100644
--- a/misc/amanda25-server/Makefile
+++ b/misc/amanda25-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	2.4.3b1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	amanda
@@ -55,9 +55,10 @@ CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-user=operator --with-group=operator \
 		--without-client
 
-MAN8=		amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdump.8 \
-		amflush.8 amgetconf.8 amlabel.8 amoverview.8 amreport.8 \
-		amrmtape.8 amstatus.8 amtape.8 amtoc.8 amverify.8
+MAN8=		amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdd.8 \
+		amdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 \
+		amoverview.8 amreport.8 amrmtape.8 amstatus.8 \
+		amtape.8 amtoc.8 amverify.8
 
 .if defined (WITH_PLOT)
 BUILD_DEPENDS+=	gnuplot:${PORTSDIR}/math/gnuplot
diff --git a/misc/amanda25-server/files/patch-ac b/misc/amanda25-server/files/patch-ac
index aa763df6c0ef..a9be81de184d 100644
--- a/misc/amanda25-server/files/patch-ac
+++ b/misc/amanda25-server/files/patch-ac
@@ -1,6 +1,26 @@
---- tape-src/Makefile.in	Fri Nov 30 11:33:56 2001
-+++ tape-src/Makefile.in.new	Fri Nov 30 18:16:35 2001
-@@ -524,7 +524,11 @@
+--- tape-src/Makefile.in.orig	Fri Nov 30 14:33:56 2001
++++ tape-src/Makefile.in	Tue Dec  4 08:04:12 2001
+@@ -162,7 +162,8 @@
+ @WANT_LIBTOOL_FALSE@LIB_EXTENSION = a
+ @WANT_LIBTOOL_FALSE@noinst_LIBRARIES = libamtape.a
+ 
+-sbin_PROGRAMS = ammt amdd
++@WANT_SERVER_TRUE@sbin_PROGRAMS = ammt amdd
++@WANT_CLIENT_TRUE@sbin_PROGRAMS = 
+ 
+ libamtape_la_SOURCES = output-file.c \
+ 			output-null.c \
+@@ -241,7 +242,8 @@
+ output-tape.lo tapeio.lo
+ libamtape_la_OBJECTS = $(am_libamtape_la_OBJECTS)
+ EXTRA_PROGRAMS = tapetype$(EXEEXT) amtapeio$(EXEEXT)
+-sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT)
++@WANT_SERVER_TRUE@sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT)
++@WANT_CLIENT_TRUE@sbin_PROGRAMS = 
+ PROGRAMS = $(sbin_PROGRAMS)
+ 
+ amdd_SOURCES = amdd.c
+@@ -524,7 +526,11 @@
  
  install-data-am:
  
diff --git a/misc/amanda25-server/pkg-plist b/misc/amanda25-server/pkg-plist
index 68910673977c..6eb1159ad008 100644
--- a/misc/amanda25-server/pkg-plist
+++ b/misc/amanda25-server/pkg-plist
@@ -24,10 +24,12 @@ sbin/amadmin
 sbin/amcheck
 sbin/amcheckdb
 sbin/amcleanup
+sbin/amdd
 sbin/amdump
 sbin/amflush
 sbin/amgetconf
 sbin/amlabel
+sbin/ammt
 sbin/amoverview
 %%PLOT%%sbin/amplot
 sbin/amreport
diff --git a/misc/amanda25-server/pkg-plist.client b/misc/amanda25-server/pkg-plist.client
index 4f109899c777..5c6b60570375 100644
--- a/misc/amanda25-server/pkg-plist.client
+++ b/misc/amanda25-server/pkg-plist.client
@@ -18,6 +18,7 @@ share/amanda/COPYRIGHT
 share/amanda/COPYRIGHT-APACHE
 share/amanda/COPYRIGHT-REGEX
 share/amanda/DUMPER-API
+share/amanda/EXCLUDE
 share/amanda/FAQ
 share/amanda/INDEXING
 share/amanda/INSTALL
@@ -25,6 +26,7 @@ share/amanda/INTERNALS
 share/amanda/KERBEROS
 share/amanda/LABEL.PRINTING
 share/amanda/MULTITAPE
+share/amanda/PORT.USAGE
 share/amanda/RESTORE
 share/amanda/SAMBA
 share/amanda/SECURITY
diff --git a/misc/amanda26-client/Makefile b/misc/amanda26-client/Makefile
index 16388333d255..91b7b1457fa4 100644
--- a/misc/amanda26-client/Makefile
+++ b/misc/amanda26-client/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
-PORTREVISION=	0
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../amanda-server
 COMMENT=	${PKGDIR}/pkg-comment.client
diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile
index 18d5e310128e..b216905c2202 100644
--- a/misc/amanda26-server/Makefile
+++ b/misc/amanda26-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	2.4.3b1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	amanda
@@ -55,9 +55,10 @@ CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-user=operator --with-group=operator \
 		--without-client
 
-MAN8=		amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdump.8 \
-		amflush.8 amgetconf.8 amlabel.8 amoverview.8 amreport.8 \
-		amrmtape.8 amstatus.8 amtape.8 amtoc.8 amverify.8
+MAN8=		amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdd.8 \
+		amdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 \
+		amoverview.8 amreport.8 amrmtape.8 amstatus.8 \
+		amtape.8 amtoc.8 amverify.8
 
 .if defined (WITH_PLOT)
 BUILD_DEPENDS+=	gnuplot:${PORTSDIR}/math/gnuplot
diff --git a/misc/amanda26-server/files/patch-ac b/misc/amanda26-server/files/patch-ac
index aa763df6c0ef..a9be81de184d 100644
--- a/misc/amanda26-server/files/patch-ac
+++ b/misc/amanda26-server/files/patch-ac
@@ -1,6 +1,26 @@
---- tape-src/Makefile.in	Fri Nov 30 11:33:56 2001
-+++ tape-src/Makefile.in.new	Fri Nov 30 18:16:35 2001
-@@ -524,7 +524,11 @@
+--- tape-src/Makefile.in.orig	Fri Nov 30 14:33:56 2001
++++ tape-src/Makefile.in	Tue Dec  4 08:04:12 2001
+@@ -162,7 +162,8 @@
+ @WANT_LIBTOOL_FALSE@LIB_EXTENSION = a
+ @WANT_LIBTOOL_FALSE@noinst_LIBRARIES = libamtape.a
+ 
+-sbin_PROGRAMS = ammt amdd
++@WANT_SERVER_TRUE@sbin_PROGRAMS = ammt amdd
++@WANT_CLIENT_TRUE@sbin_PROGRAMS = 
+ 
+ libamtape_la_SOURCES = output-file.c \
+ 			output-null.c \
+@@ -241,7 +242,8 @@
+ output-tape.lo tapeio.lo
+ libamtape_la_OBJECTS = $(am_libamtape_la_OBJECTS)
+ EXTRA_PROGRAMS = tapetype$(EXEEXT) amtapeio$(EXEEXT)
+-sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT)
++@WANT_SERVER_TRUE@sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT)
++@WANT_CLIENT_TRUE@sbin_PROGRAMS = 
+ PROGRAMS = $(sbin_PROGRAMS)
+ 
+ amdd_SOURCES = amdd.c
+@@ -524,7 +526,11 @@
  
  install-data-am:
  
diff --git a/misc/amanda26-server/pkg-plist b/misc/amanda26-server/pkg-plist
index 68910673977c..6eb1159ad008 100644
--- a/misc/amanda26-server/pkg-plist
+++ b/misc/amanda26-server/pkg-plist
@@ -24,10 +24,12 @@ sbin/amadmin
 sbin/amcheck
 sbin/amcheckdb
 sbin/amcleanup
+sbin/amdd
 sbin/amdump
 sbin/amflush
 sbin/amgetconf
 sbin/amlabel
+sbin/ammt
 sbin/amoverview
 %%PLOT%%sbin/amplot
 sbin/amreport
diff --git a/misc/amanda26-server/pkg-plist.client b/misc/amanda26-server/pkg-plist.client
index 4f109899c777..5c6b60570375 100644
--- a/misc/amanda26-server/pkg-plist.client
+++ b/misc/amanda26-server/pkg-plist.client
@@ -18,6 +18,7 @@ share/amanda/COPYRIGHT
 share/amanda/COPYRIGHT-APACHE
 share/amanda/COPYRIGHT-REGEX
 share/amanda/DUMPER-API
+share/amanda/EXCLUDE
 share/amanda/FAQ
 share/amanda/INDEXING
 share/amanda/INSTALL
@@ -25,6 +26,7 @@ share/amanda/INTERNALS
 share/amanda/KERBEROS
 share/amanda/LABEL.PRINTING
 share/amanda/MULTITAPE
+share/amanda/PORT.USAGE
 share/amanda/RESTORE
 share/amanda/SAMBA
 share/amanda/SECURITY
diff --git a/misc/amanda32-client/Makefile b/misc/amanda32-client/Makefile
index 16388333d255..91b7b1457fa4 100644
--- a/misc/amanda32-client/Makefile
+++ b/misc/amanda32-client/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
-PORTREVISION=	0
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../amanda-server
 COMMENT=	${PKGDIR}/pkg-comment.client
diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile
index 18d5e310128e..b216905c2202 100644
--- a/misc/amanda32-server/Makefile
+++ b/misc/amanda32-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	2.4.3b1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	amanda
@@ -55,9 +55,10 @@ CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-user=operator --with-group=operator \
 		--without-client
 
-MAN8=		amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdump.8 \
-		amflush.8 amgetconf.8 amlabel.8 amoverview.8 amreport.8 \
-		amrmtape.8 amstatus.8 amtape.8 amtoc.8 amverify.8
+MAN8=		amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdd.8 \
+		amdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 \
+		amoverview.8 amreport.8 amrmtape.8 amstatus.8 \
+		amtape.8 amtoc.8 amverify.8
 
 .if defined (WITH_PLOT)
 BUILD_DEPENDS+=	gnuplot:${PORTSDIR}/math/gnuplot
diff --git a/misc/amanda32-server/files/patch-ac b/misc/amanda32-server/files/patch-ac
index aa763df6c0ef..a9be81de184d 100644
--- a/misc/amanda32-server/files/patch-ac
+++ b/misc/amanda32-server/files/patch-ac
@@ -1,6 +1,26 @@
---- tape-src/Makefile.in	Fri Nov 30 11:33:56 2001
-+++ tape-src/Makefile.in.new	Fri Nov 30 18:16:35 2001
-@@ -524,7 +524,11 @@
+--- tape-src/Makefile.in.orig	Fri Nov 30 14:33:56 2001
++++ tape-src/Makefile.in	Tue Dec  4 08:04:12 2001
+@@ -162,7 +162,8 @@
+ @WANT_LIBTOOL_FALSE@LIB_EXTENSION = a
+ @WANT_LIBTOOL_FALSE@noinst_LIBRARIES = libamtape.a
+ 
+-sbin_PROGRAMS = ammt amdd
++@WANT_SERVER_TRUE@sbin_PROGRAMS = ammt amdd
++@WANT_CLIENT_TRUE@sbin_PROGRAMS = 
+ 
+ libamtape_la_SOURCES = output-file.c \
+ 			output-null.c \
+@@ -241,7 +242,8 @@
+ output-tape.lo tapeio.lo
+ libamtape_la_OBJECTS = $(am_libamtape_la_OBJECTS)
+ EXTRA_PROGRAMS = tapetype$(EXEEXT) amtapeio$(EXEEXT)
+-sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT)
++@WANT_SERVER_TRUE@sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT)
++@WANT_CLIENT_TRUE@sbin_PROGRAMS = 
+ PROGRAMS = $(sbin_PROGRAMS)
+ 
+ amdd_SOURCES = amdd.c
+@@ -524,7 +526,11 @@
  
  install-data-am:
  
diff --git a/misc/amanda32-server/pkg-plist b/misc/amanda32-server/pkg-plist
index 68910673977c..6eb1159ad008 100644
--- a/misc/amanda32-server/pkg-plist
+++ b/misc/amanda32-server/pkg-plist
@@ -24,10 +24,12 @@ sbin/amadmin
 sbin/amcheck
 sbin/amcheckdb
 sbin/amcleanup
+sbin/amdd
 sbin/amdump
 sbin/amflush
 sbin/amgetconf
 sbin/amlabel
+sbin/ammt
 sbin/amoverview
 %%PLOT%%sbin/amplot
 sbin/amreport
diff --git a/misc/amanda32-server/pkg-plist.client b/misc/amanda32-server/pkg-plist.client
index 4f109899c777..5c6b60570375 100644
--- a/misc/amanda32-server/pkg-plist.client
+++ b/misc/amanda32-server/pkg-plist.client
@@ -18,6 +18,7 @@ share/amanda/COPYRIGHT
 share/amanda/COPYRIGHT-APACHE
 share/amanda/COPYRIGHT-REGEX
 share/amanda/DUMPER-API
+share/amanda/EXCLUDE
 share/amanda/FAQ
 share/amanda/INDEXING
 share/amanda/INSTALL
@@ -25,6 +26,7 @@ share/amanda/INTERNALS
 share/amanda/KERBEROS
 share/amanda/LABEL.PRINTING
 share/amanda/MULTITAPE
+share/amanda/PORT.USAGE
 share/amanda/RESTORE
 share/amanda/SAMBA
 share/amanda/SECURITY