[77231] trunk/dports/math/xgraph
jmr at macports.org
jmr at macports.org
Thu Mar 24 05:05:50 PDT 2011
Revision: 77231
http://trac.macports.org/changeset/77231
Author: jmr at macports.org
Date: 2011-03-24 05:05:46 -0700 (Thu, 24 Mar 2011)
Log Message:
-----------
xgraph: apply patch to fix 64-bit crash (#23497)
Modified Paths:
--------------
trunk/dports/math/xgraph/Portfile
Added Paths:
-----------
trunk/dports/math/xgraph/files/
trunk/dports/math/xgraph/files/patch-64b.diff
Modified: trunk/dports/math/xgraph/Portfile
===================================================================
--- trunk/dports/math/xgraph/Portfile 2011-03-24 11:22:02 UTC (rev 77230)
+++ trunk/dports/math/xgraph/Portfile 2011-03-24 12:05:46 UTC (rev 77231)
@@ -3,7 +3,7 @@
PortSystem 1.0
name xgraph
version 12.1
-revision 1
+revision 2
categories math x11
platforms darwin
maintainers nomaintainer
@@ -16,6 +16,10 @@
depends_lib port:xorg-libX11 \
port:xorg-libsm
+# http://www.blasted-heath.com/xg/
+patchfiles patch-64b.diff
+patch.pre_args -p1
+
post-destroot {
move ${destroot}${prefix}/man/manm/xgraph.man \
${destroot}${prefix}/share/man/man1/xgraph.1
Added: trunk/dports/math/xgraph/files/patch-64b.diff
===================================================================
--- trunk/dports/math/xgraph/files/patch-64b.diff (rev 0)
+++ trunk/dports/math/xgraph/files/patch-64b.diff 2011-03-24 12:05:46 UTC (rev 77231)
@@ -0,0 +1,731 @@
+diff -r -N -c xgraph-12.1-dist/Makefile.am xgraph-12.1-bh-dist/Makefile.am
+*** xgraph-12.1-dist/Makefile.am Wed Dec 15 18:30:09 1999
+--- xgraph-12.1-bh-dist/Makefile.am Thu Aug 15 14:52:18 2002
+***************
+*** 10,15 ****
+--- 10,16 ----
+ xgraph.c xgX.c hard_devices.c dialog.c hpgl.c \
+ ps.c idraw.c xtb.c st.c params.c alloc.c draw.c \
+ init.c read.c tgif.c derivative.c \
++ alloc.h \
+ copyright.h \
+ general.h \
+ hard_devices.h \
+diff -r -N -c xgraph-12.1-dist/Makefile.in xgraph-12.1-bh-dist/Makefile.in
+*** xgraph-12.1-dist/Makefile.in Mon Dec 20 16:40:32 1999
+--- xgraph-12.1-bh-dist/Makefile.in Thu Aug 15 18:06:00 2002
+***************
+*** 1,6 ****
+! # Makefile.in generated automatically by automake 1.4 from Makefile.am
+
+! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+--- 1,6 ----
+! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+
+! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+***************
+*** 69,75 ****
+ AUTOMAKE_OPTIONS = 1.0 foreign
+
+ bin_PROGRAMS = xgraph
+! xgraph_c_sources = xgraph.c xgX.c hard_devices.c dialog.c hpgl.c ps.c idraw.c xtb.c st.c params.c alloc.c draw.c init.c read.c tgif.c derivative.c copyright.h general.h hard_devices.h params.h plotter.h st.h xgout.h xgraph.h xtb.h
+
+ xgraph_SOURCES = $(xgraph_c_sources)
+
+--- 69,75 ----
+ AUTOMAKE_OPTIONS = 1.0 foreign
+
+ bin_PROGRAMS = xgraph
+! xgraph_c_sources = xgraph.c xgX.c hard_devices.c dialog.c hpgl.c ps.c idraw.c xtb.c st.c params.c alloc.c draw.c init.c read.c tgif.c derivative.c alloc.h copyright.h general.h hard_devices.h params.h plotter.h st.h xgout.h xgraph.h xtb.h
+
+ xgraph_SOURCES = $(xgraph_c_sources)
+
+***************
+*** 117,123 ****
+
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+! TAR = gtar
+ GZIP_ENV = --best
+ SOURCES = $(xgraph_SOURCES)
+ OBJECTS = $(xgraph_OBJECTS)
+--- 117,123 ----
+
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+! TAR = tar
+ GZIP_ENV = --best
+ SOURCES = $(xgraph_SOURCES)
+ OBJECTS = $(xgraph_OBJECTS)
+***************
+*** 326,363 ****
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+! cp -pr $$/$$file $(distdir)/$$file; \
+ else \
+ test -f $(distdir)/$$file \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ || cp -p $$d/$$file $(distdir)/$$file || :; \
+ fi; \
+ done
+! alloc.o: alloc.c
+! derivative.o: derivative.c xgraph.h autoconf.h xgout.h
+! dialog.o: dialog.c copyright.h xgout.h xgraph.h autoconf.h \
+ hard_devices.h xtb.h params.h
+! draw.o: draw.c copyright.h xgraph.h autoconf.h xgout.h xtb.h \
+ hard_devices.h params.h
+ hard_devices.o: hard_devices.c copyright.h xgout.h hard_devices.h \
+! params.h xgraph.h autoconf.h
+! hpgl.o: hpgl.c copyright.h xgraph.h autoconf.h xgout.h plotter.h
+! idraw.o: idraw.c hard_devices.h xgout.h
+! init.o: init.c copyright.h xgraph.h autoconf.h xgout.h xtb.h \
+ hard_devices.h params.h
+! params.o: params.c st.h params.h xgraph.h autoconf.h xgout.h \
+ hard_devices.h
+! ps.o: ps.c copyright.h xgraph.h autoconf.h xgout.h
+! read.o: read.c copyright.h xgraph.h autoconf.h xgout.h xtb.h \
+ hard_devices.h params.h
+! st.o: st.c copyright.h st.h xgraph.h autoconf.h xgout.h
+! tgif.o: tgif.c hard_devices.h xgout.h
+! xgX.o: xgX.c copyright.h xgout.h params.h xgraph.h autoconf.h \
+ bitmaps/dot.11 bitmaps/mark1.11 bitmaps/mark2.11 \
+ bitmaps/mark3.11 bitmaps/mark4.11 bitmaps/mark5.11 \
+ bitmaps/mark6.11 bitmaps/mark7.11 bitmaps/mark8.11
+- xgraph.o: xgraph.c copyright.h xgraph.h autoconf.h xgout.h xtb.h \
+- hard_devices.h params.h
+ xtb.o: xtb.c xtb.h copyright.h
+
+ info-am:
+--- 326,363 ----
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+! cp -pr $$d/$$file $(distdir)/$$file; \
+ else \
+ test -f $(distdir)/$$file \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ || cp -p $$d/$$file $(distdir)/$$file || :; \
+ fi; \
+ done
+! alloc.o: alloc.c alloc.h
+! derivative.o: derivative.c xgraph.h autoconf.h xgout.h alloc.h
+! dialog.o: dialog.c copyright.h xgout.h xgraph.h autoconf.h alloc.h \
+ hard_devices.h xtb.h params.h
+! draw.o: draw.c copyright.h xgraph.h autoconf.h xgout.h alloc.h xtb.h \
+ hard_devices.h params.h
+ hard_devices.o: hard_devices.c copyright.h xgout.h hard_devices.h \
+! params.h xgraph.h autoconf.h alloc.h
+! hpgl.o: hpgl.c copyright.h xgraph.h autoconf.h xgout.h alloc.h plotter.h
+! idraw.o: idraw.c hard_devices.h xgout.h alloc.h
+! init.o: init.c copyright.h xgraph.h autoconf.h xgout.h alloc.h xtb.h \
+ hard_devices.h params.h
+! params.o: params.c st.h params.h xgraph.h autoconf.h xgout.h alloc.h \
+ hard_devices.h
+! ps.o: ps.c copyright.h xgraph.h autoconf.h xgout.h alloc.h
+! read.o: read.c copyright.h xgraph.h autoconf.h xgout.h alloc.h xtb.h \
+ hard_devices.h params.h
+! st.o: st.c copyright.h st.h xgraph.h autoconf.h xgout.h alloc.h
+! tgif.o: tgif.c hard_devices.h xgout.h alloc.h
+! xgraph.o: xgraph.c copyright.h xgraph.h autoconf.h xgout.h alloc.h xtb.h \
+! hard_devices.h params.h
+! xgX.o: xgX.c copyright.h xgout.h params.h xgraph.h autoconf.h alloc.h \
+ bitmaps/dot.11 bitmaps/mark1.11 bitmaps/mark2.11 \
+ bitmaps/mark3.11 bitmaps/mark4.11 bitmaps/mark5.11 \
+ bitmaps/mark6.11 bitmaps/mark7.11 bitmaps/mark8.11
+ xtb.o: xtb.c xtb.h copyright.h
+
+ info-am:
+diff -r -N -c xgraph-12.1-dist/alloc.c xgraph-12.1-bh-dist/alloc.c
+*** xgraph-12.1-dist/alloc.c Fri Dec 3 18:16:41 1999
+--- xgraph-12.1-bh-dist/alloc.c Thu Aug 15 14:48:23 2002
+***************
+*** 66,71 ****
+--- 66,73 ----
+
+ #endif
+
++ #include "alloc.h"
++
+ #ifndef NIL
+ #define NIL(a) ((a *) 0)
+ #endif /* NIL */
+***************
+*** 87,107 ****
+ #endif /* public */
+
+
+ #define SIG_GOOD 0x01020304
+ #define SIG_FREE 0x04030201
+! #define OVERHEAD (sizeof(long) + sizeof(unsigned))
+
+ private unsigned memused = 0;
+ private unsigned memalloc = 0;
+
+- #ifdef __STDC__
+- typedef void *Ptr;
+-
+- #else
+- typedef char *Ptr;
+-
+- #endif
+-
+ /* _chaina():
+ * Check things for validity and allocate space
+ */
+--- 89,113 ----
+ #endif /* public */
+
+
++ /* most restricted type in terms of alignment */
++ typedef Ptr mostrestricted;
++
+ #define SIG_GOOD 0x01020304
+ #define SIG_FREE 0x04030201
+! typedef struct {
+! int good;
+! unsigned size;
+! mostrestricted r; /* not used, but needed to align Ptr */
+! /* returned to callers of allocators */
+! } Ptr_SIG;
+! #define OVERHEAD (sizeof(Ptr_SIG) - sizeof(mostrestricted))
+! #define GOOD(ptr) ((Ptr_SIG *) ptr)->good
+! #define SIZE(ptr) ((Ptr_SIG *) ptr)->size
+! #define RETURNED(ptr) ((Ptr) (&((Ptr_SIG *) ptr)->r))
+
+ private unsigned memused = 0;
+ private unsigned memalloc = 0;
+
+ /* _chaina():
+ * Check things for validity and allocate space
+ */
+***************
+*** 120,127 ****
+ action);
+ if (tptr != (Ptr) 0) {
+ ptr = tptr;
+! *((long *) ptr) = SIG_GOOD;
+! memused += *((unsigned *) &ptr[sizeof(long)]);
+ memalloc++;
+ }
+ abort();
+--- 126,133 ----
+ action);
+ if (tptr != (Ptr) 0) {
+ ptr = tptr;
+! GOOD(ptr) = SIG_GOOD;
+! memused += SIZE(ptr);
+ memalloc++;
+ }
+ abort();
+***************
+*** 132,149 ****
+
+ if (ptr == NIL(char)) {
+ if (tptr != (Ptr) 0)
+! *((long *) tptr) = SIG_GOOD;
+ (void) fprintf(stderr,
+! "*** Out of memory in %s (current allocation %d).\n",
+! action, memused, n);
+
+ abort();
+ }
+! *((long *) ptr) = SIG_GOOD;
+! memused += (*((unsigned *) &ptr[sizeof(long)]) = n);
+ memalloc++;
+! ptr += OVERHEAD;
+! return ((Ptr) ptr);
+ } /* end _chaina */
+
+
+--- 138,155 ----
+
+ if (ptr == NIL(char)) {
+ if (tptr != (Ptr) 0)
+! GOOD(tptr) = SIG_GOOD;
+ (void) fprintf(stderr,
+! "*** Out of memory in %s"
+! " (wanted %d, current allocation %d).\n",
+! action, n, memused);
+
+ abort();
+ }
+! GOOD(ptr) = SIG_GOOD;
+! memused += (SIZE(ptr) = n);
+ memalloc++;
+! return RETURNED(ptr);
+ } /* end _chaina */
+
+
+***************
+*** 162,170 ****
+ abort();
+ }
+ *ptr -= OVERHEAD;
+! switch (*((long *) *ptr)) {
+ case SIG_GOOD:
+! return (*((unsigned *) &((*ptr)[sizeof(long)])));
+ case SIG_FREE:
+ (void) fprintf(stderr, msg, action, "free");
+ abort();
+--- 168,176 ----
+ abort();
+ }
+ *ptr -= OVERHEAD;
+! switch (GOOD(*ptr)) {
+ case SIG_GOOD:
+! return (SIZE(ptr));
+ case SIG_FREE:
+ (void) fprintf(stderr, msg, action, "free");
+ abort();
+***************
+*** 219,225 ****
+
+ memused -= _chainc((char **) &ptr, routine);
+ memalloc--;
+! *((long *) ptr) = SIG_FREE;
+ return (_chaina(n, realloc, routine, ptr));
+ } /* end Realloc */
+
+--- 225,231 ----
+
+ memused -= _chainc((char **) &ptr, routine);
+ memalloc--;
+! GOOD(ptr) = SIG_FREE;
+ return (_chaina(n, realloc, routine, ptr));
+ } /* end Realloc */
+
+***************
+*** 235,241 ****
+
+ memused -= _chainc((char **) &ptr, routine);
+ memalloc--;
+! *((long *) ptr) = SIG_FREE;
+ free(ptr);
+ } /* end Free */
+
+--- 241,247 ----
+
+ memused -= _chainc((char **) &ptr, routine);
+ memalloc--;
+! GOOD(ptr) = SIG_FREE;
+ free(ptr);
+ } /* end Free */
+
+diff -r -N -c xgraph-12.1-dist/alloc.h xgraph-12.1-bh-dist/alloc.h
+*** xgraph-12.1-dist/alloc.h Wed Dec 31 19:00:00 1969
+--- xgraph-12.1-bh-dist/alloc.h Thu Aug 15 13:33:18 2002
+***************
+*** 0 ****
+--- 1,30 ----
++ /*
++ * Decls for private mallocator
++ */
++
++ #ifndef _ALLOC_H_
++ #define _ALLOC_H_
++
++
++
++ #ifdef __STDC__
++ #define Ptr void *
++ Ptr Malloc(unsigned);
++ Ptr Calloc(unsigned, unsigned);
++ Ptr Realloc(Ptr, unsigned);
++ void Free(Ptr);
++
++ void MemChain(void);
++ unsigned MemStat(void);
++ unsigned MemPtr(Ptr);
++
++ #else
++ #define Ptr char *
++ extern Ptr Malloc();
++ extern Ptr Realloc();
++ extern Ptr Calloc();
++ extern void Free();
++
++ #endif
++
++ #endif /* _ALLOC_H_ */
+diff -r -N -c xgraph-12.1-dist/dialog.c xgraph-12.1-bh-dist/dialog.c
+*** xgraph-12.1-dist/dialog.c Tue Dec 14 15:09:46 1999
+--- xgraph-12.1-bh-dist/dialog.c Thu Aug 15 13:50:43 2002
+***************
+*** 740,745 ****
+--- 740,746 ----
+ line[ML];
+ int y,
+ i;
++ int getline();
+ unsigned long wamask;
+ XSetWindowAttributes wattr;
+ XFontStruct *bigFont = PM_FONT("TitleFont");
+diff -r -N -c xgraph-12.1-dist/draw.c xgraph-12.1-bh-dist/draw.c
+*** xgraph-12.1-dist/draw.c Fri Dec 3 18:16:42 1999
+--- xgraph-12.1-bh-dist/draw.c Thu Aug 15 17:31:44 2002
+***************
+*** 124,129 ****
+--- 124,130 ----
+ leftWidth;
+ char err[MAXBUFSIZE];
+ char *XUnitText = PM_STR("XUnitText");
++ extern void do_error();
+
+ /*
+ * First, we figure out the origin in the X window. Above the space we
+***************
+*** 640,655 ****
+ code2,
+ cd,
+ mark_inside;
+! int X_idx, StoreIDX; /* PW */
+ XSegment *ptr;
+! PointList *thisList,
+! *lastList;
+ int markFlag,
+ pixelMarks,
+ bigPixel,
+ colorMark;
+ int noLines = PM_BOOL("NoLines");
+ int lineWidth = PM_INT("LineWidth");
+
+ /* PW Suggests we Flush and set first */
+ set_mark_flags(&markFlag, &pixelMarks, &bigPixel, &colorMark);
+--- 641,658 ----
+ code2,
+ cd,
+ mark_inside;
+! int X_idx; /* PW */
+ XSegment *ptr;
+! PointList *thisList;
+ int markFlag,
+ pixelMarks,
+ bigPixel,
+ colorMark;
+ int noLines = PM_BOOL("NoLines");
+ int lineWidth = PM_INT("LineWidth");
++
++ if (!TransformCompute(wi))
++ return;
+
+ /* PW Suggests we Flush and set first */
+ set_mark_flags(&markFlag, &pixelMarks, &bigPixel, &colorMark);
+diff -r -N -c xgraph-12.1-dist/idraw.c xgraph-12.1-bh-dist/idraw.c
+*** xgraph-12.1-dist/idraw.c Fri Dec 3 18:16:43 1999
+--- xgraph-12.1-bh-dist/idraw.c Thu Aug 15 13:30:01 2002
+***************
+*** 7,15 ****
+--- 7,17 ----
+ */
+
+ #include <stdio.h>
++ #include <string.h>
+ #include <X11/Xlib.h>
+ #include "hard_devices.h"
+ #include "xgout.h"
++ #include "alloc.h"
+
+ #define HEIGHT 792
+ #define FIX(X) X = HEIGHT - X;
+diff -r -N -c xgraph-12.1-dist/init.c xgraph-12.1-bh-dist/init.c
+*** xgraph-12.1-dist/init.c Sat Dec 18 19:52:06 1999
+--- xgraph-12.1-bh-dist/init.c Thu Aug 15 13:49:22 2002
+***************
+*** 251,257 ****
+ static char *def_str;
+
+ #define DEF(name, type) \
+! if (def_str = XGetDefault(disp, Prog_Name, name)) { \
+ param_set(name, type, def_str); \
+ }
+
+--- 251,257 ----
+ static char *def_str;
+
+ #define DEF(name, type) \
+! if ((def_str = XGetDefault(disp, Prog_Name, name))) { \
+ param_set(name, type, def_str); \
+ }
+
+***************
+*** 448,454 ****
+ if (idx + 1 >= argc)
+ argerror("missing coordinate(s)",
+ argv[idx]);
+! if (hi = index(argv[idx + 1], ',')) {
+ char low[MAXLO];
+
+ (void) strncpy(low, argv[idx + 1], hi - argv[idx + 1]);
+--- 448,454 ----
+ if (idx + 1 >= argc)
+ argerror("missing coordinate(s)",
+ argv[idx]);
+! if ((hi = index(argv[idx + 1], ','))) {
+ char low[MAXLO];
+
+ (void) strncpy(low, argv[idx + 1], hi - argv[idx + 1]);
+***************
+*** 471,477 ****
+ if (idx + 1 >= argc)
+ argerror("missing coordinate(s)",
+ argv[idx]);
+! if (hi = index(argv[idx + 1], ',')) {
+ char low[MAXLO];
+
+ (void) strncpy(low, argv[idx + 1], hi - argv[idx + 1]);
+--- 471,477 ----
+ if (idx + 1 >= argc)
+ argerror("missing coordinate(s)",
+ argv[idx]);
+! if ((hi = index(argv[idx + 1], ','))) {
+ char low[MAXLO];
+
+ (void) strncpy(low, argv[idx + 1], hi - argv[idx + 1]);
+diff -r -N -c xgraph-12.1-dist/params.c xgraph-12.1-bh-dist/params.c
+*** xgraph-12.1-dist/params.c Wed Dec 8 14:32:42 1999
+--- xgraph-12.1-bh-dist/params.c Thu Aug 15 13:30:00 2002
+***************
+*** 342,348 ****
+ /* First attempt to interpret as font family/size */
+ if (PM_INT("Output Device") == D_XWINDOWS) {
+ (void) strcpy(name_copy, name);
+! if (font_size = index(name_copy, '-')) {
+ *font_size = '\0';
+ font_family = name_copy;
+ font_size++;
+--- 342,348 ----
+ /* First attempt to interpret as font family/size */
+ if (PM_INT("Output Device") == D_XWINDOWS) {
+ (void) strcpy(name_copy, name);
+! if ((font_size = index(name_copy, '-'))) {
+ *font_size = '\0';
+ font_family = name_copy;
+ font_size++;
+***************
+*** 358,372 ****
+
+ /* Load first one that you can */
+ for (i = 0; i < font_count; i++)
+! if (*font_info = XLoadQueryFont(param_disp, font_list[i]))
+ break;
+ if (*font_info)
+ return 1;
+ }
+ }
+ /* Assume normal font name */
+! return (int) (*font_info = XLoadQueryFont(param_disp, name));
+ }
+ }
+
+
+--- 358,374 ----
+
+ /* Load first one that you can */
+ for (i = 0; i < font_count; i++)
+! if ((*font_info = XLoadQueryFont(param_disp, font_list[i])))
+ break;
+ if (*font_info)
+ return 1;
+ }
+ }
+ /* Assume normal font name */
+! return (*font_info = XLoadQueryFont(param_disp, name)) != NULL;
+ }
++
++ return 0;
+ }
+
+
+diff -r -N -c xgraph-12.1-dist/ps.c xgraph-12.1-bh-dist/ps.c
+*** xgraph-12.1-dist/ps.c Fri Dec 3 18:16:44 1999
+--- xgraph-12.1-bh-dist/ps.c Thu Aug 15 13:30:01 2002
+***************
+*** 240,246 ****
+ pnt_height;
+
+ if (flags & D_DOCU) {
+! OUT(psFile, "%%%%BoundingBox: %ld %ld %ld %ld\n",
+ 0, 0,
+ (int) (((double) width) /
+ (MICRONS_PER_INCH * INCHES_PER_POINT) + 0.5),
+--- 240,246 ----
+ pnt_height;
+
+ if (flags & D_DOCU) {
+! OUT(psFile, "%%%%BoundingBox: %d %d %d %d\n",
+ 0, 0,
+ (int) (((double) width) /
+ (MICRONS_PER_INCH * INCHES_PER_POINT) + 0.5),
+diff -r -N -c xgraph-12.1-dist/st.c xgraph-12.1-bh-dist/st.c
+*** xgraph-12.1-dist/st.c Fri Dec 3 18:16:44 1999
+--- xgraph-12.1-bh-dist/st.c Thu Aug 15 13:46:26 2002
+***************
+*** 19,27 ****
+ #define alloc(type) (type *) Malloc(sizeof(type))
+
+ #define ABS(x) ((x) < 0 ? -(x) : (x))
+! #define ST_NUMCMP(x,y) ((int) (x) - (int) (y))
+! #define ST_NUMHASH(x,size) (ABS((int)x)%(size))
+! #define ST_PTRHASH(x,size) ((int)((unsigned)(x)>>2)%size)
+ #define EQUAL(func, x, y) \
+ ((((func) == st_numcmp) || ((func) == st_ptrcmp)) ?\
+ (ST_NUMCMP((x),(y)) == 0) : ((*func)((x), (y)) == 0))
+--- 19,27 ----
+ #define alloc(type) (type *) Malloc(sizeof(type))
+
+ #define ABS(x) ((x) < 0 ? -(x) : (x))
+! #define ST_NUMCMP(x,y) ((long int) (x) - (long int) (y))
+! #define ST_NUMHASH(x,size) (ABS((long int)x)%(size))
+! #define ST_PTRHASH(x,size) ((int)((unsigned long)(x)>>2)%size)
+ #define EQUAL(func, x, y) \
+ ((((func) == st_numcmp) || ((func) == st_ptrcmp)) ?\
+ (ST_NUMCMP((x),(y)) == 0) : ((*func)((x), (y)) == 0))
+diff -r -N -c xgraph-12.1-dist/tgif.c xgraph-12.1-bh-dist/tgif.c
+*** xgraph-12.1-dist/tgif.c Fri Dec 3 18:16:44 1999
+--- xgraph-12.1-bh-dist/tgif.c Thu Aug 15 13:46:25 2002
+***************
+*** 5,13 ****
+--- 5,15 ----
+ */
+
+ #include <stdio.h>
++ #include <string.h>
+ #include <X11/Xlib.h>
+ #include "hard_devices.h"
+ #include "xgout.h"
++ #include "alloc.h"
+
+ #define COLOR "DarkSlateGray"
+
+***************
+*** 222,228 ****
+ * _ObjFill,_Vspace,StrList),
+ */
+ /* font ok too */
+! style == T_AXIS ? tgif->axis_font :
+ tgif->title_font;
+ /* ok 0, 1 as in tgif */
+ size = style == T_AXIS ? tgif->axis_size :
+--- 224,230 ----
+ * _ObjFill,_Vspace,StrList),
+ */
+ /* font ok too */
+! font = style == T_AXIS ? tgif->axis_font :
+ tgif->title_font;
+ /* ok 0, 1 as in tgif */
+ size = style == T_AXIS ? tgif->axis_size :
+***************
+*** 265,273 ****
+ int color; /* Line color (if any) */
+ {
+ Info *tgif = (Info *) user_state;
+! int i,
+! j,
+! k;
+
+ /*
+ * poly(_Color,_NumVs,_Vs,_LineStyle,_LineWidth,_PenPat,_Id,_Spline,
+--- 267,273 ----
+ int color; /* Line color (if any) */
+ {
+ Info *tgif = (Info *) user_state;
+! int i;
+
+ /*
+ * poly(_Color,_NumVs,_Vs,_LineStyle,_LineWidth,_PenPat,_Id,_Spline,
+diff -r -N -c xgraph-12.1-dist/xgraph.c xgraph-12.1-bh-dist/xgraph.c
+*** xgraph-12.1-dist/xgraph.c Sat Dec 18 19:52:09 1999
+--- xgraph-12.1-bh-dist/xgraph.c Thu Aug 15 13:46:26 2002
+***************
+*** 80,85 ****
+--- 80,86 ----
+
+
+
++ int
+ main(argc, argv)
+ int argc;
+ char *argv[];
+diff -r -N -c xgraph-12.1-dist/xgraph.h xgraph-12.1-bh-dist/xgraph.h
+*** xgraph-12.1-dist/xgraph.h Fri Dec 17 19:04:02 1999
+--- xgraph-12.1-bh-dist/xgraph.h Thu Aug 15 13:46:26 2002
+***************
+*** 9,14 ****
+--- 9,15 ----
+
+ #include <X11/Xos.h>
+ #include <X11/Xlib.h>
++ #include <X11/Xresource.h>
+ #include <X11/Xutil.h>
+ #include <X11/cursorfont.h>
+
+***************
+*** 47,52 ****
+--- 48,55 ----
+ #define MAXBUFSIZE 120
+ #define MAXLS 50
+
++ #include "alloc.h"
++
+ #define STRDUP(xx) (strcpy(Malloc((unsigned) (strlen(xx)+1)), (xx)))
+ #define SCREENX(ws, userX) \
+ (((int) (((userX) - ws->UsrOrgX)/ws->XUnitsPerPixel + 0.5)) + ws->XOrgX)
+***************
+*** 194,204 ****
+ extern int Num_Windows;
+ extern char *Prog_Name;
+ extern char *disp_name;
+-
+- /* To make lint happy */
+- extern char *Malloc();
+- extern char *Realloc();
+- extern void Free();
+
+ #ifndef _POSIX_SOURCE
+ /* extern int sprintf(); ---conflicts with sunos */
+--- 197,202 ----
+diff -r -N -c xgraph-12.1-dist/xtb.c xgraph-12.1-bh-dist/xtb.c
+*** xgraph-12.1-dist/xtb.c Fri Dec 17 19:07:31 1999
+--- xgraph-12.1-bh-dist/xtb.c Thu Aug 15 13:30:00 2002
+***************
+*** 12,21 ****
+ * want to use any of the standards yet -- they are too unstable).
+ */
+
+ #include <X11/Xos.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+- #include <string.h> /* for strcpy */
+ #include "xtb.h"
+
+ extern void abort();
+--- 12,23 ----
+ * want to use any of the standards yet -- they are too unstable).
+ */
+
++ #include <stdio.h>
++ #include <string.h> /* for strcpy */
+ #include <X11/Xos.h>
+ #include <X11/Xlib.h>
++ #include <X11/Xresource.h>
+ #include <X11/Xutil.h>
+ #include "xtb.h"
+
+ extern void abort();
+***************
+*** 865,870 ****
+--- 867,873 ----
+ }
+
+ /* For debugging */
++ void
+ focus_evt(evt)
+ XEvent *evt;
+ {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110324/ead80628/attachment.html>
More information about the macports-changes
mailing list