Update to euler-1.61. Euler now uses GNU autotools for the build and GTK2+

for the user interface. Also apply patch for static/extern mismatch from
Aleksej Saushev in PR 36449, which fixes build with gcc4.

8 files changed, 142 insertions, 341 deletions

diff --git a/math/euler/Makefile b/math/euler/Makefile
index 68943e9d43e..8f25663503e 100644
--- a/math/euler/Makefile
+++ b/math/euler/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2006/09/09 02:43:10 obache Exp $
+# $NetBSD: Makefile,v 1.18 2007/06/06 12:43:31 tnn Exp $
 
-DISTNAME=		euler-1.60.6
-PKGREVISION=		5
+DISTNAME=		euler-1.61.0
+PKGNAME=		euler-1.61
+EXTRACT_SUFX=		.tgz
 CATEGORIES=		math
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=euler/}
 
@@ -9,9 +10,9 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://euler.sourceforge.net/index.html
 COMMENT=		Interactive numerical analysis and graphics program
 
-WRKSRC=			${WRKDIR}/euler-1.60/source
-MAKE_FILE=		makefile
-BUILD_TARGET=		euler
+USE_LANGUAGES=		c c++
+GNU_CONFIGURE=		yes
+USE_TOOLS+=		gmake pkg-config
 
-.include "../../x11/gtk/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/euler/PLIST b/math/euler/PLIST
index 439ee8eb159..3599a1ba428 100644
--- a/math/euler/PLIST
+++ b/math/euler/PLIST
@@ -1,11 +1,32 @@
-@comment $NetBSD: PLIST,v 1.2 2003/04/29 22:22:44 jtb Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/06/06 12:43:31 tnn Exp $
 bin/euler
-share/doc/euler/doc.html
-share/doc/euler/download.html
+share/doc/euler/french/doc.html
+share/doc/euler/french/download.html
+share/doc/euler/french/index.html
+share/doc/euler/french/links.html
+share/doc/euler/french/screenshots.html
+share/doc/euler/german/images/Binomial.gif
+share/doc/euler/german/images/Contour.gif
+share/doc/euler/german/images/HalfPipe1.gif
+share/doc/euler/german/images/Halfpipe.gif
+share/doc/euler/german/images/Liss.gif
+share/doc/euler/german/images/Mesh.gif
+share/doc/euler/german/images/Plot2D.gif
+share/doc/euler/german/images/Plot3D.gif
+share/doc/euler/german/images/Sinc.gif
+share/doc/euler/german/images/SincI.gif
+share/doc/euler/german/images/fcd.gif
+share/doc/euler/german/images/index.php
+share/doc/euler/german/images/euler.css
+share/doc/euler/german/doc.html
+share/doc/euler/german/download.html
+share/doc/euler/german/examples.html
+share/doc/euler/german/index.html
+share/doc/euler/german/links.html
+share/doc/euler/german/screenshots.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
@@ -20,24 +41,31 @@ 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
-share/doc/euler/reference/about.html
+share/doc/euler/images/index.php
 share/doc/euler/reference/back.gif
 share/doc/euler/reference/bezier1.gif
 share/doc/euler/reference/bezier2.gif
 share/doc/euler/reference/bezier3.gif
 share/doc/euler/reference/bezier4.gif
-share/doc/euler/reference/commandline.html
 share/doc/euler/reference/compl0.gif
 share/doc/euler/reference/compl1.gif
 share/doc/euler/reference/compl2.gif
 share/doc/euler/reference/compl3.gif
 share/doc/euler/reference/dgl1.gif
 share/doc/euler/reference/dgl2.gif
-share/doc/euler/reference/euler.css
+share/doc/euler/reference/fft1.gif
+share/doc/euler/reference/fft2.gif
+share/doc/euler/reference/fft3.gif
+share/doc/euler/reference/german.gif
+share/doc/euler/reference/knot.gif
+share/doc/euler/reference/logo.gif
+share/doc/euler/reference/rene.gif
+share/doc/euler/reference/sin1.gif
+share/doc/euler/reference/sin2.gif
+share/doc/euler/reference/about.html
+share/doc/euler/reference/commandline.html
 share/doc/euler/reference/euler.html
+share/doc/euler/reference/files.html
 share/doc/euler/reference/euler_credits.html
 share/doc/euler/reference/euler_download.html
 share/doc/euler/reference/euler_features.html
@@ -47,134 +75,153 @@ share/doc/euler/reference/euler_systems.html
 share/doc/euler/reference/eulerdoc.html
 share/doc/euler/reference/examples.html
 share/doc/euler/reference/expressions.html
-share/doc/euler/reference/fft1.gif
-share/doc/euler/reference/fft2.gif
-share/doc/euler/reference/fft3.gif
-share/doc/euler/reference/files.html
 share/doc/euler/reference/functions.html
-share/doc/euler/reference/german.gif
 share/doc/euler/reference/graphics.html
 share/doc/euler/reference/index.html
 share/doc/euler/reference/intervall.html
 share/doc/euler/reference/introduction.html
-share/doc/euler/reference/knot.gif
 share/doc/euler/reference/linearalgebra.html
 share/doc/euler/reference/links.html
-share/doc/euler/reference/logo.gif
 share/doc/euler/reference/polynomials.html
 share/doc/euler/reference/programming.html
-share/doc/euler/reference/rene.gif
 share/doc/euler/reference/settings.html
-share/doc/euler/reference/sin1.gif
-share/doc/euler/reference/sin2.gif
 share/doc/euler/reference/somefiles.html
 share/doc/euler/reference/special.html
 share/doc/euler/reference/statistics.html
 share/doc/euler/reference/version.html
+share/doc/euler/reference/euler.css
+share/doc/euler/doc.html
+share/doc/euler/download.html
+share/doc/euler/index.html
+share/doc/euler/links.html
+share/doc/euler/news.html
 share/doc/euler/screenshots.html
 share/doc/euler/style.css
+share/doc/euler/README
+share/doc/euler/COPYING
+share/doc/euler/AUTHORS
+share/doc/euler/ChangeLog
+share/doc/euler/INSTALL
+share/doc/euler/NEWS
+share/doc/euler/TODO
 share/euler/help.txt
+share/euler/progs/user/bad.e
+share/euler/progs/user/bode.e
+share/euler/progs/user/control.e
+share/euler/progs/user/cooling.e
+share/euler/progs/user/fresnel.e
+share/euler/progs/user/logplot.e
+share/euler/progs/user/saite.e
+share/euler/progs/user/scope.e
+share/euler/progs/user/siggen.e
+share/euler/progs/user/smith.e
+share/euler/progs/user/theod.e
+share/euler/progs/user/ctrldemo.en
+share/euler/progs/user/fftuser.en
+share/euler/progs/user/fresnel.en
+share/euler/progs/user/logplot.en
+share/euler/progs/user/saite.en
+share/euler/progs/user/scope.en
+share/euler/progs/user/control.txt
 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/bahnen.e
 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/contfrac.e
 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/logo.e
 share/euler/progs/lorenz.e
 share/euler/progs/mandog.e
 share/euler/progs/modulo.e
+share/euler/progs/newtonbarrier.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/x.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
+share/euler/progs/yacas.e
+share/euler/progs/3body.en
+share/euler/progs/3d.en
+share/euler/progs/astro.en
+share/euler/progs/autodemo.en
+share/euler/progs/ballistics.en
+share/euler/progs/boundaryvalue.en
+share/euler/progs/child-and-toy.en
+share/euler/progs/complex.en
+share/euler/progs/dea.en
+share/euler/progs/demo.en
+share/euler/progs/deutsch.en
+share/euler/progs/electricity.en
+share/euler/progs/eval.en
+share/euler/progs/feigenbaum.en
+share/euler/progs/fftsound.en
+share/euler/progs/figure.en
+share/euler/progs/fmin.en
+share/euler/progs/ieigen.en
+share/euler/progs/interval.en
+share/euler/progs/iterate.en
+share/euler/progs/kettenlinie.en
+share/euler/progs/root.en
+share/euler/progs/linear.en
+share/euler/progs/logplot.en
+share/euler/progs/program.en
+share/euler/progs/randwalk.en
+share/euler/progs/rounding.en
+share/euler/progs/statist.en
+share/euler/progs/swimming.en
+share/euler/progs/temperament.en
+share/euler/progs/welcome.en
+share/euler/progs/weltseil.en
+share/euler/progs/westerbench.en
+share/euler/progs/yacas.en
+share/euler/progs/kette.dat
+share/euler/progs/test.dat
 @dirrm share/euler/progs/user
 @dirrm share/euler/progs
 @dirrm share/euler
-@dirrm share/doc/euler/reference
+@dirrm share/doc/euler/french
+@dirrm share/doc/euler/german/images
+@dirrm share/doc/euler/german
 @dirrm share/doc/euler/images
+@dirrm share/doc/euler/reference
 @dirrm share/doc/euler
diff --git a/math/euler/distinfo b/math/euler/distinfo
index ebdfc3f4818..5a1c1ccaf99 100644
--- a/math/euler/distinfo
+++ b/math/euler/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.9 2005/12/20 14:51:00 joerg Exp $
+$NetBSD: distinfo,v 1.10 2007/06/06 12:43:31 tnn Exp $
 
-SHA1 (euler-1.60.6.tar.gz) = 30e9fe077b8c4b2cb61f72b618fcbe7054c67746
-RMD160 (euler-1.60.6.tar.gz) = aa4e67b78902f1c29514b1dc528da6684cf42c18
-Size (euler-1.60.6.tar.gz) = 769602 bytes
-SHA1 (patch-aa) = 30997ef15312f470b91bd49c2e6954fa9aa74918
-SHA1 (patch-ab) = 1705383882d30ab0d1574a9d6328ed9d843f089e
-SHA1 (patch-ac) = 578b456efe37219d4edbb5b7a27f671011b3c26c
-SHA1 (patch-ad) = 375b3c0db540a8e16948f85d7812bfc91893d78f
-SHA1 (patch-ae) = 033028df857014d3b5fc140bb6acae9f24fc4bf5
+SHA1 (euler-1.61.0.tgz) = 55f8c768bf370db5ea07911cc40a995c556d23a4
+RMD160 (euler-1.61.0.tgz) = d015f1eaf1192508ddfe20ea9aba033bcc1d140d
+Size (euler-1.61.0.tgz) = 1202485 bytes
+SHA1 (patch-aa) = 68f12461b0c37256295ae272dfeaabf96b37a532
+SHA1 (patch-ab) = 11049b09d4fd218b3f0f60770f022a4cf110c094
diff --git a/math/euler/patches/patch-aa b/math/euler/patches/patch-aa
index 153dd9fca42..7b2347ab18d 100644
--- a/math/euler/patches/patch-aa
+++ b/math/euler/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2003/05/11 00:06:14 jtb Exp $
+$NetBSD: patch-aa,v 1.6 2007/06/06 12:43:31 tnn Exp $
 
---- main.c.orig
-+++ main.c
-@@ -429,7 +429,8 @@
+--- src/main.c.orig	2005-10-30 23:54:17.000000000 +0100
++++ src/main.c
+@@ -439,7 +439,8 @@ double myclock (void)
  	gettimer(TIMEOFDAY,&t);
  	return (t.tv_sec+t.tv_nsec/1000000000.0);
  #else
diff --git a/math/euler/patches/patch-ab b/math/euler/patches/patch-ab
index a898ce16829..fd04599a227 100644
--- a/math/euler/patches/patch-ab
+++ b/math/euler/patches/patch-ab
@@ -1,193 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2003/04/29 22:22:45 jtb Exp $
+$NetBSD: patch-ab,v 1.3 2007/06/06 12:43:31 tnn Exp $
 
---- makefile.orig
-+++ makefile
-@@ -6,7 +6,7 @@
- # view docs/index.html with any Web browser.
+--- src/command.c.orig	2005-10-24 02:38:24.000000000 +0200
++++ src/command.c
+@@ -732,7 +732,7 @@ static void do_comment (void)
+ }
  
  
--#INSTALL_DIR = /usr/local
-+INSTALL_DIR = $(PREFIX)
+-static int command_count;
++int command_count;
  
- 
- # Changes for other systems:
-@@ -28,7 +28,8 @@
- # If you do not have M_PI or PI and need pi with more than 16 digits
- # define it -DPI=3.1415... (not necessary for 8 byte doubles)
- 
--CC=gcc -Wall -O2 -DINSTALL_DIR=\"$(INSTALL_DIR)\"
-+CLFAGS+= -Wall
-+CPPFLAGS+= -DINSTALL_DIR=\"$(INSTALL_DIR)\"
- 
- 
- # This is for printing the DOC on your local printer
-@@ -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) $(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,104 +60,104 @@
- #	object file dependances
- #
- binary.o :	sysdep.h stack.h output.h binary.h binary.c
--	$(CC) -c  binary.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c  binary.c
- 
- builtin.o :	sysdep.h stack.h builtin.h builtin.c
--	$(CC) -c  builtin.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c  builtin.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 :	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
- 
- 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 : sysdep.h stack.h output.h linear.h fft.h fft.c
--	$(CC) -c  fft.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c  fft.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 :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 :	output.h help.h help.c
--	$(CC) -c  help.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c  help.c
- 
- input.o :	sysdep.h input.c
--	$(CC) -c  input.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c  input.c
- 
- interval.o : interval.h spread.h stack.h interval.c
--	$(CC) -c  interval.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c  interval.c
- 
- 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
- 
- 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
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c meta.c
- 
- metaps.o:	sysdep.h meta.h metaps.h metaps.c
--	$(CC) -c metaps.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c metaps.c
- 
- output.o :	sysdep.h output.c
--	$(CC) -c  output.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c  output.c
- 
- 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
- 
- psgraph.o : psgraph.h psgraph.c
--	$(CC) -c psgraph.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c psgraph.c
- 
- scalp.o :	interval.h express.h stack.h scalp.c
--	$(CC) -c  scalp.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c  scalp.c
- 
- special.o : stack.h spread.h special.c
--	$(CC) -c  special.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c  special.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 : sysdep.h stack.h stack.c
--	$(CC) -c  stack.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c  stack.c
- 
- udf.o : sysdep.h stack.h udf.c help.h
--	$(CC) -c  udf.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c  udf.c
- 
- main.o : main.c rc.h earray.h term.h metagtk.h metaps.h
--	$(CC) `gtk-config --cflags` -c  main.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) `gtk-config --cflags` -c  main.c
- 
- rc.o :		rc.c rc.h
--	$(CC) `gtk-config --cflags` -c  rc.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) `gtk-config --cflags` -c  rc.c
- 
- earray.o : earray.c earray.h
--	$(CC) `gtk-config --cflags` -c  earray.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) `gtk-config --cflags` -c  earray.c
- 
- term.o : term.c term.h earray.h
--	$(CC) `gtk-config --cflags` -c term.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) `gtk-config --cflags` -c term.c
- 
- metagtk.o : metagtk.c metagtk.h meta.h
--	$(CC) `gtk-config --cflags` -c metagtk.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) `gtk-config --cflags` -c metagtk.c
- 
- colbut.o : colbut.c colbut.h
--	$(CC) `gtk-config --cflags` -c colbut.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) `gtk-config --cflags` -c colbut.c
- 
- #
- #	install
-@@ -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)/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/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
-+	$(BSD_INSTALL_DATA_DIR) $(INSTALL_DIR)/share/doc/euler/reference
-+	$(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
+ commandtyp command_list[] = {
+ 	{"quit",c_quit,do_quit},
diff --git a/math/euler/patches/patch-ac b/math/euler/patches/patch-ac
deleted file mode 100644
index d0adf7b57d3..00000000000
--- a/math/euler/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
-@@ -1770,8 +1770,8 @@
- 	g_free(filename);
- 
- 	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/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");
diff --git a/math/euler/patches/patch-ad b/math/euler/patches/patch-ad
deleted file mode 100644
index 57bbaf08c3c..00000000000
--- a/math/euler/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2004/02/13 22:36:40 kristerw Exp $
-
---- metaps.c.orig	2004-02-13 23:01:18.000000000 +0100
-+++ metaps.c	2004-02-13 23:24:42.000000000 +0100
-@@ -209,7 +209,7 @@
- //	rectangle clipping
- //	x1 y1 x2 y2 setclip
- static char setclipmacro[]= "/setclip {\n\
--gsave
-+gsave\n\
- 	/y2 exch def\n\
- 	/x2 exch def\n\
- 	/y1 exch def\n\
diff --git a/math/euler/patches/patch-ae b/math/euler/patches/patch-ae
deleted file mode 100644
index 2a0b7e4ee9f..00000000000
--- a/math/euler/patches/patch-ae
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/12/20 14:51:00 joerg Exp $
-
---- term.c.orig	2005-12-20 14:34:42.000000000 +0000
-+++ term.c
-@@ -2164,6 +2164,7 @@ static void get_scan(GdkEventKey *event,
- 									ch = 'Û';
- 									break;
- 								default:
-+									break;
- 							}
- 							deadkey=0;
- 							break;
-@@ -2207,6 +2208,7 @@ static void get_scan(GdkEventKey *event,
- 									ch = 'Ü';
- 									break;
- 								default:
-+									break;
- 							}
- 							deadkey=0;
- 							break;
-@@ -2587,6 +2589,7 @@ static gint gtk_term_key_press (GtkWidge
- 										ch = 'Û';
- 										break;
- 									default:
-+										break;
- 								}
- 								deadkey=0;
- 								break;
-@@ -2630,6 +2633,7 @@ static gint gtk_term_key_press (GtkWidge
- 										ch = 'Ü';
- 										break;
- 									default:
-+										break;
- 								}
- 								deadkey=0;
- 								break;