4 files changed, 30 insertions, 27 deletions

diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile
index f36ae4febe2c..18d5e310128e 100644
--- a/misc/amanda26-server/Makefile
+++ b/misc/amanda26-server/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	${MASTERPORTNAME}
-PORTVERSION=	2.4.2p2
-PORTREVISION?=	1
+PORTVERSION=	2.4.3b1
+PORTREVISION?=	0
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	amanda
@@ -16,8 +16,8 @@ DISTFILES=	amanda-${PORTVERSION}${EXTRACT_SUFX}
 MAINTAINER=	jeh@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/amanda-${PORTVERSION}
-SLAVEDIRS=	misc/amanda24-client
-MASTERPORTNAME=	amanda24-server
+SLAVEDIRS=	misc/amanda-client
+MASTERPORTNAME=	amanda-server
 
 NO_LATEST_LINK=	yes
 USE_GMAKE=	yes
@@ -27,7 +27,7 @@ LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 PATCH_STRIP=
 
 .include <bsd.port.pre.mk>
-# amanda24-server part
+# amanda-server part
 .if !defined(CLIENT_ONLY)
 
 pre-fetch:
@@ -46,8 +46,8 @@ pre-fetch:
 	@${ECHO} "        The default is user"
 	@${ECHO} ""
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda24-client
-BUILD_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda24-client
+RUN_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client
+BUILD_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client
 
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
@@ -101,7 +101,7 @@ PLIST_SUB+=	SCSICHG=''
 PLIST_SUB+=	SCSICHG='@comment '
 .endif
 
-# amanda24-client part
+# amanda-client part
 .else
 
 pre-fetch:
diff --git a/misc/amanda26-server/distinfo b/misc/amanda26-server/distinfo
index 172b9ac175b6..0a10eaeeff2c 100644
--- a/misc/amanda26-server/distinfo
+++ b/misc/amanda26-server/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.2p2.tar.gz) = f8f66a5a86df588f467db9997cce6764
+MD5 (amanda-2.4.3b1.tar.gz) = 97eb282d51c820f138d62492d7fffcd0
diff --git a/misc/amanda26-server/files/patch-ab b/misc/amanda26-server/files/patch-ab
index 92690f794cad..4f6bc0ca5d58 100644
--- a/misc/amanda26-server/files/patch-ab
+++ b/misc/amanda26-server/files/patch-ab
@@ -1,12 +1,12 @@
---- common-src/Makefile.in.orig	Fri Jan 26 14:28:17 2001
-+++ common-src/Makefile.in	Thu Feb  8 06:51:25 2001
-@@ -481,7 +481,8 @@
- check: check-am
- installcheck-am:
- installcheck: installcheck-am
+--- common-src/Makefile.in	Fri Nov 30 11:33:48 2001
++++ common-src/Makefile.in.new	Fri Nov 30 18:03:29 2001
+@@ -611,7 +611,8 @@
+ 
+ install-data-am:
+ 
 -install-exec-am: install-libLTLIBRARIES
 +@WANT_CLIENT_TRUE@install-exec-am: @WANT_CLIENT_TRUE@install-libLTLIBRARIES
 +@WANT_SERVER_TRUE@install-exec-am:
- install-exec: install-exec-am
  
- install-data-am:
+ install-info:
+ 
diff --git a/misc/amanda26-server/files/patch-ac b/misc/amanda26-server/files/patch-ac
index f7e9751971fa..aa763df6c0ef 100644
--- a/misc/amanda26-server/files/patch-ac
+++ b/misc/amanda26-server/files/patch-ac
@@ -1,12 +1,15 @@
---- tape-src/Makefile.in.orig	Fri Jan 26 14:28:19 2001
-+++ tape-src/Makefile.in	Sun Feb 11 21:18:00 2001
-@@ -353,7 +353,8 @@
- check: check-am
- installcheck-am:
- installcheck: installcheck-am
--install-exec-am: install-libLTLIBRARIES
-+@WANT_CLIENT_TRUE@install-exec-am: @WANT_CLIENT_TRUE@install-libLTLIBRARIES
-+@WANT_SERVER_TRUE@install-exec-am:
- install-exec: install-exec-am
+--- tape-src/Makefile.in	Fri Nov 30 11:33:56 2001
++++ tape-src/Makefile.in.new	Fri Nov 30 18:16:35 2001
+@@ -524,7 +524,11 @@
  
  install-data-am:
+ 
+-install-exec-am: install-libLTLIBRARIES install-sbinPROGRAMS
++@WANT_CLIENT_TRUE@install-exec-am: @WANT_CLIENT_TRUE@install-libLTLIBRARIES \
++	install-sbinPROGRAMS
++	@$(NORMAL_INSTALL)
++	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
++@WANT_SERVER_TRUE@install-exec-am: install-sbinPROGRAMS
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+