Split out amplot into amanda-plot package to get rid of the nasty

dependency on X11 being installed.

5 files changed, 39 insertions, 26 deletions

diff --git a/sysutils/amanda-server/Makefile b/sysutils/amanda-server/Makefile
index 5b19a9eef4d..991a25fda84 100644
--- a/sysutils/amanda-server/Makefile
+++ b/sysutils/amanda-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1999/09/04 01:21:25 bad Exp $
+# $NetBSD: Makefile,v 1.11 1999/09/06 18:16:34 bad Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
 #
 
@@ -11,7 +11,6 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.amanda.org/
 
 DEPENDS+=		readline-4.0:../../devel/readline
-DEPENDS+=		gnuplot-3.7:../../graphics/gnuplot
 DEPENDS+=		amanda-common-2.4.1p1:../../sysutils/amanda-common
 
 USE_X11=		yes
diff --git a/sysutils/amanda-server/patches/patch-aa b/sysutils/amanda-server/patches/patch-aa
index a774d70929e..5def18046b4 100644
--- a/sysutils/amanda-server/patches/patch-aa
+++ b/sysutils/amanda-server/patches/patch-aa
@@ -1,8 +1,25 @@
-$NetBSD: patch-aa,v 1.2 1999/04/04 23:34:46 tron Exp $
+$NetBSD: patch-aa,v 1.3 1999/09/06 18:16:34 bad Exp $
 
---- configure.orig	Sat Jul 18 10:34:33 1998
-+++ configure	Sat Jul 18 10:35:03 1998
-@@ -4204,6 +4204,7 @@
+--- configure.orig	Sat Nov 21 18:12:59 1998
++++ configure	Fri Sep  3 20:08:38 1999
+@@ -2943,6 +2943,7 @@
+ done
+ 
+ 
++if false ;then
+ for ac_prog in gnuplot
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -2978,6 +2979,8 @@
+ 
+ test -n "$GNUPLOT" && break
+ done
++fi
++GNUPLOT=""
+ 
+ if test -z "$GNUPLOT"; then
+     BUILD_AMPLOT_SBIN=
+@@ -4457,6 +4460,7 @@
    echo "$ac_t""no" 1>&6
  fi
  
@@ -10,11 +27,11 @@ $NetBSD: patch-aa,v 1.2 1999/04/04 23:34:46 tron Exp $
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  
-@@ -4249,6 +4250,7 @@
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
+@@ -4502,6 +4506,7 @@
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
  $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
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
diff --git a/sysutils/amanda-server/patches/patch-ac b/sysutils/amanda-server/patches/patch-ac
index 300bee82ba4..7d0a31bb9fb 100644
--- a/sysutils/amanda-server/patches/patch-ac
+++ b/sysutils/amanda-server/patches/patch-ac
@@ -1,13 +1,16 @@
-$NetBSD: patch-ac,v 1.3 1999/09/04 01:19:50 bad Exp $
+$NetBSD: patch-ac,v 1.4 1999/09/06 18:16:34 bad Exp $
 
---- Makefile.in.old	Tue Feb 23 10:37:10 1999
-+++ Makefile.in	Tue Feb 23 10:38:36 1999
-@@ -157,7 +157,7 @@
+--- Makefile.in.orig	Sat Nov 21 18:32:54 1998
++++ Makefile.in	Fri Sep  3 20:09:55 1999
+@@ -157,9 +157,9 @@
  AUTOCONF = @AUTOCONF@ --localdir=config
  
  SUBDIRS=config		\
 -	common-src	client-src	tape-src	\
 +	client-src	\
  	server-src	restore-src	recover-src	\
- 	changer-src	amplot		man		\
+-	changer-src	amplot		man		\
++	changer-src			man		\
  	example
+ 
+ EXTRA_DIST = \
diff --git a/sysutils/amanda-server/patches/patch-ad b/sysutils/amanda-server/patches/patch-ad
index 44d65a66ed1..5144c9c2dbc 100644
--- a/sysutils/amanda-server/patches/patch-ad
+++ b/sysutils/amanda-server/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.3 1999/09/04 01:19:50 bad Exp $
+$NetBSD: patch-ad,v 1.4 1999/09/06 18:16:34 bad Exp $
 
---- man/Makefile.in.old	Tue Feb 23 10:43:23 1999
-+++ man/Makefile.in	Tue Feb 23 10:42:34 1999
+--- man/Makefile.in.orig	Sat Nov 21 18:34:50 1998
++++ man/Makefile.in	Sat Sep  4 03:26:17 1999
 @@ -158,10 +158,10 @@
  
  transform =	s,x,x,;
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.3 1999/09/04 01:19:50 bad Exp $
  		amcheckdb.8	amcleanup.8	amdump.8	\
  		amflush.8	amlabel.8	amoverview.8	\
 -		amplot.8	amrecover.8	amrestore.8	\
-+		amplot.8	amrestore.8	\
++						amrestore.8	\
  		amrmtape.8	amtape.8	amtoc.8		\
  		amverify.8	amstatus.8	amreport.8
  
diff --git a/sysutils/amanda-server/pkg/PLIST b/sysutils/amanda-server/pkg/PLIST
index 741c87fc804..f1774c86438 100644
--- a/sysutils/amanda-server/pkg/PLIST
+++ b/sysutils/amanda-server/pkg/PLIST
@@ -1,12 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 1999/04/04 23:34:47 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 1999/09/06 18:16:35 bad Exp $
 lib/libamserver.a
 lib/libamserver-2.4.1p1.so.0.0
-libexec/amcat.awk
 libexec/amidxtaped
 libexec/amindexd
-libexec/amplot.awk
-libexec/amplot.g
-libexec/amplot.gp
 libexec/amtrmidx
 libexec/chg-scsi
 libexec/chg-zd-mtx
@@ -29,7 +25,6 @@ man/man8/amdump.8
 man/man8/amflush.8
 man/man8/amlabel.8
 man/man8/amoverview.8
-man/man8/amplot.8
 man/man8/amreport.8
 man/man8/amrestore.8
 man/man8/amrmtape.8
@@ -45,7 +40,6 @@ sbin/amdump
 sbin/amflush
 sbin/amlabel
 sbin/amoverview
-sbin/amplot
 sbin/amreport
 sbin/amrestore
 sbin/amrmtape