netbsd-bugs: pkg/22800: update of graphics/Ngraph to 6.3.20

Subject: pkg/22800: update of graphics/Ngraph to 6.3.20
To: None <gnats-bugs@gnats.netbsd.org>
From: Osamu OISHI <oishi@alef.ims.ac.jp>
List: netbsd-bugs
Date: 09/12/2003 17:59:08
>Number:         22800
>Category:       pkg
>Synopsis:       update of graphics/Ngraph to 6.3.20
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Sep 15 03:03:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Osamu OISHI
>Release:        <NetBSD-current source date>
>Organization:
	
>Environment:
	
System: NetBSD alef.ims.ac.jp 1.4.3_ALPHA NetBSD 1.4.3_ALPHA (ALEF) #0: Tue Jul 31 15:45:47 JST 2001 root@alef.ims.ac.jp:/usr/src/sys/arch/i386/compile/ALEF i386


>Description:
	update of graphics/Ngraph to 6.3.20
>How-To-Repeat:
The following is the patche for graphics/Ngraph pkgsrc.


diff -Nur Ngraph.org/Makefile Ngraph/Makefile
--- Ngraph.org/Makefile	Wed Aug 27 18:20:55 2003
+++ Ngraph/Makefile	Fri Aug 29 06:03:28 2003
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/07/21 16:51:35 martti Exp $
+# $NetBSD: Makefile Exp $
 #
 
-DISTNAME=	Ngraph-6.3.20-src
-PKGNAME=	Ngraph-6.3.20
+DISTNAME=	Ngraph-${VERSION}-src
+PKGNAME=	Ngraph-${VERSION}
 CATEGORIES=	graphics
 MASTER_SITES=	http://www2e.biglobe.ne.jp/~isizaka/bin/ \
 		ftp://ftp.cs.umb.edu/pub/interleaf/CDE/
@@ -13,6 +13,7 @@
 HOMEPAGE=	http://www2e.biglobe.ne.jp/~isizaka/
 COMMENT=	The 2D graph and data analysis program
 
+VERSION=	6.3.20
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 USE_BUILDLINK2=		yes
diff -Nur Ngraph.org/PLIST Ngraph/PLIST
--- Ngraph.org/PLIST	Thu Nov  1 08:50:12 2001
+++ Ngraph/PLIST	Fri Aug 29 06:01:53 2003
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:50:12 zuntum Exp $
+@comment $NetBSD$
 bin/ngraph
 libexec/Ngraph/.Ngraph
 libexec/Ngraph/.Ngraph.ngp
@@ -25,6 +25,7 @@
 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.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 -Nur Ngraph.org/distinfo Ngraph/distinfo
--- Ngraph.org/distinfo	Mon Sep 23 19:19:58 2002
+++ Ngraph/distinfo	Fri Aug 29 06:03:39 2003
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.4 2002/09/22 00:06:23 jlam Exp $
+$NetBSD: distinfo, 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) = c7fb609e9f15a705aa5466c44f09d2413d84d645
diff -Nur Ngraph.org/patches/patch-aa Ngraph/patches/patch-aa
--- Ngraph.org/patches/patch-aa	Mon Sep 23 19:19:59 2002
+++ Ngraph/patches/patch-aa	Fri Aug 29 06:03:57 2003
@@ -1,11 +1,10 @@
-$NetBSD: patch-aa,v 1.3 2002/09/22 00:06:23 jlam Exp $
-
---- Makefile.orig	Sat Oct 16 06:00:08 1999
-+++ Makefile
-@@ -1,27 +1,43 @@
+$NetBSD$
+--- Makefile.orig	Fri Feb 21 19:53:54 2003
++++ Makefile	Fri Aug 29 05:48:52 2003
+@@ -1,26 +1,41 @@
  #
  MAINVERSION = '"6.03"'
- GUIVERSION = '".06"'
+ GUIVERSION = '".20"'
 -LIBDIR = '"/usr/local/lib/Ngraph"'
 -INSTALLDIR = /usr/local/lib/Ngraph
 -BINDIR = /usr/local/bin
@@ -16,28 +15,30 @@
  #
  ###############################################################################
  #
--# Linux + Motif 2.1 (RedHat) [static link]
+-# Linux + Open Motif 2.1 [dynamic link]
 +# NetBSD + lesstif/openmotif [dynamic link]
  #
  CC = gcc
 -CCOPTION = -O2 -m486
 -MAKE = make
 +CCOPTION = ${CFLAGS}
++MAKE = gmake
  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]
++# Linux + Open Motif 2.1 [dynamic link]
 +#
 +#CC = gcc
 +#CCOPTION = -O2 -m486
@@ -46,18 +47,14 @@
 +#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
++#PLATFORM  = '"for X11 [Linux(glibc2) + Open Motif]"'
 +#X11INCLUDE = -I/usr/X11R6/include
-+#STATICLINK = /usr/X11R6/lib/libXm.a 
-+#X11LIB = -L/usr/X11R6/lib -lm -lXext -lXt -lXp -lX11 -lICE -lSM
++#STATICLINK =
++#X11LIB = -L/usr/X11R6/lib -lm -lXm -lXext -lXt -lXp -lX11 -lICE -lSM
  #
  #
  ###############################################################################
-@@ -154,6 +170,7 @@
+@@ -170,6 +185,7 @@
  OBJECT = x11/main.o x11/x11.a src/kern.a
  
  all:
@@ -65,7 +62,7 @@
  	(cd src; $(MAKE) kern.a)
  	(cd x11; $(MAKE) main.o)
  	(cd x11; $(MAKE) x11.a)
-@@ -196,6 +213,7 @@
+@@ -212,6 +228,7 @@
  	- (cd x11; $(MAKE) clean)
  	- (cd x11drive; $(MAKE) clean)
  	- (cd x11addin; $(MAKE) clean)
diff -Nur Ngraph.org/patches/patch-ab Ngraph/patches/patch-ab
--- Ngraph.org/patches/patch-ab	Thu Nov 25 17:17:15 1999
+++ Ngraph/patches/patch-ab	Thu Jan  1 09:00:00 1970
@@ -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
>Fix:
	
>Release-Note:
>Audit-Trail:
>Unformatted: