ports/131193: [UPDATE] misc/amanda-* to version 2.6.1

Goran Lowkrantz glz at hidden-powers.com
Sat Jan 31 10:50:05 UTC 2009


>Number:         131193
>Category:       ports
>Synopsis:       [UPDATE] misc/amanda-* to version 2.6.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 31 10:50:04 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Goran Lowkrantz
>Release:        FreeBSD 7.1-STABLE
>Organization:
>Environment:
FreeBSD midgard.glz.hidden-powers.com 7.1-STABLE FreeBSD 7.1-STABLE #7: Wed Jan 21 14:40:50 CET 2009     root at midgard.glz.hidden-powers.com:/usr/obj/usr/src/sys/SERVER  amd64

>Description:
Patches to current port of misc/amanda-server and misc/amanda-client to current stable from Amanda.

The patches changes the structure of the port, as I was unable to break i to a clean server and client port. Thus I have added a combined port, just named misc/amanda intended for the case when you want to have bot a server and a client installed on the same machine.

my personal feeling is that no repocopy of the 2.6.0 structure is required, as the 2.6.1 is a natural extension on the things added in 2.6.0 and no new incompatibles are added with this.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	amanda-2.6.1.diff
#
echo x - amanda-2.6.1.diff
sed 's/^X//' >amanda-2.6.1.diff << 'e97ad6bb25843b8253e9fde628cbbdc8'
Xdiff -ruN amanda.orig/Makefile amanda/Makefile
X--- amanda.orig/Makefile	1970-01-01 01:00:00.000000000 +0100
X+++ amanda/Makefile	2009-01-31 10:49:47.354826387 +0100
X@@ -0,0 +1,231 @@
X+# New ports collection makefile for:	amanda
X+# Date created:				28th Feb 1995
X+# Whom:					gpalmer
X+#
X+# $FreeBSD:$
X+#
X+
X+PORTNAME=	amanda
X+PORTVERSION=	${AMANDA_VERSION}
X+CATEGORIES=	misc
X+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
X+MASTER_SITE_SUBDIR=	amanda
X+
X+MAINTAINER=	kuriyama at FreeBSD.org
X+COMMENT?=	The Advanced Maryland Automatic Network Disk Archiver (server and client)
X+
X+SLAVEDIRS=	misc/amanda-client misc/amanda-server
X+
X+AMANDA_VERSION=2.6.1
X+
X+LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
X+GNU_CONFIGURE=	yes
X+USE_GNOME=	pkgconfig glib20
X+USE_GMAKE=	yes
X+USE_OPENSSL=	yes
X+PATCH_STRIP=
X+CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
X+		--without-amlibexecdir \
X+		--with-amandahosts --with-fqdn \
X+		--with-dump-honor-nodump --with-buffered-dump \
X+		--disable-libtool --prefix=${PREFIX} \
X+		--disable-glibtest \
X+		--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \
X+		--with-bsdtcp-security --with-bsdudp-security
X+
X+USE_LDCONFIG=	yes
X+WANT_PERL=	yes
X+
X+CONFLICTS=	amanda-server-2.5.* amanda-server-2.6.* amanda-client-2.5.* amanda-client-2.6.*
X+.if !defined (SERVER_ONLY) && !defined (CLIENT_ONLY)
X+CONFLICTS+=	amanda-devel-server-2.6.[0-9]* amanda-devel-client-2.6.[0-9]*
X+.endif
X+.if defined (SERVER_ONLY)
X+CONFLICTS+=	amanda-devel-2.6.[0-9]* amanda-devel-client-2.6.[0-9]*
X+.endif
X+.if defined (CLIENT_ONLY)
X+CONFLICTS+=	amanda-devel-2.6.[0-9]* amanda-devel-server-2.6.[0-9]*
X+.endif
X+
X+OPTIONS=	GNUTAR "use GNU tar" on \
X+		SSH "enable ssh-auth" off
X+.if !defined (CLIENT_ONLY)
X+OPTIONS+=	PLOT "enable ploting, requires X11 libraries" off\
X+		SAMBA "enable the use of smbclient" off \
X+		MTX "enable the use of mtx changer scripts" off \
X+		AESPIPE "enable encryption. Needed by amcrypt" off
X+.endif
X+.if !defined (SERVER_ONLY)
X+OPTIONS+=	ZFSCOMP "accurate estimation of compressed ZFS filesystems" off
X+.endif
X+
X+.include <bsd.port.pre.mk>
X+
X+AMANDA_USER?=		operator
X+AMANDA_GROUP?=		operator
X+AMANDA_GNUTAR_LISTDIR?=	${PREFIX}/var/amanda/gnutar-lists
X+PLIST_SUB=		SHLIBVER=${AMANDA_VERSION}-${AMANDA_DROPDATE}
X+
X+.if defined (WITH_SSH)
X+CONFIGURE_ARGS+=	--with-ssh-security
X+.endif
X+
X+.if !defined(WITHOUT_GNUTAR)
X+CONFIGURE_ARGS+=--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \
X+		--with-gnutar=${LOCALBASE}/bin/gtar
X+BUILD_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
X+RUN_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
X+.endif
X+
X+# amanda/manda-server/amanda-client common part
X+.if defined (AMANDA_SERVER)
X+CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
X+CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
X+.endif
X+
X+.if defined (AMANDA_CONFIG)
X+CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
X+.endif
X+
X+.if defined (AMANDA_UDPPORTRANGE)
X+CONFIGURE_ARGS+=	--with-udpportrange=${AMANDA_UDPPORTRANGE}
X+.endif
X+
X+.if defined (AMANDA_TCPPORTRANGE)
X+CONFIGURE_ARGS+=	--with-tcpportrange=${AMANDA_TCPPORTRANGE}
X+.endif
X+
X+# Amnada server and client
X+pre-fetch:
X+	@${ECHO} ""
X+	@${ECHO} "You may use the following build options:"
X+	@${ECHO} ""
X+	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
X+	@${ECHO} "        The default is `uname -n`"
X+	@${ECHO} "    AMANDA_TAPE=tape to specify the default tape device"
X+	@${ECHO} "        The default is /dev/nrsa0"
X+	@${ECHO} "    AMANDA_CONFIG=config to specify the default configuration"
X+	@${ECHO} "        The default is user"
X+	@${ECHO} "    AMANDA_USER=user to specify the default user"
X+	@${ECHO} "        The default is operator"
X+	@${ECHO} "    AMANDA_GROUP=group to specify the default group"
X+	@${ECHO} "        The default is operator"
X+	@${ECHO} "    AMANDA_TCPPORTRANGE=low,high to restrict Amanda to TCP ports"
X+	@${ECHO} "        between low and high when connecting from the server"
X+	@${ECHO} "        to the client for data, messages, and indexing."
X+	@${ECHO} "        The default is no restriction on TCP ports."
X+	@${ECHO} "    AMANDA_UDPPORTRANGE=low,high to restrict Amanda to UDP ports"
X+	@${ECHO} "        between low and high when connecting from the client"
X+	@${ECHO} "        to the server. Use ports below 1024."
X+	@${ECHO} "        The default is no restriction on UDP ports."
X+	@${ECHO} ""
X+
X+USE_PERL5=	yes
X+
X+# install both client and server
X+.if !defined (SERVER_ONLY) && !defined (CLIENT_ONLY)
X+
X+MAN5=		tapelist.5 disklist.5 amanda.conf.5 amanda-client.conf.5 amanda-archive-format.5
X+MAN7=		amanda-scripts.7 amanda-devices.7 amanda-changers.7 amanda-auth.7 amanda-applications.7
X+MAN8=		script-email.8 amzfs-snapshot.8 amzfs-sendrecv.8 amvault.8 amtoc.8 amtapetype.8 \
X+		amtape.8 amstatus.8 amstar.8 amservice.8 amserverconfig.8 amsamba.8 amrmtape.8 \
X+		amrestore.8 amreport.8 amrecover.8 amoverview.8 amlabel.8 amgtar.8 amgpgcrypt.8 \
X+		amgetconf.8 amflush.8 amfetchdump.8 amdump.8 amdevcheck.8 amcryptsimple.8 amcrypt.8 \
X+		amcrypt-ossl.8 amcrypt-ossl-asym.8 amcleanup.8 amcheckdump.8 amcheckdb.8 amcheck.8 \
X+		amarchiver.8 amanda.8 amaespipe.8 amadmin.8 amaddclient.8
X+
X+# end client and server isntall
X+.endif
X+
X+# server only install
X+.if defined(SERVER_ONLY)
X+
X+CONFIGURE_ARGS+=--without-client
X+
X+MAN5=		tapelist.5 disklist.5 amanda.conf.5 amanda-client.conf.5 amanda-archive-format.5
X+MAN7=		amanda-scripts.7 amanda-devices.7 amanda-changers.7 amanda-auth.7
X+MAN8=		script-email.8 amvault.8 amtoc.8 amtapetype.8 amtape.8 amstatus.8 amservice.8 \
X+		amserverconfig.8 amrmtape.8 amrestore.8 amreport.8 amoverview.8 \
X+		amlabel.8 amgpgcrypt.8 amgetconf.8 amflush.8 amfetchdump.8 amdump.8 amdevcheck.8 \
X+		amcryptsimple.8 amcrypt.8 amcrypt-ossl.8 amcrypt-ossl-asym.8 amcleanup.8 amcheckdump.8 \
X+		amcheckdb.8 amcheck.8 amarchiver.8 amanda.8 amaespipe.8 amadmin.8 amaddclient.8
X+
X+#end server only
X+.endif
X+
X+# setup server side only definitions
X+.if !defined (CLIENT_ONLY)
X+
X+.if defined (WITH_PLOT)
X+BUILD_DEPENDS+=	gnuplot:${PORTSDIR}/math/gnuplot
X+RUN_DEPENDS+=	gnuplot:${PORTSDIR}/math/gnuplot
X+MAN8+=		amplot.8
X+PLIST_SUB+=	PLOT=''
X+.else
X+PLIST_SUB+=	PLOT='@comment '
X+.endif
X+
X+.if defined (WITH_SAMBA)
X+BUILD_DEPENDS+=	smbclient:${PORTSDIR}/net/samba3
X+RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba3
X+CONFIGURE_ARGS+=	--with-smbclient=${PREFIX}/bin/smbclient
X+.endif
X+
X+.if defined (WITH_MTX)
X+BUILD_DEPENDS+=	mtx:${PORTSDIR}/misc/mtx
X+RUN_DEPENDS+=	mtx:${PORTSDIR}/misc/mtx
X+.endif
X+
X+.if defined (WITH_AESPIPE)
X+RUN_DEPENDS+=	aespipe:${PORTSDIR}/security/aespipe
X+PLIST_SUB+=	AESPIPE=''
X+.else
X+PLIST_SUB+=	AESPIPE='@comment '
X+.endif
X+
X+.if defined (AMANDA_TAPE)
X+CONFIGURE_ARGS+=	--with-tape-device=${AMANDA_TAPE}
X+.endif
X+
X+# server side defines
X+.endif
X+
X+# client only install
X+.if defined(CLIENT_ONLY)
X+
X+CONFIGURE_ARGS+=--without-server
X+
X+MAN5=		amanda.conf.5 amanda-client.conf.5 amanda-archive-format.5
X+MAN7=		amanda-scripts.7 amanda-auth.7 amanda-applications.7
X+MAN8=		script-email.8 amzfs-snapshot.8 amzfs-sendrecv.8 amstar.8 amsamba.8 \
X+		amrecover.8 amgtar.8 amarchiver.8 amanda.8
X+
X+# end client only
X+.endif
X+
X+post-install:
X+.if !defined (CLIENT_ONLY)
X+.ifndef(NOPORTDOCS)
X+	${MKDIR} ${EXAMPLESDIR}
X+	${CP} -R ${WRKSRC}/example/amanda.conf \
X+		${WRKSRC}/example/chg-multi.conf \
X+		${WRKSRC}/example/chg-scsi.conf \
X+		${WRKSRC}/example/disklist \
X+		${EXAMPLESDIR}
X+.endif
X+.endif
X+.if !defined (SERVER_ONLY)
X+	${MKDIR} ${AMANDA_GNUTAR_LISTDIR}
X+	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${AMANDA_GNUTAR_LISTDIR}
X+	${TOUCH} ${PREFIX}/var/amanda/amandates
X+	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${PREFIX}/var/amanda/amandates
X+.endif
X+
X+.if defined (WITH_ZFSCOMP)
X+EXTRA_PATCHES=  ${FILESDIR}/extra-patch-application-src::amzfs-sendrecv.pl
X+.endif
X+
X+# Maintainer TODO:
X+#   o man pages have incorrect markups.
X+
X+.include <bsd.port.post.mk>
Xdiff -ruN amanda.orig/distinfo amanda/distinfo
X--- amanda.orig/distinfo	1970-01-01 01:00:00.000000000 +0100
X+++ amanda/distinfo	2009-01-31 11:14:26.101654679 +0100
X@@ -0,0 +1,3 @@
X+SIZE (amanda-2.6.1.tar.gz) = 2850868
X+MD5 (amanda-2.6.1.tar.gz) = cf084afc6fd993f088c91c3ba5062b40
X+SHA256 (amanda-2.6.1.tar.gz) = a7eb2874129e9289600a5fa46a27fe3b17f078977818df07cc41ac6614c4a4ff
Xdiff -ruN amanda.orig/files/extra-patch-application-src::amzfs-sendrecv.pl amanda/files/extra-patch-application-src::amzfs-sendrecv.pl
X--- amanda.orig/files/extra-patch-application-src::amzfs-sendrecv.pl	1970-01-01 01:00:00.000000000 +0100
X+++ amanda/files/extra-patch-application-src::amzfs-sendrecv.pl	2009-01-31 10:39:17.178261902 +0100
X@@ -0,0 +1,52 @@
X+--- application-src/amzfs-sendrecv.pl.orig	2009-01-22 02:35:38.000000000 +0100
X++++ application-src/amzfs-sendrecv.pl	2009-01-31 10:37:59.495534563 +0100
X+@@ -235,13 +235,48 @@
X+         } elsif (defined $errmsg) {
X+             $self->print_to_server_and_die($action, $errmsg, $Amanda::Script_App::ERROR);
X+         } else {
X+-	        $self->print_to_server_and_die($action, "cannot estimate snapshot '$self->{snapshot}\@$self->{snapshot}': unknown reason", $Amanda::Script_App::ERROR);
X++	    $self->print_to_server_and_die($action, "cannot estimate snapshot '$self->{snapshot}\@$self->{snapshot}': unknown reason", $Amanda::Script_App::ERROR);
X+ 	}
X+     }
X++    if ($level == 0) {
X++	my $compratio = $self->get_compratio();
X++	$msg *= int $compratio;
X++    }
X+ 
X+     return $msg;
X+ }
X+ 
X++sub get_compratio
X++{
X++    my $self = shift;
X++    my $action = shift;
X++
X++    my $cmd;
X++    $cmd =  "$self->{pfexec_cmd} $self->{zfs_path} get -Hp -o value compressratio $self->{filesystem}\@$self->{snapshot}";
X++    debug "running (get-compression): $cmd";
X++    my($wtr, $rdr, $err, $pid);
X++    $err = Symbol::gensym;
X++    $pid = open3($wtr, $rdr, $err, $cmd);
X++    close $wtr;
X++    my ($msg) = <$rdr>;
X++    my ($errmsg) = <$err>;
X++    waitpid $pid, 0;
X++    close $rdr;
X++    close $err;
X++    if ($? !=  0) {
X++        if (defined $msg && defined $errmsg) {
X++            $self->print_to_server_and_die($action, "$msg, $errmsg", $Amanda::Script_App::ERROR);
X++        } elsif (defined $msg) {
X++            $self->print_to_server_and_die($action, $msg, $Amanda::Script_App::ERROR);
X++        } elsif (defined $errmsg) {
X++            $self->print_to_server_and_die($action, $errmsg, $Amanda::Script_App::ERROR);
X++        } else {
X++	    $self->print_to_server_and_die($action, "cannot read compression ratio '$self->{snapshot}\@$self->{snapshot}': unknown reason", $Amanda::Script_App::ERROR);
X++	}
X++    }
X++    return $msg
X++}
X++
X+ sub command_index_from_output {
X+ }
X+ 
Xdiff -ruN amanda.orig/files/patch-ad amanda/files/patch-ad
X--- amanda.orig/files/patch-ad	1970-01-01 01:00:00.000000000 +0100
X+++ amanda/files/patch-ad	2008-08-30 13:12:20.000000000 +0200
X@@ -0,0 +1,14 @@
X+--- client-src/calcsize.c.orig	2008-01-18 09:31:16.000000000 +0900
X++++ client-src/calcsize.c	2008-08-30 20:11:59.000000000 +0900
X+@@ -160,7 +160,11 @@
X+ 	dump_total += (ST_BLOCKS(finfo) + (off_t)1) / (off_t)2 + (off_t)1;
X+ 	gtar_total += ROUND(4,(ST_BLOCKS(finfo) + (off_t)1));
X+     }
X++#ifdef GNUTAR
X++    g_printf("           GNUTAR           dump\n");
X++#else
X+     g_printf("           gtar           dump\n");
X++#endif
X+     g_printf("total      %-9lu         %-9lu\n",gtar_total,dump_total);
X+     return 0;
X+ #else
Xdiff -ruN amanda.orig/pkg-descr amanda/pkg-descr
X--- amanda.orig/pkg-descr	1970-01-01 01:00:00.000000000 +0100
X+++ amanda/pkg-descr	2004-02-07 14:59:09.000000000 +0100
X@@ -0,0 +1,22 @@
X+WHAT IS AMANDA?
X+---------------
X+
X+This is a release of Amanda, the Advanced Maryland Automatic
X+Network Disk Archiver.  Amanda is a backup system designed to archive many
X+computers on a network to a single large-capacity tape drive.  
X+
X+Here are some features of Amanda:
X+
X+  * written in C, freely distributable.
X+  * built on top of standard backup software: Unix dump/restore, and
X+    later GNU Tar and others.
X+  * will back up multiple machines in parallel to a holding disk, blasting
X+    finished dumps one by one to tape as fast as we can write files to
X+    tape.  For example, a ~2 Gb 8mm tape on a ~240K/s interface to a host
X+    with a large holding disk can be filled by Amanda in under 4 hours. 
X+  * does simple tape management: will not overwrite the wrong tape.
X+
X+WWW: http://sourceforge.net/projects/amanda/
X+
X+- Jim
X+jeh at FreeBSD.org
Xdiff -ruN amanda.orig/pkg-plist amanda/pkg-plist
X--- amanda.orig/pkg-plist	1970-01-01 01:00:00.000000000 +0100
X+++ amanda/pkg-plist	2009-01-25 12:11:06.024504950 +0100
X@@ -0,0 +1,246 @@
X+ at unexec if cmp -s %D/var/amanda/amandates /dev/null; then rm -f %D/var/amanda/amandates; fi
X+%%PORTDOCS%%%%EXAMPLESDIR%%/disklist
X+%%PORTDOCS%%%%EXAMPLESDIR%%/chg-scsi.conf
X+%%PORTDOCS%%%%EXAMPLESDIR%%/chg-multi.conf
X+%%PORTDOCS%%%%EXAMPLESDIR%%/amanda.conf
X+share/amanda/template.d/tapetypes
X+share/amanda/template.d/dumptypes
X+share/amanda/template.d/chg-manual.conf
X+share/amanda/template.d/amanda-tape-changer.conf
X+share/amanda/template.d/amanda-single-tape.conf
X+share/amanda/template.d/amanda-harddisk.conf
X+share/amanda/template.d/amanda-S3.conf
X+share/amanda/template.d/advanced.conf
X+share/amanda/template.d/README
X+share/amanda/example/xinetd.amandaserver
X+share/amanda/example/xinetd.amandaclient
X+share/amanda/example/label-templates/HP-DAT.ps
X+share/amanda/example/label-templates/EXB-8500.ps
X+share/amanda/example/label-templates/DLT.ps
X+share/amanda/example/label-templates/DLT-A4.ps
X+share/amanda/example/label-templates/DIN-A4.ps
X+share/amanda/example/label-templates/8.5x11.ps
X+share/amanda/example/label-templates/3hole.ps
X+share/amanda/example/inetd.conf.amandaserver
X+share/amanda/example/inetd.conf.amandaclient
X+share/amanda/example/amanda.conf
X+share/amanda/example/amanda-client.conf
X+share/amanda/ReleaseNotes
X+share/amanda/NEWS
X+share/amanda/ChangeLog
X+share/amanda/COPYRIGHT
X+sbin/amvault
X+sbin/amtoc
X+sbin/amtapetype
X+sbin/amtape
X+sbin/amstatus
X+sbin/amservice
X+sbin/amserverconfig
X+sbin/amrmtape
X+sbin/amrestore
X+sbin/amreport
X+sbin/amrecover
X+%%PLOT%%sbin/amplot
X+sbin/amoverview
X+sbin/amoldrecover
X+sbin/amlabel
X+sbin/amgpgcrypt
X+sbin/amgetconf
X+sbin/amflush
X+sbin/amfetchdump
X+sbin/amdump
X+sbin/amdevcheck
X+sbin/amcryptsimple
X+sbin/amcrypt-ossl-asym
X+sbin/amcrypt-ossl
X+sbin/amcrypt
X+sbin/amcleanup
X+sbin/amcheckdump
X+sbin/amcheckdb
X+sbin/amcheck
X+sbin/amarchiver
X+sbin/amaespipe
X+sbin/amadmin
X+sbin/amaddclient
X+%%AESPIPE%%sbin/activate-devpay
X+libexec/amanda/versionsuffix
X+libexec/amanda/teecount
X+libexec/amanda/taper
X+libexec/amanda/sendsize
X+libexec/amanda/sendbackup
X+libexec/amanda/selfcheck
X+libexec/amanda/runtar
X+libexec/amanda/rundump
X+libexec/amanda/planner
X+libexec/amanda/patch-system
X+libexec/amanda/noop
X+libexec/amanda/killpgrp
X+libexec/amanda/dumper
X+libexec/amanda/driver
X+libexec/amanda/chunker
X+libexec/amanda/chg-zd-mtx
X+libexec/amanda/chg-rth
X+libexec/amanda/chg-rait
X+libexec/amanda/chg-null
X+libexec/amanda/chg-multi
X+libexec/amanda/chg-mtx
X+libexec/amanda/chg-mcutil
X+libexec/amanda/chg-manual
X+libexec/amanda/chg-lib.sh
X+libexec/amanda/chg-juke
X+libexec/amanda/chg-iomega
X+libexec/amanda/chg-glue
X+libexec/amanda/chg-disk
X+libexec/amanda/chg-chs
X+libexec/amanda/chg-chio
X+libexec/amanda/calcsize
X+libexec/amanda/application/script-email
X+libexec/amanda/application/amzfs-snapshot
X+libexec/amanda/application/amzfs-sendrecv
X+libexec/amanda/application/amstar
X+libexec/amanda/application/amsamba
X+libexec/amanda/application/amlog-script
X+libexec/amanda/application/amgtar_perl
X+libexec/amanda/application/amgtar
X+libexec/amanda/amtrmlog
X+libexec/amanda/amtrmidx
X+%%PLOT%%libexec/amanda/amplot.gp
X+%%PLOT%%libexec/amanda/amplot.g
X+%%PLOT%%libexec/amanda/amplot.awk
X+libexec/amanda/amlogroll
X+libexec/amanda/amindexd
X+libexec/amanda/amidxtaped
X+libexec/amanda/amcleanupdisk
X+%%PLOT%%libexec/amanda/amcat.awk
X+libexec/amanda/amandad
X+libexec/amanda/amanda-sh-lib.sh
X+%%SITE_PERL%%/auto/Amanda/Xfer/libXfer.so
X+%%SITE_PERL%%/auto/Amanda/Xfer/libXfer.la
X+%%SITE_PERL%%/auto/Amanda/Xfer/libXfer.a
X+%%SITE_PERL%%/auto/Amanda/Util/libUtil.so
X+%%SITE_PERL%%/auto/Amanda/Util/libUtil.la
X+%%SITE_PERL%%/auto/Amanda/Util/libUtil.a
X+%%SITE_PERL%%/auto/Amanda/Types/libTypes.so
X+%%SITE_PERL%%/auto/Amanda/Types/libTypes.la
X+%%SITE_PERL%%/auto/Amanda/Types/libTypes.a
X+%%SITE_PERL%%/auto/Amanda/Tests/libTests.so
X+%%SITE_PERL%%/auto/Amanda/Tests/libTests.la
X+%%SITE_PERL%%/auto/Amanda/Tests/libTests.a
X+%%SITE_PERL%%/auto/Amanda/Tapelist/libTapelist.so
X+%%SITE_PERL%%/auto/Amanda/Tapelist/libTapelist.la
X+%%SITE_PERL%%/auto/Amanda/Tapelist/libTapelist.a
X+%%SITE_PERL%%/auto/Amanda/MainLoop/libMainLoop.so
X+%%SITE_PERL%%/auto/Amanda/MainLoop/libMainLoop.la
X+%%SITE_PERL%%/auto/Amanda/MainLoop/libMainLoop.a
X+%%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.so
X+%%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.la
X+%%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.a
X+%%SITE_PERL%%/auto/Amanda/Device/libDevice.so
X+%%SITE_PERL%%/auto/Amanda/Device/libDevice.la
X+%%SITE_PERL%%/auto/Amanda/Device/libDevice.a
X+%%SITE_PERL%%/auto/Amanda/Debug/libDebug.so
X+%%SITE_PERL%%/auto/Amanda/Debug/libDebug.la
X+%%SITE_PERL%%/auto/Amanda/Debug/libDebug.a
X+%%SITE_PERL%%/auto/Amanda/Config/libConfig.so
X+%%SITE_PERL%%/auto/Amanda/Config/libConfig.la
X+%%SITE_PERL%%/auto/Amanda/Config/libConfig.a
X+%%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.so
X+%%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.la
X+%%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.a
X+%%SITE_PERL%%/auto/Amanda/Archive/libArchive.so
X+%%SITE_PERL%%/auto/Amanda/Archive/libArchive.la
X+%%SITE_PERL%%/auto/Amanda/Archive/libArchive.a
X+%%SITE_PERL%%/auto/Amanda/Application/libApplication.so
X+%%SITE_PERL%%/auto/Amanda/Application/libApplication.la
X+%%SITE_PERL%%/auto/Amanda/Application/libApplication.a
X+%%SITE_PERL%%/Amanda/Xfer.pm
X+%%SITE_PERL%%/Amanda/Util.pm
X+%%SITE_PERL%%/Amanda/Types.pm
X+%%SITE_PERL%%/Amanda/Tests.pm
X+%%SITE_PERL%%/Amanda/Tapelist.pm
X+%%SITE_PERL%%/Amanda/Script_App.pm
X+%%SITE_PERL%%/Amanda/Script.pm
X+%%SITE_PERL%%/Amanda/Process.pm
X+%%SITE_PERL%%/Amanda/Paths.pm
X+%%SITE_PERL%%/Amanda/MainLoop.pm
X+%%SITE_PERL%%/Amanda/Logfile.pm
X+%%SITE_PERL%%/Amanda/Device.pm
X+%%SITE_PERL%%/Amanda/Debug.pm
X+%%SITE_PERL%%/Amanda/DB/Catalog.pm
X+%%SITE_PERL%%/Amanda/Constants.pm
X+%%SITE_PERL%%/Amanda/Config.pm
X+%%SITE_PERL%%/Amanda/Cmdline.pm
X+%%SITE_PERL%%/Amanda/Changer/single.pm
X+%%SITE_PERL%%/Amanda/Changer/disk.pm
X+%%SITE_PERL%%/Amanda/Changer/compat.pm
X+%%SITE_PERL%%/Amanda/Changer.pm
X+%%SITE_PERL%%/Amanda/BigIntCompat.pm
X+%%SITE_PERL%%/Amanda/Archive.pm
X+%%SITE_PERL%%/Amanda/Application/Zfs.pm
X+%%SITE_PERL%%/Amanda/Application.pm
X+lib/amanda/librestore.so
X+lib/amanda/librestore.la
X+lib/amanda/librestore.a
X+lib/amanda/librestore-%%SHLIBVER%%.so
X+lib/amanda/libamxfer.so.0
X+lib/amanda/libamxfer.so
X+lib/amanda/libamxfer.la
X+lib/amanda/libamxfer.a
X+lib/amanda/libamserver.so
X+lib/amanda/libamserver.la
X+lib/amanda/libamserver.a
X+lib/amanda/libamserver-%%SHLIBVER%%.so
X+lib/amanda/libamglue.so
X+lib/amanda/libamglue.la
X+lib/amanda/libamglue.a
X+lib/amanda/libamdevice.so
X+lib/amanda/libamdevice.la
X+lib/amanda/libamdevice.a
X+lib/amanda/libamdevice-%%SHLIBVER%%.so
X+lib/amanda/libamclient.so
X+lib/amanda/libamclient.la
X+lib/amanda/libamclient.a
X+lib/amanda/libamclient-%%SHLIBVER%%.so
X+lib/amanda/libamar.so
X+lib/amanda/libamar.la
X+lib/amanda/libamar.a
X+lib/amanda/libamar-%%SHLIBVER%%.so
X+lib/amanda/libamandad.so
X+lib/amanda/libamandad.la
X+lib/amanda/libamandad.a
X+lib/amanda/libamandad-%%SHLIBVER%%.so
X+lib/amanda/libamanda.so
X+lib/amanda/libamanda.la
X+lib/amanda/libamanda.a
X+lib/amanda/libamanda-%%SHLIBVER%%.so
X+ at dirrmtry var/amanda/gnutar-lists
X+ at dirrmtry var/amanda
X+ at dirrmtry var
X+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
X+ at dirrm share/amanda/template.d
X+ at dirrm share/amanda/example/label-templates
X+ at dirrm share/amanda/example
X+ at dirrm share/amanda
X+ at dirrm libexec/amanda/application
X+ at dirrm libexec/amanda
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Xfer
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Util
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Types
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Tests
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Tapelist
X+ at dirrm %%SITE_PERL%%/auto/Amanda/MainLoop
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Logfile
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Device
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Debug
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Config
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Cmdline
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Archive
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Application
X+ at dirrm %%SITE_PERL%%/auto/Amanda
X+ at dirrmtry %%SITE_PERL%%/auto
X+ at dirrm %%SITE_PERL%%/Amanda/DB
X+ at dirrm %%SITE_PERL%%/Amanda/Changer
X+ at dirrm %%SITE_PERL%%/Amanda/Application
X+ at dirrm %%SITE_PERL%%/Amanda
X+ at dirrm lib/amanda
X+ at dirrm include/amanda
Xdiff -ruN amanda.orig/pkg-plist.client amanda/pkg-plist.client
X--- amanda.orig/pkg-plist.client	1970-01-01 01:00:00.000000000 +0100
X+++ amanda/pkg-plist.client	2009-01-25 12:32:43.669234742 +0100
X@@ -0,0 +1,137 @@
X+ at unexec if cmp -s %D/var/amanda/amandates /dev/null; then rm -f %D/var/amanda/amandates; fi
X+share/amanda/template.d/tapetypes
X+share/amanda/template.d/dumptypes
X+share/amanda/template.d/chg-manual.conf
X+share/amanda/template.d/amanda-tape-changer.conf
X+share/amanda/template.d/amanda-single-tape.conf
X+share/amanda/template.d/amanda-harddisk.conf
X+share/amanda/template.d/amanda-S3.conf
X+share/amanda/template.d/advanced.conf
X+share/amanda/template.d/README
X+share/amanda/example/xinetd.amandaserver
X+share/amanda/example/xinetd.amandaclient
X+share/amanda/example/label-templates/HP-DAT.ps
X+share/amanda/example/label-templates/EXB-8500.ps
X+share/amanda/example/label-templates/DLT.ps
X+share/amanda/example/label-templates/DLT-A4.ps
X+share/amanda/example/label-templates/DIN-A4.ps
X+share/amanda/example/label-templates/8.5x11.ps
X+share/amanda/example/label-templates/3hole.ps
X+share/amanda/example/inetd.conf.amandaserver
X+share/amanda/example/inetd.conf.amandaclient
X+share/amanda/example/amanda.conf
X+share/amanda/example/amanda-client.conf
X+share/amanda/ReleaseNotes
X+share/amanda/NEWS
X+share/amanda/ChangeLog
X+share/amanda/COPYRIGHT
X+sbin/amrecover
X+sbin/amoldrecover
X+sbin/amgpgcrypt
X+sbin/amgetconf
X+sbin/amcryptsimple
X+sbin/amcrypt-ossl-asym
X+sbin/amcrypt-ossl
X+sbin/amcrypt
X+sbin/amarchiver
X+sbin/amaespipe
X+libexec/amanda/versionsuffix
X+libexec/amanda/teecount
X+libexec/amanda/sendsize
X+libexec/amanda/sendbackup
X+libexec/amanda/selfcheck
X+libexec/amanda/runtar
X+libexec/amanda/rundump
X+libexec/amanda/patch-system
X+libexec/amanda/noop
X+libexec/amanda/killpgrp
X+libexec/amanda/calcsize
X+libexec/amanda/application/script-email
X+libexec/amanda/application/amzfs-snapshot
X+libexec/amanda/application/amzfs-sendrecv
X+libexec/amanda/application/amstar
X+libexec/amanda/application/amsamba
X+libexec/amanda/application/amlog-script
X+libexec/amanda/application/amgtar_perl
X+libexec/amanda/application/amgtar
X+libexec/amanda/amandad
X+libexec/amanda/amanda-sh-lib.sh
X+%%SITE_PERL%%/auto/Amanda/Util/libUtil.so
X+%%SITE_PERL%%/auto/Amanda/Util/libUtil.la
X+%%SITE_PERL%%/auto/Amanda/Util/libUtil.a
X+%%SITE_PERL%%/auto/Amanda/Types/libTypes.so
X+%%SITE_PERL%%/auto/Amanda/Types/libTypes.la
X+%%SITE_PERL%%/auto/Amanda/Types/libTypes.a
X+%%SITE_PERL%%/auto/Amanda/Tests/libTests.so
X+%%SITE_PERL%%/auto/Amanda/Tests/libTests.la
X+%%SITE_PERL%%/auto/Amanda/Tests/libTests.a
X+%%SITE_PERL%%/auto/Amanda/MainLoop/libMainLoop.so
X+%%SITE_PERL%%/auto/Amanda/MainLoop/libMainLoop.la
X+%%SITE_PERL%%/auto/Amanda/MainLoop/libMainLoop.a
X+%%SITE_PERL%%/auto/Amanda/Debug/libDebug.so
X+%%SITE_PERL%%/auto/Amanda/Debug/libDebug.la
X+%%SITE_PERL%%/auto/Amanda/Debug/libDebug.a
X+%%SITE_PERL%%/auto/Amanda/Config/libConfig.so
X+%%SITE_PERL%%/auto/Amanda/Config/libConfig.la
X+%%SITE_PERL%%/auto/Amanda/Config/libConfig.a
X+%%SITE_PERL%%/auto/Amanda/Archive/libArchive.so
X+%%SITE_PERL%%/auto/Amanda/Archive/libArchive.la
X+%%SITE_PERL%%/auto/Amanda/Archive/libArchive.a
X+%%SITE_PERL%%/auto/Amanda/Application/libApplication.so
X+%%SITE_PERL%%/auto/Amanda/Application/libApplication.la
X+%%SITE_PERL%%/auto/Amanda/Application/libApplication.a
X+%%SITE_PERL%%/Amanda/Util.pm
X+%%SITE_PERL%%/Amanda/Types.pm
X+%%SITE_PERL%%/Amanda/Tests.pm
X+%%SITE_PERL%%/Amanda/Script_App.pm
X+%%SITE_PERL%%/Amanda/Script.pm
X+%%SITE_PERL%%/Amanda/Paths.pm
X+%%SITE_PERL%%/Amanda/MainLoop.pm
X+%%SITE_PERL%%/Amanda/Debug.pm
X+%%SITE_PERL%%/Amanda/Constants.pm
X+%%SITE_PERL%%/Amanda/Config.pm
X+%%SITE_PERL%%/Amanda/BigIntCompat.pm
X+%%SITE_PERL%%/Amanda/Archive.pm
X+%%SITE_PERL%%/Amanda/Application/Zfs.pm
X+%%SITE_PERL%%/Amanda/Application.pm
X+lib/amanda/libamglue.so
X+lib/amanda/libamglue.la
X+lib/amanda/libamglue.a
X+lib/amanda/libamclient.so
X+lib/amanda/libamclient.la
X+lib/amanda/libamclient.a
X+lib/amanda/libamclient-%%SHLIBVER%%.so
X+lib/amanda/libamar.so
X+lib/amanda/libamar.la
X+lib/amanda/libamar.a
X+lib/amanda/libamar-%%SHLIBVER%%.so
X+lib/amanda/libamandad.so
X+lib/amanda/libamandad.la
X+lib/amanda/libamandad.a
X+lib/amanda/libamandad-%%SHLIBVER%%.so
X+lib/amanda/libamanda.so
X+lib/amanda/libamanda.la
X+lib/amanda/libamanda.a
X+lib/amanda/libamanda-%%SHLIBVER%%.so
X+ at dirrmtry var/amanda/gnutar-lists
X+ at dirrmtry var/amanda
X+ at dirrmtry var
X+ at dirrm share/amanda/template.d
X+ at dirrm share/amanda/example/label-templates
X+ at dirrm share/amanda/example
X+ at dirrm share/amanda
X+ at dirrm libexec/amanda/application
X+ at dirrm libexec/amanda
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Util
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Types
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Tests
X+ at dirrm %%SITE_PERL%%/auto/Amanda/MainLoop
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Debug
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Config
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Archive
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Application
X+ at dirrm %%SITE_PERL%%/auto/Amanda
X+ at dirrmtry %%SITE_PERL%%/auto
X+ at dirrm %%SITE_PERL%%/Amanda/Application
X+ at dirrm %%SITE_PERL%%/Amanda
X+ at dirrm lib/amanda
Xdiff -ruN amanda.orig/pkg-plist.server amanda/pkg-plist.server
X--- amanda.orig/pkg-plist.server	1970-01-01 01:00:00.000000000 +0100
X+++ amanda/pkg-plist.server	2009-01-25 13:40:14.679616403 +0100
X@@ -0,0 +1,209 @@
X+%%PORTDOCS%%%%EXAMPLESDIR%%/disklist
X+%%PORTDOCS%%%%EXAMPLESDIR%%/chg-scsi.conf
X+%%PORTDOCS%%%%EXAMPLESDIR%%/chg-multi.conf
X+%%PORTDOCS%%%%EXAMPLESDIR%%/amanda.conf
X+share/amanda/template.d/tapetypes
X+share/amanda/template.d/dumptypes
X+share/amanda/template.d/chg-manual.conf
X+share/amanda/template.d/amanda-tape-changer.conf
X+share/amanda/template.d/amanda-single-tape.conf
X+share/amanda/template.d/amanda-harddisk.conf
X+share/amanda/template.d/amanda-S3.conf
X+share/amanda/template.d/advanced.conf
X+share/amanda/template.d/README
X+share/amanda/example/xinetd.amandaserver
X+share/amanda/example/xinetd.amandaclient
X+share/amanda/example/label-templates/HP-DAT.ps
X+share/amanda/example/label-templates/EXB-8500.ps
X+share/amanda/example/label-templates/DLT.ps
X+share/amanda/example/label-templates/DLT-A4.ps
X+share/amanda/example/label-templates/DIN-A4.ps
X+share/amanda/example/label-templates/8.5x11.ps
X+share/amanda/example/label-templates/3hole.ps
X+share/amanda/example/inetd.conf.amandaserver
X+share/amanda/example/inetd.conf.amandaclient
X+share/amanda/example/amanda.conf
X+share/amanda/example/amanda-client.conf
X+share/amanda/ReleaseNotes
X+share/amanda/NEWS
X+share/amanda/ChangeLog
X+share/amanda/COPYRIGHT
X+sbin/amvault
X+sbin/amtoc
X+sbin/amtapetype
X+sbin/amtape
X+sbin/amstatus
X+sbin/amservice
X+sbin/amserverconfig
X+sbin/amrmtape
X+sbin/amrestore
X+sbin/amreport
X+%%PLOT%%sbin/amplot
X+sbin/amoverview
X+sbin/amlabel
X+sbin/amgpgcrypt
X+sbin/amgetconf
X+sbin/amflush
X+sbin/amfetchdump
X+sbin/amdump
X+sbin/amdevcheck
X+sbin/amcryptsimple
X+sbin/amcrypt-ossl-asym
X+sbin/amcrypt-ossl
X+sbin/amcrypt
X+sbin/amcleanup
X+sbin/amcheckdump
X+sbin/amcheckdb
X+sbin/amcheck
X+sbin/amarchiver
X+sbin/amaespipe
X+sbin/amadmin
X+sbin/amaddclient
X+%%AESPIPE%%sbin/activate-devpay
X+libexec/amanda/taper
X+libexec/amanda/planner
X+libexec/amanda/dumper
X+libexec/amanda/driver
X+libexec/amanda/chunker
X+libexec/amanda/chg-zd-mtx
X+libexec/amanda/chg-rth
X+libexec/amanda/chg-rait
X+libexec/amanda/chg-null
X+libexec/amanda/chg-multi
X+libexec/amanda/chg-mtx
X+libexec/amanda/chg-mcutil
X+libexec/amanda/chg-manual
X+libexec/amanda/chg-lib.sh
X+libexec/amanda/chg-juke
X+libexec/amanda/chg-iomega
X+libexec/amanda/chg-glue
X+libexec/amanda/chg-disk
X+libexec/amanda/chg-chs
X+libexec/amanda/chg-chio
X+libexec/amanda/amtrmlog
X+libexec/amanda/amtrmidx
X+%%PLOT%%libexec/amanda/amplot.gp
X+%%PLOT%%libexec/amanda/amplot.g
X+%%PLOT%%libexec/amanda/amplot.awk
X+libexec/amanda/amlogroll
X+libexec/amanda/amindexd
X+libexec/amanda/amidxtaped
X+libexec/amanda/amcleanupdisk
X+%%PLOT%%libexec/amanda/amcat.awk
X+libexec/amanda/amandad
X+libexec/amanda/amanda-sh-lib.sh
X+%%SITE_PERL%%/auto/Amanda/Xfer/libXfer.so
X+%%SITE_PERL%%/auto/Amanda/Xfer/libXfer.la
X+%%SITE_PERL%%/auto/Amanda/Xfer/libXfer.a
X+%%SITE_PERL%%/auto/Amanda/Util/libUtil.so
X+%%SITE_PERL%%/auto/Amanda/Util/libUtil.la
X+%%SITE_PERL%%/auto/Amanda/Util/libUtil.a
X+%%SITE_PERL%%/auto/Amanda/Types/libTypes.so
X+%%SITE_PERL%%/auto/Amanda/Types/libTypes.la
X+%%SITE_PERL%%/auto/Amanda/Types/libTypes.a
X+%%SITE_PERL%%/auto/Amanda/Tests/libTests.so
X+%%SITE_PERL%%/auto/Amanda/Tests/libTests.la
X+%%SITE_PERL%%/auto/Amanda/Tests/libTests.a
X+%%SITE_PERL%%/auto/Amanda/Tapelist/libTapelist.so
X+%%SITE_PERL%%/auto/Amanda/Tapelist/libTapelist.la
X+%%SITE_PERL%%/auto/Amanda/Tapelist/libTapelist.a
X+%%SITE_PERL%%/auto/Amanda/MainLoop/libMainLoop.so
X+%%SITE_PERL%%/auto/Amanda/MainLoop/libMainLoop.la
X+%%SITE_PERL%%/auto/Amanda/MainLoop/libMainLoop.a
X+%%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.so
X+%%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.la
X+%%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.a
X+%%SITE_PERL%%/auto/Amanda/Device/libDevice.so
X+%%SITE_PERL%%/auto/Amanda/Device/libDevice.la
X+%%SITE_PERL%%/auto/Amanda/Device/libDevice.a
X+%%SITE_PERL%%/auto/Amanda/Debug/libDebug.so
X+%%SITE_PERL%%/auto/Amanda/Debug/libDebug.la
X+%%SITE_PERL%%/auto/Amanda/Debug/libDebug.a
X+%%SITE_PERL%%/auto/Amanda/Config/libConfig.so
X+%%SITE_PERL%%/auto/Amanda/Config/libConfig.la
X+%%SITE_PERL%%/auto/Amanda/Config/libConfig.a
X+%%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.so
X+%%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.la
X+%%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.a
X+%%SITE_PERL%%/auto/Amanda/Archive/libArchive.so
X+%%SITE_PERL%%/auto/Amanda/Archive/libArchive.la
X+%%SITE_PERL%%/auto/Amanda/Archive/libArchive.a
X+%%SITE_PERL%%/Amanda/Xfer.pm
X+%%SITE_PERL%%/Amanda/Util.pm
X+%%SITE_PERL%%/Amanda/Types.pm
X+%%SITE_PERL%%/Amanda/Tests.pm
X+%%SITE_PERL%%/Amanda/Tapelist.pm
X+%%SITE_PERL%%/Amanda/Script_App.pm
X+%%SITE_PERL%%/Amanda/Script.pm
X+%%SITE_PERL%%/Amanda/Process.pm
X+%%SITE_PERL%%/Amanda/Paths.pm
X+%%SITE_PERL%%/Amanda/MainLoop.pm
X+%%SITE_PERL%%/Amanda/Logfile.pm
X+%%SITE_PERL%%/Amanda/Device.pm
X+%%SITE_PERL%%/Amanda/Debug.pm
X+%%SITE_PERL%%/Amanda/DB/Catalog.pm
X+%%SITE_PERL%%/Amanda/Constants.pm
X+%%SITE_PERL%%/Amanda/Config.pm
X+%%SITE_PERL%%/Amanda/Cmdline.pm
X+%%SITE_PERL%%/Amanda/Changer/single.pm
X+%%SITE_PERL%%/Amanda/Changer/disk.pm
X+%%SITE_PERL%%/Amanda/Changer/compat.pm
X+%%SITE_PERL%%/Amanda/Changer.pm
X+%%SITE_PERL%%/Amanda/BigIntCompat.pm
X+%%SITE_PERL%%/Amanda/Archive.pm
X+lib/amanda/librestore.so
X+lib/amanda/librestore.la
X+lib/amanda/librestore.a
X+lib/amanda/librestore-%%SHLIBVER%%.so
X+lib/amanda/libamxfer.so.0
X+lib/amanda/libamxfer.so
X+lib/amanda/libamxfer.la
X+lib/amanda/libamxfer.a
X+lib/amanda/libamserver.so
X+lib/amanda/libamserver.la
X+lib/amanda/libamserver.a
X+lib/amanda/libamserver-%%SHLIBVER%%.so
X+lib/amanda/libamglue.so
X+lib/amanda/libamglue.la
X+lib/amanda/libamglue.a
X+lib/amanda/libamdevice.so
X+lib/amanda/libamdevice.la
X+lib/amanda/libamdevice.a
X+lib/amanda/libamdevice-%%SHLIBVER%%.so
X+lib/amanda/libamar.so
X+lib/amanda/libamar.la
X+lib/amanda/libamar.a
X+lib/amanda/libamar-%%SHLIBVER%%.so
X+lib/amanda/libamandad.so
X+lib/amanda/libamandad.la
X+lib/amanda/libamandad.a
X+lib/amanda/libamandad-%%SHLIBVER%%.so
X+lib/amanda/libamanda.so
X+lib/amanda/libamanda.la
X+lib/amanda/libamanda.a
X+lib/amanda/libamanda-%%SHLIBVER%%.so
X+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
X+ at dirrm share/amanda/template.d
X+ at dirrm share/amanda/example/label-templates
X+ at dirrm share/amanda/example
X+ at dirrm share/amanda
X+ at dirrm libexec/amanda
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Xfer
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Util
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Types
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Tests
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Tapelist
X+ at dirrm %%SITE_PERL%%/auto/Amanda/MainLoop
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Logfile
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Device
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Debug
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Config
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Cmdline
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Archive
X+ at dirrm %%SITE_PERL%%/auto/Amanda
X+ at dirrmtry %%SITE_PERL%%/auto
X+ at dirrm %%SITE_PERL%%/Amanda/DB
X+ at dirrm %%SITE_PERL%%/Amanda/Changer
X+ at dirrm %%SITE_PERL%%/Amanda
X+ at dirrm lib/amanda
X+ at dirrm include/amanda
Xdiff -ruN amanda-client.orig/Makefile amanda-client/Makefile
X--- amanda-client.orig/Makefile	2009-01-09 05:56:06.734270097 +0100
X+++ amanda-client/Makefile	2009-01-31 10:49:04.234093142 +0100
X@@ -2,15 +2,14 @@
X # Date created:				28th Feb 1995
X # Whom:					gpalmer
X #
X-# $FreeBSD: ports/misc/amanda-client/Makefile,v 1.63 2009/01/09 01:48:48 kuriyama Exp $
X+# $FreeBSD: $
X #
X 
X PKGNAMESUFFIX=	-client
X-PORTREVISION=	1
X 
X COMMENT=	The Advanced Maryland Automatic Network Disk Archiver (client)
X 
X-MASTERDIR=	${.CURDIR}/../amanda-server
X+MASTERDIR=	${.CURDIR}/../amanda
X PKGINSTALL=	mustnotexist
X 
X PLIST=		${PKGDIR}/pkg-plist.client
Xdiff -ruN amanda-server.orig/Makefile amanda-server/Makefile
X--- amanda-server.orig/Makefile	2009-01-09 05:56:06.735269902 +0100
X+++ amanda-server/Makefile	2009-01-31 10:49:21.134556190 +0100
X@@ -2,218 +2,18 @@
X # Date created:				28th Feb 1995
X # Whom:					gpalmer
X #
X-# $FreeBSD: ports/misc/amanda-server/Makefile,v 1.111 2009/01/09 01:48:48 kuriyama Exp $
X+# $FreeBSD: $
X #
X 
X-PORTNAME=	amanda
X-PORTVERSION=	2.6.0p2
X-PORTEPOCH=	1
X-CATEGORIES=	misc
X-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
X-MASTER_SITE_SUBDIR=	amanda
X-PKGNAMESUFFIX?=	-server
X-
X-MAINTAINER=	kuriyama at FreeBSD.org
X-COMMENT?=	The Advanced Maryland Automatic Network Disk Archiver (server)
X-
X-WRKSRC=		${WRKDIR}/amanda-${PORTVERSION}
X-SLAVEDIRS=	misc/amanda-client
X-
X-LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
X-GNU_CONFIGURE=	yes
X-USE_GNOME=	pkgconfig glib20
X-USE_GMAKE=	yes
X-USE_OPENSSL=	yes
X-PATCH_STRIP=
X-CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
X-		--without-amlibexecdir \
X-		--with-amandahosts --with-fqdn \
X-		--with-dump-honor-nodump --with-buffered-dump \
X-		--disable-libtool --prefix=${PREFIX} \
X-		--disable-glibtest \
X-		--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \
X-		--with-bsdtcp-security --with-bsdudp-security
X-
X-USE_LDCONFIG=	yes
X-WANT_PERL=	yes
X-
X-OPTIONS=	GNUTAR "use GNU tar" on \
X-		SSH "enable ssh-auth" off
X-
X-.include <bsd.port.pre.mk>
X-
X-AMANDA_USER?=		operator
X-AMANDA_GROUP?=		operator
X-AMANDA_GNUTAR_LISTDIR?=	${PREFIX}/var/amanda/gnutar-lists
X-AMANDA_DATES?=		${PREFIX}/var/amanda/amandadates
X-PLIST_SUB=		SHLIBVER=${PORTVERSION} AMANDA_DATES=${PREFIX}/var/amanda/amandadates
X-
X-# amanda-server/amanda-client common part
X-.if defined (AMANDA_SERVER)
X-CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
X-CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
X-.endif
X-
X-.if defined (AMANDA_CONFIG)
X-CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
X-.endif
X-
X-.if defined (AMANDA_UDPPORTRANGE)
X-CONFIGURE_ARGS+=	--with-udpportrange=${AMANDA_UDPPORTRANGE}
X-.endif
X-
X-.if defined (WITH_SSH)
X-CONFIGURE_ARGS+=	--with-ssh-security
X-.endif
X-
X-.if defined (AMANDA_TCPPORTRANGE)
X-CONFIGURE_ARGS+=	--with-tcpportrange=${AMANDA_TCPPORTRANGE}
X-.endif
X-
X-.if !defined(WITHOUT_GNUTAR)
X-CONFIGURE_ARGS+=--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \
X-		--with-gnutar=${LOCALBASE}/bin/gtar
X-BUILD_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
X-RUN_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
X-.endif
X-
X-# amanda-server part
X-.if !defined(CLIENT_ONLY)
X-
X-pre-fetch:
X-	@${ECHO} ""
X-	@${ECHO} "You may use the following build options:"
X-	@${ECHO} ""
X-	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
X-	@${ECHO} "        The default is `uname -n`"
X-	@${ECHO} "    AMANDA_TAPE=tape to specify the default tape device"
X-	@${ECHO} "        The default is /dev/nrsa0"
X-	@${ECHO} "    AMANDA_CONFIG=config to specify the default configuration"
X-	@${ECHO} "        The default is user"
X-	@${ECHO} "    AMANDA_USER=user to specify the default user"
X-	@${ECHO} "        The default is operator"
X-	@${ECHO} "    AMANDA_GROUP=group to specify the default group"
X-	@${ECHO} "        The default is operator"
X-	@${ECHO} "    AMANDA_TCPPORTRANGE=low,high to restrict Amanda to TCP ports"
X-	@${ECHO} "        between low and high when connecting from the server"
X-	@${ECHO} "        to the client for data, messages, and indexing."
X-	@${ECHO} "        The default is no restriction on TCP ports."
X-	@${ECHO} "    AMANDA_UDPPORTRANGE=low,high to restrict Amanda to UDP ports"
X-	@${ECHO} "        between low and high when connecting from the client"
X-	@${ECHO} "        to the server. Use ports below 1024."
X-	@${ECHO} "        The default is no restriction on UDP ports."
X-	@${ECHO} ""
X-
X-USE_PERL5=	yes
X-CONFLICTS=	amanda-server-2.5.*
X-
X-BUILD_DEPENDS+=	${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-client
X-RUN_DEPENDS+=	${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-client
X-
X-CONFIGURE_ARGS+=--without-client
X-
X-MAN8=		amaddclient.8 amadmin.8 amaespipe.8 amcheck.8 \
X-		amcheckdb.8 amcheckdump.8 amcleanup.8 \
X-		amcrypt.8 amcryptsimple.8 amcrypt-ossl-asym.8 amcrypt-ossl.8 \
X-		amdd.8 amdevcheck.8 \
X-		amdump.8 amfetchdump.8 amflush.8 amgetconf.8 amgpgcrypt.8 \
X-		amlabel.8 ammt.8 \
X-		amoverview.8 amreport.8 amrestore.8 amrmtape.8 \
X-		amserverconfig.8 amstatus.8 \
X-		amtape.8 amtoc.8 amverify.8 amverifyrun.8 amtapetype.8
X-
X-OPTIONS+=	PLOT "enable ploting, requires X11 libraries" off\
X-		SAMBA "enable the use of smbclient" off \
X-		MTX "enable the use of mtx changer scripts" off \
X-		AESPIPE "enable encryption. Needed by amcrypt" off
X-
X-.if defined (WITH_PLOT)
X-BUILD_DEPENDS+=	gnuplot:${PORTSDIR}/math/gnuplot
X-RUN_DEPENDS+=	gnuplot:${PORTSDIR}/math/gnuplot
X-MAN8+=		amplot.8
X-PLIST_SUB+=	PLOT=''
X-.else
X-PLIST_SUB+=	PLOT='@comment '
X-.endif
X-
X-.if defined (WITH_SAMBA)
X-BUILD_DEPENDS+=	smbclient:${PORTSDIR}/net/samba3
X-RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba3
X-CONFIGURE_ARGS+=	--with-smbclient=${PREFIX}/bin/smbclient
X-.endif
X-
X-.if defined (WITH_MTX)
X-BUILD_DEPENDS+=	mtx:${PORTSDIR}/misc/mtx
X-RUN_DEPENDS+=	mtx:${PORTSDIR}/misc/mtx
X-.endif
X-
X-.if defined (WITH_AESPIPE)
X-RUN_DEPENDS+=	aespipe:${PORTSDIR}/security/aespipe
X-.endif
X-
X-.if defined (AMANDA_TAPE)
X-CONFIGURE_ARGS+=	--with-tape-device=${AMANDA_TAPE}
X-.endif
X-
X-# amanda-client part
X-.else
X-
X-pre-fetch:
X-	@${ECHO} ""
X-	@${ECHO} "You may use the following build options:"
X-	@${ECHO} ""
X-	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
X-	@${ECHO} "        The default is `uname -n`"
X-	@${ECHO} "    AMANDA_CONFIG=config to specify the default configuation"
X-	@${ECHO} "        The default is user"
X-	@${ECHO} "    AMANDA_GNUTAR_LISTDIR=dir to specify the directory that"
X-	@${ECHO} "        the gnutar index files should live in"
X-	@${ECHO} "        The default is /var/amanda/gnutar-lists"
X-	@${ECHO} "    AMANDA_USER=user to specify the default user"
X-	@${ECHO} "        The default is operator"
X-	@${ECHO} "    AMANDA_GROUP=group to specify the default group"
X-	@${ECHO} "        The default is operator"
X-	@${ECHO} "    AMANDA_TCPPORTRANGE=low,high to restrict Amanda to TCP ports"
X-	@${ECHO} "        between low and high when connecting from the server"
X-	@${ECHO} "        to the client for data, messages, and indexing."
X-	@${ECHO} "        The default is no restriction on TCP ports."
X-	@${ECHO} "    AMANDA_UDPPORTRANGE=low,high to restrict Amanda to UDP ports"
X-	@${ECHO} "        between low and high when connecting from the client"
X-	@${ECHO} "        to the server. Use ports below 1024."
X-	@${ECHO} "        The default is no restriction on UDP ports."
X-	@${ECHO} "    AMANDA_DATES=path to client amandates file"
X-	@${ECHO} ""
X-
X-CONFLICTS=	amanda-client-2.5.*
X-CONFIGURE_ARGS+=--without-server --with-amandates=${AMANDA_DATES}
X-
X-MAN5=		amanda.conf.5 amanda-client.conf.5
X-MAN8=		amanda.8 amrecover.8
X-
X-OPTIONS+=	DUMP_SNAPSHOT "use snapshot by using dump -L" off
X-
X-post-install:
X-	${MKDIR} ${PREFIX}/share/examples/amanda
X-	${CP} -R ${WRKSRC}/example/amanda.conf \
X-		${WRKSRC}/example/chg-multi.conf \
X-		${WRKSRC}/example/chg-scsi.conf \
X-		${WRKSRC}/example/disklist \
X-		${PREFIX}/share/examples/amanda
X-	${MKDIR} ${AMANDA_GNUTAR_LISTDIR}
X-	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${AMANDA_GNUTAR_LISTDIR}
X-	${TOUCH} ${AMANDA_DATES}
X-	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${AMANDA_DATES}
X-
X-.if defined (WITH_DUMP_SNAPSHOT)
X-EXTRA_PATCHES=	${FILESDIR}/extra-patch-sendbackup-dump.c
X-.endif
X-
X-.endif
X-
X-# Maintainer TODO:
X-#   o amanda-server installs lib/libamandad.a which should be handled by
X-#     amanda-client only.
X-#   o man pages have incorrect markups.
X-#   o pthread issue: http://wiki.zmanda.com/index.php/Installation/OS_Specific_Notes/Installing_Amanda_on_FreeBSD#Threading_and_-pthread
X+PKGNAMESUFFIX=	-server
X 
X-.include <bsd.port.post.mk>
X+COMMENT=	The Advanced Maryland Automatic Network Disk Archiver (server)
X+
X+MASTERDIR=	${.CURDIR}/../amanda
X+PKGINSTALL=	mustnotexist
X+
X+PLIST=		${PKGDIR}/pkg-plist.server
X+
X+SERVER_ONLY=	yes
X+
X+.include "${MASTERDIR}/Makefile"
Xdiff -ruN amanda-server.orig/distinfo amanda-server/distinfo
X--- amanda-server.orig/distinfo	2009-01-06 05:55:58.658341771 +0100
X+++ amanda-server/distinfo	1970-01-01 01:00:00.000000000 +0100
X@@ -1,3 +0,0 @@
X-MD5 (amanda-2.6.0p2.tar.gz) = 75dcba5a75327ebcd4f197a93b8e8c9c
X-SHA256 (amanda-2.6.0p2.tar.gz) = 3830d9c95cfe72e63aea5179208851a141481b037ec4060bf3d5829bf50e6ae3
X-SIZE (amanda-2.6.0p2.tar.gz) = 2402088
Xdiff -ruN amanda-server.orig/files/extra-patch-sendbackup-dump.c amanda-server/files/extra-patch-sendbackup-dump.c
X--- amanda-server.orig/files/extra-patch-sendbackup-dump.c	2006-11-06 23:44:04.000000000 +0100
X+++ amanda-server/files/extra-patch-sendbackup-dump.c	1970-01-01 01:00:00.000000000 +0100
X@@ -1,36 +0,0 @@
X---- client-src/sendbackup-dump.c.orig	Fri Sep  8 13:09:14 2006
X-+++ client-src/sendbackup-dump.c	Fri Sep  8 13:15:44 2006
X-@@ -35,6 +35,10 @@
X- #include "clock.h"
X- #include "version.h"
X- 
X-+#ifdef __FreeBSD__
X-+#include <sys/param.h>
X-+#endif
X-+
X- #define LEAF_AND_DIRS "sed -e \'\ns/^leaf[ \t]*[0-9]*[ \t]*\\.//\nt\n/^dir[ \t]/ {\ns/^dir[ \t]*[0-9]*[ \t]*\\.//\ns%$%/%\nt\n}\nd\n\'"
X- 
X- static amregex_t re_table[] = {
X-@@ -370,6 +374,12 @@
X- 
X- 	dumpkeys = vstralloc(level_str,
X- 			     options->no_record ? "" : "u",
X-+#ifdef __FreeBSD__
X-+			     "b",
X-+#if defined(__FreeBSD_version) && (__FreeBSD_version >= 500043)
X-+			     "L",
X-+#endif
X-+#endif
X- 			     "s",
X- #ifdef HAVE_HONOR_NODUMP
X- 			     "h",
X-@@ -392,6 +402,9 @@
X- 			    &dumpin, &dumpout, &mesgf, 
X- 			    cmd, config,
X- 			    dumpkeys,
X-+#ifdef __FreeBSD__
X-+			    "64",
X-+#endif
X- 			    "1048576",
X- #ifdef HAVE_HONOR_NODUMP
X- 			    "0",
Xdiff -ruN amanda-server.orig/files/patch-ad amanda-server/files/patch-ad
X--- amanda-server.orig/files/patch-ad	2009-01-06 05:55:58.658341771 +0100
X+++ amanda-server/files/patch-ad	1970-01-01 01:00:00.000000000 +0100
X@@ -1,14 +0,0 @@
X---- client-src/calcsize.c.orig	2008-01-18 09:31:16.000000000 +0900
X-+++ client-src/calcsize.c	2008-08-30 20:11:59.000000000 +0900
X-@@ -160,7 +160,11 @@
X- 	dump_total += (ST_BLOCKS(finfo) + (off_t)1) / (off_t)2 + (off_t)1;
X- 	gtar_total += ROUND(4,(ST_BLOCKS(finfo) + (off_t)1));
X-     }
X-+#ifdef GNUTAR
X-+    g_printf("           GNUTAR           dump\n");
X-+#else
X-     g_printf("           gtar           dump\n");
X-+#endif
X-     g_printf("total      %-9lu         %-9lu\n",gtar_total,dump_total);
X-     return 0;
X- #else
Xdiff -ruN amanda-server.orig/files/patch-chg-zd-mtx.sh.in amanda-server/files/patch-chg-zd-mtx.sh.in
X--- amanda-server.orig/files/patch-chg-zd-mtx.sh.in	2009-01-06 05:55:58.659342417 +0100
X+++ amanda-server/files/patch-chg-zd-mtx.sh.in	1970-01-01 01:00:00.000000000 +0100
X@@ -1,20 +0,0 @@
X---- changer-src/chg-zd-mtx.sh.orig	2008-05-27 02:25:32.000000000 +0900
X-+++ changer-src/chg-zd-mtx.sh	2009-01-05 07:34:15.000000000 +0900
X-@@ -411,7 +411,7 @@
X- 
X- IsNumeric() {
X- 	test -z "$1" && return 1
X--	x="`expr "$1" : '\([-0-9][0-9]*\)' 2>/dev/null`"
X-+	x="`expr -- "$1" : "\([-0-9][0-9]*\)" 2>/dev/null`"
X- 	return `expr X"$1" != X"$x"`
X- }
X- 
X-@@ -797,7 +797,7 @@
X- max_drive_wait=${max_drive_wait:-'120'}			# default: two minutes
X- 
X- # check MT and MTX for sanity
X--if test "${MTX:0:1}" = "/"; then
X-+if test "${MTX%${MTX#?}}" = "/"; then
X-     if ! test -f "${MTX}"; then
X- 	Exit 2 \
X- 	    `_ '<none>'` \
Xdiff -ruN amanda-server.orig/files/patch-common-src::Makefile.in amanda-server/files/patch-common-src::Makefile.in
X--- amanda-server.orig/files/patch-common-src::Makefile.in	2008-09-01 00:42:46.000000000 +0200
X+++ amanda-server/files/patch-common-src::Makefile.in	1970-01-01 01:00:00.000000000 +0100
X@@ -1,42 +0,0 @@
X---- common-src/Makefile.in.orig	2008-08-23 03:20:00.000000000 +0900
X-+++ common-src/Makefile.in	2008-09-01 07:42:20.000000000 +0900
X-@@ -926,12 +926,14 @@
X- sbin_SCRIPTS_PERL = \
X- 	    amgpgcrypt \
X- 	    amcryptsimple
X-+ at WANT_SERVER_TRUE@sbin_SCRIPTS_PERL =
X- 
X- sbin_SCRIPTS_SHELL = \
X- 	    amcrypt \
X- 	    amaespipe \
X- 	    amcrypt-ossl \
X- 	    amcrypt-ossl-asym
X-+ at WANT_SERVER_TRUE@sbin_SCRIPTS_SHELL =
X- 
X- amlibexec_SCRIPTS_PERL = 
X- SCRIPTS_INCLUDE = \
X-@@ -985,15 +987,15 @@
X- versuff.c: $(top_builddir)/config.status $(srcdir)/versuff.c.in
X- 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
X- install-amlibLTLIBRARIES: $(amlib_LTLIBRARIES)
X--	@$(NORMAL_INSTALL)
X--	test -z "$(amlibdir)" || $(MKDIR_P) "$(DESTDIR)$(amlibdir)"
X--	@list='$(amlib_LTLIBRARIES)'; for p in $$list; do \
X--	  if test -f $$p; then \
X--	    f=$(am__strip_dir) \
X--	    echo " $(LIBTOOL) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(amlibdir)/$$f'"; \
X--	    $(LIBTOOL) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(amlibdir)/$$f"; \
X--	  else :; fi; \
X--	done
X-+ at WANT_CLIENT_TRUE@	@$(NORMAL_INSTALL)
X-+ at WANT_CLIENT_TRUE@	test -z "$(amlibdir)" || $(MKDIR_P) "$(DESTDIR)$(amlibdir)"
X-+ at WANT_CLIENT_TRUE@	@list='$(amlib_LTLIBRARIES)'; for p in $$list; do \
X-+ at WANT_CLIENT_TRUE@	  if test -f $$p; then \
X-+ at WANT_CLIENT_TRUE@	    f=$(am__strip_dir) \
X-+ at WANT_CLIENT_TRUE@	    echo " $(LIBTOOL) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(amlibdir)/$$f'"; \
X-+ at WANT_CLIENT_TRUE@	    $(LIBTOOL) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(amlibdir)/$$f"; \
X-+ at WANT_CLIENT_TRUE@	  else :; fi; \
X-+ at WANT_CLIENT_TRUE@	done
X- 
X- uninstall-amlibLTLIBRARIES:
X- 	@$(NORMAL_UNINSTALL)
Xdiff -ruN amanda-server.orig/files/patch-man::Makefile.in amanda-server/files/patch-man::Makefile.in
X--- amanda-server.orig/files/patch-man::Makefile.in	2008-08-31 15:28:16.000000000 +0200
X+++ amanda-server/files/patch-man::Makefile.in	1970-01-01 01:00:00.000000000 +0100
X@@ -1,10 +0,0 @@
X---- man/Makefile.in.orig	2008-08-31 22:27:26.000000000 +0900
X-+++ man/Makefile.in	2008-08-31 22:27:46.000000000 +0900
X-@@ -565,6 +565,7 @@
X- COMMON_MAN_PAGES = amanda.8 \
X- 		    amanda.conf.5 \
X- 		    amanda-client.conf.5
X-+ at WANT_SERVER_TRUE@COMMON_MAN_PAGES =
X- 
X- SERVER_MAN_PAGES = amadmin.8 \
X- 		    amcheck.8 \
Xdiff -ruN amanda-server.orig/files/patch-perl::Makefile.in amanda-server/files/patch-perl::Makefile.in
X--- amanda-server.orig/files/patch-perl::Makefile.in	2008-09-02 00:37:02.000000000 +0200
X+++ amanda-server/files/patch-perl::Makefile.in	1970-01-01 01:00:00.000000000 +0100
X@@ -1,115 +0,0 @@
X---- perl/Makefile.in.orig	2008-08-23 03:20:01.000000000 +0900
X-+++ perl/Makefile.in	2008-09-02 07:36:59.000000000 +0900
X-@@ -291,15 +291,15 @@
X- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
X- 	$(libCmdline_la_LDFLAGS) $(LDFLAGS) -o $@
X- @WANT_SERVER_TRUE at am_libCmdline_la_rpath = -rpath $(libCmdlinedir)
X--libConfig_la_DEPENDENCIES = libamglue.la \
X--	$(top_builddir)/common-src/libamanda.la
X-+ at WANT_CLIENT_TRUE@libConfig_la_DEPENDENCIES = libamglue.la \
X-+ at WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
X- am_libConfig_la_OBJECTS = Config.lo $(am__objects_1)
X- libConfig_la_OBJECTS = $(am_libConfig_la_OBJECTS)
X- libConfig_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
X- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
X- 	$(libConfig_la_LDFLAGS) $(LDFLAGS) -o $@
X--libDebug_la_DEPENDENCIES = libamglue.la \
X--	$(top_builddir)/common-src/libamanda.la
X-+ at WANT_CLIENT_TRUE@libDebug_la_DEPENDENCIES = libamglue.la \
X-+ at WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
X- am_libDebug_la_OBJECTS = Debug.lo $(am__objects_1)
X- libDebug_la_OBJECTS = $(am_libDebug_la_OBJECTS)
X- libDebug_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
X-@@ -343,22 +343,22 @@
X- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
X- 	$(libTapefile_la_LDFLAGS) $(LDFLAGS) -o $@
X- @WANT_SERVER_TRUE at am_libTapefile_la_rpath = -rpath $(libTapefiledir)
X--libTypes_la_DEPENDENCIES = libamglue.la \
X--	$(top_builddir)/common-src/libamanda.la
X-+ at WANT_CLIENT_TRUE@libTypes_la_DEPENDENCIES = libamglue.la \
X-+ at WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
X- am_libTypes_la_OBJECTS = Types.lo $(am__objects_1)
X- libTypes_la_OBJECTS = $(am_libTypes_la_OBJECTS)
X- libTypes_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
X- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
X- 	$(libTypes_la_LDFLAGS) $(LDFLAGS) -o $@
X--libUtil_la_DEPENDENCIES = libamglue.la \
X--	$(top_builddir)/common-src/libamanda.la
X--am_libUtil_la_OBJECTS = Util.lo $(am__objects_1)
X-+ at WANT_CLIENT_TRUE@libUtil_la_DEPENDENCIES = libamglue.la \
X-+ at WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
X-+ at WANT_CLIENT_TRUE@am_libUtil_la_OBJECTS = Util.lo $(am__objects_1)
X- libUtil_la_OBJECTS = $(am_libUtil_la_OBJECTS)
X- libUtil_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
X- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
X- 	$(libUtil_la_LDFLAGS) $(LDFLAGS) -o $@
X- libamglue_la_LIBADD =
X--am_libamglue_la_OBJECTS = ghashtable.lo bigint.lo
X-+ at WANT_CLIENT_TRUE@am_libamglue_la_OBJECTS = ghashtable.lo bigint.lo
X- libamglue_la_OBJECTS = $(am_libamglue_la_OBJECTS)
X- libamglue_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
X- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
X-@@ -914,39 +914,39 @@
X- 
X- 
X- # PACKAGE: Amanda::Debug
X--libDebugdir = $(amperldir)/auto/Amanda/Debug
X--libDebug_LTLIBRARIES = libDebug.la
X--libDebug_la_SOURCES = Amanda/Debug.c $(AMGLUE_SWG)
X--libDebug_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
X--libDebug_la_LIBADD = libamglue.la \
X--	$(top_builddir)/common-src/libamanda.la
X-+ at WANT_CLIENT_TRUE@libDebugdir = $(amperldir)/auto/Amanda/Debug
X-+ at WANT_CLIENT_TRUE@libDebug_LTLIBRARIES = libDebug.la
X-+ at WANT_CLIENT_TRUE@libDebug_la_SOURCES = Amanda/Debug.c $(AMGLUE_SWG)
X-+ at WANT_CLIENT_TRUE@libDebug_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
X-+ at WANT_CLIENT_TRUE@libDebug_la_LIBADD = libamglue.la \
X-+ at WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
X- 
X- 
X- # PACKAGE: Amanda::Config
X--libConfigdir = $(amperldir)/auto/Amanda/Config
X--libConfig_LTLIBRARIES = libConfig.la
X--libConfig_la_SOURCES = Amanda/Config.c $(AMGLUE_SWG)
X--libConfig_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
X--libConfig_la_LIBADD = libamglue.la \
X--	$(top_builddir)/common-src/libamanda.la
X-+ at WANT_CLIENT_TRUE@libConfigdir = $(amperldir)/auto/Amanda/Config
X-+ at WANT_CLIENT_TRUE@libConfig_LTLIBRARIES = libConfig.la
X-+ at WANT_CLIENT_TRUE@libConfig_la_SOURCES = Amanda/Config.c $(AMGLUE_SWG)
X-+ at WANT_CLIENT_TRUE@libConfig_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
X-+ at WANT_CLIENT_TRUE@libConfig_la_LIBADD = libamglue.la \
X-+ at WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
X- 
X- 
X- # PACKAGE: Amanda::Util
X--libUtildir = $(amperldir)/auto/Amanda/Util
X--libUtil_LTLIBRARIES = libUtil.la
X--libUtil_la_SOURCES = Amanda/Util.c $(AMGLUE_SWG)
X--libUtil_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
X--libUtil_la_LIBADD = libamglue.la \
X--	$(top_builddir)/common-src/libamanda.la
X-+ at WANT_CLIENT_TRUE@libUtildir = $(amperldir)/auto/Amanda/Util
X-+ at WANT_CLIENT_TRUE@libUtil_LTLIBRARIES = libUtil.la
X-+ at WANT_CLIENT_TRUE@libUtil_la_SOURCES = Amanda/Util.c $(AMGLUE_SWG)
X-+ at WANT_CLIENT_TRUE@libUtil_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
X-+ at WANT_CLIENT_TRUE@libUtil_la_LIBADD = libamglue.la \
X-+ at WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
X- 
X- 
X- # PACKAGE: Amanda::Types
X--libTypesdir = $(amperldir)/auto/Amanda/Types
X--libTypes_LTLIBRARIES = libTypes.la
X--libTypes_la_SOURCES = Amanda/Types.c $(AMGLUE_SWG)
X--libTypes_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
X--libTypes_la_LIBADD = libamglue.la \
X--	$(top_builddir)/common-src/libamanda.la
X-+ at WANT_CLIENT_TRUE@libTypesdir = $(amperldir)/auto/Amanda/Types
X-+ at WANT_CLIENT_TRUE@libTypes_LTLIBRARIES = libTypes.la
X-+ at WANT_CLIENT_TRUE@libTypes_la_SOURCES = Amanda/Types.c $(AMGLUE_SWG)
X-+ at WANT_CLIENT_TRUE@libTypes_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
X-+ at WANT_CLIENT_TRUE@libTypes_la_LIBADD = libamglue.la \
X-+ at WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
X- 
X- 
X- # perl doesn't use the cyg prefix and it doesn't search in the bin
Xdiff -ruN amanda-server.orig/files/patch-server-src::amcleanup.sh amanda-server/files/patch-server-src::amcleanup.sh
X--- amanda-server.orig/files/patch-server-src::amcleanup.sh	2009-01-05 05:59:06.000000000 +0100
X+++ amanda-server/files/patch-server-src::amcleanup.sh	1970-01-01 01:00:00.000000000 +0100
X@@ -1,11 +0,0 @@
X---- server-src/amcleanup.sh.orig	2009-01-05 07:37:09.000000000 +0900
X-+++ server-src/amcleanup.sh	2009-01-05 07:37:26.000000000 +0900
X-@@ -75,7 +75,7 @@
X- #   after receiving SIGTERM,  if yes send SIGKILL  
X- #
X- 
X--function killpid() {
X-+killpid() {
X- 
X- killPID=$1
X- SIGTERM=15
Xdiff -ruN amanda-server.orig/pkg-descr amanda-server/pkg-descr
X--- amanda-server.orig/pkg-descr	2004-02-07 14:59:09.000000000 +0100
X+++ amanda-server/pkg-descr	1970-01-01 01:00:00.000000000 +0100
X@@ -1,22 +0,0 @@
X-WHAT IS AMANDA?
X----------------
X-
X-This is a release of Amanda, the Advanced Maryland Automatic
X-Network Disk Archiver.  Amanda is a backup system designed to archive many
X-computers on a network to a single large-capacity tape drive.  
X-
X-Here are some features of Amanda:
X-
X-  * written in C, freely distributable.
X-  * built on top of standard backup software: Unix dump/restore, and
X-    later GNU Tar and others.
X-  * will back up multiple machines in parallel to a holding disk, blasting
X-    finished dumps one by one to tape as fast as we can write files to
X-    tape.  For example, a ~2 Gb 8mm tape on a ~240K/s interface to a host
X-    with a large holding disk can be filled by Amanda in under 4 hours. 
X-  * does simple tape management: will not overwrite the wrong tape.
X-
X-WWW: http://sourceforge.net/projects/amanda/
X-
X-- Jim
X-jeh at FreeBSD.org
Xdiff -ruN amanda-server.orig/pkg-plist amanda-server/pkg-plist
X--- amanda-server.orig/pkg-plist	2009-01-06 05:55:58.660342225 +0100
X+++ amanda-server/pkg-plist	1970-01-01 01:00:00.000000000 +0100
X@@ -1,93 +0,0 @@
X-lib/amanda/libamdevice-%%SHLIBVER%%.so
X-lib/amanda/libamdevice.a
X-lib/amanda/libamdevice.la
X-lib/amanda/libamdevice.so
X-lib/amanda/libamserver-%%SHLIBVER%%.so
X-lib/amanda/libamserver.a
X-lib/amanda/libamserver.la
X-lib/amanda/libamserver.so
X-lib/amanda/libamtape-%%SHLIBVER%%.so
X-lib/amanda/libamtape.a
X-lib/amanda/libamtape.la
X-lib/amanda/libamtape.so
X-lib/amanda/librestore-%%SHLIBVER%%.so
X-lib/amanda/librestore.a
X-lib/amanda/librestore.la
X-lib/amanda/librestore.so
X-%%SITE_PERL%%/Amanda/Changer.pm
X-%%SITE_PERL%%/Amanda/Cmdline.pm
X-%%SITE_PERL%%/Amanda/Device.pm
X-%%SITE_PERL%%/Amanda/Logfile.pm
X-%%SITE_PERL%%/Amanda/Tapefile.pm
X-%%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.a
X-%%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.la
X-%%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.so
X-%%SITE_PERL%%/auto/Amanda/Device/libDevice.a
X-%%SITE_PERL%%/auto/Amanda/Device/libDevice.la
X-%%SITE_PERL%%/auto/Amanda/Device/libDevice.so
X-%%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.a
X-%%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.la
X-%%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.so
X-%%SITE_PERL%%/auto/Amanda/Tapefile/libTapefile.a
X-%%SITE_PERL%%/auto/Amanda/Tapefile/libTapefile.la
X-%%SITE_PERL%%/auto/Amanda/Tapefile/libTapefile.so
X-%%PLOT%%libexec/amanda/amcat.awk
X-libexec/amanda/amcleanupdisk
X-libexec/amanda/amindexd
X-libexec/amanda/amlogroll
X-%%PLOT%%libexec/amanda/amplot.awk
X-%%PLOT%%libexec/amanda/amplot.g
X-%%PLOT%%libexec/amanda/amplot.gp
X-libexec/amanda/amtrmidx
X-libexec/amanda/amtrmlog
X-libexec/amanda/chg-chio
X-libexec/amanda/chg-chs
X-libexec/amanda/chg-disk
X-libexec/amanda/chg-iomega
X-libexec/amanda/chg-juke
X-libexec/amanda/chg-lib.sh
X-libexec/amanda/chg-manual
X-libexec/amanda/chg-mcutil
X-libexec/amanda/chg-mtx
X-libexec/amanda/chg-multi
X-libexec/amanda/chg-null
X-libexec/amanda/chg-rait
X-libexec/amanda/chg-rth
X-libexec/amanda/chg-zd-mtx
X-libexec/amanda/chunker
X-libexec/amanda/amidxtaped
X-libexec/amanda/driver
X-libexec/amanda/dumper
X-libexec/amanda/planner
X-libexec/amanda/taper
X-sbin/amaddclient
X-sbin/amadmin
X-sbin/amcheck
X-sbin/amcheckdb
X-sbin/amcheckdump
X-sbin/amcleanup
X-sbin/amdd
X-sbin/amdevcheck
X-sbin/amdump
X-sbin/amfetchdump
X-sbin/amflush
X-sbin/amgetconf
X-sbin/amlabel
X-sbin/ammt
X-sbin/amoverview
X-%%PLOT%%sbin/amplot
X-sbin/amreport
X-sbin/amrestore
X-sbin/amrmtape
X-sbin/amserverconfig
X-sbin/amstatus
X-sbin/amtape
X-sbin/amtapetype
X-sbin/amtoc
X-sbin/amverify
X-sbin/amverifyrun
X- at dirrm %%SITE_PERL%%/auto/Amanda/Cmdline
X- at dirrm %%SITE_PERL%%/auto/Amanda/Device
X- at dirrm %%SITE_PERL%%/auto/Amanda/Logfile
X- at dirrm %%SITE_PERL%%/auto/Amanda/Tapefile
X- at dirrm include/amanda
Xdiff -ruN amanda-server.orig/pkg-plist.client amanda-server/pkg-plist.client
X--- amanda-server.orig/pkg-plist.client	2009-01-09 05:56:06.736270546 +0100
X+++ amanda-server/pkg-plist.client	1970-01-01 01:00:00.000000000 +0100
X@@ -1,103 +0,0 @@
X- at unexec if cmp -s %%AMANDA_DATES%% /dev/null; then rm -f %%AMANDA_DATES; fi
X-lib/amanda/libamanda-%%SHLIBVER%%.so
X-lib/amanda/libamanda.a
X-lib/amanda/libamanda.la
X-lib/amanda/libamanda.so
X-lib/amanda/libamandad-%%SHLIBVER%%.so
X-lib/amanda/libamandad.a
X-lib/amanda/libamandad.la
X-lib/amanda/libamandad.so
X-lib/amanda/libamclient-%%SHLIBVER%%.so
X-lib/amanda/libamclient.a
X-lib/amanda/libamclient.la
X-lib/amanda/libamclient.so
X-lib/amanda/libamglue.a
X-lib/amanda/libamglue.la
X-lib/amanda/libamglue.so
X-libexec/amanda/amanda-sh-lib.sh
X-libexec/amanda/amandad
X-libexec/amanda/application/amgtar
X-libexec/amanda/application/generic-dumper
X-libexec/amanda/calcsize
X-libexec/amanda/killpgrp
X-libexec/amanda/noop
X-libexec/amanda/patch-system
X-libexec/amanda/rundump
X-libexec/amanda/runtar
X-libexec/amanda/selfcheck
X-libexec/amanda/sendbackup
X-libexec/amanda/sendsize
X-libexec/amanda/versionsuffix
X-%%SITE_PERL%%/Amanda/Config.pm
X-%%SITE_PERL%%/Amanda/Debug.pm
X-%%SITE_PERL%%/Amanda/Paths.pm
X-%%SITE_PERL%%/Amanda/Types.pm
X-%%SITE_PERL%%/Amanda/Util.pm
X-%%SITE_PERL%%/auto/Amanda/Config/libConfig.a
X-%%SITE_PERL%%/auto/Amanda/Config/libConfig.la
X-%%SITE_PERL%%/auto/Amanda/Config/libConfig.so
X-%%SITE_PERL%%/auto/Amanda/Debug/libDebug.a
X-%%SITE_PERL%%/auto/Amanda/Debug/libDebug.la
X-%%SITE_PERL%%/auto/Amanda/Debug/libDebug.so
X-%%SITE_PERL%%/auto/Amanda/Types/libTypes.a
X-%%SITE_PERL%%/auto/Amanda/Types/libTypes.la
X-%%SITE_PERL%%/auto/Amanda/Types/libTypes.so
X-%%SITE_PERL%%/auto/Amanda/Util/libUtil.a
X-%%SITE_PERL%%/auto/Amanda/Util/libUtil.la
X-%%SITE_PERL%%/auto/Amanda/Util/libUtil.so
X-sbin/amaespipe
X-sbin/amcrypt
X-sbin/amcrypt-ossl
X-sbin/amcrypt-ossl-asym
X-sbin/amcryptsimple
X-sbin/amgpgcrypt
X-sbin/amoldrecover
X-sbin/amrecover
X-share/amanda/COPYRIGHT
X-share/amanda/ChangeLog
X-share/amanda/NEWS
X-share/amanda/ReleaseNotes
X-share/examples/amanda/amanda.conf
X-share/examples/amanda/chg-multi.conf
X-share/examples/amanda/chg-scsi.conf
X-share/examples/amanda/disklist
X-var/lib/amanda/example/amanda-client.conf
X-var/lib/amanda/example/amanda.conf
X-var/lib/amanda/example/inetd.conf.amandaclient
X-var/lib/amanda/example/label-templates/3hole.ps
X-var/lib/amanda/example/label-templates/8.5x11.ps
X-var/lib/amanda/example/label-templates/DIN-A4.ps
X-var/lib/amanda/example/label-templates/DLT-A4.ps
X-var/lib/amanda/example/label-templates/DLT.ps
X-var/lib/amanda/example/label-templates/EXB-8500.ps
X-var/lib/amanda/example/label-templates/HP-DAT.ps
X-var/lib/amanda/example/xinetd.amandaclient
X-var/lib/amanda/example/xinetd.amandaserver
X-var/lib/amanda/template.d/README
X-var/lib/amanda/template.d/advanced.conf
X-var/lib/amanda/template.d/amanda-S3.conf
X-var/lib/amanda/template.d/amanda-harddisk.conf
X-var/lib/amanda/template.d/amanda-single-tape.conf
X-var/lib/amanda/template.d/amanda-tape-changer.conf
X-var/lib/amanda/template.d/chg-manual.conf
X-var/lib/amanda/template.d/dumptypes
X-var/lib/amanda/template.d/tapetypes
X- at dirrm %%SITE_PERL%%/auto/Amanda/Util
X- at dirrm %%SITE_PERL%%/auto/Amanda/Types
X- at dirrm %%SITE_PERL%%/auto/Amanda/Debug
X- at dirrm %%SITE_PERL%%/auto/Amanda/Config
X- at dirrm %%SITE_PERL%%/auto/Amanda
X- at dirrm %%SITE_PERL%%/Amanda
X- at dirrm var/lib/amanda/template.d
X- at dirrm var/lib/amanda/example/label-templates
X- at dirrm var/lib/amanda/example
X- at dirrm var/lib/amanda
X- at dirrmtry var/lib
X- at dirrmtry var/amanda/gnutar-lists
X- at dirrmtry var/amanda
X- at dirrmtry var
X- at dirrm share/examples/amanda
X- at dirrm share/amanda
X- at dirrm libexec/amanda/application
X- at dirrm libexec/amanda
X- at dirrm lib/amanda
e97ad6bb25843b8253e9fde628cbbdc8
exit



>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list