Index: head/misc/amanda-client/Makefile
===================================================================
--- head/misc/amanda-client/Makefile	(revision 51024)
+++ head/misc/amanda-client/Makefile	(revision 51025)
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	amanda
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
 # $FreeBSD$
 #
 
 PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
-PORTREVISION=	0
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../amanda-server
 COMMENT=	${PKGDIR}/pkg-comment.client
 PKGINSTALL=	mustnotexist
 PLIST=		${PKGDIR}/pkg-plist.client
 
 CLIENT_ONLY=	yes
 
 .include "${MASTERDIR}/Makefile"

Property changes on: head/misc/amanda-client/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.41
\ No newline at end of property
+1.42
\ No newline at end of property
Index: head/misc/amanda-server/Makefile
===================================================================
--- head/misc/amanda-server/Makefile	(revision 51024)
+++ head/misc/amanda-server/Makefile	(revision 51025)
@@ -1,152 +1,153 @@
 # New ports collection makefile for:	amanda
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	2.4.3b1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	amanda
 DISTFILES=	amanda-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	jeh@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/amanda-${PORTVERSION}
 SLAVEDIRS=	misc/amanda-client
 MASTERPORTNAME=	amanda-server
 
 NO_LATEST_LINK=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 PATCH_STRIP=
 
 .include <bsd.port.pre.mk>
 # amanda-server part
 .if !defined(CLIENT_ONLY)
 
 pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "You may use the following build options:"
 	@${ECHO} ""
 	@${ECHO} "    -DWITH_PLOT to enable ploting, requires X11 libraries"
 	@${ECHO} "    -DWITH_SAMBA to enable the use of smbclient"
 	@${ECHO} "    -DWITHOUT_GNUTAR to NOT use GNUTar and use the"
 	@${ECHO} "        native FreeBSD version"
 	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
 	@${ECHO} "        The default is `uname -n`"
 	@${ECHO} "    AMANDA_TAPE=tape to specify the default tape device"
 	@${ECHO} "        The default is /dev/nrsa0"
 	@${ECHO} "    AMANDA_CONFIG=config to specify the default configuation"
 	@${ECHO} "        The default is user"
 	@${ECHO} ""
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client
 BUILD_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client
 
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
 		--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
 RUN_DEPENDS+=	gnuplot:${PORTSDIR}/math/gnuplot
 MAN8+=		amplot.8
 PLIST_SUB+=	PLOT=''
 .else
 PLIST_SUB+=	PLOT='@comment '
 .endif
 
 .if defined (WITH_SAMBA)
 BUILD_DEPENDS+=	smbclient:${PORTSDIR}/net/samba
 RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba
 CONFIGURE_ARGS+=	--with-smbclient=${PREFIX}/bin/smbclient
 .endif
 
 .if !defined (WITHOUT_GNUTAR)
 CONFIGURE_ARGS+=	--with-gnutar=${PREFIX}/bin/gtar
 BUILD_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
 RUN_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
 .endif
 
 .if defined (AMANDA_SERVER)
 CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
 CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
 .endif
 
 .if defined (AMANDA_TAPE)
 CONFIGURE_ARGS+=	--with-tape-device=${AMANDA_TAPE}
 .endif
 
 .if defined (AMANDA_CONFIG)
 CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
 .endif
 
 #
 # Before 4.0, pre-CAM scsiio.h existed
 .if ${OSVERSION} < 400000
 PLIST_SUB+=	SCSICHG=''
 .else
 PLIST_SUB+=	SCSICHG='@comment '
 .endif
 
 # amanda-client part
 .else
 
 pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "You may use the following build options:"
 	@${ECHO} ""
 	@${ECHO} "    -DWITHOUT_GNUTAR to NOT use GNUTar and use the"
 	@${ECHO} "        native FreeBSD version"
 	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
 	@${ECHO} "        The default is `uname -n`"
 	@${ECHO} "    AMANDA_CONFIG=config to specify the default configuation"
 	@${ECHO} "        The default is user"
 	@${ECHO} ""
 
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
 		--with-user=operator --with-group=operator \
 		--without-server
 
 MAN8=		amanda.8 amrecover.8 amrestore.8
 
 post-install:
 	${MKDIR} ${PREFIX}/share/examples/amanda
 	${CP} -R ${WRKSRC}/example/amanda.conf \
 		${WRKSRC}/example/chg-multi.conf \
 		${WRKSRC}/example/chg-scsi.conf \
 		${WRKSRC}/example/disklist \
 		${PREFIX}/share/examples/amanda
 
 .if !defined (WITHOUT_GNUTAR)
 CONFIGURE_ARGS+=	--with-gnutar=${PREFIX}/bin/gtar
 BUILD_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
 RUN_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
 .endif
 
 .if defined (AMANDA_SERVER)
 CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
 CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
 .endif
 
 .if defined (AMANDA_CONFIG)
 CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
 .endif
 
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/misc/amanda-server/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.45
\ No newline at end of property
+1.46
\ No newline at end of property
Index: head/misc/amanda-server/files/patch-ac
===================================================================
--- head/misc/amanda-server/files/patch-ac	(revision 51024)
+++ head/misc/amanda-server/files/patch-ac	(revision 51025)
@@ -1,15 +1,35 @@
---- 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:
  
 -install-exec-am: install-libLTLIBRARIES install-sbinPROGRAMS
 +@WANT_CLIENT_TRUE@install-exec-am: @WANT_CLIENT_TRUE@install-libLTLIBRARIES \
 +	install-sbinPROGRAMS
 +	@$(NORMAL_INSTALL)
 +	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 +@WANT_SERVER_TRUE@install-exec-am: install-sbinPROGRAMS
  	@$(NORMAL_INSTALL)
  	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
  

Property changes on: head/misc/amanda-server/files/patch-ac
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/misc/amanda-server/pkg-plist
===================================================================
--- head/misc/amanda-server/pkg-plist	(revision 51024)
+++ head/misc/amanda-server/pkg-plist	(revision 51025)
@@ -1,38 +1,40 @@
 lib/libamserver.a
 %%PLOT%%libexec/amanda/amcat.awk
 libexec/amanda/amcleanupdisk
 libexec/amanda/amindexd
 libexec/amanda/amlogroll
 %%PLOT%%libexec/amanda/amplot.awk
 %%PLOT%%libexec/amanda/amplot.g
 %%PLOT%%libexec/amanda/amplot.gp
 libexec/amanda/amtrmidx
 libexec/amanda/amtrmlog
 libexec/amanda/chg-chio
 libexec/amanda/chg-chs
 libexec/amanda/chg-manual
 libexec/amanda/chg-mtx
 libexec/amanda/chg-multi
 libexec/amanda/chg-rth
 %%SCSICHG%%libexec/amanda/chg-scsi
 libexec/amanda/chg-zd-mtx
 libexec/amanda/driver
 libexec/amanda/dumper
 libexec/amanda/planner
 libexec/amanda/taper
 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
 sbin/amrmtape
 sbin/amstatus
 sbin/amtape
 sbin/amtoc
 sbin/amverify

Property changes on: head/misc/amanda-server/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.19
\ No newline at end of property
+1.20
\ No newline at end of property
Index: head/misc/amanda-server/pkg-plist.client
===================================================================
--- head/misc/amanda-server/pkg-plist.client	(revision 51024)
+++ head/misc/amanda-server/pkg-plist.client	(revision 51025)
@@ -1,45 +1,47 @@
 lib/libamanda.a
 lib/libamclient.a
 lib/libamtape.a
 libexec/amanda/amandad
 libexec/amanda/amidxtaped
 libexec/amanda/calcsize
 libexec/amanda/killpgrp
 libexec/amanda/patch-system
 libexec/amanda/rundump
 libexec/amanda/runtar
 libexec/amanda/selfcheck
 libexec/amanda/sendbackup
 libexec/amanda/sendsize
 libexec/amanda/versionsuffix
 sbin/amrecover
 sbin/amrestore
 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
 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
 share/amanda/SYSTEM.NOTES
 share/amanda/TAPE.CHANGERS
 share/amanda/TAPETYPES
 share/amanda/UPGRADE
 share/amanda/WHATS.NEW
 share/amanda/WISHLIST
 share/amanda/YEAR2000
 share/amanda/ZFTAPE
 share/examples/amanda/amanda.conf
 share/examples/amanda/chg-multi.conf
 share/examples/amanda/chg-scsi.conf
 share/examples/amanda/disklist
 @dirrm share/examples/amanda
 @dirrm share/amanda
 @dirrm libexec/amanda

Property changes on: head/misc/amanda-server/pkg-plist.client
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/misc/amanda25-client/Makefile
===================================================================
--- head/misc/amanda25-client/Makefile	(revision 51024)
+++ head/misc/amanda25-client/Makefile	(revision 51025)
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	amanda
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
 # $FreeBSD$
 #
 
 PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
-PORTREVISION=	0
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../amanda-server
 COMMENT=	${PKGDIR}/pkg-comment.client
 PKGINSTALL=	mustnotexist
 PLIST=		${PKGDIR}/pkg-plist.client
 
 CLIENT_ONLY=	yes
 
 .include "${MASTERDIR}/Makefile"

Property changes on: head/misc/amanda25-client/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.41
\ No newline at end of property
+1.42
\ No newline at end of property
Index: head/misc/amanda25-server/Makefile
===================================================================
--- head/misc/amanda25-server/Makefile	(revision 51024)
+++ head/misc/amanda25-server/Makefile	(revision 51025)
@@ -1,152 +1,153 @@
 # New ports collection makefile for:	amanda
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	2.4.3b1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	amanda
 DISTFILES=	amanda-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	jeh@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/amanda-${PORTVERSION}
 SLAVEDIRS=	misc/amanda-client
 MASTERPORTNAME=	amanda-server
 
 NO_LATEST_LINK=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 PATCH_STRIP=
 
 .include <bsd.port.pre.mk>
 # amanda-server part
 .if !defined(CLIENT_ONLY)
 
 pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "You may use the following build options:"
 	@${ECHO} ""
 	@${ECHO} "    -DWITH_PLOT to enable ploting, requires X11 libraries"
 	@${ECHO} "    -DWITH_SAMBA to enable the use of smbclient"
 	@${ECHO} "    -DWITHOUT_GNUTAR to NOT use GNUTar and use the"
 	@${ECHO} "        native FreeBSD version"
 	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
 	@${ECHO} "        The default is `uname -n`"
 	@${ECHO} "    AMANDA_TAPE=tape to specify the default tape device"
 	@${ECHO} "        The default is /dev/nrsa0"
 	@${ECHO} "    AMANDA_CONFIG=config to specify the default configuation"
 	@${ECHO} "        The default is user"
 	@${ECHO} ""
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client
 BUILD_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client
 
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
 		--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
 RUN_DEPENDS+=	gnuplot:${PORTSDIR}/math/gnuplot
 MAN8+=		amplot.8
 PLIST_SUB+=	PLOT=''
 .else
 PLIST_SUB+=	PLOT='@comment '
 .endif
 
 .if defined (WITH_SAMBA)
 BUILD_DEPENDS+=	smbclient:${PORTSDIR}/net/samba
 RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba
 CONFIGURE_ARGS+=	--with-smbclient=${PREFIX}/bin/smbclient
 .endif
 
 .if !defined (WITHOUT_GNUTAR)
 CONFIGURE_ARGS+=	--with-gnutar=${PREFIX}/bin/gtar
 BUILD_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
 RUN_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
 .endif
 
 .if defined (AMANDA_SERVER)
 CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
 CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
 .endif
 
 .if defined (AMANDA_TAPE)
 CONFIGURE_ARGS+=	--with-tape-device=${AMANDA_TAPE}
 .endif
 
 .if defined (AMANDA_CONFIG)
 CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
 .endif
 
 #
 # Before 4.0, pre-CAM scsiio.h existed
 .if ${OSVERSION} < 400000
 PLIST_SUB+=	SCSICHG=''
 .else
 PLIST_SUB+=	SCSICHG='@comment '
 .endif
 
 # amanda-client part
 .else
 
 pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "You may use the following build options:"
 	@${ECHO} ""
 	@${ECHO} "    -DWITHOUT_GNUTAR to NOT use GNUTar and use the"
 	@${ECHO} "        native FreeBSD version"
 	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
 	@${ECHO} "        The default is `uname -n`"
 	@${ECHO} "    AMANDA_CONFIG=config to specify the default configuation"
 	@${ECHO} "        The default is user"
 	@${ECHO} ""
 
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
 		--with-user=operator --with-group=operator \
 		--without-server
 
 MAN8=		amanda.8 amrecover.8 amrestore.8
 
 post-install:
 	${MKDIR} ${PREFIX}/share/examples/amanda
 	${CP} -R ${WRKSRC}/example/amanda.conf \
 		${WRKSRC}/example/chg-multi.conf \
 		${WRKSRC}/example/chg-scsi.conf \
 		${WRKSRC}/example/disklist \
 		${PREFIX}/share/examples/amanda
 
 .if !defined (WITHOUT_GNUTAR)
 CONFIGURE_ARGS+=	--with-gnutar=${PREFIX}/bin/gtar
 BUILD_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
 RUN_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
 .endif
 
 .if defined (AMANDA_SERVER)
 CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
 CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
 .endif
 
 .if defined (AMANDA_CONFIG)
 CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
 .endif
 
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/misc/amanda25-server/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.45
\ No newline at end of property
+1.46
\ No newline at end of property
Index: head/misc/amanda25-server/files/patch-ac
===================================================================
--- head/misc/amanda25-server/files/patch-ac	(revision 51024)
+++ head/misc/amanda25-server/files/patch-ac	(revision 51025)
@@ -1,15 +1,35 @@
---- 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:
  
 -install-exec-am: install-libLTLIBRARIES install-sbinPROGRAMS
 +@WANT_CLIENT_TRUE@install-exec-am: @WANT_CLIENT_TRUE@install-libLTLIBRARIES \
 +	install-sbinPROGRAMS
 +	@$(NORMAL_INSTALL)
 +	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 +@WANT_SERVER_TRUE@install-exec-am: install-sbinPROGRAMS
  	@$(NORMAL_INSTALL)
  	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
  

Property changes on: head/misc/amanda25-server/files/patch-ac
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/misc/amanda25-server/pkg-plist
===================================================================
--- head/misc/amanda25-server/pkg-plist	(revision 51024)
+++ head/misc/amanda25-server/pkg-plist	(revision 51025)
@@ -1,38 +1,40 @@
 lib/libamserver.a
 %%PLOT%%libexec/amanda/amcat.awk
 libexec/amanda/amcleanupdisk
 libexec/amanda/amindexd
 libexec/amanda/amlogroll
 %%PLOT%%libexec/amanda/amplot.awk
 %%PLOT%%libexec/amanda/amplot.g
 %%PLOT%%libexec/amanda/amplot.gp
 libexec/amanda/amtrmidx
 libexec/amanda/amtrmlog
 libexec/amanda/chg-chio
 libexec/amanda/chg-chs
 libexec/amanda/chg-manual
 libexec/amanda/chg-mtx
 libexec/amanda/chg-multi
 libexec/amanda/chg-rth
 %%SCSICHG%%libexec/amanda/chg-scsi
 libexec/amanda/chg-zd-mtx
 libexec/amanda/driver
 libexec/amanda/dumper
 libexec/amanda/planner
 libexec/amanda/taper
 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
 sbin/amrmtape
 sbin/amstatus
 sbin/amtape
 sbin/amtoc
 sbin/amverify

Property changes on: head/misc/amanda25-server/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.19
\ No newline at end of property
+1.20
\ No newline at end of property
Index: head/misc/amanda25-server/pkg-plist.client
===================================================================
--- head/misc/amanda25-server/pkg-plist.client	(revision 51024)
+++ head/misc/amanda25-server/pkg-plist.client	(revision 51025)
@@ -1,45 +1,47 @@
 lib/libamanda.a
 lib/libamclient.a
 lib/libamtape.a
 libexec/amanda/amandad
 libexec/amanda/amidxtaped
 libexec/amanda/calcsize
 libexec/amanda/killpgrp
 libexec/amanda/patch-system
 libexec/amanda/rundump
 libexec/amanda/runtar
 libexec/amanda/selfcheck
 libexec/amanda/sendbackup
 libexec/amanda/sendsize
 libexec/amanda/versionsuffix
 sbin/amrecover
 sbin/amrestore
 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
 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
 share/amanda/SYSTEM.NOTES
 share/amanda/TAPE.CHANGERS
 share/amanda/TAPETYPES
 share/amanda/UPGRADE
 share/amanda/WHATS.NEW
 share/amanda/WISHLIST
 share/amanda/YEAR2000
 share/amanda/ZFTAPE
 share/examples/amanda/amanda.conf
 share/examples/amanda/chg-multi.conf
 share/examples/amanda/chg-scsi.conf
 share/examples/amanda/disklist
 @dirrm share/examples/amanda
 @dirrm share/amanda
 @dirrm libexec/amanda

Property changes on: head/misc/amanda25-server/pkg-plist.client
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/misc/amanda26-client/Makefile
===================================================================
--- head/misc/amanda26-client/Makefile	(revision 51024)
+++ head/misc/amanda26-client/Makefile	(revision 51025)
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	amanda
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
 # $FreeBSD$
 #
 
 PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
-PORTREVISION=	0
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../amanda-server
 COMMENT=	${PKGDIR}/pkg-comment.client
 PKGINSTALL=	mustnotexist
 PLIST=		${PKGDIR}/pkg-plist.client
 
 CLIENT_ONLY=	yes
 
 .include "${MASTERDIR}/Makefile"

Property changes on: head/misc/amanda26-client/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.41
\ No newline at end of property
+1.42
\ No newline at end of property
Index: head/misc/amanda26-server/Makefile
===================================================================
--- head/misc/amanda26-server/Makefile	(revision 51024)
+++ head/misc/amanda26-server/Makefile	(revision 51025)
@@ -1,152 +1,153 @@
 # New ports collection makefile for:	amanda
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	2.4.3b1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	amanda
 DISTFILES=	amanda-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	jeh@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/amanda-${PORTVERSION}
 SLAVEDIRS=	misc/amanda-client
 MASTERPORTNAME=	amanda-server
 
 NO_LATEST_LINK=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 PATCH_STRIP=
 
 .include <bsd.port.pre.mk>
 # amanda-server part
 .if !defined(CLIENT_ONLY)
 
 pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "You may use the following build options:"
 	@${ECHO} ""
 	@${ECHO} "    -DWITH_PLOT to enable ploting, requires X11 libraries"
 	@${ECHO} "    -DWITH_SAMBA to enable the use of smbclient"
 	@${ECHO} "    -DWITHOUT_GNUTAR to NOT use GNUTar and use the"
 	@${ECHO} "        native FreeBSD version"
 	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
 	@${ECHO} "        The default is `uname -n`"
 	@${ECHO} "    AMANDA_TAPE=tape to specify the default tape device"
 	@${ECHO} "        The default is /dev/nrsa0"
 	@${ECHO} "    AMANDA_CONFIG=config to specify the default configuation"
 	@${ECHO} "        The default is user"
 	@${ECHO} ""
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client
 BUILD_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client
 
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
 		--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
 RUN_DEPENDS+=	gnuplot:${PORTSDIR}/math/gnuplot
 MAN8+=		amplot.8
 PLIST_SUB+=	PLOT=''
 .else
 PLIST_SUB+=	PLOT='@comment '
 .endif
 
 .if defined (WITH_SAMBA)
 BUILD_DEPENDS+=	smbclient:${PORTSDIR}/net/samba
 RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba
 CONFIGURE_ARGS+=	--with-smbclient=${PREFIX}/bin/smbclient
 .endif
 
 .if !defined (WITHOUT_GNUTAR)
 CONFIGURE_ARGS+=	--with-gnutar=${PREFIX}/bin/gtar
 BUILD_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
 RUN_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
 .endif
 
 .if defined (AMANDA_SERVER)
 CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
 CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
 .endif
 
 .if defined (AMANDA_TAPE)
 CONFIGURE_ARGS+=	--with-tape-device=${AMANDA_TAPE}
 .endif
 
 .if defined (AMANDA_CONFIG)
 CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
 .endif
 
 #
 # Before 4.0, pre-CAM scsiio.h existed
 .if ${OSVERSION} < 400000
 PLIST_SUB+=	SCSICHG=''
 .else
 PLIST_SUB+=	SCSICHG='@comment '
 .endif
 
 # amanda-client part
 .else
 
 pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "You may use the following build options:"
 	@${ECHO} ""
 	@${ECHO} "    -DWITHOUT_GNUTAR to NOT use GNUTar and use the"
 	@${ECHO} "        native FreeBSD version"
 	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
 	@${ECHO} "        The default is `uname -n`"
 	@${ECHO} "    AMANDA_CONFIG=config to specify the default configuation"
 	@${ECHO} "        The default is user"
 	@${ECHO} ""
 
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
 		--with-user=operator --with-group=operator \
 		--without-server
 
 MAN8=		amanda.8 amrecover.8 amrestore.8
 
 post-install:
 	${MKDIR} ${PREFIX}/share/examples/amanda
 	${CP} -R ${WRKSRC}/example/amanda.conf \
 		${WRKSRC}/example/chg-multi.conf \
 		${WRKSRC}/example/chg-scsi.conf \
 		${WRKSRC}/example/disklist \
 		${PREFIX}/share/examples/amanda
 
 .if !defined (WITHOUT_GNUTAR)
 CONFIGURE_ARGS+=	--with-gnutar=${PREFIX}/bin/gtar
 BUILD_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
 RUN_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
 .endif
 
 .if defined (AMANDA_SERVER)
 CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
 CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
 .endif
 
 .if defined (AMANDA_CONFIG)
 CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
 .endif
 
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/misc/amanda26-server/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.45
\ No newline at end of property
+1.46
\ No newline at end of property
Index: head/misc/amanda26-server/files/patch-ac
===================================================================
--- head/misc/amanda26-server/files/patch-ac	(revision 51024)
+++ head/misc/amanda26-server/files/patch-ac	(revision 51025)
@@ -1,15 +1,35 @@
---- 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:
  
 -install-exec-am: install-libLTLIBRARIES install-sbinPROGRAMS
 +@WANT_CLIENT_TRUE@install-exec-am: @WANT_CLIENT_TRUE@install-libLTLIBRARIES \
 +	install-sbinPROGRAMS
 +	@$(NORMAL_INSTALL)
 +	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 +@WANT_SERVER_TRUE@install-exec-am: install-sbinPROGRAMS
  	@$(NORMAL_INSTALL)
  	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
  

Property changes on: head/misc/amanda26-server/files/patch-ac
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/misc/amanda26-server/pkg-plist
===================================================================
--- head/misc/amanda26-server/pkg-plist	(revision 51024)
+++ head/misc/amanda26-server/pkg-plist	(revision 51025)
@@ -1,38 +1,40 @@
 lib/libamserver.a
 %%PLOT%%libexec/amanda/amcat.awk
 libexec/amanda/amcleanupdisk
 libexec/amanda/amindexd
 libexec/amanda/amlogroll
 %%PLOT%%libexec/amanda/amplot.awk
 %%PLOT%%libexec/amanda/amplot.g
 %%PLOT%%libexec/amanda/amplot.gp
 libexec/amanda/amtrmidx
 libexec/amanda/amtrmlog
 libexec/amanda/chg-chio
 libexec/amanda/chg-chs
 libexec/amanda/chg-manual
 libexec/amanda/chg-mtx
 libexec/amanda/chg-multi
 libexec/amanda/chg-rth
 %%SCSICHG%%libexec/amanda/chg-scsi
 libexec/amanda/chg-zd-mtx
 libexec/amanda/driver
 libexec/amanda/dumper
 libexec/amanda/planner
 libexec/amanda/taper
 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
 sbin/amrmtape
 sbin/amstatus
 sbin/amtape
 sbin/amtoc
 sbin/amverify

Property changes on: head/misc/amanda26-server/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.19
\ No newline at end of property
+1.20
\ No newline at end of property
Index: head/misc/amanda26-server/pkg-plist.client
===================================================================
--- head/misc/amanda26-server/pkg-plist.client	(revision 51024)
+++ head/misc/amanda26-server/pkg-plist.client	(revision 51025)
@@ -1,45 +1,47 @@
 lib/libamanda.a
 lib/libamclient.a
 lib/libamtape.a
 libexec/amanda/amandad
 libexec/amanda/amidxtaped
 libexec/amanda/calcsize
 libexec/amanda/killpgrp
 libexec/amanda/patch-system
 libexec/amanda/rundump
 libexec/amanda/runtar
 libexec/amanda/selfcheck
 libexec/amanda/sendbackup
 libexec/amanda/sendsize
 libexec/amanda/versionsuffix
 sbin/amrecover
 sbin/amrestore
 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
 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
 share/amanda/SYSTEM.NOTES
 share/amanda/TAPE.CHANGERS
 share/amanda/TAPETYPES
 share/amanda/UPGRADE
 share/amanda/WHATS.NEW
 share/amanda/WISHLIST
 share/amanda/YEAR2000
 share/amanda/ZFTAPE
 share/examples/amanda/amanda.conf
 share/examples/amanda/chg-multi.conf
 share/examples/amanda/chg-scsi.conf
 share/examples/amanda/disklist
 @dirrm share/examples/amanda
 @dirrm share/amanda
 @dirrm libexec/amanda

Property changes on: head/misc/amanda26-server/pkg-plist.client
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/misc/amanda32-client/Makefile
===================================================================
--- head/misc/amanda32-client/Makefile	(revision 51024)
+++ head/misc/amanda32-client/Makefile	(revision 51025)
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	amanda
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
 # $FreeBSD$
 #
 
 PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
-PORTREVISION=	0
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../amanda-server
 COMMENT=	${PKGDIR}/pkg-comment.client
 PKGINSTALL=	mustnotexist
 PLIST=		${PKGDIR}/pkg-plist.client
 
 CLIENT_ONLY=	yes
 
 .include "${MASTERDIR}/Makefile"

Property changes on: head/misc/amanda32-client/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.41
\ No newline at end of property
+1.42
\ No newline at end of property
Index: head/misc/amanda32-server/Makefile
===================================================================
--- head/misc/amanda32-server/Makefile	(revision 51024)
+++ head/misc/amanda32-server/Makefile	(revision 51025)
@@ -1,152 +1,153 @@
 # New ports collection makefile for:	amanda
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	2.4.3b1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	amanda
 DISTFILES=	amanda-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	jeh@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/amanda-${PORTVERSION}
 SLAVEDIRS=	misc/amanda-client
 MASTERPORTNAME=	amanda-server
 
 NO_LATEST_LINK=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 PATCH_STRIP=
 
 .include <bsd.port.pre.mk>
 # amanda-server part
 .if !defined(CLIENT_ONLY)
 
 pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "You may use the following build options:"
 	@${ECHO} ""
 	@${ECHO} "    -DWITH_PLOT to enable ploting, requires X11 libraries"
 	@${ECHO} "    -DWITH_SAMBA to enable the use of smbclient"
 	@${ECHO} "    -DWITHOUT_GNUTAR to NOT use GNUTar and use the"
 	@${ECHO} "        native FreeBSD version"
 	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
 	@${ECHO} "        The default is `uname -n`"
 	@${ECHO} "    AMANDA_TAPE=tape to specify the default tape device"
 	@${ECHO} "        The default is /dev/nrsa0"
 	@${ECHO} "    AMANDA_CONFIG=config to specify the default configuation"
 	@${ECHO} "        The default is user"
 	@${ECHO} ""
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client
 BUILD_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client
 
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
 		--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
 RUN_DEPENDS+=	gnuplot:${PORTSDIR}/math/gnuplot
 MAN8+=		amplot.8
 PLIST_SUB+=	PLOT=''
 .else
 PLIST_SUB+=	PLOT='@comment '
 .endif
 
 .if defined (WITH_SAMBA)
 BUILD_DEPENDS+=	smbclient:${PORTSDIR}/net/samba
 RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba
 CONFIGURE_ARGS+=	--with-smbclient=${PREFIX}/bin/smbclient
 .endif
 
 .if !defined (WITHOUT_GNUTAR)
 CONFIGURE_ARGS+=	--with-gnutar=${PREFIX}/bin/gtar
 BUILD_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
 RUN_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
 .endif
 
 .if defined (AMANDA_SERVER)
 CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
 CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
 .endif
 
 .if defined (AMANDA_TAPE)
 CONFIGURE_ARGS+=	--with-tape-device=${AMANDA_TAPE}
 .endif
 
 .if defined (AMANDA_CONFIG)
 CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
 .endif
 
 #
 # Before 4.0, pre-CAM scsiio.h existed
 .if ${OSVERSION} < 400000
 PLIST_SUB+=	SCSICHG=''
 .else
 PLIST_SUB+=	SCSICHG='@comment '
 .endif
 
 # amanda-client part
 .else
 
 pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "You may use the following build options:"
 	@${ECHO} ""
 	@${ECHO} "    -DWITHOUT_GNUTAR to NOT use GNUTar and use the"
 	@${ECHO} "        native FreeBSD version"
 	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
 	@${ECHO} "        The default is `uname -n`"
 	@${ECHO} "    AMANDA_CONFIG=config to specify the default configuation"
 	@${ECHO} "        The default is user"
 	@${ECHO} ""
 
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
 		--with-user=operator --with-group=operator \
 		--without-server
 
 MAN8=		amanda.8 amrecover.8 amrestore.8
 
 post-install:
 	${MKDIR} ${PREFIX}/share/examples/amanda
 	${CP} -R ${WRKSRC}/example/amanda.conf \
 		${WRKSRC}/example/chg-multi.conf \
 		${WRKSRC}/example/chg-scsi.conf \
 		${WRKSRC}/example/disklist \
 		${PREFIX}/share/examples/amanda
 
 .if !defined (WITHOUT_GNUTAR)
 CONFIGURE_ARGS+=	--with-gnutar=${PREFIX}/bin/gtar
 BUILD_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
 RUN_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
 .endif
 
 .if defined (AMANDA_SERVER)
 CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
 CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
 .endif
 
 .if defined (AMANDA_CONFIG)
 CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
 .endif
 
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/misc/amanda32-server/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.45
\ No newline at end of property
+1.46
\ No newline at end of property
Index: head/misc/amanda32-server/files/patch-ac
===================================================================
--- head/misc/amanda32-server/files/patch-ac	(revision 51024)
+++ head/misc/amanda32-server/files/patch-ac	(revision 51025)
@@ -1,15 +1,35 @@
---- 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:
  
 -install-exec-am: install-libLTLIBRARIES install-sbinPROGRAMS
 +@WANT_CLIENT_TRUE@install-exec-am: @WANT_CLIENT_TRUE@install-libLTLIBRARIES \
 +	install-sbinPROGRAMS
 +	@$(NORMAL_INSTALL)
 +	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 +@WANT_SERVER_TRUE@install-exec-am: install-sbinPROGRAMS
  	@$(NORMAL_INSTALL)
  	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
  

Property changes on: head/misc/amanda32-server/files/patch-ac
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/misc/amanda32-server/pkg-plist
===================================================================
--- head/misc/amanda32-server/pkg-plist	(revision 51024)
+++ head/misc/amanda32-server/pkg-plist	(revision 51025)
@@ -1,38 +1,40 @@
 lib/libamserver.a
 %%PLOT%%libexec/amanda/amcat.awk
 libexec/amanda/amcleanupdisk
 libexec/amanda/amindexd
 libexec/amanda/amlogroll
 %%PLOT%%libexec/amanda/amplot.awk
 %%PLOT%%libexec/amanda/amplot.g
 %%PLOT%%libexec/amanda/amplot.gp
 libexec/amanda/amtrmidx
 libexec/amanda/amtrmlog
 libexec/amanda/chg-chio
 libexec/amanda/chg-chs
 libexec/amanda/chg-manual
 libexec/amanda/chg-mtx
 libexec/amanda/chg-multi
 libexec/amanda/chg-rth
 %%SCSICHG%%libexec/amanda/chg-scsi
 libexec/amanda/chg-zd-mtx
 libexec/amanda/driver
 libexec/amanda/dumper
 libexec/amanda/planner
 libexec/amanda/taper
 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
 sbin/amrmtape
 sbin/amstatus
 sbin/amtape
 sbin/amtoc
 sbin/amverify

Property changes on: head/misc/amanda32-server/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.19
\ No newline at end of property
+1.20
\ No newline at end of property
Index: head/misc/amanda32-server/pkg-plist.client
===================================================================
--- head/misc/amanda32-server/pkg-plist.client	(revision 51024)
+++ head/misc/amanda32-server/pkg-plist.client	(revision 51025)
@@ -1,45 +1,47 @@
 lib/libamanda.a
 lib/libamclient.a
 lib/libamtape.a
 libexec/amanda/amandad
 libexec/amanda/amidxtaped
 libexec/amanda/calcsize
 libexec/amanda/killpgrp
 libexec/amanda/patch-system
 libexec/amanda/rundump
 libexec/amanda/runtar
 libexec/amanda/selfcheck
 libexec/amanda/sendbackup
 libexec/amanda/sendsize
 libexec/amanda/versionsuffix
 sbin/amrecover
 sbin/amrestore
 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
 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
 share/amanda/SYSTEM.NOTES
 share/amanda/TAPE.CHANGERS
 share/amanda/TAPETYPES
 share/amanda/UPGRADE
 share/amanda/WHATS.NEW
 share/amanda/WISHLIST
 share/amanda/YEAR2000
 share/amanda/ZFTAPE
 share/examples/amanda/amanda.conf
 share/examples/amanda/chg-multi.conf
 share/examples/amanda/chg-scsi.conf
 share/examples/amanda/disklist
 @dirrm share/examples/amanda
 @dirrm share/amanda
 @dirrm libexec/amanda

Property changes on: head/misc/amanda32-server/pkg-plist.client
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property