25 files changed, 35 insertions, 695 deletions

diff --git a/misc/amanda-client/Makefile b/misc/amanda-client/Makefile
index 266db71258a6..ec5bd27292b4 100644
--- a/misc/amanda-client/Makefile
+++ b/misc/amanda-client/Makefile
@@ -5,39 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	amanda
-PORTVERSION=	2.4.2
-CATEGORIES=	misc
-MASTER_SITES=	ftp://ftp.amanda.org/pub/amanda/
+PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
 
-MAINTAINER=	jeh@FreeBSD.org
+MASTERDIR=	${.CURDIR}/../amanda24-server
+COMMENT=	${PKGDIR}/pkg-comment.client
+PKGINSTALL=	mustnotexist
+PLIST=		${PKGDIR}/pkg-plist.client
 
-BUILD_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
-RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
+CLIENT_ONLY=	yes
 
-WRKSRC=		${WRKDIR}/amanda-2.4.2
-NO_LATEST_LINK=	yes
-USE_GMAKE=	yes
-USE_LIBTOOL=	yes
-INSTALLS_SHLIB=	yes
-LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
-CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
-		--with-amandahosts --with-fqdn \
-		--with-dump-honor-nodump \
-		--with-user=operator --with-group=operator
-
-PATCH_STRIP=
-MAN8=		amadmin.8 amanda.8 amcheck.8 amcheckdb.8 amcleanup.8 \
-		amdump.8 amflush.8 amgetconf.8 amlabel.8 amoverview.8 \
-		amplot.8 amrecover.8 amreport.8 amrestore.8 amrmtape.8 \
-		amstatus.8 amtape.8 amtoc.8 amverify.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
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/misc/amanda-client/distinfo b/misc/amanda-client/distinfo
deleted file mode 100644
index 11c39fd7d06c..000000000000
--- a/misc/amanda-client/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (amanda-2.4.2.tar.gz) = b10c0ada724694d0bbc46a0d3ebee3c9
diff --git a/misc/amanda-client/pkg-comment b/misc/amanda-client/pkg-comment
deleted file mode 100644
index 87b97277da1d..000000000000
--- a/misc/amanda-client/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Advanced Maryland Automatic Network Disk Archiver
diff --git a/misc/amanda-client/pkg-descr b/misc/amanda-client/pkg-descr
deleted file mode 100644
index c9f6e12287ec..000000000000
--- a/misc/amanda-client/pkg-descr
+++ /dev/null
@@ -1,22 +0,0 @@
-** CAUTION **
- 
-THE RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
-EARLIER AMANDA CLIENTS (PER CHANGES FILE IN THE DISTRIBUTION.) 
-
-WHAT IS AMANDA?
----------------
-
-This is a release of Amanda, the Advanced Maryland Automatic
-Network Disk Archiver.  Amanda is a backup system designed to archive many
-computers on a network to a single large-capacity tape drive.  
-
-Here are some features of Amanda:
-
-  * written in C, freely distributable.
-  * built on top of standard backup software: Unix dump/restore, and
-    later GNU Tar and others.
-  * will back up multiple machines in parallel to a holding disk, blasting
-    finished dumps one by one to tape as fast as we can write files to
-    tape.  For example, a ~2 Gb 8mm tape on a ~240K/s interface to a host
-    with a large holding disk can be filled by Amanda in under 4 hours. 
-  * does simple tape management: will not overwrite the wrong tape.
diff --git a/misc/amanda-client/pkg-plist b/misc/amanda-client/pkg-plist
deleted file mode 100644
index 2475022db66e..000000000000
--- a/misc/amanda-client/pkg-plist
+++ /dev/null
@@ -1,82 +0,0 @@
-lib/libamanda.a
-lib/libamclient.a
-lib/libamserver.a
-lib/libamtape.a
-libexec/amanda/amandad
-libexec/amanda/amcat.awk
-libexec/amanda/amcleanupdisk
-libexec/amanda/amidxtaped
-libexec/amanda/amindexd
-libexec/amanda/amlogroll
-libexec/amanda/amplot.awk
-libexec/amanda/amplot.g
-libexec/amanda/amplot.gp
-libexec/amanda/amtrmidx
-libexec/amanda/amtrmlog
-libexec/amanda/calcsize
-libexec/amanda/chg-chio
-libexec/amanda/chg-chs
-libexec/amanda/chg-manual
-libexec/amanda/chg-mtx
-libexec/amanda/chg-multi
-libexec/amanda/chg-rth
-libexec/amanda/chg-zd-mtx
-libexec/amanda/driver
-libexec/amanda/dumper
-libexec/amanda/killpgrp
-libexec/amanda/patch-system
-libexec/amanda/planner
-libexec/amanda/rundump
-libexec/amanda/runtar
-libexec/amanda/selfcheck
-libexec/amanda/sendbackup
-libexec/amanda/sendsize
-libexec/amanda/taper
-libexec/amanda/versionsuffix
-sbin/amadmin
-sbin/amcheck
-sbin/amcheckdb
-sbin/amcleanup
-sbin/amdump
-sbin/amflush
-sbin/amgetconf
-sbin/amlabel
-sbin/amoverview
-sbin/amplot
-sbin/amrecover
-sbin/amreport
-sbin/amrestore
-sbin/amrmtape
-sbin/amstatus
-sbin/amtape
-sbin/amtoc
-sbin/amverify
-share/amanda/COPYRIGHT
-share/amanda/COPYRIGHT-APACHE
-share/amanda/COPYRIGHT-REGEX
-share/amanda/DUMPER-API
-share/amanda/FAQ
-share/amanda/INDEXING
-share/amanda/INSTALL
-share/amanda/INTERNALS
-share/amanda/KERBEROS
-share/amanda/LABEL.PRINTING
-share/amanda/MULTITAPE
-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
diff --git a/misc/amanda24-client/Makefile b/misc/amanda24-client/Makefile
index 266db71258a6..ec5bd27292b4 100644
--- a/misc/amanda24-client/Makefile
+++ b/misc/amanda24-client/Makefile
@@ -5,39 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	amanda
-PORTVERSION=	2.4.2
-CATEGORIES=	misc
-MASTER_SITES=	ftp://ftp.amanda.org/pub/amanda/
+PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
 
-MAINTAINER=	jeh@FreeBSD.org
+MASTERDIR=	${.CURDIR}/../amanda24-server
+COMMENT=	${PKGDIR}/pkg-comment.client
+PKGINSTALL=	mustnotexist
+PLIST=		${PKGDIR}/pkg-plist.client
 
-BUILD_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
-RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
+CLIENT_ONLY=	yes
 
-WRKSRC=		${WRKDIR}/amanda-2.4.2
-NO_LATEST_LINK=	yes
-USE_GMAKE=	yes
-USE_LIBTOOL=	yes
-INSTALLS_SHLIB=	yes
-LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
-CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
-		--with-amandahosts --with-fqdn \
-		--with-dump-honor-nodump \
-		--with-user=operator --with-group=operator
-
-PATCH_STRIP=
-MAN8=		amadmin.8 amanda.8 amcheck.8 amcheckdb.8 amcleanup.8 \
-		amdump.8 amflush.8 amgetconf.8 amlabel.8 amoverview.8 \
-		amplot.8 amrecover.8 amreport.8 amrestore.8 amrmtape.8 \
-		amstatus.8 amtape.8 amtoc.8 amverify.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
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/misc/amanda24-client/distinfo b/misc/amanda24-client/distinfo
deleted file mode 100644
index 11c39fd7d06c..000000000000
--- a/misc/amanda24-client/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (amanda-2.4.2.tar.gz) = b10c0ada724694d0bbc46a0d3ebee3c9
diff --git a/misc/amanda24-client/pkg-comment b/misc/amanda24-client/pkg-comment
deleted file mode 100644
index 87b97277da1d..000000000000
--- a/misc/amanda24-client/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Advanced Maryland Automatic Network Disk Archiver
diff --git a/misc/amanda24-client/pkg-descr b/misc/amanda24-client/pkg-descr
deleted file mode 100644
index c9f6e12287ec..000000000000
--- a/misc/amanda24-client/pkg-descr
+++ /dev/null
@@ -1,22 +0,0 @@
-** CAUTION **
- 
-THE RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
-EARLIER AMANDA CLIENTS (PER CHANGES FILE IN THE DISTRIBUTION.) 
-
-WHAT IS AMANDA?
----------------
-
-This is a release of Amanda, the Advanced Maryland Automatic
-Network Disk Archiver.  Amanda is a backup system designed to archive many
-computers on a network to a single large-capacity tape drive.  
-
-Here are some features of Amanda:
-
-  * written in C, freely distributable.
-  * built on top of standard backup software: Unix dump/restore, and
-    later GNU Tar and others.
-  * will back up multiple machines in parallel to a holding disk, blasting
-    finished dumps one by one to tape as fast as we can write files to
-    tape.  For example, a ~2 Gb 8mm tape on a ~240K/s interface to a host
-    with a large holding disk can be filled by Amanda in under 4 hours. 
-  * does simple tape management: will not overwrite the wrong tape.
diff --git a/misc/amanda24-client/pkg-plist b/misc/amanda24-client/pkg-plist
deleted file mode 100644
index 2475022db66e..000000000000
--- a/misc/amanda24-client/pkg-plist
+++ /dev/null
@@ -1,82 +0,0 @@
-lib/libamanda.a
-lib/libamclient.a
-lib/libamserver.a
-lib/libamtape.a
-libexec/amanda/amandad
-libexec/amanda/amcat.awk
-libexec/amanda/amcleanupdisk
-libexec/amanda/amidxtaped
-libexec/amanda/amindexd
-libexec/amanda/amlogroll
-libexec/amanda/amplot.awk
-libexec/amanda/amplot.g
-libexec/amanda/amplot.gp
-libexec/amanda/amtrmidx
-libexec/amanda/amtrmlog
-libexec/amanda/calcsize
-libexec/amanda/chg-chio
-libexec/amanda/chg-chs
-libexec/amanda/chg-manual
-libexec/amanda/chg-mtx
-libexec/amanda/chg-multi
-libexec/amanda/chg-rth
-libexec/amanda/chg-zd-mtx
-libexec/amanda/driver
-libexec/amanda/dumper
-libexec/amanda/killpgrp
-libexec/amanda/patch-system
-libexec/amanda/planner
-libexec/amanda/rundump
-libexec/amanda/runtar
-libexec/amanda/selfcheck
-libexec/amanda/sendbackup
-libexec/amanda/sendsize
-libexec/amanda/taper
-libexec/amanda/versionsuffix
-sbin/amadmin
-sbin/amcheck
-sbin/amcheckdb
-sbin/amcleanup
-sbin/amdump
-sbin/amflush
-sbin/amgetconf
-sbin/amlabel
-sbin/amoverview
-sbin/amplot
-sbin/amrecover
-sbin/amreport
-sbin/amrestore
-sbin/amrmtape
-sbin/amstatus
-sbin/amtape
-sbin/amtoc
-sbin/amverify
-share/amanda/COPYRIGHT
-share/amanda/COPYRIGHT-APACHE
-share/amanda/COPYRIGHT-REGEX
-share/amanda/DUMPER-API
-share/amanda/FAQ
-share/amanda/INDEXING
-share/amanda/INSTALL
-share/amanda/INTERNALS
-share/amanda/KERBEROS
-share/amanda/LABEL.PRINTING
-share/amanda/MULTITAPE
-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
diff --git a/misc/amanda25-client/Makefile b/misc/amanda25-client/Makefile
index 266db71258a6..ec5bd27292b4 100644
--- a/misc/amanda25-client/Makefile
+++ b/misc/amanda25-client/Makefile
@@ -5,39 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	amanda
-PORTVERSION=	2.4.2
-CATEGORIES=	misc
-MASTER_SITES=	ftp://ftp.amanda.org/pub/amanda/
+PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
 
-MAINTAINER=	jeh@FreeBSD.org
+MASTERDIR=	${.CURDIR}/../amanda24-server
+COMMENT=	${PKGDIR}/pkg-comment.client
+PKGINSTALL=	mustnotexist
+PLIST=		${PKGDIR}/pkg-plist.client
 
-BUILD_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
-RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
+CLIENT_ONLY=	yes
 
-WRKSRC=		${WRKDIR}/amanda-2.4.2
-NO_LATEST_LINK=	yes
-USE_GMAKE=	yes
-USE_LIBTOOL=	yes
-INSTALLS_SHLIB=	yes
-LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
-CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
-		--with-amandahosts --with-fqdn \
-		--with-dump-honor-nodump \
-		--with-user=operator --with-group=operator
-
-PATCH_STRIP=
-MAN8=		amadmin.8 amanda.8 amcheck.8 amcheckdb.8 amcleanup.8 \
-		amdump.8 amflush.8 amgetconf.8 amlabel.8 amoverview.8 \
-		amplot.8 amrecover.8 amreport.8 amrestore.8 amrmtape.8 \
-		amstatus.8 amtape.8 amtoc.8 amverify.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
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/misc/amanda25-client/distinfo b/misc/amanda25-client/distinfo
deleted file mode 100644
index 11c39fd7d06c..000000000000
--- a/misc/amanda25-client/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (amanda-2.4.2.tar.gz) = b10c0ada724694d0bbc46a0d3ebee3c9
diff --git a/misc/amanda25-client/pkg-comment b/misc/amanda25-client/pkg-comment
deleted file mode 100644
index 87b97277da1d..000000000000
--- a/misc/amanda25-client/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Advanced Maryland Automatic Network Disk Archiver
diff --git a/misc/amanda25-client/pkg-descr b/misc/amanda25-client/pkg-descr
deleted file mode 100644
index c9f6e12287ec..000000000000
--- a/misc/amanda25-client/pkg-descr
+++ /dev/null
@@ -1,22 +0,0 @@
-** CAUTION **
- 
-THE RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
-EARLIER AMANDA CLIENTS (PER CHANGES FILE IN THE DISTRIBUTION.) 
-
-WHAT IS AMANDA?
----------------
-
-This is a release of Amanda, the Advanced Maryland Automatic
-Network Disk Archiver.  Amanda is a backup system designed to archive many
-computers on a network to a single large-capacity tape drive.  
-
-Here are some features of Amanda:
-
-  * written in C, freely distributable.
-  * built on top of standard backup software: Unix dump/restore, and
-    later GNU Tar and others.
-  * will back up multiple machines in parallel to a holding disk, blasting
-    finished dumps one by one to tape as fast as we can write files to
-    tape.  For example, a ~2 Gb 8mm tape on a ~240K/s interface to a host
-    with a large holding disk can be filled by Amanda in under 4 hours. 
-  * does simple tape management: will not overwrite the wrong tape.
diff --git a/misc/amanda25-client/pkg-plist b/misc/amanda25-client/pkg-plist
deleted file mode 100644
index 2475022db66e..000000000000
--- a/misc/amanda25-client/pkg-plist
+++ /dev/null
@@ -1,82 +0,0 @@
-lib/libamanda.a
-lib/libamclient.a
-lib/libamserver.a
-lib/libamtape.a
-libexec/amanda/amandad
-libexec/amanda/amcat.awk
-libexec/amanda/amcleanupdisk
-libexec/amanda/amidxtaped
-libexec/amanda/amindexd
-libexec/amanda/amlogroll
-libexec/amanda/amplot.awk
-libexec/amanda/amplot.g
-libexec/amanda/amplot.gp
-libexec/amanda/amtrmidx
-libexec/amanda/amtrmlog
-libexec/amanda/calcsize
-libexec/amanda/chg-chio
-libexec/amanda/chg-chs
-libexec/amanda/chg-manual
-libexec/amanda/chg-mtx
-libexec/amanda/chg-multi
-libexec/amanda/chg-rth
-libexec/amanda/chg-zd-mtx
-libexec/amanda/driver
-libexec/amanda/dumper
-libexec/amanda/killpgrp
-libexec/amanda/patch-system
-libexec/amanda/planner
-libexec/amanda/rundump
-libexec/amanda/runtar
-libexec/amanda/selfcheck
-libexec/amanda/sendbackup
-libexec/amanda/sendsize
-libexec/amanda/taper
-libexec/amanda/versionsuffix
-sbin/amadmin
-sbin/amcheck
-sbin/amcheckdb
-sbin/amcleanup
-sbin/amdump
-sbin/amflush
-sbin/amgetconf
-sbin/amlabel
-sbin/amoverview
-sbin/amplot
-sbin/amrecover
-sbin/amreport
-sbin/amrestore
-sbin/amrmtape
-sbin/amstatus
-sbin/amtape
-sbin/amtoc
-sbin/amverify
-share/amanda/COPYRIGHT
-share/amanda/COPYRIGHT-APACHE
-share/amanda/COPYRIGHT-REGEX
-share/amanda/DUMPER-API
-share/amanda/FAQ
-share/amanda/INDEXING
-share/amanda/INSTALL
-share/amanda/INTERNALS
-share/amanda/KERBEROS
-share/amanda/LABEL.PRINTING
-share/amanda/MULTITAPE
-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
diff --git a/misc/amanda26-client/Makefile b/misc/amanda26-client/Makefile
index 266db71258a6..ec5bd27292b4 100644
--- a/misc/amanda26-client/Makefile
+++ b/misc/amanda26-client/Makefile
@@ -5,39 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	amanda
-PORTVERSION=	2.4.2
-CATEGORIES=	misc
-MASTER_SITES=	ftp://ftp.amanda.org/pub/amanda/
+PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
 
-MAINTAINER=	jeh@FreeBSD.org
+MASTERDIR=	${.CURDIR}/../amanda24-server
+COMMENT=	${PKGDIR}/pkg-comment.client
+PKGINSTALL=	mustnotexist
+PLIST=		${PKGDIR}/pkg-plist.client
 
-BUILD_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
-RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
+CLIENT_ONLY=	yes
 
-WRKSRC=		${WRKDIR}/amanda-2.4.2
-NO_LATEST_LINK=	yes
-USE_GMAKE=	yes
-USE_LIBTOOL=	yes
-INSTALLS_SHLIB=	yes
-LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
-CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
-		--with-amandahosts --with-fqdn \
-		--with-dump-honor-nodump \
-		--with-user=operator --with-group=operator
-
-PATCH_STRIP=
-MAN8=		amadmin.8 amanda.8 amcheck.8 amcheckdb.8 amcleanup.8 \
-		amdump.8 amflush.8 amgetconf.8 amlabel.8 amoverview.8 \
-		amplot.8 amrecover.8 amreport.8 amrestore.8 amrmtape.8 \
-		amstatus.8 amtape.8 amtoc.8 amverify.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
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/misc/amanda26-client/distinfo b/misc/amanda26-client/distinfo
deleted file mode 100644
index 11c39fd7d06c..000000000000
--- a/misc/amanda26-client/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (amanda-2.4.2.tar.gz) = b10c0ada724694d0bbc46a0d3ebee3c9
diff --git a/misc/amanda26-client/pkg-comment b/misc/amanda26-client/pkg-comment
deleted file mode 100644
index 87b97277da1d..000000000000
--- a/misc/amanda26-client/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Advanced Maryland Automatic Network Disk Archiver
diff --git a/misc/amanda26-client/pkg-descr b/misc/amanda26-client/pkg-descr
deleted file mode 100644
index c9f6e12287ec..000000000000
--- a/misc/amanda26-client/pkg-descr
+++ /dev/null
@@ -1,22 +0,0 @@
-** CAUTION **
- 
-THE RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
-EARLIER AMANDA CLIENTS (PER CHANGES FILE IN THE DISTRIBUTION.) 
-
-WHAT IS AMANDA?
----------------
-
-This is a release of Amanda, the Advanced Maryland Automatic
-Network Disk Archiver.  Amanda is a backup system designed to archive many
-computers on a network to a single large-capacity tape drive.  
-
-Here are some features of Amanda:
-
-  * written in C, freely distributable.
-  * built on top of standard backup software: Unix dump/restore, and
-    later GNU Tar and others.
-  * will back up multiple machines in parallel to a holding disk, blasting
-    finished dumps one by one to tape as fast as we can write files to
-    tape.  For example, a ~2 Gb 8mm tape on a ~240K/s interface to a host
-    with a large holding disk can be filled by Amanda in under 4 hours. 
-  * does simple tape management: will not overwrite the wrong tape.
diff --git a/misc/amanda26-client/pkg-plist b/misc/amanda26-client/pkg-plist
deleted file mode 100644
index 2475022db66e..000000000000
--- a/misc/amanda26-client/pkg-plist
+++ /dev/null
@@ -1,82 +0,0 @@
-lib/libamanda.a
-lib/libamclient.a
-lib/libamserver.a
-lib/libamtape.a
-libexec/amanda/amandad
-libexec/amanda/amcat.awk
-libexec/amanda/amcleanupdisk
-libexec/amanda/amidxtaped
-libexec/amanda/amindexd
-libexec/amanda/amlogroll
-libexec/amanda/amplot.awk
-libexec/amanda/amplot.g
-libexec/amanda/amplot.gp
-libexec/amanda/amtrmidx
-libexec/amanda/amtrmlog
-libexec/amanda/calcsize
-libexec/amanda/chg-chio
-libexec/amanda/chg-chs
-libexec/amanda/chg-manual
-libexec/amanda/chg-mtx
-libexec/amanda/chg-multi
-libexec/amanda/chg-rth
-libexec/amanda/chg-zd-mtx
-libexec/amanda/driver
-libexec/amanda/dumper
-libexec/amanda/killpgrp
-libexec/amanda/patch-system
-libexec/amanda/planner
-libexec/amanda/rundump
-libexec/amanda/runtar
-libexec/amanda/selfcheck
-libexec/amanda/sendbackup
-libexec/amanda/sendsize
-libexec/amanda/taper
-libexec/amanda/versionsuffix
-sbin/amadmin
-sbin/amcheck
-sbin/amcheckdb
-sbin/amcleanup
-sbin/amdump
-sbin/amflush
-sbin/amgetconf
-sbin/amlabel
-sbin/amoverview
-sbin/amplot
-sbin/amrecover
-sbin/amreport
-sbin/amrestore
-sbin/amrmtape
-sbin/amstatus
-sbin/amtape
-sbin/amtoc
-sbin/amverify
-share/amanda/COPYRIGHT
-share/amanda/COPYRIGHT-APACHE
-share/amanda/COPYRIGHT-REGEX
-share/amanda/DUMPER-API
-share/amanda/FAQ
-share/amanda/INDEXING
-share/amanda/INSTALL
-share/amanda/INTERNALS
-share/amanda/KERBEROS
-share/amanda/LABEL.PRINTING
-share/amanda/MULTITAPE
-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
diff --git a/misc/amanda32-client/Makefile b/misc/amanda32-client/Makefile
index 266db71258a6..ec5bd27292b4 100644
--- a/misc/amanda32-client/Makefile
+++ b/misc/amanda32-client/Makefile
@@ -5,39 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	amanda
-PORTVERSION=	2.4.2
-CATEGORIES=	misc
-MASTER_SITES=	ftp://ftp.amanda.org/pub/amanda/
+PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
 
-MAINTAINER=	jeh@FreeBSD.org
+MASTERDIR=	${.CURDIR}/../amanda24-server
+COMMENT=	${PKGDIR}/pkg-comment.client
+PKGINSTALL=	mustnotexist
+PLIST=		${PKGDIR}/pkg-plist.client
 
-BUILD_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
-RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
+CLIENT_ONLY=	yes
 
-WRKSRC=		${WRKDIR}/amanda-2.4.2
-NO_LATEST_LINK=	yes
-USE_GMAKE=	yes
-USE_LIBTOOL=	yes
-INSTALLS_SHLIB=	yes
-LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
-CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
-		--with-amandahosts --with-fqdn \
-		--with-dump-honor-nodump \
-		--with-user=operator --with-group=operator
-
-PATCH_STRIP=
-MAN8=		amadmin.8 amanda.8 amcheck.8 amcheckdb.8 amcleanup.8 \
-		amdump.8 amflush.8 amgetconf.8 amlabel.8 amoverview.8 \
-		amplot.8 amrecover.8 amreport.8 amrestore.8 amrmtape.8 \
-		amstatus.8 amtape.8 amtoc.8 amverify.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
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/misc/amanda32-client/distinfo b/misc/amanda32-client/distinfo
deleted file mode 100644
index 11c39fd7d06c..000000000000
--- a/misc/amanda32-client/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (amanda-2.4.2.tar.gz) = b10c0ada724694d0bbc46a0d3ebee3c9
diff --git a/misc/amanda32-client/pkg-comment b/misc/amanda32-client/pkg-comment
deleted file mode 100644
index 87b97277da1d..000000000000
--- a/misc/amanda32-client/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Advanced Maryland Automatic Network Disk Archiver
diff --git a/misc/amanda32-client/pkg-descr b/misc/amanda32-client/pkg-descr
deleted file mode 100644
index c9f6e12287ec..000000000000
--- a/misc/amanda32-client/pkg-descr
+++ /dev/null
@@ -1,22 +0,0 @@
-** CAUTION **
- 
-THE RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
-EARLIER AMANDA CLIENTS (PER CHANGES FILE IN THE DISTRIBUTION.) 
-
-WHAT IS AMANDA?
----------------
-
-This is a release of Amanda, the Advanced Maryland Automatic
-Network Disk Archiver.  Amanda is a backup system designed to archive many
-computers on a network to a single large-capacity tape drive.  
-
-Here are some features of Amanda:
-
-  * written in C, freely distributable.
-  * built on top of standard backup software: Unix dump/restore, and
-    later GNU Tar and others.
-  * will back up multiple machines in parallel to a holding disk, blasting
-    finished dumps one by one to tape as fast as we can write files to
-    tape.  For example, a ~2 Gb 8mm tape on a ~240K/s interface to a host
-    with a large holding disk can be filled by Amanda in under 4 hours. 
-  * does simple tape management: will not overwrite the wrong tape.
diff --git a/misc/amanda32-client/pkg-plist b/misc/amanda32-client/pkg-plist
deleted file mode 100644
index 2475022db66e..000000000000
--- a/misc/amanda32-client/pkg-plist
+++ /dev/null
@@ -1,82 +0,0 @@
-lib/libamanda.a
-lib/libamclient.a
-lib/libamserver.a
-lib/libamtape.a
-libexec/amanda/amandad
-libexec/amanda/amcat.awk
-libexec/amanda/amcleanupdisk
-libexec/amanda/amidxtaped
-libexec/amanda/amindexd
-libexec/amanda/amlogroll
-libexec/amanda/amplot.awk
-libexec/amanda/amplot.g
-libexec/amanda/amplot.gp
-libexec/amanda/amtrmidx
-libexec/amanda/amtrmlog
-libexec/amanda/calcsize
-libexec/amanda/chg-chio
-libexec/amanda/chg-chs
-libexec/amanda/chg-manual
-libexec/amanda/chg-mtx
-libexec/amanda/chg-multi
-libexec/amanda/chg-rth
-libexec/amanda/chg-zd-mtx
-libexec/amanda/driver
-libexec/amanda/dumper
-libexec/amanda/killpgrp
-libexec/amanda/patch-system
-libexec/amanda/planner
-libexec/amanda/rundump
-libexec/amanda/runtar
-libexec/amanda/selfcheck
-libexec/amanda/sendbackup
-libexec/amanda/sendsize
-libexec/amanda/taper
-libexec/amanda/versionsuffix
-sbin/amadmin
-sbin/amcheck
-sbin/amcheckdb
-sbin/amcleanup
-sbin/amdump
-sbin/amflush
-sbin/amgetconf
-sbin/amlabel
-sbin/amoverview
-sbin/amplot
-sbin/amrecover
-sbin/amreport
-sbin/amrestore
-sbin/amrmtape
-sbin/amstatus
-sbin/amtape
-sbin/amtoc
-sbin/amverify
-share/amanda/COPYRIGHT
-share/amanda/COPYRIGHT-APACHE
-share/amanda/COPYRIGHT-REGEX
-share/amanda/DUMPER-API
-share/amanda/FAQ
-share/amanda/INDEXING
-share/amanda/INSTALL
-share/amanda/INTERNALS
-share/amanda/KERBEROS
-share/amanda/LABEL.PRINTING
-share/amanda/MULTITAPE
-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