upgrade 6.3.54

4 files changed, 129 insertions, 17 deletions

diff --git a/math/ngraph/Makefile b/math/ngraph/Makefile
index 87c4ca57bf5b..3bf6a584a166 100644
--- a/math/ngraph/Makefile
+++ b/math/ngraph/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ngraph
-PORTVERSION=	6.3.51
-PORTREVISION=	1
+PORTVERSION=	6.3.54
 CATEGORIES=	math
 MASTER_SITES=	http://www2e.biglobe.ne.jp/~isizaka/bin/ \
 		PORTS_JP
@@ -12,6 +11,9 @@ DISTNAME=	Ngraph-${PORTVERSION}-src
 MAINTAINER=	sanpei@FreeBSD.org
 COMMENT=	XY plotting tool for students, scientists, and engineers
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/gpl.txt
+
 USES=		gmake motif
 
 .include <bsd.port.mk>
diff --git a/math/ngraph/distinfo b/math/ngraph/distinfo
index 32fafec61b33..e4d88fd23f74 100644
--- a/math/ngraph/distinfo
+++ b/math/ngraph/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Ngraph-6.3.51-src.tar.gz) = 8e23b74637ae4cc5d75fe98ed0a143f2a18949f396ec8a9d77914a06b806a073
-SIZE (Ngraph-6.3.51-src.tar.gz) = 421084
+SHA256 (Ngraph-6.3.54-src.tar.gz) = a491e5a0397bb518b9dad38c95a1441fc8055a030eba86cd46712fd4fcbaac3b
+SIZE (Ngraph-6.3.54-src.tar.gz) = 995722
diff --git a/math/ngraph/files/patch-Makefile b/math/ngraph/files/patch-Makefile
index 62734d0a1bf5..a147ad434831 100644
--- a/math/ngraph/files/patch-Makefile
+++ b/math/ngraph/files/patch-Makefile
@@ -1,8 +1,8 @@
---- Makefile.orig	2009-10-15 20:17:47.000000000 +0900
-+++ Makefile	2014-06-20 21:48:30.928895628 +0900
-@@ -2,26 +2,26 @@
- MAINVERSION = '"6.03"'
- GUIVERSION = '".51"'
+--- Makefile.orig	2015-07-13 12:31:19.000000000 +0900
++++ Makefile	2015-07-18 08:34:18.463818755 +0900
+@@ -3,26 +3,26 @@
+ GUIVERSION = '".54"'
+ VERSION=6.3.54
  ALIGNSIZE = 8
 -LIBDIR = '"/usr/local/lib/Ngraph"'
 -INSTALLDIR = /usr/local/lib/Ngraph
@@ -17,31 +17,31 @@
  # Linux + Open Motif 2.1 [dynamic link]
  #
 -CC = gcc
--CCOPTION = -O2 -m486
+-CCOPTION = -O2
 -MAKE = make
 -AR = ar
 -RANLIB = ranlib
 -STRIP = strip
 -DEFS = -DJAPANESE
 -PLATFORM  = '"for X11 [Linux(glibc2) + Open Motif]"'
--X11INCLUDE = -I/usr/X11R6/include
+-X11INCLUDE = 
 -STATICLINK =
 -X11LIB = -L/usr/X11R6/lib -lm -lXm -lXext -lXt -lXp -lX11 -lICE -lSM
 +#CC = gcc
-+#CCOPTION = -O2 -m486
++#CCOPTION = -O2
 +#MAKE = make
 +#AR = ar
 +#RANLIB = ranlib
 +#STRIP = strip
 +#DEFS = -DJAPANESE
-+#PLATFORM  = '"for X11 [Linux(glibc2) + Open Motif]"'
-+#X11INCLUDE = -I/usr/X11R6/include
++##PLATFORM  = '"for X11 [Linux(glibc2) + Open Motif]"'
++#X11INCLUDE = 
 +#STATICLINK =
 +#X11LIB = -L/usr/X11R6/lib -lm -lXm -lXext -lXt -lXp -lX11 -lICE -lSM
  #
  #
  ###############################################################################
-@@ -149,17 +149,18 @@
+@@ -150,17 +150,18 @@
  #
  # (Thanks to MIHIRA Sanpei Yoshiro <sanpei@sanpei.org>)
  #
diff --git a/math/ngraph/pkg-plist b/math/ngraph/pkg-plist
index 582f88d2952c..a6eb7723ff96 100644
--- a/math/ngraph/pkg-plist
+++ b/math/ngraph/pkg-plist
@@ -25,13 +25,124 @@ lib/Ngraph/demo/demo5c.ngp
 lib/Ngraph/demo/demo5d.ngp
 lib/Ngraph/demo/demo5e.ngp
 lib/Ngraph/demo/encoding.ngp
+lib/Ngraph/doc/addin.htm
+lib/Ngraph/doc/copyrigh.htm
+lib/Ngraph/doc/data.htm
+lib/Ngraph/doc/dialogs/axis.jpg
+lib/Ngraph/doc/dialogs/axisbase.jpg
+lib/Ngraph/doc/dialogs/axisfont.jpg
+lib/Ngraph/doc/dialogs/axisgage.jpg
+lib/Ngraph/doc/dialogs/axisnum.jpg
+lib/Ngraph/doc/dialogs/axispos.jpg
+lib/Ngraph/doc/dialogs/data.jpg
+lib/Ngraph/doc/dialogs/datafit.jpg
+lib/Ngraph/doc/dialogs/dataload.jpg
+lib/Ngraph/doc/dialogs/datamask.jpg
+lib/Ngraph/doc/dialogs/datamath.jpg
+lib/Ngraph/doc/dialogs/datamove.jpg
+lib/Ngraph/doc/dialogs/grid.jpg
+lib/Ngraph/doc/dialogs/lgndarc.jpg
+lib/Ngraph/doc/dialogs/lgndcurv.jpg
+lib/Ngraph/doc/dialogs/lgndgaus.jpg
+lib/Ngraph/doc/dialogs/lgndline.jpg
+lib/Ngraph/doc/dialogs/lgndmark.jpg
+lib/Ngraph/doc/dialogs/lgndpoly.jpg
+lib/Ngraph/doc/dialogs/lgndrect.jpg
+lib/Ngraph/doc/dialogs/lgndtext.jpg
+lib/Ngraph/doc/dialogs/loadngp.jpg
+lib/Ngraph/doc/dialogs/loadprm.jpg
+lib/Ngraph/doc/dialogs/merge.jpg
+lib/Ngraph/doc/dialogs/pageord.jpg
+lib/Ngraph/doc/dialogs/prefmisc.jpg
+lib/Ngraph/doc/dialogs/save.jpg
+lib/Ngraph/doc/gra.htm
+lib/Ngraph/doc/img/axisref.gif
+lib/Ngraph/doc/img/barc.gif
+lib/Ngraph/doc/img/baxispo.gif
+lib/Ngraph/doc/img/bclear.gif
+lib/Ngraph/doc/img/bcross.gif
+lib/Ngraph/doc/img/bcurve.gif
+lib/Ngraph/doc/img/bdataopn.gif
+lib/Ngraph/doc/img/bdatapo.gif
+lib/Ngraph/doc/img/bdraw.gif
+lib/Ngraph/doc/img/beval.gif
+lib/Ngraph/doc/img/bframe.gif
+lib/Ngraph/doc/img/bgauss.gif
+lib/Ngraph/doc/img/blgndpo.gif
+lib/Ngraph/doc/img/bline.gif
+lib/Ngraph/doc/img/bload.gif
+lib/Ngraph/doc/img/bmark.gif
+lib/Ngraph/doc/img/bmath.gif
+lib/Ngraph/doc/img/bpoint.gif
+lib/Ngraph/doc/img/bpolygon.gif
+lib/Ngraph/doc/img/bpreview.gif
+lib/Ngraph/doc/img/bprint.gif
+lib/Ngraph/doc/img/brect.gif
+lib/Ngraph/doc/img/bsave.gif
+lib/Ngraph/doc/img/bscale.gif
+lib/Ngraph/doc/img/bscundo.gif
+lib/Ngraph/doc/img/bsection.gif
+lib/Ngraph/doc/img/bsingle.gif
+lib/Ngraph/doc/img/bstop.gif
+lib/Ngraph/doc/img/btext.gif
+lib/Ngraph/doc/img/btrim.gif
+lib/Ngraph/doc/img/bzoom.gif
+lib/Ngraph/doc/img/iconl.gif
+lib/Ngraph/doc/img/winaxis.gif
+lib/Ngraph/doc/img/wincoord.gif
+lib/Ngraph/doc/img/windata.gif
+lib/Ngraph/doc/img/wininfo.gif
+lib/Ngraph/doc/img/winlgnd.gif
+lib/Ngraph/doc/img/winmerge.gif
+lib/Ngraph/doc/intro.htm
+lib/Ngraph/doc/math.htm
+lib/Ngraph/doc/ngraph.htm
+lib/Ngraph/doc/object.htm
+lib/Ngraph/doc/operate.htm
+lib/Ngraph/doc/refer.htm
+lib/Ngraph/doc/script.htm
+lib/Ngraph/doc/text.htm
+lib/Ngraph/doc/tutorial.htm
+lib/Ngraph/doc/tutorial/aclear.jpg
+lib/Ngraph/doc/tutorial/addgraph.jpg
+lib/Ngraph/doc/tutorial/adialog.jpg
+lib/Ngraph/doc/tutorial/alegend.jpg
+lib/Ngraph/doc/tutorial/awindow.jpg
+lib/Ngraph/doc/tutorial/axispo.jpg
+lib/Ngraph/doc/tutorial/axisref.jpg
+lib/Ngraph/doc/tutorial/datapo.jpg
+lib/Ngraph/doc/tutorial/draw.jpg
+lib/Ngraph/doc/tutorial/eval.jpg
+lib/Ngraph/doc/tutorial/evaldlg.jpg
+lib/Ngraph/doc/tutorial/fdialog.jpg
+lib/Ngraph/doc/tutorial/fdialog2.jpg
+lib/Ngraph/doc/tutorial/fdialog3.jpg
+lib/Ngraph/doc/tutorial/fdup.jpg
+lib/Ngraph/doc/tutorial/filedlg.jpg
+lib/Ngraph/doc/tutorial/fitdlg.jpg
+lib/Ngraph/doc/tutorial/focus.jpg
+lib/Ngraph/doc/tutorial/fopen.jpg
+lib/Ngraph/doc/tutorial/fwindow.jpg
+lib/Ngraph/doc/tutorial/fwindow2.jpg
+lib/Ngraph/doc/tutorial/graphc.jpg
+lib/Ngraph/doc/tutorial/graphf.jpg
+lib/Ngraph/doc/tutorial/graphs.jpg
+lib/Ngraph/doc/tutorial/infowin.jpg
+lib/Ngraph/doc/tutorial/lapoint.jpg
+lib/Ngraph/doc/tutorial/legend.jpg
+lib/Ngraph/doc/tutorial/lwindow.jpg
+lib/Ngraph/doc/tutorial/math.jpg
+lib/Ngraph/doc/tutorial/pointer.jpg
+lib/Ngraph/doc/tutorial/scundo.jpg
+lib/Ngraph/doc/tutorial/trimming.jpg
+lib/Ngraph/doc/tutorial/window.jpg
 lib/Ngraph/fft
 lib/Ngraph/fft.nsc
 lib/Ngraph/fft.tcl
 lib/Ngraph/fitrslt.nsc
 lib/Ngraph/fitrslt.tcl
-lib/Ngraph/gpl.txt
 lib/Ngraph/gpl.ja.txt
+lib/Ngraph/gpl.txt
 lib/Ngraph/gra2ps
 lib/Ngraph/gra2ps.ini
 lib/Ngraph/gra2wmf
@@ -44,4 +155,3 @@ lib/Ngraph/ngraph
 lib/Ngraph/ngraph.sh
 lib/Ngraph/terminal
 lib/Ngraph/text-in.nsc
-@dir lib/Ngraph/doc