Index: head/graphics/plotutils/Makefile =================================================================== --- head/graphics/plotutils/Makefile (revision 561606) +++ head/graphics/plotutils/Makefile (revision 561607) @@ -1,28 +1,30 @@ # Created by: Chuck Robey # $FreeBSD$ PORTNAME= plotutils PORTVERSION= 2.6 -PORTREVISION= 8 +PORTREVISION= 9 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= GNU MAINTAINER= stephen@FreeBSD.org COMMENT= Plotting library and toolkit +LICENSE= GPLv3 + LIB_DEPENDS= libpng.so:graphics/png USES= gmake libtool xorg # parallel builds are broken with bmake(1) GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-libplotter --enable-libxmi USE_LDCONFIG= yes -USE_XORG= xaw +USE_XORG= ice sm x11 xaw xext xmu xt TEST_TARGET= check CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INFO= libxmi plotutils .include Index: head/graphics/plotutils/files/patch-tek-egm-bug =================================================================== --- head/graphics/plotutils/files/patch-tek-egm-bug (revision 561606) +++ head/graphics/plotutils/files/patch-tek-egm-bug (nonexistent) @@ -1,36 +0,0 @@ -# This patch fixes a bug where the tek2plot program misinterprets -# optimized Tek4014 datastreams which update LoY without sending -# the ExtraByte also. -# This patch has been submitted FSF: -# From: "Poul-Henning Kamp" -# Subject: Re: Bug in plotutils-2.5.1::tek2plot -# To: bug-gnu-utils@gnu.org -# Message-Id: <15929.1226142709@critter.freebsd.dk> -# Date: Sat, 08 Nov 2008 11:11:49 GMT -####################################################################### - -diff -ur tek2plot/tek2plot.c tek2plot/tek2plot.c ---- tek2plot/tek2plot.c 2008-07-16 04:00:16.000000000 +0000 -+++ tek2plot/tek2plot.c 2008-11-08 11:04:49.000000000 +0000 -@@ -559,7 +559,7 @@ - int temp_three = 0; - - /* following variables are saved from point to point */ -- static int saved_lo_y = 0, saved_hi_x = 0, saved_hi_y = 0; -+ static int saved_lo_y = 0, saved_hi_x = 0, saved_hi_y = 0, saved_egm = 0; - static bool margin_reset = false; - - int byte_read, type; -@@ -709,10 +709,12 @@ - lo_y = got_lo_y ? lo_y : saved_lo_y; - hi_x = got_hi_x ? hi_x : saved_hi_x; - hi_y = got_hi_y ? hi_y : saved_hi_y; -+ egm = got_egm ? egm : saved_egm; - - saved_lo_y = lo_y; - saved_hi_x = hi_x; - saved_hi_y = hi_y; -+ saved_egm = egm; - - /* On a genuine Tektronix 4014, the MSB of the 5-bit EGM - byte sets the margin to equal Margin2 (2048) */ Property changes on: head/graphics/plotutils/files/patch-tek-egm-bug ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/plotutils/files/patch-libplot-x_afftext.c =================================================================== --- head/graphics/plotutils/files/patch-libplot-x_afftext.c (revision 561606) +++ head/graphics/plotutils/files/patch-libplot-x_afftext.c (revision 561607) @@ -1,46 +1,46 @@ ---- libplot/x_afftext.c.orig 2010-01-25 01:37:45.000000000 -0500 -+++ libplot/x_afftext.c 2010-01-25 01:38:02.000000000 -0500 -@@ -185,7 +185,10 @@ +--- libplot/x_afftext.c.orig 2008-07-16 00:54:10 UTC ++++ libplot/x_afftext.c +@@ -185,7 +185,10 @@ XAffCreateAffinedText (Display *dpy, XFontStruct *font /* invert transformation matrix */ det = aa[0] * aa[3] - aa[1] * aa[2]; if (det == 0.0) + { + free(afftext); return NULL; /* don't support singular matrices */ + } a_inverse[0] = aa[3] / det; a_inverse[1] = - aa[1] / det; a_inverse[2] = - aa[2] / det; -@@ -205,7 +208,10 @@ +@@ -205,7 +208,10 @@ XAffCreateAffinedText (Display *dpy, XFontStruct *font /* paranoia */ if (size_in.x == 0 || size_in.y == 0) + { + free(afftext); return NULL; + } /* work around a possible bug: some X displays can't create pixmaps that are only one pixel wide or high */ -@@ -238,7 +244,10 @@ +@@ -238,7 +244,10 @@ XAffCreateAffinedText (Display *dpy, XFontStruct *font /* create local image */ im_in = XAffCreateXImage (dpy, size_in); if (im_in == NULL) + { + free(afftext); return NULL; + } /* copy bitmap to it */ XGetSubImage (dpy, bitmap_in, 0, 0, size_in.x, size_in.y, -@@ -308,7 +317,10 @@ +@@ -308,7 +317,10 @@ XAffCreateAffinedText (Display *dpy, XFontStruct *font /* create 2nd image, to hold affinely transformed text */ im_out = XAffCreateXImage (dpy, size_out); if (im_out == NULL) + { + free(afftext); return NULL; + } /* copy from 1st image to this new one */ Index: head/graphics/plotutils/files/patch-libplot-z_write.c =================================================================== --- head/graphics/plotutils/files/patch-libplot-z_write.c (revision 561606) +++ head/graphics/plotutils/files/patch-libplot-z_write.c (revision 561607) @@ -1,29 +1,29 @@ ---- libplot/z_write.c.orig 2008-07-16 02:54:10.000000000 +0200 -+++ libplot/z_write.c 2012-04-27 19:12:55.000000000 +0200 -@@ -164,7 +164,7 @@ +--- libplot/z_write.c.orig 2008-07-16 00:54:10 UTC ++++ libplot/z_write.c +@@ -164,7 +164,7 @@ _pl_z_maybe_output_image (S___(Plotter *_plotter)) } /* cleanup after libpng errors (error handler does a longjmp) */ - if (setjmp (png_ptr->jmpbuf)) + if (setjmp (png_jmpbuf(png_ptr))) { png_destroy_write_struct (&png_ptr, (png_info **)NULL); return -1; -@@ -444,7 +444,7 @@ +@@ -444,7 +444,7 @@ _our_error_fn_stdio (png_struct *png_ptr, const char * #endif } - longjmp (png_ptr->jmpbuf, 1); + longjmp (png_jmpbuf(png_ptr), 1); } static void -@@ -515,7 +515,7 @@ +@@ -515,7 +515,7 @@ _our_error_fn_stream (png_struct *png_ptr, const char #endif } - longjmp (png_ptr->jmpbuf, 1); + longjmp (png_jmpbuf(png_ptr), 1); } static void Index: head/graphics/plotutils/files/patch-tek2plot_tek2plot.c =================================================================== --- head/graphics/plotutils/files/patch-tek2plot_tek2plot.c (nonexistent) +++ head/graphics/plotutils/files/patch-tek2plot_tek2plot.c (revision 561607) @@ -0,0 +1,35 @@ +# This patch fixes a bug where the tek2plot program misinterprets +# optimized Tek4014 datastreams which update LoY without sending +# the ExtraByte also. +# This patch has been submitted FSF: +# From: "Poul-Henning Kamp" +# Subject: Re: Bug in plotutils-2.5.1::tek2plot +# To: bug-gnu-utils@gnu.org +# Message-Id: <15929.1226142709@critter.freebsd.dk> +# Date: Sat, 08 Nov 2008 11:11:49 GMT +####################################################################### + +--- tek2plot/tek2plot.c.orig 2009-07-30 04:29:14 UTC ++++ tek2plot/tek2plot.c +@@ -559,7 +559,7 @@ getpoint (int *xcoor, int *ycoor, FILE *in_stream, int + int temp_three = 0; + + /* following variables are saved from point to point */ +- static int saved_lo_y = 0, saved_hi_x = 0, saved_hi_y = 0; ++ static int saved_lo_y = 0, saved_hi_x = 0, saved_hi_y = 0, saved_egm = 0; + static bool margin_reset = false; + + int byte_read, type; +@@ -709,10 +709,12 @@ getpoint (int *xcoor, int *ycoor, FILE *in_stream, int + lo_y = got_lo_y ? lo_y : saved_lo_y; + hi_x = got_hi_x ? hi_x : saved_hi_x; + hi_y = got_hi_y ? hi_y : saved_hi_y; ++ egm = got_egm ? egm : saved_egm; + + saved_lo_y = lo_y; + saved_hi_x = hi_x; + saved_hi_y = hi_y; ++ saved_egm = egm; + + /* On a genuine Tektronix 4014, the MSB of the 5-bit EGM + byte sets the margin to equal Margin2 (2048) */ Property changes on: head/graphics/plotutils/files/patch-tek2plot_tek2plot.c ___________________________________________________________________ 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