From dff20603bf9617de4a0fdd08db237e89546d4359 Mon Sep 17 00:00:00 2001
From: Steve Price <steve@FreeBSD.org>
Date: Fri, 10 Dec 1999 19:31:50 +0000
Subject: [PATCH] Fixup MASTER_SITES, one diff per patch, and install example
 data.

PR:		15381
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>
---
 math/xgraph/Makefile       | 10 ++++++++--
 math/xgraph/distinfo       |  2 +-
 math/xgraph/files/patch-ac | 11 +++++++++++
 math/xgraph/files/patch-ad | 14 ++++++++++++++
 math/xgraph/files/patch-ae | 39 ++++++++++++++++++++++++++++++++++++++
 math/xgraph/files/patch-ag | 10 ++++++++++
 math/xgraph/pkg-plist      |  6 ++++++
 7 files changed, 89 insertions(+), 3 deletions(-)
 create mode 100644 math/xgraph/files/patch-ac
 create mode 100644 math/xgraph/files/patch-ad
 create mode 100644 math/xgraph/files/patch-ae
 create mode 100644 math/xgraph/files/patch-ag

diff --git a/math/xgraph/Makefile b/math/xgraph/Makefile
index 1226a7a4cb99..07d03c865005 100644
--- a/math/xgraph/Makefile
+++ b/math/xgraph/Makefile
@@ -6,13 +6,19 @@
 # $FreeBSD$
 #
 
-DISTNAME=	xgraph-11.3.2
+DISTNAME=	xgraph-11
+PKGNAME=	xgraph-11.3.2
 CATEGORIES=	math print
-MASTER_SITES=	${MASTER_SITE_PORTS_JP}
+MASTER_SITES=	ftp://ftp.cs.utoronto.ca/pub/radford/
+EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	sanpei@sanpei.org
 
 USE_IMAKE=	yes
 MAN1=		xgraph.1
 
+post-install:
+	@${MKDIR} ${PREFIX}/share/examples/xgraph
+	${INSTALL_DATA} ${WRKSRC}/examples/*.xg ${PREFIX}/share/examples/xgraph
+
 .include <bsd.port.mk>
diff --git a/math/xgraph/distinfo b/math/xgraph/distinfo
index f2ddcb50d113..291fb681fed9 100644
--- a/math/xgraph/distinfo
+++ b/math/xgraph/distinfo
@@ -1 +1 @@
-MD5 (xgraph-11.3.2.tar.gz) = d717ff190e967465a3785f86fb2b8007
+MD5 (xgraph-11.tar.Z) = 15d78d243f007da88e1732474711e8b9
diff --git a/math/xgraph/files/patch-ac b/math/xgraph/files/patch-ac
new file mode 100644
index 000000000000..41fe9c2d3005
--- /dev/null
+++ b/math/xgraph/files/patch-ac
@@ -0,0 +1,11 @@
+--- xtb.c.orig	Thu Jul 17 04:26:41 1997
++++ xtb.c	Fri Dec 10 03:06:26 1999
+@@ -196,7 +196,7 @@
+ {
+     xtb_data data;
+ 
+-    if (!XFindContext(t_disp, win, h_context, &data)) {
++    if (!XFindContext(t_disp, win, h_context, (XPointer*)&data)) {
+ 	return ((struct h_info *) data)->info;
+     } else {
+ 	return (xtb_data) 0;
diff --git a/math/xgraph/files/patch-ad b/math/xgraph/files/patch-ad
new file mode 100644
index 000000000000..1ef0c3d7a482
--- /dev/null
+++ b/math/xgraph/files/patch-ad
@@ -0,0 +1,14 @@
+--- hpgl.c.orig	Thu Jul 17 03:40:40 1997
++++ hpgl.c	Fri Dec 10 03:07:38 1999
+@@ -11,10 +11,8 @@
+ #include "xgout.h"
+ #include "plotter.h"
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <math.h>
+-#define MAX(a,b) ( ((a)>(b)) ? (a) : (b) )
+-#define MIN(a,b) ( ((a)<(b)) ? (a) : (b) )
+-char *malloc();
+ 
+ static void hpglText();
+ static void hpglSeg();
diff --git a/math/xgraph/files/patch-ae b/math/xgraph/files/patch-ae
new file mode 100644
index 000000000000..a89aaf4b1730
--- /dev/null
+++ b/math/xgraph/files/patch-ae
@@ -0,0 +1,39 @@
+--- xgraph.h.orig	Thu Jul 17 03:40:41 1997
++++ xgraph.h	Fri Dec 10 03:10:48 1999
+@@ -5,7 +5,12 @@
+ #ifndef _XGRAPH_H_
+ #define _XGRAPH_H_
+ 
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <X11/Xos.h>
++#undef index
++#undef rindex
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #include <X11/cursorfont.h>
+@@ -33,20 +38,9 @@
+ extern void ho_dialog();	/* Hardcopy dialog         */
+ extern void set_X();		/* Initializes X device    */
+ 
+-#if 0
+-/* To make lint happy */
+-extern char *malloc();
+-extern char *realloc();
+-extern char *sprintf();
+-extern char *strcpy();
+-extern char *strcat();
+-extern char *rindex();
+-extern char *index();
+-extern void exit();
+-extern void free();
+-extern double atof();
++#ifndef MAX
++#define MAX(a,b)	((a) > (b) ? (a) : (b))
++#define MIN(a,b)	((a) < (b) ? (a) : (b))
+ #endif
+-
+-extern void abort();
+ 
+ #endif /* _XGRAPH_H_ */
diff --git a/math/xgraph/files/patch-ag b/math/xgraph/files/patch-ag
new file mode 100644
index 000000000000..a6f6313886be
--- /dev/null
+++ b/math/xgraph/files/patch-ag
@@ -0,0 +1,10 @@
+--- ps.c.orig	Thu Jul 17 03:40:40 1997
++++ ps.c	Fri Dec 10 03:11:36 1999
+@@ -57,7 +57,6 @@
+ #define PS(str)		OUT(psFile, str)
+ #define PSU(str)	OUT(ui->psFile, str)
+ #define IY(val)		(ui->height_devs - val)
+-#define MAX(a, b)	((a) > (b) ? (a) : (b))
+ 
+ /*
+  * Globals
diff --git a/math/xgraph/pkg-plist b/math/xgraph/pkg-plist
index 3e36cc3be2be..2b4e028d1459 100644
--- a/math/xgraph/pkg-plist
+++ b/math/xgraph/pkg-plist
@@ -1 +1,7 @@
 bin/xgraph
+share/examples/xgraph/bar.xg
+share/examples/xgraph/surface.xg
+share/examples/xgraph/surface2.xg
+share/examples/xgraph/surface3.xg
+share/examples/xgraph/xgtest.xg
+@dirrm share/examples/xgraph