aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeh <jeh@FreeBSD.org>2001-12-03 21:18:46 +0800
committerjeh <jeh@FreeBSD.org>2001-12-03 21:18:46 +0800
commita5e21e6bf31f8d2378d2c1bb96dafb6128769a5b (patch)
tree6e8a2901a7046d50d8de35874c3a9f5f93f4ae61
parent7de6fe6f24c59f1d6e1a6dc43498e99117658ce0 (diff)
downloadfreebsd-ports-gnome-a5e21e6bf31f8d2378d2c1bb96dafb6128769a5b.tar.gz
freebsd-ports-gnome-a5e21e6bf31f8d2378d2c1bb96dafb6128769a5b.tar.zst
freebsd-ports-gnome-a5e21e6bf31f8d2378d2c1bb96dafb6128769a5b.zip
Upgrade amanda to 2.4.3b1.
This is an upgraded repo-copy of amand24-client and amanda24-server, which along with the out dated amanda will be going away. PR: 32419 Submitted by: John Merryweather Cooper <john_m_cooper@yahoo.com> Approved by: jeh
-rw-r--r--misc/Makefile2
-rw-r--r--misc/amanda-client/Makefile4
-rw-r--r--misc/amanda-server/Makefile16
-rw-r--r--misc/amanda-server/distinfo2
-rw-r--r--misc/amanda-server/files/patch-ab16
-rw-r--r--misc/amanda-server/files/patch-ac23
-rw-r--r--misc/amanda25-client/Makefile4
-rw-r--r--misc/amanda25-server/Makefile16
-rw-r--r--misc/amanda25-server/distinfo2
-rw-r--r--misc/amanda25-server/files/patch-ab16
-rw-r--r--misc/amanda25-server/files/patch-ac23
-rw-r--r--misc/amanda26-client/Makefile4
-rw-r--r--misc/amanda26-server/Makefile16
-rw-r--r--misc/amanda26-server/distinfo2
-rw-r--r--misc/amanda26-server/files/patch-ab16
-rw-r--r--misc/amanda26-server/files/patch-ac23
-rw-r--r--misc/amanda32-client/Makefile4
-rw-r--r--misc/amanda32-server/Makefile16
-rw-r--r--misc/amanda32-server/distinfo2
-rw-r--r--misc/amanda32-server/files/patch-ab16
-rw-r--r--misc/amanda32-server/files/patch-ac23
21 files changed, 130 insertions, 116 deletions
diff --git a/misc/Makefile b/misc/Makefile
index ecc266e671c4..6b9035a376da 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -14,6 +14,8 @@
SUBDIR += afbackup-server
SUBDIR += alevt
SUBDIR += amanda
+ SUBDIR += amanda-client
+ SUBDIR += amanda-server
SUBDIR += amanda24-client
SUBDIR += amanda24-server
SUBDIR += argparse
diff --git a/misc/amanda-client/Makefile b/misc/amanda-client/Makefile
index b628acef5816..16388333d255 100644
--- a/misc/amanda-client/Makefile
+++ b/misc/amanda-client/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= ${MASTERPORTNAME:S/-server/-client/g}
-PORTREVISION= 1
+PORTREVISION= 0
-MASTERDIR= ${.CURDIR}/../amanda24-server
+MASTERDIR= ${.CURDIR}/../amanda-server
COMMENT= ${PKGDIR}/pkg-comment.client
PKGINSTALL= mustnotexist
PLIST= ${PKGDIR}/pkg-plist.client
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index f36ae4febe2c..18d5e310128e 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-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/amanda-server/distinfo b/misc/amanda-server/distinfo
index 172b9ac175b6..0a10eaeeff2c 100644
--- a/misc/amanda-server/distinfo
+++ b/misc/amanda-server/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.2p2.tar.gz) = f8f66a5a86df588f467db9997cce6764
+MD5 (amanda-2.4.3b1.tar.gz) = 97eb282d51c820f138d62492d7fffcd0
diff --git a/misc/amanda-server/files/patch-ab b/misc/amanda-server/files/patch-ab
index 92690f794cad..4f6bc0ca5d58 100644
--- a/misc/amanda-server/files/patch-ab
+++ b/misc/amanda-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/amanda-server/files/patch-ac b/misc/amanda-server/files/patch-ac
index f7e9751971fa..aa763df6c0ef 100644
--- a/misc/amanda-server/files/patch-ac
+++ b/misc/amanda-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
+
diff --git a/misc/amanda25-client/Makefile b/misc/amanda25-client/Makefile
index b628acef5816..16388333d255 100644
--- a/misc/amanda25-client/Makefile
+++ b/misc/amanda25-client/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= ${MASTERPORTNAME:S/-server/-client/g}
-PORTREVISION= 1
+PORTREVISION= 0
-MASTERDIR= ${.CURDIR}/../amanda24-server
+MASTERDIR= ${.CURDIR}/../amanda-server
COMMENT= ${PKGDIR}/pkg-comment.client
PKGINSTALL= mustnotexist
PLIST= ${PKGDIR}/pkg-plist.client
diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile
index f36ae4febe2c..18d5e310128e 100644
--- a/misc/amanda25-server/Makefile
+++ b/misc/amanda25-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/amanda25-server/distinfo b/misc/amanda25-server/distinfo
index 172b9ac175b6..0a10eaeeff2c 100644
--- a/misc/amanda25-server/distinfo
+++ b/misc/amanda25-server/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.2p2.tar.gz) = f8f66a5a86df588f467db9997cce6764
+MD5 (amanda-2.4.3b1.tar.gz) = 97eb282d51c820f138d62492d7fffcd0
diff --git a/misc/amanda25-server/files/patch-ab b/misc/amanda25-server/files/patch-ab
index 92690f794cad..4f6bc0ca5d58 100644
--- a/misc/amanda25-server/files/patch-ab
+++ b/misc/amanda25-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/amanda25-server/files/patch-ac b/misc/amanda25-server/files/patch-ac
index f7e9751971fa..aa763df6c0ef 100644
--- a/misc/amanda25-server/files/patch-ac
+++ b/misc/amanda25-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
+
diff --git a/misc/amanda26-client/Makefile b/misc/amanda26-client/Makefile
index b628acef5816..16388333d255 100644
--- a/misc/amanda26-client/Makefile
+++ b/misc/amanda26-client/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= ${MASTERPORTNAME:S/-server/-client/g}
-PORTREVISION= 1
+PORTREVISION= 0
-MASTERDIR= ${.CURDIR}/../amanda24-server
+MASTERDIR= ${.CURDIR}/../amanda-server
COMMENT= ${PKGDIR}/pkg-comment.client
PKGINSTALL= mustnotexist
PLIST= ${PKGDIR}/pkg-plist.client
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
+
diff --git a/misc/amanda32-client/Makefile b/misc/amanda32-client/Makefile
index b628acef5816..16388333d255 100644
--- a/misc/amanda32-client/Makefile
+++ b/misc/amanda32-client/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= ${MASTERPORTNAME:S/-server/-client/g}
-PORTREVISION= 1
+PORTREVISION= 0
-MASTERDIR= ${.CURDIR}/../amanda24-server
+MASTERDIR= ${.CURDIR}/../amanda-server
COMMENT= ${PKGDIR}/pkg-comment.client
PKGINSTALL= mustnotexist
PLIST= ${PKGDIR}/pkg-plist.client
diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile
index f36ae4febe2c..18d5e310128e 100644
--- a/misc/amanda32-server/Makefile
+++ b/misc/amanda32-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/amanda32-server/distinfo b/misc/amanda32-server/distinfo
index 172b9ac175b6..0a10eaeeff2c 100644
--- a/misc/amanda32-server/distinfo
+++ b/misc/amanda32-server/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.2p2.tar.gz) = f8f66a5a86df588f467db9997cce6764
+MD5 (amanda-2.4.3b1.tar.gz) = 97eb282d51c820f138d62492d7fffcd0
diff --git a/misc/amanda32-server/files/patch-ab b/misc/amanda32-server/files/patch-ab
index 92690f794cad..4f6bc0ca5d58 100644
--- a/misc/amanda32-server/files/patch-ab
+++ b/misc/amanda32-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/amanda32-server/files/patch-ac b/misc/amanda32-server/files/patch-ac
index f7e9751971fa..aa763df6c0ef 100644
--- a/misc/amanda32-server/files/patch-ac
+++ b/misc/amanda32-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
+