Index: head/math/xgraph/Makefile =================================================================== --- head/math/xgraph/Makefile (revision 507731) +++ head/math/xgraph/Makefile (revision 507732) @@ -1,32 +1,32 @@ # Created by: asami # $FreeBSD$ PORTNAME= xgraph PORTVERSION= 11.3.2.20000910 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math print MASTER_SITES= ftp://ftp.cs.utoronto.ca/pub/radford/ DISTNAME= xgraph-11 MAINTAINER= ports@FreeBSD.org COMMENT= Program that helps you plot graphs LICENSE= XGRAPH LICENSE_NAME= xgraph license LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept USES= imake tar:Z USE_XORG= x11 xext WRKSRC= ${WRKDIR}/${PORTNAME} OPTIONS_DEFINE= EXAMPLES post-extract: @${SED} -ne '2,19 {s|^ \* *||;p;}' < ${WRKSRC}/copyright.h > ${WRKSRC}/COPYING post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/examples/xgraph ${INSTALL_DATA} ${WRKSRC}/examples/*.xg ${STAGEDIR}${PREFIX}/share/examples/xgraph .include Index: head/math/xgraph/files/patch-xgraph.c =================================================================== --- head/math/xgraph/files/patch-xgraph.c (revision 507731) +++ head/math/xgraph/files/patch-xgraph.c (revision 507732) @@ -1,84 +1,84 @@ --- xgraph.c.orig 2000-09-10 14:05:47 UTC +++ xgraph.c @@ -74,8 +74,6 @@ #define BTNPAD 1 #define BTNINTER 3 -#define MAX(a,b) ((a) > (b) ? (a) : (b)) -#define MIN(a,b) ((a) < (b) ? (a) : (b)) #define ABS(x) ((x) < 0 ? -(x) : (x)) #define ZERO_THRES 1.0E-07 @@ -333,6 +331,7 @@ char *argv[]; if (!strm) { (void) fprintf(stderr, "Warning: cannot open file `%s'\n", inFileNames[idx]); + errs++; } else { if ((maxitems = ReadData(strm, inFileNames[idx])) < 0) { errs++; @@ -403,6 +402,7 @@ char *argv[]; fg_color = PM_COLOR("Foreground"); bg_color = PM_COLOR("Background"); XRecolorCursor(disp, zoomCursor, &fg_color, &bg_color); -+ init_X(win_info->dev_info.user_state); ++ init_X(NULL); Num_Windows = 1; while (Num_Windows > 0) { -@@ -415,6 +415,12 @@ char *argv[]; +@@ -415,6 +415,13 @@ char *argv[]; continue; } switch (theEvent.type) { + case ConfigureNotify: + win_info->dev_info.area_w = theEvent.xconfigure.width; + win_info->dev_info.area_h = theEvent.xconfigure.height; ++ init_X(win_info->dev_info.user_state); + XClearArea(disp, theEvent.xany.window, 1, 1, win_info->dev_info.area_w, win_info->dev_info.area_h, 0); + DrawWindow(win_info); + break; case Expose: if (theEvent.xexpose.count <= 0) { XWindowAttributes win_attr; -@@ -422,7 +428,7 @@ char *argv[]; - XGetWindowAttributes(disp, theEvent.xany.window, &win_attr); +@@ -423,6 +430,7 @@ char *argv[]; win_info->dev_info.area_w = win_attr.width; win_info->dev_info.area_h = win_attr.height; -- init_X(win_info->dev_info.user_state); + init_X(win_info->dev_info.user_state); + XClearArea(disp, theEvent.xany.window, 1, 1, win_info->dev_info.area_w, win_info->dev_info.area_h, 0); DrawWindow(win_info); } break; -@@ -715,7 +721,7 @@ int primary; /* Is this the primary wi +@@ -715,7 +723,7 @@ int primary; /* Is this the primary window? */ if (sizehints.x<0) sizehints.x = 0; sizehints.y += 25; } -#endif +#else /* Aspect ratio computation */ if (asp < 1.0) { -@@ -723,6 +729,7 @@ int primary; /* Is this the primary wi +@@ -723,6 +731,7 @@ int primary; /* Is this the primary window? */ } else { height = ((int) (((double) NORMSIZE) / asp)); } +#endif height = MAX(MINDIM, height); width = MAX(MINDIM, width); -@@ -789,7 +796,7 @@ int primary; /* Is this the primary wi +@@ -789,7 +798,7 @@ int primary; /* Is this the primary window? */ new_info->flags = 0; XSelectInput(disp, new_window, - ExposureMask|KeyPressMask|ButtonPressMask); + ExposureMask|KeyPressMask|ButtonPressMask|StructureNotifyMask); if (!theCursor) { theCursor = XCreateFontCursor(disp, XC_top_left_arrow); fg_color = PM_COLOR("Foreground"); -@@ -1478,6 +1485,8 @@ LineInfo *result; /* Returned result */ +@@ -1478,6 +1487,8 @@ LineInfo *result; /* Returned result */ while (*line && (*line != '\n') && (*line != '"')) line++; if (*line) *line = '\0'; } else { + /* treat comma's as white space */ + for (first=line; *first; ++first) if (*first == ',') *first = ' '; first = line; while (*line && !isspace(*line)) line++; if (*line) { Index: head/math/xgraph/files/patch-xgraph.h =================================================================== --- head/math/xgraph/files/patch-xgraph.h (revision 507731) +++ head/math/xgraph/files/patch-xgraph.h (revision 507732) @@ -1,39 +1,39 @@ --- xgraph.h.orig 1997-07-16 18:40:41 UTC +++ xgraph.h @@ -5,7 +5,12 @@ #ifndef _XGRAPH_H_ #define _XGRAPH_H_ +#include +#include +#include #include +#undef index +#undef rindex #include #include #include -@@ -33,20 +38,9 @@ extern void do_hardcopy(); /* Carries ou +@@ -33,20 +38,9 @@ extern void do_hardcopy(); /* Carries out hardcopy 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(); - +-extern void abort(); + #endif /* _XGRAPH_H_ */ Index: head/math/xgraph/files/patch-xtb.h =================================================================== --- head/math/xgraph/files/patch-xtb.h (nonexistent) +++ head/math/xgraph/files/patch-xtb.h (revision 507732) @@ -0,0 +1,11 @@ +--- xtb.h.orig 1997-07-16 18:40:41 UTC ++++ xtb.h +@@ -164,7 +164,7 @@ typedef union xtb_fmt_defn { + xtb_fmt_align align; + } xtb_fmt; + +-#define NE 0 ++#define NE ((xtb_fmt *) 0) + + DECLARE(xtb_w, xtb_fmt *, (xtb_frame *w)); + /* Returns formatting structure for frame */ Property changes on: head/math/xgraph/files/patch-xtb.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property