Date: Mon, 25 Jan 2010 07:11:26 GMT From: bf <bf1783@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/143204: [PATCH]graphics/plotutils: update to 2.6, add a regression-test target, minor fixes Message-ID: <201001250711.o0P7BQHo000911@www.freebsd.org> Resent-Message-ID: <201001250720.o0P7K2Vn011172@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 143204
>Category: ports
>Synopsis: [PATCH]graphics/plotutils: update to 2.6, add a regression-test target, minor fixes
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Jan 25 07:20:02 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: bf
>Release: 9-CURRENT amd64
>Organization:
-
>Environment:
>Description:
update to 2.6; respect CPPFLAGS/LDFLAGS; to be on the safe side, patch a few memory leaks that will rarely be encountered, if at all; add a regression-test target.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN plotutils.orig/Makefile plotutils/Makefile
--- plotutils.orig/Makefile 2010-01-25 01:39:45.000000000 -0500
+++ plotutils/Makefile 2010-01-25 02:00:38.000000000 -0500
@@ -6,7 +6,7 @@
#
PORTNAME= plotutils
-PORTVERSION= 2.5
+PORTVERSION= 2.6
PORTEPOCH= 1
CATEGORIES= graphics
MASTER_SITES= GNU
@@ -26,7 +26,10 @@
MAN1= ode.1 plot.1 plotfont.1 spline.1 tek2plot.1
INFO= libxmi plotutils
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+
+test: build
+ @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} check)
.include <bsd.port.mk>
diff -ruN plotutils.orig/distinfo plotutils/distinfo
--- plotutils.orig/distinfo 2010-01-25 01:39:53.000000000 -0500
+++ plotutils/distinfo 2010-01-24 21:33:50.000000000 -0500
@@ -1,3 +1,3 @@
-MD5 (plotutils-2.5.tar.gz) = 0d6855cce17832afe2ff75c26a57be49
-SHA256 (plotutils-2.5.tar.gz) = b402546feb34f6762faf26aa7c621c6261f79d2eb4d9a2b26824855203c26826
-SIZE (plotutils-2.5.tar.gz) = 3686955
+MD5 (plotutils-2.6.tar.gz) = c08a424bd2438c80a786a7f4b5bb6a40
+SHA256 (plotutils-2.6.tar.gz) = 4f4222820f97ca08c7ea707e4c53e5a3556af4d8f1ab51e0da6ff1627ff433ab
+SIZE (plotutils-2.6.tar.gz) = 3657562
diff -ruN plotutils.orig/files/patch-libplot-x_afftext.c plotutils/files/patch-libplot-x_afftext.c
--- plotutils.orig/files/patch-libplot-x_afftext.c 1969-12-31 19:00:00.000000000 -0500
+++ plotutils/files/patch-libplot-x_afftext.c 2010-01-25 01:38:20.000000000 -0500
@@ -0,0 +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 @@
+ /* 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 @@
+
+ /* 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 @@
+ /* 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 @@
+ /* 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 */
+
diff -ruN plotutils.orig/pkg-plist plotutils/pkg-plist
--- plotutils.orig/pkg-plist 2010-01-25 01:40:03.000000000 -0500
+++ plotutils/pkg-plist 2010-01-24 22:30:37.000000000 -0500
@@ -1,5 +1,6 @@
bin/double
bin/graph
+bin/hersheydemo
bin/ode
bin/pic2plot
bin/plot
@@ -24,13 +25,11 @@
lib/libxmi.so.1
share/libplot/README
share/libplot/colors.txt
-share/libplot/demo-page
-share/libplot/h-demo.c
-share/libplot/h-fonts.doc
-share/libplot/h-glyphs.doc
+share/libplot/h-fonts.txt
+share/libplot/h-glyphs.txt
share/libplot/hershey.bib
-share/libplot/kana.doc
-share/libplot/kanji.doc
+share/libplot/kana.txt
+share/libplot/kanji.txt
share/ode/README
share/ode/atwoods.ode
share/ode/bead.ode
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001250711.o0P7BQHo000911>