6 files changed, 11 insertions, 117 deletions
diff --git a/sysutils/amanda-plot/Makefile b/sysutils/amanda-plot/Makefile
index 957ef6e3e24..d7bd6e4484e 100644
--- a/sysutils/amanda-plot/Makefile
+++ b/sysutils/amanda-plot/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2012/07/30 07:05:54 sbd Exp $
+# $NetBSD: Makefile,v 1.31 2012/07/30 07:21:11 sbd Exp $
 #
 
 PKGNAME=		amanda-plot-${AMANDA_VERSION}
-PKGREVISION=		1
 SVR4_PKGNAME=		amapl
 
 COMMENT=		Visualizes the behavior of Amanda, a network backup system
@@ -12,6 +11,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 DEPENDS+=		gnuplot>=3.7:../../graphics/gnuplot
 DEPENDS+=		amanda-server-${AMANDA_VERSION}{,nb[0-9]*}:../../sysutils/amanda-server
 
+MANPAGES+=		amplot.8
+
 .include "../../sysutils/amanda-common/Makefile.common"
 
 FIND_PREFIX:=		GNUPLOT_PREFIX=gnuplot
@@ -22,4 +23,6 @@ CONFIGURE_ARGS+=	--without-restore
 CONFIGURE_ARGS+=	--without-amrecover
 CONFIGURE_ENV+=		GNUPLOT="${GNUPLOT_PREFIX}/bin/gnuplot"
 
+BUILD_DIRS=		amplot
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/amanda-plot/PLIST b/sysutils/amanda-plot/PLIST
index 0d33d2b4d1e..5cba194d4ac 100644
--- a/sysutils/amanda-plot/PLIST
+++ b/sysutils/amanda-plot/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:52:49 zuntum Exp $
-libexec/amcat.awk
-libexec/amplot.awk
-libexec/amplot.g
-libexec/amplot.gp
-man/man8/amplot.8
+@comment $NetBSD: PLIST,v 1.2 2012/07/30 07:21:11 sbd Exp $
+libexec/amanda/amcat.awk
+libexec/amanda/amplot.awk
+libexec/amanda/amplot.g
+libexec/amanda/amplot.gp
 sbin/amplot
+man/man8/amplot.8
diff --git a/sysutils/amanda-plot/distinfo b/sysutils/amanda-plot/distinfo
deleted file mode 100644
index 0225bcb09b6..00000000000
--- a/sysutils/amanda-plot/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.9 2008/02/15 16:23:09 gdt Exp $
-
-SHA1 (amanda-2.5.2p1.tar.gz) = 0969376590a93b2c060dbe9d2573bf335614a4c2
-RMD160 (amanda-2.5.2p1.tar.gz) = 31a81a7c5c0d953a6dffa575a7c3edc14d41f236
-Size (amanda-2.5.2p1.tar.gz) = 1967240 bytes
-SHA1 (patch-aa) = 7b041da3d60634c0741cb19a2ea296dfcdb88601
-SHA1 (patch-ab) = 33c7b2c3dbc21bd1fcfa490b0e9bb9fccaedb70c
-SHA1 (patch-ac) = 066c93eeaba931cb04040f3f6859ffc7b9c81f29
diff --git a/sysutils/amanda-plot/patches/patch-aa b/sysutils/amanda-plot/patches/patch-aa
deleted file mode 100644
index b0fb4e99cec..00000000000
--- a/sysutils/amanda-plot/patches/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2008/02/15 16:23:09 gdt Exp $
-
---- configure.orig	2008-02-08 16:34:38.000000000 -0500
-+++ configure
-@@ -13538,7 +13538,10 @@ echo $ECHO_N "checking SSH options... $E
-     # now convert that to a comma-separated list of C strings
-     eval "set dummy ${SSH_OPTIONS}"; shift
-     SSH_OPTIONS=''
--    for i in "${@}"; do SSH_OPTIONS="${SSH_OPTIONS}${SSH_OPTIONS:+, }\"${i/\"/\\\"}\""; done
-+    for i in "${@}"; do
-+	quoted="\"`echo "$i" | sed -e 's/\"/\\\"/'`\""
-+	SSH_OPTIONS="${SSH_OPTIONS}${SSH_OPTIONS:+, }$quoted";
-+     done
-     echo "$as_me:$LINENO: result: $SSH_OPTIONS" >&5
- echo "${ECHO_T}$SSH_OPTIONS" >&6
- 
-@@ -38647,8 +38650,10 @@ fi
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
- 
-+if false ; then
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+fi
- 
- # Prevent multiple expansion
- 
-@@ -62491,7 +62496,7 @@ fi;
- # Check whether --with-xsltproc-flags or --without-xsltproc-flags was given.
- if test "${with_xsltproc_flags+set}" = set; then
-   withval="$with_xsltproc_flags"
--   if test "x$withval" == "xno"; then
-+   if test "x$withval" = "xno"; then
- 	XSLTPROC_FLAGS=''
-     else
- 	if test "x$withval" != "xyes"; then
diff --git a/sysutils/amanda-plot/patches/patch-ab b/sysutils/amanda-plot/patches/patch-ab
deleted file mode 100644
index 0761fd40dc4..00000000000
--- a/sysutils/amanda-plot/patches/patch-ab
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2008/02/15 16:23:09 gdt Exp $
-
---- Makefile.in.orig	2007-06-06 19:22:51.000000000 -0400
-+++ Makefile.in
-@@ -380,21 +380,14 @@ ACINCLUDE_M4_DEPS = $(GNULIB_M4I) $(ACIN
- @WANT_AMPLOT_TRUE@PLOT_SUBDIRS = amplot
- # order is significant, don't change it arbitrarily
- SUBDIRS = \
--	gnulib \
- 	config \
--	common-src \
--	amandad-src \
--	$(TAPE_SUBDIRS) \
- 	$(CLIENT_SUBDIRS) \
--	$(SERVER_SUBDIRS) \
- 	$(RESTORE_SUBDIRS) \
- 	$(RECOVER_SUBDIRS) \
- 	$(PLOT_SUBDIRS) \
--	man docs example
-+	man
- 
--pkgdata_DATA = \
--	ReleaseNotes			\
--	COPYRIGHT
-+pkgdata_DATA =
- 
- EXTRA_DIST = $(SNAPSHOT_STAMP) \
- 	$(pkgdata_DATA)			\
-@@ -775,7 +768,7 @@ install-data: install-data-recursive
- uninstall: uninstall-recursive
- 
- install-am: all-am
--	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am
- 
- installcheck: installcheck-recursive
- install-strip:
diff --git a/sysutils/amanda-plot/patches/patch-ac b/sysutils/amanda-plot/patches/patch-ac
deleted file mode 100644
index d96a6e6d482..00000000000
--- a/sysutils/amanda-plot/patches/patch-ac
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ac,v 1.8 2008/02/15 16:23:09 gdt Exp $
-
---- man/Makefile.in.orig	2007-06-06 19:22:52.000000000 -0400
-+++ man/Makefile.in
-@@ -373,19 +373,10 @@ SERVER_MAN8_PAGES = amadmin.8 \
- #endif
- @WANT_RECOVER_TRUE@RECOVER_MAN8_PAGES = amrecover.8
- @WANT_RESTORE_TRUE@RESTORE_MAN8_PAGES = amrestore.8
--man8_pages = $(COMMON_MAN8_PAGES) \
--	    $(AMPLOT_MAN8_PAGES) \
--	    $(SERVER_MAN8_PAGES) \
--	    $(RECOVER_MAN8_PAGES) \
--	    $(RESTORE_MAN8_PAGES)
--
--man5_pages = $(COMMON_MAN5_PAGES)
--ALL_MAN_PAGES = $(AMPLOT_MAN8_PAGES) \
--	   $(COMMON_MAN5_PAGES) \
--	   $(COMMON_MAN8_PAGES) \
--	   $(SERVER_MAN8_PAGES) \
--	   $(RECOVER_MAN8_PAGES) \
--	   $(RESTORE_MAN8_PAGES)
-+man8_pages = $(AMPLOT_MAN8_PAGES)
-+
-+man5_pages =
-+ALL_MAN_PAGES = $(AMPLOT_MAN8_PAGES)
- 
- 
- # These lines are needed to force automake to set the $man<n>dir variables.