Update to version 1.60.6.

Changes:

* read_line in input.c and e_load in earray.c handles now properly '\r'
  characters from DOS files.
* bug fix in metaps.c : postscript macros bar and fbar now handle hue the
  right way.
* handles wheel mouse to scroll the text window content.
* better event handling : test_key, test_code, syswait hack.
* drag and drop support from gtk/gnome apps (xdnd). it works with
  - ROX
  - Nautilus
  drag and drop from Konqueror does not work.
* popup menu for terminal editing
* modulo bug fix
* logspace, xlogplot, ylogplot, xylogplot, xlogmark, ylogmark, xylogmark
  enhanced and included in util.e (no more in a separate package).
* gcm, lcm, primes, isprime and factor functions added to modulo.e
* bug fix in project function in graphics.c
* util.e
  - added figure function which allow to draw quicly several graphs
    in the graphical window
  - xlabel, ylabel updates to fill the figure function requirements
  - xgrid : scale is now sent to the bottom right of the graph
  - added rotate, animate
* bug fix in my scan_dir function in main.c, which causes Segmentation
  fault
* bug fix in the way euler was dealing with input and lineinput in term.c
* new : antialiasing function to enable or disable antialiasing in
  density plots
* complete reorder in source file for future enhancements
* bug fix with solaris (scandir made portable)
* delete outputs menu item

6 files changed, 174 insertions, 185 deletions

diff --git a/math/euler/Makefile b/math/euler/Makefile
index 718bf088271..4fd7046b34e 100644
--- a/math/euler/Makefile
+++ b/math/euler/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2003/03/29 12:41:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2003/04/29 22:22:44 jtb Exp $
 
-DISTNAME=		euler-1.60.2
+DISTNAME=		euler-1.60.6
 WRKSRC=			${WRKDIR}/euler-1.60/source
 CATEGORIES=		math
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=euler/}
diff --git a/math/euler/PLIST b/math/euler/PLIST
index 626fd2f45b5..439ee8eb159 100644
--- a/math/euler/PLIST
+++ b/math/euler/PLIST
@@ -1,13 +1,16 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/04 01:49:10 jtb Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/04/29 22:22:44 jtb Exp $
 bin/euler
 share/doc/euler/doc.html
 share/doc/euler/download.html
+share/doc/euler/images/de.gif
 share/doc/euler/images/euler.gif
+share/doc/euler/images/fr.gif
 share/doc/euler/images/index.php
 share/doc/euler/images/pref1.gif
 share/doc/euler/images/pref2.gif
 share/doc/euler/images/pref3.gif
 share/doc/euler/images/pref4.gif
+share/doc/euler/images/ru.gif
 share/doc/euler/images/shot1.gif
 share/doc/euler/images/shot2.gif
 share/doc/euler/images/shot3.gif
@@ -16,6 +19,7 @@ share/doc/euler/images/shot5.gif
 share/doc/euler/images/shot6.gif
 share/doc/euler/images/shot7.gif
 share/doc/euler/images/shot8.gif
+share/doc/euler/images/uk.gif
 share/doc/euler/index.html
 share/doc/euler/links.html
 share/doc/euler/news.html
@@ -69,104 +73,107 @@ share/doc/euler/reference/statistics.html
 share/doc/euler/reference/version.html
 share/doc/euler/screenshots.html
 share/doc/euler/style.css
-share/euler/3body.e
-share/euler/3body.en
-share/euler/3d.en
-share/euler/3dplot.e
-share/euler/apple.e
-share/euler/astro.e
-share/euler/autodemo.e
-share/euler/autodemo.en
-share/euler/bench.e
-share/euler/bessel.e
-share/euler/bezier.e
-share/euler/broyden.e
-share/euler/cg.e
-share/euler/chebysh.e
-share/euler/child-and-toy.en
-share/euler/child.e
-share/euler/choleski.e
-share/euler/complex.en
-share/euler/demo.e
-share/euler/demo.en
-share/euler/deutsch.en
-share/euler/eigen.e
-share/euler/electricity.e
-share/euler/electricity.en
-share/euler/eval.en
-share/euler/feigenbaum.en
-share/euler/fftsound.en
-share/euler/flower.e
-share/euler/fmin.en
-share/euler/fminmax.e
-share/euler/framed.e
-share/euler/games.e
-share/euler/gauss.e
 share/euler/help.txt
-share/euler/histo.e
-share/euler/hondt.e
-share/euler/ieigen.en
-share/euler/interest.e
-share/euler/interval.e
-share/euler/interval.en
-share/euler/ipoldemo.e
-share/euler/iterate.en
-share/euler/kepler.e
-share/euler/kette.dat
-share/euler/kettenlinie.en
-share/euler/linear.en
-share/euler/logplot.e
-share/euler/logplot.en
-share/euler/lorenz.e
-share/euler/mandog.e
-share/euler/modulo.e
-share/euler/opti.e
-share/euler/polymult.e
-share/euler/program.en
-share/euler/randtest.e
-share/euler/randwalk.en
-share/euler/remez.e
-share/euler/rendite.e
-share/euler/root.en
-share/euler/rounding.en
-share/euler/showdgl.e
-share/euler/smith.e
-share/euler/sound.e
-share/euler/spline.e
-share/euler/splines.e
-share/euler/statist.e
-share/euler/statist.en
-share/euler/steffens.e
-share/euler/stereo.e
-share/euler/svd.e
-share/euler/test.dat
-share/euler/testsuit.e
-share/euler/texprint.e
-share/euler/trigfit.e
-share/euler/user/bad.e
-share/euler/user/bode.e
-share/euler/user/control.e
-share/euler/user/control.txt
-share/euler/user/cooling.e
-share/euler/user/ctrldemo.en
-share/euler/user/fftuser.en
-share/euler/user/fresnel.e
-share/euler/user/fresnel.en
-share/euler/user/logplot.e
-share/euler/user/logplot.en
-share/euler/user/saite.e
-share/euler/user/saite.en
-share/euler/user/scope.e
-share/euler/user/scope.en
-share/euler/user/siggen.e
-share/euler/user/smith.e
-share/euler/user/theod.e
-share/euler/util.e
-share/euler/vplot.e
-share/euler/welcome.en
-share/euler/x.e
-share/euler/xdis.e
-@dirrm share/euler/user
+share/euler/progs/3body.e
+share/euler/progs/3body.en
+share/euler/progs/3d.en
+share/euler/progs/3dplot.e
+share/euler/progs/apple.e
+share/euler/progs/astro.e
+share/euler/progs/autodemo.e
+share/euler/progs/autodemo.en
+share/euler/progs/bench.e
+share/euler/progs/bessel.e
+share/euler/progs/bezier.e
+share/euler/progs/broyden.e
+share/euler/progs/cg.e
+share/euler/progs/chebysh.e
+share/euler/progs/child-and-toy.en
+share/euler/progs/child.e
+share/euler/progs/choleski.e
+share/euler/progs/complex.en
+share/euler/progs/dea.e
+share/euler/progs/dea.en
+share/euler/progs/demo.e
+share/euler/progs/demo.en
+share/euler/progs/deutsch.en
+share/euler/progs/eigen.e
+share/euler/progs/electricity.e
+share/euler/progs/electricity.en
+share/euler/progs/eval.en
+share/euler/progs/feigenbaum.en
+share/euler/progs/figure.en
+share/euler/progs/fftsound.en
+share/euler/progs/flower.e
+share/euler/progs/fmin.en
+share/euler/progs/fminmax.e
+share/euler/progs/framed.e
+share/euler/progs/games.e
+share/euler/progs/gauss.e
+share/euler/progs/histo.e
+share/euler/progs/hondt.e
+share/euler/progs/ieigen.en
+share/euler/progs/interest.e
+share/euler/progs/interval.e
+share/euler/progs/interval.en
+share/euler/progs/ipoldemo.e
+share/euler/progs/iterate.en
+share/euler/progs/kepler.e
+share/euler/progs/kette.dat
+share/euler/progs/kettenlinie.en
+share/euler/progs/linear.en
+share/euler/progs/logplot.en
+share/euler/progs/lorenz.e
+share/euler/progs/mandog.e
+share/euler/progs/modulo.e
+share/euler/progs/opti.e
+share/euler/progs/polymult.e
+share/euler/progs/program.en
+share/euler/progs/randtest.e
+share/euler/progs/randwalk.en
+share/euler/progs/remez.e
+share/euler/progs/rendite.e
+share/euler/progs/root.en
+share/euler/progs/rounding.en
+share/euler/progs/showdgl.e
+share/euler/progs/smith.e
+share/euler/progs/sound.e
+share/euler/progs/spline.e
+share/euler/progs/splines.e
+share/euler/progs/statist.e
+share/euler/progs/statist.en
+share/euler/progs/steffens.e
+share/euler/progs/stereo.e
+share/euler/progs/svd.e
+share/euler/progs/test.dat
+share/euler/progs/testsuit.e
+share/euler/progs/texprint.e
+share/euler/progs/trigfit.e
+share/euler/progs/user/bad.e
+share/euler/progs/user/bode.e
+share/euler/progs/user/control.e
+share/euler/progs/user/control.txt
+share/euler/progs/user/cooling.e
+share/euler/progs/user/ctrldemo.en
+share/euler/progs/user/fftuser.en
+share/euler/progs/user/fresnel.e
+share/euler/progs/user/fresnel.en
+share/euler/progs/user/logplot.e
+share/euler/progs/user/logplot.en
+share/euler/progs/user/saite.e
+share/euler/progs/user/saite.en
+share/euler/progs/user/scope.e
+share/euler/progs/user/scope.en
+share/euler/progs/user/siggen.e
+share/euler/progs/user/smith.e
+share/euler/progs/user/theod.e
+share/euler/progs/util.e
+share/euler/progs/vplot.e
+share/euler/progs/welcome.en
+share/euler/progs/x.e
+share/euler/progs/xdis.e
+@dirrm share/euler/progs/user
+@dirrm share/euler/progs
 @dirrm share/euler
 @dirrm share/doc/euler/reference
 @dirrm share/doc/euler/images
diff --git a/math/euler/distinfo b/math/euler/distinfo
index c5aa8c74a40..c1c78c4e446 100644
--- a/math/euler/distinfo
+++ b/math/euler/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2002/07/02 12:58:27 wiz Exp $
+$NetBSD: distinfo,v 1.5 2003/04/29 22:22:44 jtb Exp $
 
-SHA1 (euler-1.60.2.tar.gz) = 5cc5701639aa220b8108b4c5691c79de8ca5f235
-Size (euler-1.60.2.tar.gz) = 640913 bytes
-SHA1 (patch-aa) = 1d926a52a67b509ef41a182e8b774c6791fd9a78
-SHA1 (patch-ab) = 672014ec88ec5b6be7f6d5297136aa86733deb61
-SHA1 (patch-ac) = d9f17e01176fe1ce9784c8df3a0dfb4070e75612
+SHA1 (euler-1.60.6.tar.gz) = 30e9fe077b8c4b2cb61f72b618fcbe7054c67746
+Size (euler-1.60.6.tar.gz) = 769602 bytes
+SHA1 (patch-aa) = 98b8aa3441d5fa0ab822019ea9dc0446625e7072
+SHA1 (patch-ab) = 1705383882d30ab0d1574a9d6328ed9d843f089e
+SHA1 (patch-ac) = 578b456efe37219d4edbb5b7a27f671011b3c26c
diff --git a/math/euler/patches/patch-aa b/math/euler/patches/patch-aa
index 961d1c5a263..ddfeb625a2e 100644
--- a/math/euler/patches/patch-aa
+++ b/math/euler/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2002/06/27 03:50:48 jtb Exp $
+$NetBSD: patch-aa,v 1.4 2003/04/29 22:22:45 jtb Exp $
 
---- main.c.orig	Wed Feb 20 08:59:59 2002
+--- main.c.orig
 +++ main.c
-@@ -389,7 +389,9 @@
+@@ -429,7 +429,9 @@
  	gettimer(TIMEOFDAY,&t);
  	return (t.tv_sec+t.tv_nsec/1000000000.0);
  #else
@@ -12,13 +12,3 @@ $NetBSD: patch-aa,v 1.3 2002/06/27 03:50:48 jtb Exp $
 +	return (double)(t.tms_utime+t.tms_stime)/CLK_TCK;
  #endif
  }
- 
-@@ -1308,7 +1310,7 @@
- 			break;
- 		case E_DOC: {
- 				char *browser;
--				browser = g_strconcat(prefs.browser," ",INSTALL_DIR,"/doc/euler/index.html &",NULL);
-+				browser = g_strconcat(prefs.browser," ",INSTALL_DIR,"/share/doc/euler/index.html &",NULL);
- 				system(browser);
- 				g_free(browser);
- 			}
diff --git a/math/euler/patches/patch-ab b/math/euler/patches/patch-ab
index 217ef34f549..a898ce16829 100644
--- a/math/euler/patches/patch-ab
+++ b/math/euler/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/05/04 01:49:13 jtb Exp $
+$NetBSD: patch-ab,v 1.2 2003/04/29 22:22:45 jtb Exp $
 
---- makefile.orig	Wed Feb 20 09:41:30 2002
-+++ makefile	Thu Apr 25 10:48:52 2002
+--- makefile.orig
++++ makefile
 @@ -6,7 +6,7 @@
  # view docs/index.html with any Web browser.
  
  
--INSTALL_DIR = /usr/local
-+INSTALL_DIR = ${PREFIX}
+-#INSTALL_DIR = /usr/local
++INSTALL_DIR = $(PREFIX)
  
  
  # Changes for other systems:
@@ -16,93 +16,90 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/04 01:49:13 jtb Exp $
  # define it -DPI=3.1415... (not necessary for 8 byte doubles)
  
 -CC=gcc -Wall -O2 -DINSTALL_DIR=\"$(INSTALL_DIR)\"
-+CFLAGS+= -Wall
-+CPPFLAGS+= -Dunix -DINSTALL_DIR=\"$(INSTALL_DIR)\"
++CLFAGS+= -Wall
++CPPFLAGS+= -DINSTALL_DIR=\"$(INSTALL_DIR)\"
  
  
  # This is for printing the DOC on your local printer
-@@ -46,7 +47,7 @@
+@@ -45,8 +46,8 @@
+ 
  
  euler: $(OBJS) main.o rc.o earray.o term.o metagtk.o colbut.o
- 	$(CC) -o euler main.o rc.o earray.o term.o metagtk.o colbut.o $(OBJS) -lm `gtk-config --libs`
+-	$(CC) -o euler main.o rc.o earray.o term.o metagtk.o colbut.o $(OBJS) -lm `gtk-config --libs`
 -	
++	$(CC) $(CPPFLAGS) $(CFLAGS) -o euler main.o rc.o earray.o term.o metagtk.o colbut.o $(OBJS) -lm `gtk-config --libs`
 +
  imported: import.cpp
  	g++ -o import import.cpp
  	./import *.cpp *.h help.txt euler.cfg
-@@ -59,120 +60,127 @@
+@@ -59,104 +60,104 @@
  #	object file dependances
  #
- assign.o : header.h stack.h extend.h interval.h assign.c
--	$(CC) -c  assign.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c  assign.c
- 
- binary.o :	header.h stack.h binary.c
+ binary.o :	sysdep.h stack.h output.h binary.h binary.c
 -	$(CC) -c  binary.c
 +	$(CC) $(CPPFLAGS) $(CFLAGS) -c  binary.c
  
- builtin.o :	header.h builtin.h builtin.c
+ builtin.o :	sysdep.h stack.h builtin.h builtin.c
 -	$(CC) -c  builtin.c
 +	$(CC) $(CPPFLAGS) $(CFLAGS) -c  builtin.c
  
- edit.o :	header.h sysdep.h graphics.h edit.c
+ command.o :	stack.h command.h builtin.h udf.h express.h command.c
+-	$(CC) -c  command.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c  command.c
+ 
+ edit.o :	sysdep.h graphics.h edit.c
 -	$(CC) -c  edit.c
 +	$(CC) $(CPPFLAGS) $(CFLAGS) -c  edit.c
  
- express.o :	header.h sysdep.h funcs.h interval.h builtin.h express.h stack.h express.c
+ express.o :	sysdep.h stack.h output.h funcs.h interval.h builtin.h express.h\
+ 			spread.h udf.h matrix.h command.h input.h express.c
 -	$(CC) -c  express.c
 +	$(CC) $(CPPFLAGS) $(CFLAGS) -c  express.c
  
- extend.o :	header.h extend.h extend.c
--	$(CC) -c  extend.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c  extend.c
- 
- feval.o :	header.h stack.h builtin.h sysdep.h feval.c
+ feval.o :	stack.h output.h builtin.h udf.h mainloop.h feval.c
 -	$(CC) -c  feval.c
 +	$(CC) $(CPPFLAGS) $(CFLAGS) -c  feval.c
  
- fft.o : header.h matheh.h sysdep.h fft.c
+ fft.o : sysdep.h stack.h output.h linear.h fft.h fft.c
 -	$(CC) -c  fft.c
 +	$(CC) $(CPPFLAGS) $(CFLAGS) -c  fft.c
  
- frames.o :	header.h sysdep.h stack.h frames.c
--	$(CC) -c  frames.c
--	
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c  frames.c
-+
- funcs.o :	header.h sysdep.h funcs.h matheh.h polynom.h helpf.h\
- 	interval.h spread.h express.h stack.h funcs.c
+ funcs.o :	sysdep.h stack.h output.h builtin.h funcs.h linear.h polynom.h\
+ 			interval.h spread.h express.h udf.h mainloop.h edit.h funcs.c
 -	$(CC) -c  funcs.c
 +	$(CC) $(CPPFLAGS) $(CFLAGS) -c  funcs.c
  
- graphics.o : header.h sysdep.h funcs.h graphics.h stack.h meta.h graphics.c
+ graphics.o :sysdep.h stack.h output.h funcs.h express.h matrix.h meta.h\
+ 			graphics.h graphics.c
 -	$(CC) -c  graphics.c
 +	$(CC) $(CPPFLAGS) $(CFLAGS) -c  graphics.c
  
- help.o :	header.h help.h help.c
+ help.o :	output.h help.h help.c
 -	$(CC) -c  help.c
 +	$(CC) $(CPPFLAGS) $(CFLAGS) -c  help.c
  
- helpf.o :	header.h funcs.h helpf.h matheh.h interval.h stack.h helpf.c
--	$(CC) -c  helpf.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c  helpf.c
- 
- input.o :	header.h sysdep.h input.c
+ input.o :	sysdep.h input.c
 -	$(CC) -c  input.c
 +	$(CC) $(CPPFLAGS) $(CFLAGS) -c  input.c
  
- interval.o : header.h interval.h spread.h stack.h interval.c
+ interval.o : interval.h spread.h stack.h interval.c
 -	$(CC) -c  interval.c
 +	$(CC) $(CPPFLAGS) $(CFLAGS) -c  interval.c
  
- mainloop.o : header.h sysdep.h funcs.h graphics.h version.h\
+ linear.o :	sysdep.h stack.h output.h interval.h mainloop.h\
+ 			linear.h linear.c
+-	$(CC) -c  linear.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c  linear.c
+ 
+ mainloop.o : sysdep.h funcs.h graphics.h version.h\
  	interval.h builtin.h stack.h meta.h mainloop.c
 -	$(CC) `glib-config --cflags` -c  mainloop.c
 +	$(CC) $(CPPFLAGS) $(CFLAGS) `glib-config --cflags` -c  mainloop.c
  
- matheh.o :	header.h sysdep.h matheh.h stack.h matheh.c
--	$(CC) -c  matheh.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c  matheh.c
+ matrix.o :	stack.h output.h funcs.h interval.h linear.h mainloop.h\
+ 			matrix.h matrix.c
+-	$(CC) -c  matrix.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c  matrix.c
  
  meta.o:		sysdep.h meta.h meta.c
 -	$(CC) -c meta.c
@@ -112,11 +109,11 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/04 01:49:13 jtb Exp $
 -	$(CC) -c metaps.c
 +	$(CC) $(CPPFLAGS) $(CFLAGS) -c metaps.c
  
- output.o :	header.h sysdep.h output.c
+ output.o :	sysdep.h output.c
 -	$(CC) -c  output.c
 +	$(CC) $(CPPFLAGS) $(CFLAGS) -c  output.c
  
- polynom.o : header.h polynom.h funcs.h matheh.h interval.h\
+ polynom.o : polynom.h funcs.h linear.h interval.h\
  	express.h stack.h polynom.c
 -	$(CC) -c  polynom.c
 +	$(CC) $(CPPFLAGS) $(CFLAGS) -c  polynom.c
@@ -125,27 +122,23 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/04 01:49:13 jtb Exp $
 -	$(CC) -c psgraph.c
 +	$(CC) $(CPPFLAGS) $(CFLAGS) -c psgraph.c
  
- scalp.o :	header.h interval.h express.h stack.h scalp.c
+ scalp.o :	interval.h express.h stack.h scalp.c
 -	$(CC) -c  scalp.c
 +	$(CC) $(CPPFLAGS) $(CFLAGS) -c  scalp.c
  
- special.o : header.h stack.h spread.h special.c
+ special.o : stack.h spread.h special.c
 -	$(CC) -c  special.c
 +	$(CC) $(CPPFLAGS) $(CFLAGS) -c  special.c
  
- spread.o : header.h sysdep.h funcs.h interval.h spread.h stack.h spread.c
+ spread.o : stack.h output.h spread.h builtin.h udf.h spread.c
 -	$(CC) -c  spread.c
 +	$(CC) $(CPPFLAGS) $(CFLAGS) -c  spread.c
  
- stack.o : header.h stack.h stack.c
+ stack.o : sysdep.h stack.h stack.c
 -	$(CC) -c  stack.c
 +	$(CC) $(CPPFLAGS) $(CFLAGS) -c  stack.c
  
- store.o : header.h store.h store.c
--	$(CC) -c  store.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c  store.c
- 
- udf.o : header.h sysdep.h stack.h udf.c help.h
+ udf.o : sysdep.h stack.h udf.c help.h
 -	$(CC) -c  udf.c
 +	$(CC) $(CPPFLAGS) $(CFLAGS) -c  udf.c
  
@@ -175,19 +168,19 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/04 01:49:13 jtb Exp $
  
  #
  #	install
- #
- install:
--	if [ ! -d "$(INSTALL_DIR)/share/euler" ]; then mkdir $(INSTALL_DIR)/share/euler ; fi
--	if [ ! -d "$(INSTALL_DIR)/doc/euler" ]; then mkdir $(INSTALL_DIR)/doc/euler ; fi
+@@ -165,10 +166,18 @@
+ 	if [ ! -d "$(INSTALL_DIR)/share/euler" ]; then mkdir $(INSTALL_DIR)/share/euler ; fi
+ 	if [ ! -d "$(INSTALL_DIR)/share/doc" ]; then mkdir $(INSTALL_DIR)/share/doc ; fi
+ 	if [ ! -d "$(INSTALL_DIR)/share/doc/euler" ]; then mkdir $(INSTALL_DIR)/share/doc/euler ; fi
 -	cp -f euler $(INSTALL_DIR)/bin
 -	cp -fr ../progs $(INSTALL_DIR)/share/euler
--	cp -fr ../docs/* $(INSTALL_DIR)/doc/euler/
+-	cp -fr ../docs/* $(INSTALL_DIR)/share/doc/euler/
 -	cp -f help.txt $(INSTALL_DIR)/share/euler
 +	$(BSD_INSTALL_PROGRAM) euler $(INSTALL_DIR)/bin
 +	$(BSD_INSTALL_DATA_DIR) $(INSTALL_DIR)/share/euler
-+	$(BSD_INSTALL_DATA_DIR) $(INSTALL_DIR)/share/euler/user
-+	$(BSD_INSTALL_DATA) ../progs/*.* $(INSTALL_DIR)/share/euler
-+	$(BSD_INSTALL_DATA) ../progs/user/*.* $(INSTALL_DIR)/share/euler/user
++	$(BSD_INSTALL_DATA_DIR) $(INSTALL_DIR)/share/euler/progs/user
++	$(BSD_INSTALL_DATA) ../progs/*.* $(INSTALL_DIR)/share/euler/progs
++	$(BSD_INSTALL_DATA) ../progs/user/*.* $(INSTALL_DIR)/share/euler/progs/user
 +	$(BSD_INSTALL_DATA) help.txt $(INSTALL_DIR)/share/euler
 +	$(BSD_INSTALL_DATA_DIR) $(INSTALL_DIR)/share/doc/euler
 +	$(BSD_INSTALL_DATA_DIR) $(INSTALL_DIR)/share/doc/euler/images
@@ -195,7 +188,6 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/04 01:49:13 jtb Exp $
 +	$(BSD_INSTALL_DATA) ../docs/*.* $(INSTALL_DIR)/share/doc/euler/
 +	$(BSD_INSTALL_DATA) ../docs/images/* $(INSTALL_DIR)/share/doc/euler/images
 +	$(BSD_INSTALL_DATA) ../docs/reference/*.* $(INSTALL_DIR)/share/doc/euler/reference
-+
  
  #
  #	uninstall
diff --git a/math/euler/patches/patch-ac b/math/euler/patches/patch-ac
index e5adcd11a6d..d0adf7b57d3 100644
--- a/math/euler/patches/patch-ac
+++ b/math/euler/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/05/04 01:49:13 jtb Exp $
+$NetBSD: patch-ac,v 1.2 2003/04/29 22:22:45 jtb Exp $
 
 --- mainloop.c.orig	Thu Apr 25 10:55:54 2002
 +++ mainloop.c	Thu Apr 25 11:09:45 2002
@@ -8,8 +8,8 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/05/04 01:49:13 jtb Exp $
  	if (file) {
 -//		fprintf(file,"path(\".;%s/share/euler/progs\");\n",INSTALL_DIR);
 -//		fprintf(file,"cd(\"%s/share/euler/progs\");\n",INSTALL_DIR);
-+		fprintf(file,"path(\".;%s/share/euler\");\n",INSTALL_DIR);
-+		fprintf(file,"cd(\"%s/share/euler\");\n",INSTALL_DIR);
++		fprintf(file,"path(\".;%s/share/euler/progs\");\n",INSTALL_DIR);
++		fprintf(file,"cd(\"%s/share/euler/progs\");\n",INSTALL_DIR);
  		fprintf(file,"load \"util.e\";\n");
  		fprintf(file,"load \"framed.e\";\n");
  		fprintf(file,"load \"x.e\";\n");