diff options
-rw-r--r-- | graphics/plotutils/Makefile | 13 | ||||
-rw-r--r-- | graphics/plotutils/PLIST | 13 | ||||
-rw-r--r-- | graphics/plotutils/distinfo | 13 | ||||
-rw-r--r-- | graphics/plotutils/patches/patch-aa | 15 | ||||
-rw-r--r-- | graphics/plotutils/patches/patch-ab | 12 | ||||
-rw-r--r-- | graphics/plotutils/patches/patch-ac | 58 | ||||
-rw-r--r-- | graphics/plotutils/patches/patch-ad | 13 | ||||
-rw-r--r-- | graphics/plotutils/patches/patch-ae | 12 |
8 files changed, 17 insertions, 132 deletions
diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile index e1a9d557fa0..817c4350647 100644 --- a/graphics/plotutils/Makefile +++ b/graphics/plotutils/Makefile @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.43 2008/11/10 17:21:36 wiz Exp $ +# $NetBSD: Makefile,v 1.44 2010/05/02 13:28:43 wiz Exp $ # -DISTNAME= plotutils-2.4.1 -PKGREVISION= 6 +DISTNAME= plotutils-2.6 CATEGORIES= devel graphics x11 MASTER_SITES= ${MASTER_SITE_GNU:=plotutils/} MAINTAINER= dmcmahill@NetBSD.org HOMEPAGE= http://www.gnu.org/software/plotutils/plotutils.html COMMENT= Programs and library for plotting scientific data +LICENSE= gnu-gpl-v3 CONFLICTS+= plotutils-nox11-[0-9]* @@ -18,10 +18,11 @@ PKG_DESTDIR_SUPPORT= user-destdir USE_LANGUAGES= c c++ USE_TOOLS+= lex yacc -INFO_FILES= # PLIST -USE_LIBTOOL= YES -GNU_CONFIGURE= YES +INFO_FILES= yes +USE_LIBTOOL= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-libplotter +MAKE_JOBS_SAFE= no .include "../../graphics/png/buildlink3.mk" .include "../../x11/libXaw/buildlink3.mk" diff --git a/graphics/plotutils/PLIST b/graphics/plotutils/PLIST index 00ab4e1413f..7fbafa70b0e 100644 --- a/graphics/plotutils/PLIST +++ b/graphics/plotutils/PLIST @@ -1,6 +1,7 @@ -@comment $NetBSD: PLIST,v 1.7 2009/06/14 17:59:25 joerg Exp $ +@comment $NetBSD: PLIST,v 1.8 2010/05/02 13:28:43 wiz Exp $ bin/double bin/graph +bin/hersheydemo bin/ode bin/pic2plot bin/plot @@ -20,13 +21,11 @@ man/man1/spline.1 man/man1/tek2plot.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 diff --git a/graphics/plotutils/distinfo b/graphics/plotutils/distinfo index 94251b368b0..d11ff643748 100644 --- a/graphics/plotutils/distinfo +++ b/graphics/plotutils/distinfo @@ -1,10 +1,5 @@ -$NetBSD: distinfo,v 1.4 2005/02/24 08:45:11 agc Exp $ +$NetBSD: distinfo,v 1.5 2010/05/02 13:28:43 wiz Exp $ -SHA1 (plotutils-2.4.1.tar.gz) = e39ce89048a578683ad76f3284bb79adfb0adc22 -RMD160 (plotutils-2.4.1.tar.gz) = 02dd8d914cc769e10beb2e556efb7fe76350370d -Size (plotutils-2.4.1.tar.gz) = 3316030 bytes -SHA1 (patch-aa) = 07279355283c003f1b841a9d071592cc4d9b057e -SHA1 (patch-ab) = 8c3be941ca51b245937c84716398162fa8a28660 -SHA1 (patch-ac) = 8257da8eecfe299495f956401c5ecf0a7071cf0d -SHA1 (patch-ad) = 09e4300025b7d10ce79cdade94d2e0f10f7d624f -SHA1 (patch-ae) = fe78adacfd5e96ffdad2315c1d318f8d8e3fd0de +SHA1 (plotutils-2.6.tar.gz) = 7921301d9dfe8991e3df2829bd733df6b2a70838 +RMD160 (plotutils-2.6.tar.gz) = 2a32244eb20e00b82a0742dde7b690f688e82774 +Size (plotutils-2.6.tar.gz) = 3657562 bytes diff --git a/graphics/plotutils/patches/patch-aa b/graphics/plotutils/patches/patch-aa deleted file mode 100644 index e18f6715151..00000000000 --- a/graphics/plotutils/patches/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2003/09/09 14:52:55 jmmv Exp $ - ---- include/plotter.h.orig 2000-06-28 20:21:36.000000000 +0900 -+++ include/plotter.h 2003-09-09 21:21:17.000000000 +0900 -@@ -58,8 +58,9 @@ - /* Include iostream, stdio support if this is libplotter rather than - libplot. */ - #ifndef NOT_LIBPLOTTER --#include <iostream.h> -+#include <iostream> - #include <stdio.h> -+using namespace std; - #endif - - /* THE GLOBAL VARIABLES IN GNU LIBPLOTTER */ diff --git a/graphics/plotutils/patches/patch-ab b/graphics/plotutils/patches/patch-ab deleted file mode 100644 index 4a0daf733cc..00000000000 --- a/graphics/plotutils/patches/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2003/09/09 14:52:55 jmmv Exp $ - ---- libplot/i_rle.c.orig 1999-06-28 01:58:10.000000000 +0900 -+++ libplot/i_rle.c 2003-09-09 21:23:13.000000000 +0900 -@@ -78,7 +78,7 @@ - else if (rle->outstream) - { - rle->outstream->put ((unsigned char)(rle->oblen)); -- rle->outstream->write (&(rle->oblock[0]), rle->oblen); -+ rle->outstream->write ((const char *)&(rle->oblock[0]), rle->oblen); - } - #endif diff --git a/graphics/plotutils/patches/patch-ac b/graphics/plotutils/patches/patch-ac deleted file mode 100644 index 9e133a46d54..00000000000 --- a/graphics/plotutils/patches/patch-ac +++ /dev/null @@ -1,58 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2003/09/09 14:52:56 jmmv Exp $ - ---- libplot/n_write.c.orig 2000-06-16 14:42:13.000000000 +0900 -+++ libplot/n_write.c 2003-09-09 21:22:38.000000000 +0900 -@@ -208,7 +208,7 @@ - linebuf[pos++] = '0'; - if (pos >= MAX_PBM_PIXELS_PER_LINE || i == (width - 1)) - { -- stream->write (linebuf, pos); -+ stream->write ((const char *)linebuf, pos); - stream->put ('\n'); - - pos = 0; -@@ -253,7 +253,7 @@ - rowbuf[bytecount++] = outbyte; - } - /* emit row of bytes */ -- stream->write (rowbuf, bytecount); -+ stream->write ((const char *)rowbuf, bytecount); - } - - free (rowbuf); -@@ -366,7 +366,7 @@ - num_pixels++; - if (num_pixels >= MAX_PGM_PIXELS_PER_LINE || i == (width - 1)) - { -- stream->write (linebuf, pos); -+ stream->write ((const char *)linebuf, pos); - stream->put ('\n'); - - num_pixels = 0; -@@ -392,7 +392,7 @@ - { - for (i = 0; i < width; i++) - rowbuf[i] = pixmap[j][i].u.rgb[0]; -- stream->write (rowbuf, width); -+ stream->write ((const char *)rowbuf, width); - } - free (rowbuf); - } -@@ -514,7 +514,7 @@ - num_pixels++; - if (num_pixels >= MAX_PPM_PIXELS_PER_LINE || i == (width - 1)) - { -- stream->write (linebuf, pos); -+ stream->write ((const char *)linebuf, pos); - stream->put ('\n'); - - num_pixels = 0; -@@ -542,7 +542,7 @@ - for (i = 0; i < width; i++) - for (component = 0; component < 3; component++) - rowbuf[3 * i + component] = pixmap[j][i].u.rgb[component]; -- stream->write (rowbuf, 3 * width); -+ stream->write ((const char *)rowbuf, 3 * width); - } - free (rowbuf); - } diff --git a/graphics/plotutils/patches/patch-ad b/graphics/plotutils/patches/patch-ad deleted file mode 100644 index 46bbac9fe0c..00000000000 --- a/graphics/plotutils/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2003/09/09 14:52:56 jmmv Exp $ - ---- libplot/z_write.c.orig 2000-06-20 13:34:42.000000000 +0900 -+++ libplot/z_write.c 2003-09-09 21:22:59.000000000 +0900 -@@ -484,7 +484,7 @@ - ostream *stream; - - stream = (ostream *)png_get_io_ptr (png_ptr); -- stream->write (data, length); -+ stream->write ((const char *)data, length); - } - - static void diff --git a/graphics/plotutils/patches/patch-ae b/graphics/plotutils/patches/patch-ae deleted file mode 100644 index d8a4be1fecf..00000000000 --- a/graphics/plotutils/patches/patch-ae +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2003/09/09 14:52:57 jmmv Exp $ - ---- libplot/g_write.c 2000-05-20 01:10:01.000000000 +0900 -+++ libplot/g_write.c 2003-09-09 21:23:42.000000000 +0900 -@@ -40,7 +40,7 @@ - } - #ifdef LIBPLOTTER - else if (data->outstream) -- data->outstream->write(c, n); -+ data->outstream->write((const char *)c, n); - #endif - } |