Update to 6.3.30, provided by Osamu OISHI in PR 28454.

Changes: perhaps if I could read Japanese...

4 files changed, 100 insertions, 85 deletions

diff --git a/graphics/Ngraph/Makefile b/graphics/Ngraph/Makefile
index 28631043b8b..3356dc7e228 100644
--- a/graphics/Ngraph/Makefile
+++ b/graphics/Ngraph/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.12 2004/10/03 00:14:48 tv Exp $
+# $NetBSD: Makefile,v 1.13 2004/11/29 20:31:16 wiz Exp $
 #
 
-DISTNAME=	Ngraph-6.3.20-src
+DISTNAME=	Ngraph-6.3.30-src
 PKGNAME=	${DISTNAME:S/-src//}
-PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www2e.biglobe.ne.jp/~isizaka/bin/ \
 		ftp://ftp.cs.umb.edu/pub/interleaf/CDE/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} Ngraph-6.3-doc.tar.gz \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} Ngraph-6.3.30-doc.tar.gz \
 		ileaf-widgets.tar.Z
 
 MAINTAINER=	oishi@ims.ac.jp
@@ -24,7 +23,7 @@ post-extract:
 	${GTAR} -C ${WRKSRC}/combo -xzf ${DISTDIR}/ileaf-widgets.tar.Z
 
 post-install:
-	${GTAR} -C ${PREFIX}/libexec/Ngraph -xzf ${DISTDIR}/Ngraph-6.3-doc.tar.gz
+	${GTAR} -C ${PREFIX}/libexec/Ngraph -xzf ${DISTDIR}/Ngraph-6.3.30-doc.tar.gz
 
 .include "../../mk/motif.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/Ngraph/PLIST b/graphics/Ngraph/PLIST
index 981a5dbd586..ebc9a25ebb5 100644
--- a/graphics/Ngraph/PLIST
+++ b/graphics/Ngraph/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/11/08 10:13:10 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/11/29 20:31:16 wiz Exp $
 bin/ngraph
 libexec/Ngraph/.Ngraph
 libexec/Ngraph/.Ngraph.ngp
@@ -26,39 +26,25 @@ 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
-libexec/Ngraph/doc/data.htm
-libexec/Ngraph/doc/dialogs/axis.jpg
-libexec/Ngraph/doc/dialogs/axisbase.jpg
-libexec/Ngraph/doc/dialogs/axisfont.jpg
-libexec/Ngraph/doc/dialogs/axisgage.jpg
-libexec/Ngraph/doc/dialogs/axisnum.jpg
-libexec/Ngraph/doc/dialogs/axispos.jpg
-libexec/Ngraph/doc/dialogs/data.jpg
-libexec/Ngraph/doc/dialogs/datafit.jpg
-libexec/Ngraph/doc/dialogs/dataload.jpg
-libexec/Ngraph/doc/dialogs/datamask.jpg
-libexec/Ngraph/doc/dialogs/datamath.jpg
-libexec/Ngraph/doc/dialogs/datamove.jpg
-libexec/Ngraph/doc/dialogs/grid.jpg
-libexec/Ngraph/doc/dialogs/lgndarc.jpg
-libexec/Ngraph/doc/dialogs/lgndcurv.jpg
-libexec/Ngraph/doc/dialogs/lgndgaus.jpg
-libexec/Ngraph/doc/dialogs/lgndline.jpg
-libexec/Ngraph/doc/dialogs/lgndmark.jpg
-libexec/Ngraph/doc/dialogs/lgndpoly.jpg
-libexec/Ngraph/doc/dialogs/lgndrect.jpg
-libexec/Ngraph/doc/dialogs/lgndtext.jpg
-libexec/Ngraph/doc/dialogs/loadngp.jpg
-libexec/Ngraph/doc/dialogs/loadprm.jpg
-libexec/Ngraph/doc/dialogs/merge.jpg
-libexec/Ngraph/doc/dialogs/pageord.jpg
-libexec/Ngraph/doc/dialogs/prefmisc.jpg
-libexec/Ngraph/doc/dialogs/save.jpg
-libexec/Ngraph/doc/gra.htm
-libexec/Ngraph/doc/graph.htm
+libexec/Ngraph/fft
+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/gra2wmf
+libexec/Ngraph/gra2wmf.ini
+libexec/Ngraph/ja/Ngraph
+libexec/Ngraph/legend.nsc
+libexec/Ngraph/legend.tcl
+libexec/Ngraph/math.nsc
+libexec/Ngraph/ngraph
+libexec/Ngraph/ngraph.sh
+libexec/Ngraph/terminal
+libexec/Ngraph/text-in.nsc
 libexec/Ngraph/doc/img/axisref.gif
 libexec/Ngraph/doc/img/barc.gif
 libexec/Ngraph/doc/img/baxispo.gif
@@ -97,15 +83,6 @@ libexec/Ngraph/doc/img/windata.gif
 libexec/Ngraph/doc/img/wininfo.gif
 libexec/Ngraph/doc/img/winlgnd.gif
 libexec/Ngraph/doc/img/winmerge.gif
-libexec/Ngraph/doc/intro.htm
-libexec/Ngraph/doc/math.htm
-libexec/Ngraph/doc/ngraph.htm
-libexec/Ngraph/doc/object.htm
-libexec/Ngraph/doc/operate.htm
-libexec/Ngraph/doc/refer.htm
-libexec/Ngraph/doc/script.htm
-libexec/Ngraph/doc/text.htm
-libexec/Ngraph/doc/tutorial.htm
 libexec/Ngraph/doc/tutorial/aclear.jpg
 libexec/Ngraph/doc/tutorial/addgraph.jpg
 libexec/Ngraph/doc/tutorial/adialog.jpg
@@ -116,7 +93,6 @@ libexec/Ngraph/doc/tutorial/axisref.jpg
 libexec/Ngraph/doc/tutorial/datapo.jpg
 libexec/Ngraph/doc/tutorial/draw.jpg
 libexec/Ngraph/doc/tutorial/eval.jpg
-libexec/Ngraph/doc/tutorial/evaldlg.jpg
 libexec/Ngraph/doc/tutorial/fdialog.jpg
 libexec/Ngraph/doc/tutorial/fdialog2.jpg
 libexec/Ngraph/doc/tutorial/fdialog3.jpg
@@ -139,26 +115,52 @@ libexec/Ngraph/doc/tutorial/pointer.jpg
 libexec/Ngraph/doc/tutorial/scundo.jpg
 libexec/Ngraph/doc/tutorial/trimming.jpg
 libexec/Ngraph/doc/tutorial/window.jpg
-libexec/Ngraph/fft
-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
-libexec/Ngraph/math.nsc
-libexec/Ngraph/ngraph
-libexec/Ngraph/ngraph.sh
-libexec/Ngraph/terminal
-libexec/Ngraph/text-in.nsc
+libexec/Ngraph/doc/tutorial/evaldlg.jpg
+libexec/Ngraph/doc/Ngraph.html
+libexec/Ngraph/doc/addin.htm
+libexec/Ngraph/doc/copyrigh.htm
+libexec/Ngraph/doc/data.htm
+libexec/Ngraph/doc/gra.htm
+libexec/Ngraph/doc/intro.htm
+libexec/Ngraph/doc/math.htm
+libexec/Ngraph/doc/ngraph.htm
+libexec/Ngraph/doc/object.htm
+libexec/Ngraph/doc/operate.htm
+libexec/Ngraph/doc/refer.htm
+libexec/Ngraph/doc/script.htm
+libexec/Ngraph/doc/text.htm
+libexec/Ngraph/doc/tutorial.htm
+libexec/Ngraph/doc/dialogs/axis.jpg
+libexec/Ngraph/doc/dialogs/axisbase.jpg
+libexec/Ngraph/doc/dialogs/axisfont.jpg
+libexec/Ngraph/doc/dialogs/axisgage.jpg
+libexec/Ngraph/doc/dialogs/axisnum.jpg
+libexec/Ngraph/doc/dialogs/axispos.jpg
+libexec/Ngraph/doc/dialogs/data.jpg
+libexec/Ngraph/doc/dialogs/datafit.jpg
+libexec/Ngraph/doc/dialogs/dataload.jpg
+libexec/Ngraph/doc/dialogs/datamask.jpg
+libexec/Ngraph/doc/dialogs/datamath.jpg
+libexec/Ngraph/doc/dialogs/datamove.jpg
+libexec/Ngraph/doc/dialogs/grid.jpg
+libexec/Ngraph/doc/dialogs/lgndarc.jpg
+libexec/Ngraph/doc/dialogs/lgndcurv.jpg
+libexec/Ngraph/doc/dialogs/lgndgaus.jpg
+libexec/Ngraph/doc/dialogs/lgndline.jpg
+libexec/Ngraph/doc/dialogs/lgndmark.jpg
+libexec/Ngraph/doc/dialogs/lgndpoly.jpg
+libexec/Ngraph/doc/dialogs/lgndrect.jpg
+libexec/Ngraph/doc/dialogs/lgndtext.jpg
+libexec/Ngraph/doc/dialogs/loadngp.jpg
+libexec/Ngraph/doc/dialogs/loadprm.jpg
+libexec/Ngraph/doc/dialogs/merge.jpg
+libexec/Ngraph/doc/dialogs/pageord.jpg
+libexec/Ngraph/doc/dialogs/prefmisc.jpg
+libexec/Ngraph/doc/dialogs/save.jpg
 @dirrm libexec/Ngraph/ja
-@dirrm libexec/Ngraph/doc/tutorial
+@exec ${MKDIR} %D/libexec/Ngraph/doc
 @dirrm libexec/Ngraph/doc/img
+@dirrm libexec/Ngraph/doc/tutorial
 @dirrm libexec/Ngraph/doc/dialogs
 @dirrm libexec/Ngraph/doc
 @dirrm libexec/Ngraph/demo
diff --git a/graphics/Ngraph/distinfo b/graphics/Ngraph/distinfo
index 2d255be8d14..a89773f58ec 100644
--- a/graphics/Ngraph/distinfo
+++ b/graphics/Ngraph/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2003/11/08 10:13:10 xtraeme Exp $
+$NetBSD: distinfo,v 1.6 2004/11/29 20:31:16 wiz Exp $
 
-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 (Ngraph-6.3.30-src.tar.gz) = 81574241f35258bb14139c6ae57b28789f0d297c
+Size (Ngraph-6.3.30-src.tar.gz) = 418984 bytes
+SHA1 (Ngraph-6.3.30-doc.tar.gz) = 7f641c7f274e17950e45a4f8a1131b5d05db848e
+Size (Ngraph-6.3.30-doc.tar.gz) = 557066 bytes
 SHA1 (ileaf-widgets.tar.Z) = db0f6425f77bc3013b7aae163be558683661560e
 Size (ileaf-widgets.tar.Z) = 70223 bytes
-SHA1 (patch-aa) = 16973ed4513ddbade7bfba06362e2f48957b6ca0
+SHA1 (patch-aa) = 5b1f01b6a5e75489a8782d89ddfeeb60bc1c29fa
diff --git a/graphics/Ngraph/patches/patch-aa b/graphics/Ngraph/patches/patch-aa
index 6a208157da4..2b4506d095b 100644
--- a/graphics/Ngraph/patches/patch-aa
+++ b/graphics/Ngraph/patches/patch-aa
@@ -1,11 +1,9 @@
-$NetBSD: patch-aa,v 1.4 2003/11/08 10:13:10 xtraeme Exp $
-
---- Makefile.orig	2003-11-08 10:28:29.000000000 +0100
-+++ Makefile	2003-11-08 10:32:33.000000000 +0100
-@@ -1,26 +1,26 @@
+--- Makefile.orig	Sat Aug  7 19:57:39 2004
++++ Makefile	Tue Aug 31 20:40:29 2004
+@@ -1,26 +1,42 @@
  #
  MAINVERSION = '"6.03"'
- GUIVERSION = '".20"'
+ GUIVERSION = '".30"'
 -LIBDIR = '"/usr/local/lib/Ngraph"'
 -INSTALLDIR = /usr/local/lib/Ngraph
 -BINDIR = /usr/local/bin
@@ -17,14 +15,13 @@ $NetBSD: patch-aa,v 1.4 2003/11/08 10:13:10 xtraeme Exp $
  ###############################################################################
  #
 -# 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
++MAKE = gmake
  AR = ar
  RANLIB = ranlib
  STRIP = strip
@@ -38,10 +35,27 @@ $NetBSD: patch-aa,v 1.4 2003/11/08 10:13:10 xtraeme Exp $
 +X11INCLUDE = -I${X11BASE}/include -I../combo
 +STATICLINK = ./combo/ComboBox.o
 +X11LIB = ${LDFLAGS} ${MOTIFLIB} -lm -lXext -lXt -lXp -lX11 -lICE -lSM
++#
++#
++###############################################################################
++#
++# Linux + Open Motif 2.1 [dynamic link]
++#
++#CC = gcc
++#CCOPTION = -O2 -m486
++#MAKE = make
++#AR = ar
++#RANLIB = ranlib
++#STRIP = strip
++#DEFS = -DJAPANESE
++#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
  #
  #
  ###############################################################################
-@@ -170,6 +170,7 @@
+@@ -170,6 +186,7 @@
  OBJECT = x11/main.o x11/x11.a src/kern.a
  
  all:
@@ -49,7 +63,7 @@ $NetBSD: patch-aa,v 1.4 2003/11/08 10:13:10 xtraeme Exp $
  	(cd src; $(MAKE) kern.a)
  	(cd x11; $(MAKE) main.o)
  	(cd x11; $(MAKE) x11.a)
-@@ -212,6 +213,7 @@
+@@ -216,6 +233,7 @@
  	- (cd x11; $(MAKE) clean)
  	- (cd x11drive; $(MAKE) clean)
  	- (cd x11addin; $(MAKE) clean)