diff options
author | xtraeme <xtraeme@pkgsrc.org> | 2003-11-08 10:13:10 +0000 |
---|---|---|
committer | xtraeme <xtraeme@pkgsrc.org> | 2003-11-08 10:13:10 +0000 |
commit | 6660a2c1dc083c33f060e4121682cc7c37839442 (patch) | |
tree | 7f65ebc265fe1c4f4a4027a7ca91318557ea418d /graphics | |
parent | c96895efa73695ea4ea8d94152c3fcbac01aca2b (diff) | |
download | pkgsrc-6660a2c1dc083c33f060e4121682cc7c37839442.tar.gz |
Upgrade to 6.3.20. Update provided by Osamu OISHI in PR pkg/22800.
No Changelog available on the website/sources.
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/Ngraph/Makefile | 8 | ||||
-rw-r--r-- | graphics/Ngraph/PLIST | 6 | ||||
-rw-r--r-- | graphics/Ngraph/distinfo | 9 | ||||
-rw-r--r-- | graphics/Ngraph/patches/patch-aa | 48 | ||||
-rw-r--r-- | graphics/Ngraph/patches/patch-ab | 21 |
5 files changed, 29 insertions, 63 deletions
diff --git a/graphics/Ngraph/Makefile b/graphics/Ngraph/Makefile index 551c187fe21..05d83da6712 100644 --- a/graphics/Ngraph/Makefile +++ b/graphics/Ngraph/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2003/07/21 16:51:35 martti Exp $ +# $NetBSD: Makefile,v 1.9 2003/11/08 10:13:10 xtraeme Exp $ # -DISTNAME= Ngraph-6.3.06-src -PKGNAME= Ngraph-6.3.06 +DISTNAME= Ngraph-6.3.20-src +PKGNAME= ${DISTNAME:S/-src//} CATEGORIES= graphics MASTER_SITES= http://www2e.biglobe.ne.jp/~isizaka/bin/ \ ftp://ftp.cs.umb.edu/pub/interleaf/CDE/ @@ -16,7 +16,7 @@ COMMENT= The 2D graph and data analysis program EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} USE_BUILDLINK2= yes -USE_X11BASE= yes +USE_X11= yes USE_GMAKE= yes post-extract: diff --git a/graphics/Ngraph/PLIST b/graphics/Ngraph/PLIST index 8e9c2b80c03..981a5dbd586 100644 --- a/graphics/Ngraph/PLIST +++ b/graphics/Ngraph/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:50:12 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2003/11/08 10:13:10 xtraeme Exp $ bin/ngraph libexec/Ngraph/.Ngraph libexec/Ngraph/.Ngraph.ngp @@ -25,6 +25,7 @@ libexec/Ngraph/demo/demo5b.ngp libexec/Ngraph/demo/demo5c.ngp libexec/Ngraph/demo/demo5d.ngp libexec/Ngraph/demo/demo5e.ngp +libexec/Ngraph/demo/encoding.ngp libexec/Ngraph/doc/Ngraph.html libexec/Ngraph/doc/addin.htm libexec/Ngraph/doc/copyrigh.htm @@ -143,7 +144,10 @@ libexec/Ngraph/fft.nsc libexec/Ngraph/fft.tcl libexec/Ngraph/fitrslt.nsc libexec/Ngraph/fitrslt.tcl +libexec/Ngraph/gpl.ja.txt +libexec/Ngraph/gpl.txt libexec/Ngraph/gra2ps +libexec/Ngraph/gra2ps.ini libexec/Ngraph/ja/Ngraph libexec/Ngraph/legend.nsc libexec/Ngraph/legend.tcl diff --git a/graphics/Ngraph/distinfo b/graphics/Ngraph/distinfo index 9ad2b01c984..2d255be8d14 100644 --- a/graphics/Ngraph/distinfo +++ b/graphics/Ngraph/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.4 2002/09/22 00:06:23 jlam Exp $ +$NetBSD: distinfo,v 1.5 2003/11/08 10:13:10 xtraeme Exp $ -SHA1 (Ngraph-6.3.06-src.tar.gz) = bea0e06300c37a69e7a084f0713e973dd806c458 -Size (Ngraph-6.3.06-src.tar.gz) = 364733 bytes +SHA1 (Ngraph-6.3.20-src.tar.gz) = a2f2af4739624b5bb149bd615330d4c0febf8e60 +Size (Ngraph-6.3.20-src.tar.gz) = 404342 bytes SHA1 (Ngraph-6.3-doc.tar.gz) = d1024e53d01cca2e4cd00a5d8a53dc618c4e9fc1 Size (Ngraph-6.3-doc.tar.gz) = 556956 bytes SHA1 (ileaf-widgets.tar.Z) = db0f6425f77bc3013b7aae163be558683661560e Size (ileaf-widgets.tar.Z) = 70223 bytes -SHA1 (patch-aa) = f3f95cb0f68ee101e73ea54ec43e7bf07e7296c6 -SHA1 (patch-ab) = 194dbb122c85c6c0cad999496388f8cd9e22c238 +SHA1 (patch-aa) = 16973ed4513ddbade7bfba06362e2f48957b6ca0 diff --git a/graphics/Ngraph/patches/patch-aa b/graphics/Ngraph/patches/patch-aa index 49345ca257f..6a208157da4 100644 --- a/graphics/Ngraph/patches/patch-aa +++ b/graphics/Ngraph/patches/patch-aa @@ -1,63 +1,47 @@ -$NetBSD: patch-aa,v 1.3 2002/09/22 00:06:23 jlam Exp $ +$NetBSD: patch-aa,v 1.4 2003/11/08 10:13:10 xtraeme Exp $ ---- Makefile.orig Sat Oct 16 06:00:08 1999 -+++ Makefile -@@ -1,27 +1,43 @@ +--- Makefile.orig 2003-11-08 10:28:29.000000000 +0100 ++++ Makefile 2003-11-08 10:32:33.000000000 +0100 +@@ -1,26 +1,26 @@ # MAINVERSION = '"6.03"' - GUIVERSION = '".06"' + GUIVERSION = '".20"' -LIBDIR = '"/usr/local/lib/Ngraph"' -INSTALLDIR = /usr/local/lib/Ngraph -BINDIR = /usr/local/bin +LIBDIR = '"${PREFIX}/libexec/Ngraph"' -+INSTALLDIR = ${PREFIX}/libexec/Ngraph ++INSTALLDIR =${PREFIX}/libexec/Ngraph +BINDIR = ${PREFIX}/bin # # ############################################################################### # --# Linux + Motif 2.1 (RedHat) [static link] +-# Linux + Open Motif 2.1 [dynamic link] +# NetBSD + lesstif/openmotif [dynamic link] # - CC = gcc +-CC = gcc -CCOPTION = -O2 -m486 -MAKE = make ++#CC = gcc +CCOPTION = ${CFLAGS} ++#MAKE = make AR = ar RANLIB = ranlib STRIP = strip -DEFS = -DJAPANESE --PLATFORM = '"for X11 [Linux(glibc2)+Motif2.1]"' +-PLATFORM = '"for X11 [Linux(glibc2) + Open Motif]"' +-X11INCLUDE = -I/usr/X11R6/include +-STATICLINK = +-X11LIB = -L/usr/X11R6/lib -lm -lXm -lXext -lXt -lXp -lX11 -lICE -lSM +DEFS = ${MOTIF_DEFS} +PLATFORM = '"for X11 [NetBSD + OpenMotif/LessTif]"' +X11INCLUDE = -I${X11BASE}/include -I../combo +STATICLINK = ./combo/ComboBox.o +X11LIB = ${LDFLAGS} ${MOTIFLIB} -lm -lXext -lXt -lXp -lX11 -lICE -lSM -+# -+# -+############################################################################### -+# -+# Linux + Motif 2.1 (RedHat) [static link] -+# -+#CC = gcc -+#CCOPTION = -O2 -m486 -+#MAKE = make -+#AR = ar -+#RANLIB = ranlib -+#STRIP = strip -+#DEFS = -DJAPANESE -+#PLATFORM = '"for X11 [Linux(glibc2)+Motif2.1]"' - #PLATFORM = '"for X11 [Linux(libc5)+Motif2.1]"' --X11INCLUDE = -I/usr/X11R6/include --STATICLINK = /usr/X11R6/lib/libXm.a --X11LIB = -L/usr/X11R6/lib -lm -lXext -lXt -lXp -lX11 -lICE -lSM -+#X11INCLUDE = -I/usr/X11R6/include -+#STATICLINK = /usr/X11R6/lib/libXm.a -+#X11LIB = -L/usr/X11R6/lib -lm -lXext -lXt -lXp -lX11 -lICE -lSM # # ############################################################################### -@@ -154,6 +170,7 @@ +@@ -170,6 +170,7 @@ OBJECT = x11/main.o x11/x11.a src/kern.a all: @@ -65,7 +49,7 @@ $NetBSD: patch-aa,v 1.3 2002/09/22 00:06:23 jlam Exp $ (cd src; $(MAKE) kern.a) (cd x11; $(MAKE) main.o) (cd x11; $(MAKE) x11.a) -@@ -196,6 +213,7 @@ +@@ -212,6 +213,7 @@ - (cd x11; $(MAKE) clean) - (cd x11drive; $(MAKE) clean) - (cd x11addin; $(MAKE) clean) diff --git a/graphics/Ngraph/patches/patch-ab b/graphics/Ngraph/patches/patch-ab deleted file mode 100644 index b9563b84713..00000000000 --- a/graphics/Ngraph/patches/patch-ab +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 1999/11/25 08:17:15 sakamoto Exp $ - ---- Ngraph.ini.orig Tue Nov 16 17:23:02 1999 -+++ Ngraph.ini Tue Nov 16 17:27:29 1999 -@@ -23,11 +23,11 @@ - script=TEXT-IN: insert legend-text,text-in.nsc, - script=CALC: making a data file,calc.nsc, - script=FFT: Fast Fourier Transform,fft.nsc, --ext_driver=PostScript(EPSF),gra2ps,-e -c --ext_driver=PostScript,gra2ps,-c --prn_driver=PostScript (mono),gra2ps, | lpr, --prn_driver=PostScript (color),gra2ps, | lpr,-c --prn_driver=GhostScript,gra2ps, | gs -,-c -+ext_driver=PostScript(EPSF),gra2ps,-e -c -i INSTALLDIR/Ngraph.ps -+ext_driver=PostScript,gra2ps,-c -i INSTALLDIR/Ngraph.ps -+prn_driver=PostScript (mono),gra2ps, | lpr, -i INSTALLDIR/Ngraph.ps -+prn_driver=PostScript (color),gra2ps, | lpr,-c -i INSTALLDIR/Ngraph.ps -+prn_driver=GhostScript,gra2ps, | gs -q -sDEVICE=x11 -sOutputFile=- -dNOPAUSE - ,-c -i INSTALLDIR/Ngraph.ps - font_map=Times,0,-adobe-times-medium-r-normal--*-*-75-75-p-*-iso8859-1 - font_map=TimesBold,0,-adobe-times-bold-r-normal--*-*-75-75-p-*-iso8859-1 - font_map=TimesItalic,0,-adobe-times-medium-i-normal--*-*-75-75-p-*-iso8859-1 |