Upgrade to 2.4.3b2.

- Remove 2 contributed patchs that are now part of the release
- Build static programs for easier recovery

7 files changed, 12 insertions, 37 deletions

diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile
index 6407403f83ba..34060ff29be4 100644
--- a/misc/amanda26-server/Makefile
+++ b/misc/amanda26-server/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	${MASTERPORTNAME}
-PORTVERSION=	2.4.3b1
-PORTREVISION?=	2
+PORTVERSION=	2.4.3b2
+PORTREVISION?=	0
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	amanda
@@ -21,9 +21,7 @@ MASTERPORTNAME=	amanda-server
 
 NO_LATEST_LINK=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
-INSTALLS_SHLIB=	yes
-LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
+HAS_CONFIGURE=	yes
 PATCH_STRIP=
 
 .include <bsd.port.pre.mk>
@@ -46,14 +44,14 @@ pre-fetch:
 	@${ECHO} "        The default is user"
 	@${ECHO} ""
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client
-BUILD_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client
+RUN_DEPENDS=	${PREFIX}/sbin/amrecover:${PORTSDIR}/misc/amanda-client
+BUILD_DEPENDS=	${PREFIX}/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
+		--without-client --disable-libtool --prefix=${PREFIX}
 
 MAN8=		amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdd.8 \
 		amdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 \
@@ -121,7 +119,7 @@ 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
+		--without-server --disable-libtool --prefix=${PREFIX}
 
 MAN8=		amanda.8 amrecover.8 amrestore.8
 
diff --git a/misc/amanda26-server/distinfo b/misc/amanda26-server/distinfo
index 0a10eaeeff2c..eff82f076ac0 100644
--- a/misc/amanda26-server/distinfo
+++ b/misc/amanda26-server/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.3b1.tar.gz) = 97eb282d51c820f138d62492d7fffcd0
+MD5 (amanda-2.4.3b2.tar.gz) = ba220b2261b9cea9857fddfff5915fac
diff --git a/misc/amanda26-server/files/patch-changer-src::chg-zd-mtx.sh.in b/misc/amanda26-server/files/patch-changer-src::chg-zd-mtx.sh.in
deleted file mode 100644
index 5e1460074639..000000000000
--- a/misc/amanda26-server/files/patch-changer-src::chg-zd-mtx.sh.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- changer-src/chg-zd-mtx.sh.in.orig	Mon Apr  2 20:22:44 2001
-+++ changer-src/chg-zd-mtx.sh.in	Fri Dec 28 12:30:09 2001
-@@ -403,7 +403,7 @@
- 	includedslot=`echo $tmpincludedslot | sed -n "s/\(.*\)Storage Element \([1-9][0-9]*\):\(.*\)/\2/p;s/Data Transfer Element $drivenum:Full (Storage Element \([1-9][0-9]*\) Loaded)\(.*\)/\1/p"`
-         case $tapelabel in
-         $tapelabel)
--                if [ $tapelabel == $includedtag ]; then
-+                if [ $tapelabel = $includedtag ]; then
-                         shift 
-                         loadslot $includedslot
-                         echo "$tape"
diff --git a/misc/amanda26-server/files/patch-example::amanda.conf.in b/misc/amanda26-server/files/patch-example::amanda.conf.in
deleted file mode 100644
index 196b6d36f53a..000000000000
--- a/misc/amanda26-server/files/patch-example::amanda.conf.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- example/amanda.conf.in	2001/11/08 18:44:56
-+++ example/amanda.conf.in	2001/12/07 07:23:10
-@@ -148,7 +148,7 @@
- 
- autoflush no #
- # if autoflush is set to yes, then amdump will schedule all dump on
--holding disks to be flush to tape during the run.
-+# holding disks to be flush to tape during the run.
- 
- # The format for a ColumnSpec is a ',' seperated list of triples.
- # Each triple consists of
diff --git a/misc/amanda26-server/pkg-descr b/misc/amanda26-server/pkg-descr
index 52f5f643181a..30ad76ed3238 100644
--- a/misc/amanda26-server/pkg-descr
+++ b/misc/amanda26-server/pkg-descr
@@ -24,4 +24,4 @@ Here are some features of Amanda:
 WWW: http://sourceforge.net/projects/amanda/
 
 - Jim
-jim@thehousleys.net
+jeh@FreeBSD.org
diff --git a/misc/amanda26-server/pkg-plist b/misc/amanda26-server/pkg-plist
index 6eb1159ad008..c293460b09db 100644
--- a/misc/amanda26-server/pkg-plist
+++ b/misc/amanda26-server/pkg-plist
@@ -1,4 +1,3 @@
-lib/libamserver.a
 %%PLOT%%libexec/amanda/amcat.awk
 libexec/amanda/amcleanupdisk
 libexec/amanda/amindexd
@@ -14,6 +13,7 @@ libexec/amanda/chg-manual
 libexec/amanda/chg-mtx
 libexec/amanda/chg-multi
 libexec/amanda/chg-rth
+libexec/amanda/chg-scsi
 %%SCSICHG%%libexec/amanda/chg-scsi
 libexec/amanda/chg-zd-mtx
 libexec/amanda/driver
diff --git a/misc/amanda26-server/pkg-plist.client b/misc/amanda26-server/pkg-plist.client
index 5c6b60570375..925c4ef8826d 100644
--- a/misc/amanda26-server/pkg-plist.client
+++ b/misc/amanda26-server/pkg-plist.client
@@ -1,6 +1,3 @@
-lib/libamanda.a
-lib/libamclient.a
-lib/libamtape.a
 libexec/amanda/amandad
 libexec/amanda/amidxtaped
 libexec/amanda/calcsize
@@ -26,6 +23,7 @@ share/amanda/INTERNALS
 share/amanda/KERBEROS
 share/amanda/LABEL.PRINTING
 share/amanda/MULTITAPE
+share/amanda/RAIT
 share/amanda/PORT.USAGE
 share/amanda/RESTORE
 share/amanda/SAMBA
@@ -34,6 +32,7 @@ share/amanda/SYSTEM.NOTES
 share/amanda/TAPE.CHANGERS
 share/amanda/TAPETYPES
 share/amanda/UPGRADE
+share/amanda/VTAPE-API
 share/amanda/WHATS.NEW
 share/amanda/WISHLIST
 share/amanda/YEAR2000