5 files changed, 56 insertions, 24 deletions

diff --git a/math/ngraph/Makefile b/math/ngraph/Makefile
index e453832eb05e..708668e31118 100644
--- a/math/ngraph/Makefile
+++ b/math/ngraph/Makefile
@@ -6,10 +6,11 @@
 # $FreeBSD$
 #
 
-DISTNAME=       Ngraph-6.3.05-src
-PKGNAME=        ngraph-6.3.05
+DISTNAME=       Ngraph-6.3.06-src
+PKGNAME=        ngraph-6.3.06
 CATEGORIES=	math
-MASTER_SITES=   ${MASTER_SITE_PORTS_JP}
+MASTER_SITES=   http://www2e.biglobe.ne.jp/~isizaka/bin/ \
+		${MASTER_SITE_PORTS_JP}
 
 MAINTAINER=     sanpei@jp.FreeBSD.org
 
diff --git a/math/ngraph/distinfo b/math/ngraph/distinfo
index b4d9cfa228fe..d46589932d50 100644
--- a/math/ngraph/distinfo
+++ b/math/ngraph/distinfo
@@ -1 +1 @@
-MD5 (Ngraph-6.3.05-src.tar.gz) = b5aa3f74ebb35716b9a6551d7092d8f7
+MD5 (Ngraph-6.3.06-src.tar.gz) = 6b51d983963f97d0563525cc1e6e07a5
diff --git a/math/ngraph/files/patch-aa b/math/ngraph/files/patch-aa
index b90a09ad14c5..f967ade35f14 100644
--- a/math/ngraph/files/patch-aa
+++ b/math/ngraph/files/patch-aa
@@ -1,8 +1,20 @@
---- Makefile.orig	Sat Jul 31 22:51:43 1999
-+++ Makefile	Mon Aug 23 20:30:59 1999
-@@ -10,18 +10,18 @@
+--- Makefile.orig	Sat Oct 16 19:00:08 1999
++++ Makefile	Tue Nov  9 10:54:39 1999
+@@ -1,27 +1,27 @@
  #
- # Linux + Motif 2.1 (static link)
+ MAINVERSION = '"6.03"'
+ GUIVERSION = '".06"'
+-LIBDIR = '"/usr/local/lib/Ngraph"'
+-INSTALLDIR = /usr/local/lib/Ngraph
+-BINDIR = /usr/local/bin
++LIBDIR = '"${PREFIX}/lib/Ngraph"'
++INSTALLDIR = ${PREFIX}/lib/Ngraph
++BINDIR = ${PREFIX}/bin
+ #
+ #
+ ###############################################################################
+ #
+ # Linux + Motif 2.1 (RedHat) [static link]
  #
 -CC = gcc
 -CCOPTION = -O2 -m486
@@ -31,15 +43,21 @@
  #
  #
  ###############################################################################
-@@ -123,6 +123,21 @@
- #X11INCLUDE = -I/usr/dt/share/include/Dt
- #STATICLINK =
- #X11LIB = -L/usr/dt/lib -lm -lXm -lDtWidget -lXt -lX11
-+#
-+###############################################################################
-+#
-+# FreeBSD + Motif 2.1 (static link)
-+#
+@@ -132,17 +132,17 @@
+ #
+ # (Thanks to MIHIRA Sanpei Yoshiro <sanpei@sanpei.org>)
+ #
+-#CC = gcc
+-#CCOPTION = ${CFLAGS}
+-#MAKE = gmake
+-#AR = ar
+-#RANLIB = ranlib
+-#STRIP = strip
+-#DEFS = -DJAPANESE
+-#PLATFORM  = '"for X11 [FreeBSD+Motif2.1]"'
+-#X11INCLUDE = -I/usr/X11R6/include -I/usr/dt/include
+-#STATICLINK = /usr/dt/lib/libXm.a
+-#X11LIB = -L/usr/X11R6/lib -L/usr/dt/lib -lm -lXext -lXt -lXp -lX11 -lICE -lSM -lxpg4
 +CC = gcc
 +CCOPTION = ${CFLAGS}
 +MAKE = gmake
@@ -48,8 +66,9 @@
 +STRIP = strip
 +DEFS = -DJAPANESE
 +PLATFORM  = '"for X11 [FreeBSD+Motif2.1]"'
-+X11INCLUDE = -I/usr/X11R6/include
-+X11LIB = -L/usr/X11R6/lib -lm -lXext -lXt -lXp -lX11 -lICE -lSM -lxpg4 ${MOTIFLIB}
++X11INCLUDE = -I${X11BASE}/include -I/usr/dt/include
++STATICLINK =
++X11LIB = ${MOTIFLIB} -lm -L${X11BASE}/lib -lXext -lXt -lXp -lX11 -lICE -lSM -lxpg4
+ #
+ ###############################################################################
  
- export CC CCOPTION MAKE AR RANLIB STRIP INSTALL
- export MAINVERSION GUIVERSION LIBDIR
diff --git a/math/ngraph/pkg-descr b/math/ngraph/pkg-descr
index 4902ea1e2156..c051e1a5bc50 100644
--- a/math/ngraph/pkg-descr
+++ b/math/ngraph/pkg-descr
@@ -10,9 +10,18 @@ general ASCII text files, and plot to graph.
 	(cf, under csh/tcsh)
 	% setenv LANG ja_JP.EUC
 
-    Currently you need X True Type Server or X True Type Font server
-    to use Kanji font. These Servers are also listed in ports/package
-    system.
+    and you need....
+     - kinput2
+     - X Trye Type or X True Type Font server,
+       or kanji18 and kanji26 fonts(but these fonts are not yet in ports),
+       or to change font name in Ngraph.ini as below.
+
+font_map=Mincho,1,-*-fixed-medium-r-normal--*-*-75-75-c-*-jisx0208.1983-0
+font_map=Gothic,1,-*-fixed-medium-r-normal--*-*-75-75-c-*-jisx0208.1983-0
+
+     o You can get kanji18 and kanji26 fonts from below URL for Linux:
+ftp://ring.astem.or.jp/pub/linux/PJE/PJE-0.1.5/tgz/packages/font/xfnt18.tgz
+ftp://ring.astem.or.jp/pub/linux/PJE/PJE-0.1.5/tgz/packages/font/xfnt26.tgz
 
   - You can get documentation in Japanese from below URL.
 
diff --git a/math/ngraph/pkg-plist b/math/ngraph/pkg-plist
index 55b0728af80d..92b5bdc97686 100644
--- a/math/ngraph/pkg-plist
+++ b/math/ngraph/pkg-plist
@@ -24,6 +24,9 @@ lib/Ngraph/demo/demo5b.ngp
 lib/Ngraph/demo/demo5c.ngp
 lib/Ngraph/demo/demo5d.ngp
 lib/Ngraph/demo/demo5e.ngp
+lib/Ngraph/fft
+lib/Ngraph/fft.nsc
+lib/Ngraph/fft.tcl
 lib/Ngraph/fitrslt.nsc
 lib/Ngraph/fitrslt.tcl
 lib/Ngraph/gra2ps