Unbreak and update to 2.4.1. Now builds (with stubbed out chio functions) under CAM. Fixes for ELF and CAM RSN.

5 files changed, 103 insertions, 17 deletions

diff --git a/misc/amanda26-client/Makefile b/misc/amanda26-client/Makefile
index 153bdd867456..51cc27b203ba 100644
--- a/misc/amanda26-client/Makefile
+++ b/misc/amanda26-client/Makefile
@@ -3,10 +3,10 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.18 1998/06/29 06:42:09 cwt Exp $
+# $Id: Makefile,v 1.19 1998/08/25 02:28:37 asami Exp $
 #
 
-DISTNAME=	amanda-2.4.0p1
+DISTNAME=	amanda-2.4.1
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.amanda.org/pub/amanda/
 
@@ -15,9 +15,7 @@ MAINTAINER=	cwt@FreeBSD.ORG
 BUILD_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 
-BROKEN=		gtk11.m4
-
-WRKSRC=		${WRKDIR}/amanda-2.4.0p1
+WRKSRC=		${WRKDIR}/amanda-2.4.1
 NO_LATEST_LINK=	yes
 GNU_CONFIGURE=  yes
 CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \
@@ -27,13 +25,14 @@ CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \
 PATCH_STRIP=
 MAN8=		amadmin.8 amanda.8 amcheck.8 amcheckdb.8 amcleanup.8 \
 		amdump.8 amflush.8 amlabel.8 amoverview.8 amplot.8 \
-		amrecover.8 amrestore.8 amrmtape.8 amtape.8 amtoc.8 \
-		amverify.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
 
diff --git a/misc/amanda26-client/distinfo b/misc/amanda26-client/distinfo
index 1716520a266c..30c20edd94dc 100644
--- a/misc/amanda26-client/distinfo
+++ b/misc/amanda26-client/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.4.0p1.tar.gz) = bda875acd382ea92cfaf7750ce8ce7bd
+MD5 (amanda-2.4.1.tar.gz) = b9dac72b8b166f110977ecee8182fdcc
diff --git a/misc/amanda26-client/files/patch-ae b/misc/amanda26-client/files/patch-ae
new file mode 100644
index 000000000000..62ea9e28e154
--- /dev/null
+++ b/misc/amanda26-client/files/patch-ae
@@ -0,0 +1,18 @@
+--- config/config.h.in	Thu Aug 27 11:43:52 1998
++++ config/config.h.in	Sun Sep  6 11:38:27 1998
+@@ -1,4 +1,4 @@
+-/* config/config.h.in.  Generated automatically from configure.in by autoheader.  */
++/* config/config.h.in.  Generated automatically from ../configure.in by autoheader.  */
+ #ifndef _CONFIG_H
+ #define _CONFIG_H
+ 
+@@ -360,6 +360,9 @@
+ 
+ /* Define if you have the <arpa/inet.h> header file.  */
+ #undef HAVE_ARPA_INET_H
++
++/* Define if you have the <camlib.h> header file.  */
++#undef HAVE_CAMLIB_H
+ 
+ /* Define if you have the <chio.h> header file.  */
+ #undef HAVE_CHIO_H
diff --git a/misc/amanda26-client/files/patch-af b/misc/amanda26-client/files/patch-af
new file mode 100644
index 000000000000..272d5133ca48
--- /dev/null
+++ b/misc/amanda26-client/files/patch-af
@@ -0,0 +1,68 @@
+--- changer-src/scsi-chio.c	Tue Jul  7 21:04:04 1998
++++ changer-src/scsi-chio.c	Sat Sep 12 16:11:21 1998
+@@ -114,6 +114,38 @@
+ }
+ 
+ 
++#if defined(__FreeBSD__) && defined(HAVE_CAMLIB_H)
++#warning "CHIO TAPE CHANGER FUNCTIONS UNIMPLEMENTED FOR FREEBSD CAM"
++#warning "Code will work fine if you aren't running a changer."
++int isempty(int fd, int slot)
++{
++struct changer_element_status  ces;
++int                            i,rc;
++int type=CHET_ST;
++
++return 0;
++}
++
++int find_empty(int fd)
++{
++struct changer_element_status  ces;
++int                            i,rc;
++int type=CHET_ST;
++
++return 0;
++}
++
++int drive_loaded(int fd, int drivenum)
++{
++struct changer_element_status  ces;
++int                            i,rc;
++int type=CHET_DT;
++
++return 0;
++}
++
++#else
++
+ /* 
+  * this routine checks a specified slot to see if it is empty 
+  */
+@@ -141,6 +173,8 @@
+     return !i;
+ }
+ 
++
++
+ /*
+  * find the first empty slot 
+  */
+@@ -169,6 +203,8 @@
+     return i;
+ }
+ 
++
++
+ /*
+  * returns one if there is a tape loaded in the drive 
+  */
+@@ -195,7 +231,7 @@
+     free(ces.ces_data);
+     return i;
+ }
+-
++#endif
+ 
+ /*
+  * unloads the drive, putting the tape in the specified slot 
diff --git a/misc/amanda26-client/pkg-plist b/misc/amanda26-client/pkg-plist
index 4443edfd6ad0..c754eeee2b12 100644
--- a/misc/amanda26-client/pkg-plist
+++ b/misc/amanda26-client/pkg-plist
@@ -1,23 +1,19 @@
 lib/libamanda.a
 lib/libamanda.la
 lib/libamanda.so
-lib/libamanda.so.5.0
+lib/libamanda.so.6.0
 lib/libamclient.a
 lib/libamclient.la
 lib/libamclient.so
-lib/libamclient.so.0.4
-lib/libamnolog.a
-lib/libamnolog.la
-lib/libamnolog.so
-lib/libamnolog.so.0.0
+lib/libamclient.so.0.5
 lib/libamserver.a
 lib/libamserver.la
 lib/libamserver.so
-lib/libamserver.so.3.0
+lib/libamserver.so.4.0
 lib/libamtape.a
 lib/libamtape.la
 lib/libamtape.so
-lib/libamtape.so.1.1
+lib/libamtape.so.2.0
 @exec /sbin/ldconfig -m %B
 @unexec /sbin/ldconfig -R
 libexec/amanda/amandad
@@ -35,12 +31,14 @@ libexec/amanda/chg-manual
 libexec/amanda/chg-mtx
 libexec/amanda/chg-multi
 libexec/amanda/chg-rth
+libexec/amanda/chg-scsi
+libexec/amanda/chg-zd-mtx
 libexec/amanda/driver
 libexec/amanda/dumper
 libexec/amanda/getconf
+libexec/amanda/killpgrp
 libexec/amanda/patch-system
 libexec/amanda/planner
-libexec/amanda/reporter
 libexec/amanda/rundump
 libexec/amanda/runtar
 libexec/amanda/selfcheck
@@ -58,13 +56,16 @@ sbin/amlabel
 sbin/amoverview
 sbin/amplot
 sbin/amrecover
+sbin/amreport
 sbin/amrestore
 sbin/amrmtape
+sbin/amstatus
 sbin/amtape
 sbin/amtoc
 sbin/amverify
 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 libexec/amanda