update to 0.90.7.1 which includes patches from the author to deal with

gcc-3.3 properly

XXX this interim version does not include the demo files, they should
be re-instated when 0.91 comes out.

6 files changed, 13 insertions, 127 deletions

diff --git a/graphics/xplot/Makefile b/graphics/xplot/Makefile
index 16a4e40cbf5..de490399bf2 100644
--- a/graphics/xplot/Makefile
+++ b/graphics/xplot/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2003/07/21 16:51:54 martti Exp $
+# $NetBSD: Makefile,v 1.16 2003/09/27 02:27:47 dan Exp $
 #
 
-DISTNAME=	xplot-0.90
+DISTNAME=	xplot-0.90.7.1
 CATEGORIES=	graphics x11
-MASTER_SITES=	ftp://mercury.lcs.mit.edu/pub/shep/
+MASTER_SITES=	http://www.xplot.org/xplot/
+HOMEPAGE=	http://www.xplot.org/
 
 MAINTAINER=	thorpej@NetBSD.org
 COMMENT=	Plotting program, most often used in conjunction with tcptrace
@@ -11,8 +12,9 @@ COMMENT=	Plotting program, most often used in conjunction with tcptrace
 USE_X11BASE=	yes
 GNU_CONFIGURE=	yes
 
-DOCFILES=	ANNOUNCE README README.tcp_plots demo.0 demo.1 demo.2 \
-		demo.3 demo.4 demo.5 demo.6 demo.7
+DOCFILES=	ANNOUNCE README README.tcp_plots 
+# demo.? removed from interim .7.1 version
+#		demo.0 demo.1 demo.2 demo.3 demo.4 demo.5 demo.6 demo.7
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xplot
diff --git a/graphics/xplot/PLIST b/graphics/xplot/PLIST
index df91f884d27..d11c5289a8b 100644
--- a/graphics/xplot/PLIST
+++ b/graphics/xplot/PLIST
@@ -1,15 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:54:45 zuntum Exp $
-bin/tcpdump2xplot.pl
+@comment $NetBSD: PLIST,v 1.2 2003/09/27 02:27:47 dan Exp $
+bin/tcpdump2xplot
 bin/xplot
 share/doc/xplot/ANNOUNCE
 share/doc/xplot/README
 share/doc/xplot/README.tcp_plots
-share/doc/xplot/demo.0
-share/doc/xplot/demo.1
-share/doc/xplot/demo.2
-share/doc/xplot/demo.3
-share/doc/xplot/demo.4
-share/doc/xplot/demo.5
-share/doc/xplot/demo.6
-share/doc/xplot/demo.7
 @dirrm share/doc/xplot
diff --git a/graphics/xplot/distinfo b/graphics/xplot/distinfo
index 25094569bc4..4cb636642da 100644
--- a/graphics/xplot/distinfo
+++ b/graphics/xplot/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.3 2001/08/01 20:56:30 he Exp $
+$NetBSD: distinfo,v 1.4 2003/09/27 02:27:47 dan Exp $
 
-SHA1 (xplot-0.90.tar.gz) = 8d20e356eb767cecf428edb1140934bc423cd33c
-Size (xplot-0.90.tar.gz) = 217521 bytes
-SHA1 (patch-aa) = 12ae7dc50504201034f47e70798f41aa8dc769f6
-SHA1 (patch-ab) = 94fb5f8b5483fcc5922b619bcf0b08a682bd12c1
+SHA1 (xplot-0.90.7.1.tar.gz) = 164074206addaeb971d2fa65069c7c7be654efc5
+Size (xplot-0.90.7.1.tar.gz) = 60166 bytes
+SHA1 (patch-aa) = 18fbbe4adc3acc2f42ac8a943a758f392bdec20c
 SHA1 (patch-ac) = 671b63a8db7c41df4e9f14147988d81ff921aca7
 SHA1 (patch-ad) = fd19823030badf91734fde92b45fcaecc06cf0f8
-SHA1 (patch-ae) = 782339f6118df2c64a852921e30c620b584c08b8
diff --git a/graphics/xplot/patches/patch-aa b/graphics/xplot/patches/patch-aa
deleted file mode 100644
index c7b4ce5a93a..00000000000
--- a/graphics/xplot/patches/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.5 1999/09/15 16:13:24 drochner Exp $
---- Makefile.in.orig	Mon Aug 18 21:12:14 1997
-+++ Makefile.in	Wed Sep 15 18:00:31 1999
-@@ -38,6 +38,7 @@
- 
- CC= @CC@
- CFLAGS=@CFLAGS@ ${DEFINES}
-+LDFLAGS=@LDFLAGS@
- LIBS= @LIBS@
- 
- INSTALL = @INSTALL@
-@@ -58,7 +59,7 @@
- all:	${PROG}
- 
- ${PROG}: ${OFILES}
--	${CC} ${CFLAGS} -o $@.new ${OFILES} ${LIBS}
-+	${CC} ${LDFLAGS} -o $@.new ${OFILES} ${LIBS}
- 	-mv -f $@ $@.old
- 	mv -f $@.new $@
- 
-@@ -67,6 +68,7 @@
- 
- install: all
- 	$(INSTALL_PROGRAM) xplot $(bindir)/xplot
-+	$(BSD_INSTALL_SCRIPT) tcpdump2xplot.pl $(bindir)/tcpdump2xplot.pl
- 
- clean:
- 	rm -f ${PROG} ${PROG}.old *.o version_string.c
diff --git a/graphics/xplot/patches/patch-ab b/graphics/xplot/patches/patch-ab
deleted file mode 100644
index 49917429d17..00000000000
--- a/graphics/xplot/patches/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ab,v 1.4 1999/01/29 20:19:22 tron Exp $
-
---- tcpdump2xplot.pl.orig	Sun Dec 14 00:45:49 1997
-+++ tcpdump2xplot.pl	Sun Dec 14 00:45:56 1997
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/env perl
- # -*- Perl -*-
- #
- # Copyright 1996 Massachusetts Institute of Technology
diff --git a/graphics/xplot/patches/patch-ae b/graphics/xplot/patches/patch-ae
deleted file mode 100644
index 683c3498bb0..00000000000
--- a/graphics/xplot/patches/patch-ae
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2001/08/01 20:56:30 he Exp $
-
---- xplot.c.orig	Wed Jul  2 22:26:09 1997
-+++ xplot.c
-@@ -842,38 +842,39 @@
-     /* Allocate some color cells */
-       
-     if (d_i[d].virgin ) {
-+      int default_depth;
-+      int default_screen;
-+      int default_cmap;
-+      XVisualInfo visual_info;
-+
-       d_i[d].virgin = 0;
-       
-       d_i[d].xplot_nagle_atom = XInternAtom(pl->dpy, "XPLOT_NAGLE", False);
- 
--      d_i[d].clr_map = DefaultColormap(pl->dpy, DefaultScreen(pl->dpy));
-+      default_screen = ScreenNumberOfScreen(pl->screen);
-+      default_depth = DefaultDepth(pl->dpy, default_screen);
-+      default_cmap = DefaultColormap(pl->dpy, default_screen);
-       
--      if ( option_mono ||
-+      i = DirectColor;
-+      while (!XMatchVisualInfo(pl->dpy, default_screen, default_depth,
-+			       i--, &visual_info))
-+	;
- 
--	   ! XAllocColorCells(pl->dpy, 
--			      d_i[d].clr_map, 0,
--			      &d_i[d].line_plane_mask, 1,
--			      d_i[d].pixel, NColors) )
--	{
--	  /* probably only one bit plane, or all the color cells are taken */
--#if 1
--	  if (! option_mono)
--	    fputs("XAllocColorCells failed, will only have one plot color\n",
--		  stderr);
--#endif
--	  for ( i = 0; i < NColors; i++) {
--	    d_i[d].Colors[i] = WhitePixelOfScreen(pl->screen);
--	  }
--	} else {
--	  for (i = 0; i < NColors; i++)  {
--	    XParseColor(pl->dpy, d_i[d].clr_map, ColorNames[i], &d_i[d].clr);
--	    d_i[d].clr.pixel = d_i[d].pixel[i];
--	    XStoreColor (pl->dpy, d_i[d].clr_map, &d_i[d].clr);
--	    d_i[d].clr.pixel |= d_i[d].line_plane_mask;
--	    XStoreColor (pl->dpy, d_i[d].clr_map, &d_i[d].clr);
--	    d_i[d].Colors[i] = d_i[d].clr.pixel;
-+      if (i < StaticColor || option_mono) {
-+      mono:
-+	for ( i = 0; i < NColors; i++) {
-+	  d_i[d].Colors[i] = WhitePixelOfScreen(pl->screen);
-+	}
-+      } else {
-+	for (i = 0; i < NColors; i++)  {
-+	  XParseColor(pl->dpy, default_cmap, ColorNames[i], &d_i[d].clr);
-+	  if (!XAllocColor(pl->dpy, default_cmap, &d_i[d].clr)) {
-+	    fprintf(stderr, "XAllocColor failed, reverting to monochrome\n");
-+	    goto mono;
- 	  }
-+	  d_i[d].Colors[i] = d_i[d].clr.pixel;
- 	}
-+      }
-     }
-     
-     for (i = 0; i < NColors; i++) {