Date: Thu, 14 Jan 2021 22:39:46 +0000 (UTC) From: Stephen Montgomery-Smith <stephen@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r561607 - in head/graphics/plotutils: . files Message-ID: <202101142239.10EMdkEo034685@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: stephen Date: Thu Jan 14 22:39:46 2021 New Revision: 561607 URL: https://svnweb.freebsd.org/changeset/ports/561607 Log: - Define the license. Register some missing dependencies. Recreate patches using make makepatch. Added: head/graphics/plotutils/files/patch-tek2plot_tek2plot.c - copied, changed from r561606, head/graphics/plotutils/files/patch-tek-egm-bug Deleted: head/graphics/plotutils/files/patch-tek-egm-bug Modified: head/graphics/plotutils/Makefile head/graphics/plotutils/files/patch-libplot-x_afftext.c head/graphics/plotutils/files/patch-libplot-z_write.c Modified: head/graphics/plotutils/Makefile ============================================================================== --- head/graphics/plotutils/Makefile Thu Jan 14 22:04:26 2021 (r561606) +++ head/graphics/plotutils/Makefile Thu Jan 14 22:39:46 2021 (r561607) @@ -3,7 +3,7 @@ PORTNAME= plotutils PORTVERSION= 2.6 -PORTREVISION= 8 +PORTREVISION= 9 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= GNU @@ -11,13 +11,15 @@ 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 Modified: head/graphics/plotutils/files/patch-libplot-x_afftext.c ============================================================================== --- head/graphics/plotutils/files/patch-libplot-x_afftext.c Thu Jan 14 22:04:26 2021 (r561606) +++ head/graphics/plotutils/files/patch-libplot-x_afftext.c Thu Jan 14 22:39:46 2021 (r561607) @@ -1,6 +1,6 @@ ---- 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) @@ -11,7 +11,7 @@ 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) @@ -22,7 +22,7 @@ /* 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) @@ -33,7 +33,7 @@ /* 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) Modified: head/graphics/plotutils/files/patch-libplot-z_write.c ============================================================================== --- head/graphics/plotutils/files/patch-libplot-z_write.c Thu Jan 14 22:04:26 2021 (r561606) +++ head/graphics/plotutils/files/patch-libplot-z_write.c Thu Jan 14 22:39:46 2021 (r561607) @@ -1,6 +1,6 @@ ---- 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) */ @@ -9,7 +9,7 @@ { 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 } @@ -18,7 +18,7 @@ } static void -@@ -515,7 +515,7 @@ +@@ -515,7 +515,7 @@ _our_error_fn_stream (png_struct *png_ptr, const char #endif } Copied and modified: head/graphics/plotutils/files/patch-tek2plot_tek2plot.c (from r561606, head/graphics/plotutils/files/patch-tek-egm-bug) ============================================================================== --- head/graphics/plotutils/files/patch-tek-egm-bug Thu Jan 14 22:04:26 2021 (r561606, copy source) +++ head/graphics/plotutils/files/patch-tek2plot_tek2plot.c Thu Jan 14 22:39:46 2021 (r561607) @@ -9,10 +9,9 @@ # 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 @@ +--- 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 */ @@ -21,7 +20,7 @@ diff -ur tek2plot/tek2plot.c tek2plot/tek2plot.c static bool margin_reset = false; int byte_read, type; -@@ -709,10 +709,12 @@ +@@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101142239.10EMdkEo034685>