Date: Thu, 9 Dec 1999 10:44:15 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@freebsd.org Subject: ports/15381: Update port: math/xgraph Message-ID: <19991209184415.4BF2B15667@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 15381 >Category: ports >Synopsis: Update port: math/xgraph >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Dec 9 10:50:02 PST 1999 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 3.3-RELEASE i386 >Organization: >Environment: >Description: * Fixed MASTER_SITES * Rearrenged patches * Added example data to package New file: patches/patch-ac patches/patch-ad patches/patch-ae patches/patch-af patches/patch-ag Remove file: patches/patch-aa >How-To-Repeat: >Fix: diff -urN /usr/ports/math/xgraph/Makefile math/xgraph/Makefile --- /usr/ports/math/xgraph/Makefile Tue Aug 31 19:16:13 1999 +++ math/xgraph/Makefile Fri Dec 10 03:16:30 1999 @@ -6,15 +6,19 @@ # $FreeBSD: ports/math/xgraph/Makefile,v 1.13 1999/08/31 06:47:57 mharo Exp $ # -DISTNAME= xgraph-11.3.2 +DISTNAME= xgraph-11 +PKGNAME= xgraph-11.3.2 CATEGORIES= math print -MASTER_SITES= ftp://ftp.iis.u-tokyo.ac.jp/pub/X/misc/ \ - ftp://ftp.tk.mesh.ad.jp/pub/X/misc/ \ - ftp://ftp.eos.hokudai.ac.jp/pub/X11/misc/ +MASTER_SITES= ftp://ftp.cs.utoronto.ca/pub/radford/ +EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.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 -urN /usr/ports/math/xgraph/files/md5 math/xgraph/files/md5 --- /usr/ports/math/xgraph/files/md5 Fri May 29 19:24:51 1998 +++ math/xgraph/files/md5 Fri Dec 10 03:03:49 1999 @@ -1 +1 @@ -MD5 (xgraph-11.3.2.tar.gz) = d717ff190e967465a3785f86fb2b8007 +MD5 (xgraph-11.tar.Z) = 15d78d243f007da88e1732474711e8b9 diff -urN /usr/ports/math/xgraph/patches/patch-aa math/xgraph/patches/patch-aa --- /usr/ports/math/xgraph/patches/patch-aa Mon Jun 28 19:57:20 1999 +++ math/xgraph/patches/patch-aa Thu Jan 1 09:00:00 1970 @@ -1,159 +0,0 @@ ---- ./xtb.c.org Wed Dec 13 15:05:55 1989 -+++ ./xtb.c Thu Nov 24 20:17:29 1994 -@@ -31,7 +31,7 @@ - #define VARARGS(func, rtn, args) /*VARARGS1*/ rtn func(va_alist) va_dcl - #endif - --typedef struct h_info { -+struct h_info { - FNPTR(func, xtb_hret, (XEvent *evt, xtb_data info)); /* Function to call */ - xtb_data info; /* Additional info */ - }; -@@ -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; -@@ -244,7 +244,7 @@ - #define BT_LPAD 3 - #define BT_BRDR 1 - --typedef struct b_info { -+struct b_info { - FNPTR( func, xtb_hret, (Window win, int state, xtb_data val) ); - /* Function to call */ - char *text; /* Text of button */ -@@ -445,7 +445,7 @@ - #define BR_YPAD 2 - #define BR_INTER 2 - --typedef struct br_info { -+struct br_info { - Window main_win; /* Main button row */ - int which_one; /* Which button is on */ - int btn_cnt; /* How many buttons */ -@@ -584,7 +584,7 @@ - #define TO_HPAD 1 - #define TO_VPAD 1 - --typedef struct to_info { -+struct to_info { - char *text; /* Text to display */ - XFontStruct *ft; /* Font to use */ - }; -@@ -675,7 +675,7 @@ - #define TI_BRDR 2 - #define TI_CRSP 1 - --typedef struct ti_info { -+struct ti_info { - FNPTR( func, xtb_hret, (Window win, int ch, char *textcopy, xtb_data *val) ); - /* Function to call */ - int maxlen; /* Maximum characters */ ---- ./hpgl.c.org Wed Dec 13 11:56:44 1989 -+++ ./hpgl.c Thu Nov 24 20:17:29 1994 -@@ -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(); ---- ./xgraph.h.org Wed Dec 13 14:55:58 1989 -+++ ./xgraph.h Thu Nov 24 20:17:29 1994 -@@ -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,17 +38,9 @@ - extern void ho_dialog(); /* Hardcopy dialog */ - extern void set_X(); /* Initializes X device */ - --/* 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(); --extern void abort(); -+#ifndef MAX -+#define MAX(a,b) ((a) > (b) ? (a) : (b)) -+#define MIN(a,b) ((a) < (b) ? (a) : (b)) -+#endif - - #endif /* _XGRAPH_H_ */ ---- ./hard_devices.h.org Fri Nov 17 11:37:12 1989 -+++ ./hard_devices.h Thu Nov 24 20:17:29 1994 -@@ -9,7 +9,7 @@ - - typedef enum hard_dev_docu_defn { NONE, NO, YES } hard_dev_docu; - --typedef struct hard_dev { -+struct hard_dev { - char *dev_name; /* Device name */ - int (*dev_init)(); /* Initialization function */ - char *dev_spec; /* Default pipe program */ ---- ./ps.c.org Wed Dec 13 11:56:57 1989 -+++ ./ps.c Thu Nov 24 20:17:30 1994 -@@ -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 ---- ./xgX.c.org Wed Dec 13 14:56:29 1989 -+++ ./xgX.c Thu Nov 24 20:17:28 1994 -@@ -19,7 +19,7 @@ - #define TICKLENGTH 5 - #define MAXSEGS 1000 - --typedef struct x_state { -+struct x_state { - Window win; /* Primary window */ - }; - ---- ./dialog.c.org Wed Dec 13 15:19:58 1989 -+++ ./dialog.c Thu Nov 24 20:17:29 1994 -@@ -40,7 +40,7 @@ - #define D_DSP 10 - #define D_FS 10 - --typedef struct d_info { -+struct d_info { - char *prog; /* Program name */ - xtb_data cookie; /* Info used by do_harcopy */ - Window choices; /* Output device choices */ -@@ -639,7 +639,7 @@ - } - - --typedef struct err_info { -+struct err_info { - Window title; - Window contbtn; - int num_lines; diff -urN /usr/ports/math/xgraph/patches/patch-ac math/xgraph/patches/patch-ac --- /usr/ports/math/xgraph/patches/patch-ac Thu Jan 1 09:00:00 1970 +++ math/xgraph/patches/patch-ac Fri Dec 10 03:06:36 1999 @@ -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 -urN /usr/ports/math/xgraph/patches/patch-ad math/xgraph/patches/patch-ad --- /usr/ports/math/xgraph/patches/patch-ad Thu Jan 1 09:00:00 1970 +++ math/xgraph/patches/patch-ad Fri Dec 10 03:07:57 1999 @@ -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 -urN /usr/ports/math/xgraph/patches/patch-ae math/xgraph/patches/patch-ae --- /usr/ports/math/xgraph/patches/patch-ae Thu Jan 1 09:00:00 1970 +++ math/xgraph/patches/patch-ae Fri Dec 10 03:10:59 1999 @@ -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 -urN /usr/ports/math/xgraph/patches/patch-ag math/xgraph/patches/patch-ag --- /usr/ports/math/xgraph/patches/patch-ag Thu Jan 1 09:00:00 1970 +++ math/xgraph/patches/patch-ag Fri Dec 10 03:11:44 1999 @@ -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 -urN /usr/ports/math/xgraph/pkg/PLIST math/xgraph/pkg/PLIST --- /usr/ports/math/xgraph/pkg/PLIST Mon Sep 28 07:39:20 1998 +++ math/xgraph/pkg/PLIST Fri Dec 10 03:15:51 1999 @@ -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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19991209184415.4BF2B15667>