diff options
author | jtb <jtb@pkgsrc.org> | 2001-06-20 12:58:56 +0000 |
---|---|---|
committer | jtb <jtb@pkgsrc.org> | 2001-06-20 12:58:56 +0000 |
commit | 7aec40a4eadee8f879687b86f0f7a664bec9c4ae (patch) | |
tree | a00d5586ed9b8727d0a4088720b0bfccdc1abfdf /graphics/yplot | |
parent | 2b0432e86cb9a5d61bd0ad0959c729ce18449026 (diff) | |
download | pkgsrc-7aec40a4eadee8f879687b86f0f7a664bec9c4ae.tar.gz |
Update of yplot to 1.1.0.
Changes include:
* Configuration now done with autoconf
* Many API extensions
* Updated documentation
* Many more demos
* etc.
Diffstat (limited to 'graphics/yplot')
-rw-r--r-- | graphics/yplot/Makefile | 31 | ||||
-rw-r--r-- | graphics/yplot/distinfo | 13 | ||||
-rw-r--r-- | graphics/yplot/patches/patch-aa | 64 | ||||
-rw-r--r-- | graphics/yplot/patches/patch-ab | 102 | ||||
-rw-r--r-- | graphics/yplot/patches/patch-ac | 39 | ||||
-rw-r--r-- | graphics/yplot/patches/patch-ad | 14 | ||||
-rw-r--r-- | graphics/yplot/pkg/PLIST | 47 |
7 files changed, 130 insertions, 180 deletions
diff --git a/graphics/yplot/Makefile b/graphics/yplot/Makefile index 4a4e8c939f8..80cf82b97b8 100644 --- a/graphics/yplot/Makefile +++ b/graphics/yplot/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2001/05/01 22:40:43 jtb Exp $ +# $NetBSD: Makefile,v 1.8 2001/06/20 12:58:56 jtb Exp $ -DISTNAME= yplot-1.0.3 +DISTNAME= yplot-1.1.0 CATEGORIES= graphics math MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=yplot/} @@ -8,30 +8,17 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://yplot.sourceforge.net/ COMMENT= Yorick interface to PLplot -DEPENDS+= yorick>=1.4:../../math/yorick +DEPENDS+= yorick-1.4*:../../math/yorick DEPENDS+= plplot>=5.0.3:../../graphics/plplot +BUILD_DEPENDS+= teTeX>=1.0:../../print/teTeX +BUILD_DEPENDS+= python>=1.5:../../lang/python -PLPLOT_PREFIX_DEFAULT= ${LOCALBASE} EVAL_PREFIX+= PLPLOT_PREFIX=plplot +CONFIGURE_ENV+= PLPLOT_PREFIX=${PLPLOT_PREFIX} +EVAL_PREFIX+= YORICK_PREFIX=yorick +CONFIGURE_ENV+= YORICK_CONTRIB_PREFIX=${YORICK_PREFIX}/lib/yorick/1.4 +GNU_CONFIGURE= yes MAKEFILE= Makefile.build -# This looks bad, but the build process won't be able to find the PLplot -# include files otherwise. -pre-build: - ${MKDIR} ${WRKSRC}/plplot - ${CP} ${PLPLOT_PREFIX}/include/plplot/*.h ${WRKSRC}/plplot - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/yplot ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/yplotl ${PREFIX}/bin - cd ${WRKSRC} && ${INSTALL_DATA} yplot.i yplotl.i yplot_body.i \ - ${PREFIX}/share/yorick/1.4/startup/ - ${INSTALL_DATA} ${WRKSRC}/doc/yplot.doc \ - ${PREFIX}/share/yorick/1.4/doc/ - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/yplot - ${INSTALL_DATA} ${WRKSRC}/doc/ytut.ps ${PREFIX}/share/doc/yplot - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/yplot - ${INSTALL_DATA} ${WRKSRC}/doc/*.i ${PREFIX}/share/examples/yplot/ - .include "../../mk/bsd.pkg.mk" diff --git a/graphics/yplot/distinfo b/graphics/yplot/distinfo index eea5c4ecfef..ed5578590a0 100644 --- a/graphics/yplot/distinfo +++ b/graphics/yplot/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 09:54:31 wiz Exp $ +$NetBSD: distinfo,v 1.3 2001/06/20 12:58:56 jtb Exp $ -SHA1 (yplot-1.0.3.tar.gz) = b051c5ccec312ba91892aa7376496aafe02202ac -Size (yplot-1.0.3.tar.gz) = 877618 bytes -SHA1 (patch-aa) = 21b83acb10b4a5ab64a89bf2d2a502394679be5b -SHA1 (patch-ab) = 42a16248535188a1812807aec25a5fd5367ba190 -SHA1 (patch-ac) = 783b84c762b00a2173f52a215c1031e8bbfa010d -SHA1 (patch-ad) = dde3046a391cfca857851cb3644dc4a6266b1393 +SHA1 (yplot-1.1.0.tar.gz) = f1b6d91c6ee1939144ba61eaa74a5a951f724372 +Size (yplot-1.1.0.tar.gz) = 71736 bytes +SHA1 (patch-aa) = f9c538f5e262ac10b00a6669162f3336f4285f7a +SHA1 (patch-ab) = f0af8444900b23fc0e697c32405b5ac50834736f +SHA1 (patch-ac) = b4613e0d52de3eb94e85958b47c70679ecb8abe1 diff --git a/graphics/yplot/patches/patch-aa b/graphics/yplot/patches/patch-aa index 8831b88d5f4..a6136663d31 100644 --- a/graphics/yplot/patches/patch-aa +++ b/graphics/yplot/patches/patch-aa @@ -1,32 +1,38 @@ -$NetBSD: patch-aa,v 1.3 2001/04/02 00:56:02 jtb Exp $ +$NetBSD: patch-aa,v 1.4 2001/06/20 12:58:56 jtb Exp $ ---- Makefile.build.orig Fri Sep 3 21:59:31 1999 -+++ Makefile.build -@@ -8,8 +8,7 @@ - ROOT= +--- configure.orig Wed Jun 20 04:20:56 2001 ++++ configure +@@ -528,15 +528,6 @@ + # install with prefix=/usr/local/plplot or prefix=/usr and also installation + # of plplot with debs or rpm's (where plplot is installed with prefix=/usr). - # These flags needed to compile ps.c and ljiip.c driver routines --CFLAGS = -O -DSTDC_HEADERS=1 -DPAD_ARRAY=1 -I. -I/usr/lib/yorick/1.4/h \ -- -I/usr/lib/plplot/include -DDOUBLE -+CFLAGS = -O -DSTDC_HEADERS=1 -DPAD_ARRAY=1 -I. -DDOUBLE +-incdirs="\ +- /usr \ +- /usr/local/plplot" +-for dir in $incdirs; do +- if test -r "$dir/bin/plplot-config"; then +- PLPLOT_PREFIX="$dir" +- break +- fi +-done + if test -z "$PLPLOT_PREFIX"; then + echo "$ac_t""ERROR: configuration cannot continue because plplot" 1>&6 + echo "$ac_t""is not installed in one of the standard places." 1>&6 +@@ -548,17 +539,6 @@ + # This list of directories should cover the common cases of yorick + # rpm package or Debian package install. - ############################################## - -@@ -46,7 +45,7 @@ - "Nameclash! must get rid of Makefile so this can work"; false ; fi - yorick -batch make.i yplotl yplotl.i - mv -f Makefile Makefile_yplotl -- make -f Makefile_yplotl -+ make -f Makefile_yplotl PKG_LIBS="`plplot-config --libs` -lyorm" - - ############################################## - -@@ -64,7 +63,7 @@ - "Nameclash! must get rid of Makefile so this can work"; false ; fi - yorick -batch make.i yplot yplot.i - mv -f Makefile Makefile_yplot -- make -f Makefile_yplot -+ make -f Makefile_yplot PKG_LIBS="`plplot-config --libs` -lyorm" - - # generate doc/yplot.doc using local yplot and mkdoc - doc/yplot.doc: yplot yplot_doc.csh +-incdirs="\ +- /usr/lib/yorick/1.4 \ +- /usr/lib/yorick/1.4/i486-debian-linux/" +-for dir in $incdirs; do +-# lib seems to be a common sub-directory for these directories on either +-# rpm or debian systems. +- if test -r "$dir/lib"; then +- YORICK_CONTRIB_PREFIX="$dir" +- break +- fi +-done + if test -z "$YORICK_CONTRIB_PREFIX"; then + echo "$ac_t""ERROR: configuration cannot continue because yorick" 1>&6 + echo "$ac_t""is not installed in one of the standard places." 1>&6 diff --git a/graphics/yplot/patches/patch-ab b/graphics/yplot/patches/patch-ab index 8b2a0d0b5fd..0d5d1f4999e 100644 --- a/graphics/yplot/patches/patch-ab +++ b/graphics/yplot/patches/patch-ab @@ -1,73 +1,33 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/02/14 11:52:11 jtb Exp $ +$NetBSD: patch-ab,v 1.2 2001/06/20 12:58:56 jtb Exp $ ---- ps.c.orig Wed Feb 14 09:22:25 2001 -+++ ps.c -@@ -28,12 +28,12 @@ - - PLplot PostScript device driver. - */ --#include "plDevs.h" -+#include "plplot/plDevs.h" - - #ifdef PLD_ps - --#include "plplotP.h" --#include "drivers.h" -+#include "plplot/plplotP.h" -+#include "plplot/drivers.h" - - #include <string.h> - #include <time.h> -@@ -133,8 +133,8 @@ - - dev = (PSDev *) pls->dev; - -- dev->xold = UNDEFINED; -- dev->yold = UNDEFINED; -+ dev->xold = PL_UNDEFINED; -+ dev->yold = PL_UNDEFINED; - - plP_setpxl(pxlx, pxly); - -@@ -400,8 +400,8 @@ - { - PSDev *dev = (PSDev *) pls->dev; - -- dev->xold = UNDEFINED; -- dev->yold = UNDEFINED; -+ dev->xold = PL_UNDEFINED; -+ dev->yold = PL_UNDEFINED; - - pls->page++; - fprintf(OF, "%%%%Page: %d %d\n", (int) pls->page, (int) pls->page); -@@ -487,8 +487,8 @@ - - fprintf(OF, " S\n%d W", width); - -- dev->xold = UNDEFINED; -- dev->yold = UNDEFINED; -+ dev->xold = PL_UNDEFINED; -+ dev->yold = PL_UNDEFINED; - break; - } - case PLSTATE_COLOR0: -@@ -514,7 +514,7 @@ - - /* Reinitialize current point location. */ - -- if (dev->xold != UNDEFINED && dev->yold != UNDEFINED) { -+ if (dev->xold != PL_UNDEFINED && dev->yold != PL_UNDEFINED) { - fprintf(OF, " %d %d M \n", (int)dev->xold, (int)dev->yold); - } - } -@@ -591,8 +591,8 @@ - pls->bytecnt += strlen(outbuf); - pls->linepos += 21; - } -- dev->xold = UNDEFINED; -- dev->yold = UNDEFINED; -+ dev->xold = PL_UNDEFINED; -+ dev->yold = PL_UNDEFINED; - fprintf(OF, " F "); - } +--- Makefile.build.in.orig Wed Jun 20 03:59:57 2001 ++++ Makefile.build.in +@@ -299,19 +299,16 @@ + ############################################## + + install: all yplot.i yplotl.i +- mkdir -p $(ROOT)$(YPLOT_PREFIX)/bin +- cp yplot yplotl $(ROOT)$(YPLOT_PREFIX)/bin +- mkdir -p $(ROOT)$(YPLOT_PREFIX)/share/doc/yplot/ +- cp ANNOUNCE CHANGES COPYING DEVICES GOALS INSTALL README yplot.lsm\ +- doc/*.tex doc/*.dvi doc/ytut.ps.gz doc/yplot.doc \ +- doc/demo[1-6].ps \ +- doc/plpoin.ps doc/plsym.ps.??\ ++ $(BSD_INSTALL_PROGRAM) yplot yplotl $(ROOT)$(YPLOT_PREFIX)/bin ++ $(BSD_INSTALL_DATA_DIR) $(ROOT)$(YPLOT_PREFIX)/share/doc/yplot/ ++ $(BSD_INSTALL_DATA) ANNOUNCE CHANGES COPYING DEVICES GOALS \ ++ README doc/*.dvi doc/ytut.ps.gz doc/yplot.doc doc/demo[1-6].ps \ + $(ROOT)$(YPLOT_PREFIX)/share/doc/yplot/ +- mkdir -p $(ROOT)$(YPLOT_PREFIX)/lib/yplot1.1.0/examples +- cp doc/*.i doc/test.dat \ +- $(ROOT)$(YPLOT_PREFIX)/lib/yplot1.1.0/examples +- mkdir -p $(ROOT)$(YORICK_CONTRIB_PREFIX)/contrib +- cp yplot.i yplotl.i $(ROOT)$(YORICK_CONTRIB_PREFIX)/contrib ++ $(BSD_INSTALL_DATA_DIR) $(ROOT)$(YPLOT_PREFIX)/share/examples/yplot ++ $(BSD_INSTALL_DATA) doc/*.i doc/test.dat \ ++ $(ROOT)$(YPLOT_PREFIX)/share/examples/yplot ++ $(BSD_INSTALL_DATA_DIR) $(ROOT)$(YORICK_CONTRIB_PREFIX)/contrib ++ $(BSD_INSTALL_DATA) yplot.i yplotl.i $(ROOT)$(YORICK_CONTRIB_PREFIX)/contrib + + ############################################## diff --git a/graphics/yplot/patches/patch-ac b/graphics/yplot/patches/patch-ac index 372c92bb643..d924a8b7667 100644 --- a/graphics/yplot/patches/patch-ac +++ b/graphics/yplot/patches/patch-ac @@ -1,31 +1,10 @@ -$NetBSD: patch-ac,v 1.1.1.1 2001/02/14 11:52:11 jtb Exp $ +$NetBSD: patch-ac,v 1.2 2001/06/20 12:58:56 jtb Exp $ ---- ljiip.c.orig Wed Feb 14 09:23:57 2001 -+++ ljiip.c -@@ -28,12 +28,12 @@ - compression can speed up the printing up to 3x - - */ --#include "plDevs.h" -+#include "plplot/plDevs.h" - - #ifdef PLD_ljii - --#include "plplotP.h" --#include "drivers.h" -+#include "plplot/plplotP.h" -+#include "plplot/drivers.h" - #include <math.h> - #include <string.h> - -@@ -119,8 +119,8 @@ - - dev = plAllocDev(pls); - -- dev->xold = UNDEFINED; -- dev->yold = UNDEFINED; -+ dev->xold = PL_UNDEFINED; -+ dev->yold = PL_UNDEFINED; - dev->xmin = 0; - dev->ymin = 0; - +--- parse_documentation.py.orig Wed Jun 20 13:44:10 2001 ++++ parse_documentation.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/python ++#! /usr/bin/env python + #Parse Yorick documentation from any file that includes it. + #However, there is some yplot-specific stuff for the function + #call assumed as part of the first lines of the documentation diff --git a/graphics/yplot/patches/patch-ad b/graphics/yplot/patches/patch-ad deleted file mode 100644 index f1faa5fa2f9..00000000000 --- a/graphics/yplot/patches/patch-ad +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2001/02/14 11:52:11 jtb Exp $ - ---- pplot.c.orig Wed Feb 14 09:24:41 2001 -+++ pplot.c -@@ -1,7 +1,7 @@ - #define DOUBLE --#include "plplot.h" --#include <stdio.h> - #include <math.h> -+#include "plplot/plplot.h" -+#include <stdio.h> - #include <stdlib.h> - - #define WORD_CHARS "ABCDEFGHIJKLMNOPQRSTUVWXYZ_1234567890abcdefghijklmnopqrstuvwxyz" diff --git a/graphics/yplot/pkg/PLIST b/graphics/yplot/pkg/PLIST index 6295d311aa4..f5a4cb2a81a 100644 --- a/graphics/yplot/pkg/PLIST +++ b/graphics/yplot/pkg/PLIST @@ -1,16 +1,49 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2001/02/14 11:52:10 jtb Exp $ +@comment $NetBSD: PLIST,v 1.2 2001/06/20 12:58:57 jtb Exp $ bin/yplot bin/yplotl -share/doc/yplot/ytut.ps +lib/yorick/1.4/contrib/yplot.i +lib/yorick/1.4/contrib/yplotl.i share/examples/yplot/demo1.i share/examples/yplot/demo2.i share/examples/yplot/demo3.i share/examples/yplot/demo4.i share/examples/yplot/demo5.i share/examples/yplot/demo6.i -share/yorick/1.4/doc/yplot.doc -share/yorick/1.4/startup/yplot.i -share/yorick/1.4/startup/yplot_body.i -share/yorick/1.4/startup/yplotl.i -@dirrm share/examples/yplot +share/examples/yplot/demo7.i +share/examples/yplot/plpoin.i +share/examples/yplot/plsym.i +share/examples/yplot/test.dat +share/examples/yplot/x01.i +share/examples/yplot/x02.i +share/examples/yplot/x03.i +share/examples/yplot/x04.i +share/examples/yplot/x05.i +share/examples/yplot/x06.i +share/examples/yplot/x07.i +share/examples/yplot/x08.i +share/examples/yplot/x09.i +share/examples/yplot/x10.i +share/examples/yplot/x11.i +share/examples/yplot/x12.i +share/examples/yplot/x13.i +share/examples/yplot/x15.i +share/examples/yplot/x16.i +share/examples/yplot/x18.i +share/doc/yplot/ANNOUNCE +share/doc/yplot/CHANGES +share/doc/yplot/COPYING +share/doc/yplot/DEVICES +share/doc/yplot/GOALS +share/doc/yplot/README +share/doc/yplot/demo1.ps +share/doc/yplot/demo2.ps +share/doc/yplot/demo3.ps +share/doc/yplot/demo4.ps +share/doc/yplot/demo5.ps +share/doc/yplot/demo6.ps +share/doc/yplot/yplot.doc +share/doc/yplot/ytut.dvi +share/doc/yplot/ytut.ps.gz @dirrm share/doc/yplot +@dirrm share/examples/yplot +@unexec rmdir %D/lib/yorick/1.4/contrib 2>/dev/null || true |