Adapt to use pkg version of libtool rather than amanda's private copy.

3 files changed, 75 insertions, 61 deletions

diff --git a/misc/amanda/Makefile b/misc/amanda/Makefile
index 9338203111d..483c70904e0 100644
--- a/misc/amanda/Makefile
+++ b/misc/amanda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1998/07/15 10:37:09 agc Exp $
+# $NetBSD: Makefile,v 1.15 1998/07/18 14:39:40 tv Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
 #
 
@@ -8,6 +8,7 @@ MASTER_SITES=		ftp://ftp.cs.umd.edu/pub/amanda/
 
 MAINTAINER=		packages@netbsd.org
 
+BUILD_DEPENDS=		${PREFIX}/bin/libtool:../../devel/libtool
 DEPENDS+=		readline-2.2:../../devel/readline
 DEPENDS+=		addnerd-1.5:../../sysutils/addnerd
 DEPENDS+=		gnuplot-3.5:../../graphics/gnuplot
@@ -17,10 +18,10 @@ AMANDA_USER?=		backup
 AMANDA_GROUP=		operator
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP}
-CONFIGURE_ARGS+=	--with-mmap
-MAKE_ENV+=		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
-CONFIGURE_ENV+=		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+CONFIGURE_ARGS+=	--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \
+			--with-mmap
+CONFIGURE_ENV+=		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
+			LIBTOOL=${PREFIX}/bin/libtool
 
 pre-install:
 	@${SETENV} ${MAKE_ENV} addnerd -g ${AMANDA_GROUP} ${AMANDA_USER}
diff --git a/misc/amanda/patches/patch-ab b/misc/amanda/patches/patch-ab
new file mode 100644
index 00000000000..91df82f43af
--- /dev/null
+++ b/misc/amanda/patches/patch-ab
@@ -0,0 +1,18 @@
+--- configure.orig	Sat Jul 18 10:34:33 1998
++++ configure	Sat Jul 18 10:35:03 1998
+@@ -4204,6 +4204,7 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
++if false; then
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ 
+@@ -4249,6 +4250,7 @@
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
+ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
++fi
+ 
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
diff --git a/misc/amanda/pkg/PLIST b/misc/amanda/pkg/PLIST
index 6cf9df5656f..4ab2c8839fc 100644
--- a/misc/amanda/pkg/PLIST
+++ b/misc/amanda/pkg/PLIST
@@ -1,75 +1,70 @@
-@comment $NetBSD: PLIST,v 1.6 1998/07/15 10:37:10 agc Exp $
+@comment $NetBSD: PLIST,v 1.7 1998/07/18 14:39:41 tv Exp $
 lib/libamanda.a
 lib/libamanda.so.5.0
-lib/libamanda.la
-lib/libamnolog.so.0.0
-lib/libamnolog.la
-lib/libamnolog.a
-lib/libamclient.so.0.4
-lib/libamclient.la
 lib/libamclient.a
-lib/libamtape.so.1.1
-lib/libamtape.la
-lib/libamtape.a
-lib/libamserver.so.3.0
-lib/libamserver.la
+lib/libamclient.so.0.4
+lib/libamnolog.a
+lib/libamnolog.so.0.0
 lib/libamserver.a
-libexec/versionsuffix
+lib/libamserver.so.3.0
+lib/libamtape.a
+lib/libamtape.so.1.1
 libexec/amandad
-libexec/calcsize
-libexec/rundump
-libexec/runtar
-libexec/selfcheck
-libexec/sendsize
-libexec/sendbackup
-libexec/driver
-libexec/patch-system
+libexec/amcat.awk
+libexec/amidxtaped
 libexec/amindexd
+libexec/amplot.awk
+libexec/amplot.g
+libexec/amplot.gp
 libexec/amtrmidx
+libexec/calcsize
+libexec/chg-chio
+libexec/chg-chs
+libexec/chg-manual
+libexec/chg-mtx
+libexec/chg-multi
+libexec/chg-rth
+libexec/driver
 libexec/dumper
 libexec/getconf
+libexec/patch-system
 libexec/planner
 libexec/reporter
+libexec/rundump
+libexec/runtar
+libexec/selfcheck
+libexec/sendbackup
+libexec/sendsize
 libexec/taper
-libexec/amidxtaped
-libexec/chg-chio
-libexec/chg-manual
-libexec/chg-multi
-libexec/chg-mtx
-libexec/chg-rth
-libexec/chg-chs
-libexec/amcat.awk
-libexec/amplot.awk
-libexec/amplot.g
-libexec/amplot.gp
-sbin/amrestore
+libexec/versionsuffix
+man/man8/amadmin.8
+man/man8/amanda.8
+man/man8/amcheck.8
+man/man8/amcheckdb.8
+man/man8/amcleanup.8
+man/man8/amdump.8
+man/man8/amflush.8
+man/man8/amlabel.8
+man/man8/amoverview.8
+man/man8/amplot.8
+man/man8/amrecover.8
+man/man8/amrestore.8
+man/man8/amrmtape.8
+man/man8/amtape.8
+man/man8/amtoc.8
+man/man8/amverify.8
 sbin/amadmin
-sbin/amflush
-sbin/amlabel
 sbin/amcheck
-sbin/amdump
-sbin/amcleanup
-sbin/amtape
 sbin/amcheckdb
+sbin/amcleanup
+sbin/amdump
+sbin/amflush
+sbin/amlabel
 sbin/amoverview
+sbin/amplot
+sbin/amrecover
+sbin/amrestore
 sbin/amrmtape
+sbin/amtape
 sbin/amtoc
 sbin/amverify
-sbin/amrecover
-sbin/amplot
-man/man8/amadmin.8.gz
-man/man8/amcheck.8.gz
-man/man8/amdump.8.gz
-man/man8/amflush.8.gz
-man/man8/amlabel.8.gz
-man/man8/amrestore.8.gz
-man/man8/amtape.8.gz
-man/man8/amanda.8.gz
-man/man8/amcleanup.8.gz
-man/man8/amtoc.8
-man/man8/amcheckdb.8
-man/man8/amoverview.8
-man/man8/amplot.8
-man/man8/amrecover.8
-man/man8/amrmtape.8
-man/man8/amverify.8