4 files changed, 134 insertions, 117 deletions

diff --git a/science/euler/Makefile b/science/euler/Makefile
index e0941365abe6..8082d945cc34 100644
--- a/science/euler/Makefile
+++ b/science/euler/Makefile
@@ -7,28 +7,45 @@
 #
 
 PORTNAME=	euler
-PORTVERSION=	1.60.4
+PORTVERSION=	1.60.6
 CATEGORIES=	science
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	euler
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
 PORTCOMMENT=	A program computes with real and complex numbers and matrices
 
-USE_REINPLACE=	yes
+WRKSRC=		${WRKDIR}/${DISTNAME:R}/source
+
 USE_GNOMENG=	yes
 USE_GNOME=	gtk12
-WRKSRC=		${WRKDIR}/${DISTNAME:R}/source
+USE_REINPLACE=	yes
 MAKEFILE=	makefile
-ALL_TARGET=	# empty
+ALL_TARGET=	euler
 
 post-patch:
-	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g ; \
-		s,gtk-config,${GTK_CONFIG},g ; \
-		s,glib-config,${GLIB_CONFIG},g" ${WRKSRC}/${MAKEFILE}
+	@${REINPLACE_CMD} -e 's|^CC=gcc|CC+= \$$\{CFLAGS\}|g ; \
+		 s|[(]INSTALL_DIR[)]|(PREFIX)|g ; \
+		 s|-O2||g ; \
+		 s|g++|\$$\{CXX\}|g ; \
+		 s|gtk-config|\$$\{GTK_CONFIG\}|g ; \
+		 s|glib-config|\$$\{GLIB_CONFIG\}|g' ${WRKSRC}/${MAKEFILE}
+	@${REINPLACE_CMD} -e 's|_DIR,|_DIR |g' ${WRKSRC}/main.c
 
-post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/euler
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/euler ${PREFIX}/bin
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/help.txt ${DATADIR}
+.for dir in progs progs/user
+	@${MKDIR} ${DATADIR}/${dir}
+	${INSTALL_DATA} ${WRKSRC}/../${dir}/*.* ${DATADIR}/${dir}
+.endfor
+.if !defined(NOPORTDOCS)
+.for dir in . french german german/images images reference
+	@${MKDIR} ${DOCSDIR}/${dir}
+	${INSTALL_DATA} ${WRKSRC}/../docs/${dir}/*.* ${DOCSDIR}/${dir}
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/science/euler/distinfo b/science/euler/distinfo
index 48bc438dc992..a9ce1afb34b0 100644
--- a/science/euler/distinfo
+++ b/science/euler/distinfo
@@ -1 +1 @@
-MD5 (euler-1.60.4.tar.gz) = c91aaa1affbc6613db0bb6d936c1a8f4
+MD5 (euler-1.60.6.tar.gz) = e56a0f41c184fc2f416457f0c5ece78f
diff --git a/science/euler/files/patch-makefile b/science/euler/files/patch-makefile
deleted file mode 100644
index d14f95949d7b..000000000000
--- a/science/euler/files/patch-makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- makefile.orig	Tue May 14 11:44:07 2002
-+++ makefile	Tue May 14 11:46:54 2002
-@@ -6,7 +6,7 @@
- # view docs/index.html with any Web browser.
- 
- 
--INSTALL_DIR = /usr/local
-+INSTALL_DIR = %%PREFIX%%
- 
- 
- # Changes for other systems:
-@@ -28,7 +28,7 @@
- # 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)\"
-+CC+=${CFLAGS} -DINSTALL_DIR=\"$(INSTALL_DIR)\"
- 
- 
- # This is for printing the DOC on your local printer
diff --git a/science/euler/pkg-plist b/science/euler/pkg-plist
index 00131023532b..09208d53ffa4 100644
--- a/science/euler/pkg-plist
+++ b/science/euler/pkg-plist
@@ -1,4 +1,101 @@
 bin/euler
+%%PORTDOCS%%share/doc/euler/doc.html
+%%PORTDOCS%%share/doc/euler/download.html
+%%PORTDOCS%%share/doc/euler/french/doc.html
+%%PORTDOCS%%share/doc/euler/french/download.html
+%%PORTDOCS%%share/doc/euler/french/index.html
+%%PORTDOCS%%share/doc/euler/french/links.html
+%%PORTDOCS%%share/doc/euler/french/screenshots.html
+%%PORTDOCS%%share/doc/euler/german/doc.html
+%%PORTDOCS%%share/doc/euler/german/download.html
+%%PORTDOCS%%share/doc/euler/german/examples.html
+%%PORTDOCS%%share/doc/euler/german/images/Binomial.gif
+%%PORTDOCS%%share/doc/euler/german/images/Contour.gif
+%%PORTDOCS%%share/doc/euler/german/images/HalfPipe1.gif
+%%PORTDOCS%%share/doc/euler/german/images/Halfpipe.gif
+%%PORTDOCS%%share/doc/euler/german/images/Liss.gif
+%%PORTDOCS%%share/doc/euler/german/images/Mesh.gif
+%%PORTDOCS%%share/doc/euler/german/images/Plot2D.gif
+%%PORTDOCS%%share/doc/euler/german/images/Plot3D.gif
+%%PORTDOCS%%share/doc/euler/german/images/Sinc.gif
+%%PORTDOCS%%share/doc/euler/german/images/SincI.gif
+%%PORTDOCS%%share/doc/euler/german/images/euler.css
+%%PORTDOCS%%share/doc/euler/german/images/fcd.gif
+%%PORTDOCS%%share/doc/euler/german/images/index.php
+%%PORTDOCS%%share/doc/euler/german/index.html
+%%PORTDOCS%%share/doc/euler/german/links.html
+%%PORTDOCS%%share/doc/euler/german/screenshots.html
+%%PORTDOCS%%share/doc/euler/images/de.gif
+%%PORTDOCS%%share/doc/euler/images/euler.gif
+%%PORTDOCS%%share/doc/euler/images/fr.gif
+%%PORTDOCS%%share/doc/euler/images/index.php
+%%PORTDOCS%%share/doc/euler/images/pref1.gif
+%%PORTDOCS%%share/doc/euler/images/pref2.gif
+%%PORTDOCS%%share/doc/euler/images/pref3.gif
+%%PORTDOCS%%share/doc/euler/images/pref4.gif
+%%PORTDOCS%%share/doc/euler/images/ru.gif
+%%PORTDOCS%%share/doc/euler/images/shot1.gif
+%%PORTDOCS%%share/doc/euler/images/shot2.gif
+%%PORTDOCS%%share/doc/euler/images/shot3.gif
+%%PORTDOCS%%share/doc/euler/images/shot4.gif
+%%PORTDOCS%%share/doc/euler/images/shot5.gif
+%%PORTDOCS%%share/doc/euler/images/shot6.gif
+%%PORTDOCS%%share/doc/euler/images/shot7.gif
+%%PORTDOCS%%share/doc/euler/images/shot8.gif
+%%PORTDOCS%%share/doc/euler/images/uk.gif
+%%PORTDOCS%%share/doc/euler/index.html
+%%PORTDOCS%%share/doc/euler/links.html
+%%PORTDOCS%%share/doc/euler/news.html
+%%PORTDOCS%%share/doc/euler/reference/about.html
+%%PORTDOCS%%share/doc/euler/reference/back.gif
+%%PORTDOCS%%share/doc/euler/reference/bezier1.gif
+%%PORTDOCS%%share/doc/euler/reference/bezier2.gif
+%%PORTDOCS%%share/doc/euler/reference/bezier3.gif
+%%PORTDOCS%%share/doc/euler/reference/bezier4.gif
+%%PORTDOCS%%share/doc/euler/reference/commandline.html
+%%PORTDOCS%%share/doc/euler/reference/compl0.gif
+%%PORTDOCS%%share/doc/euler/reference/compl1.gif
+%%PORTDOCS%%share/doc/euler/reference/compl2.gif
+%%PORTDOCS%%share/doc/euler/reference/compl3.gif
+%%PORTDOCS%%share/doc/euler/reference/dgl1.gif
+%%PORTDOCS%%share/doc/euler/reference/dgl2.gif
+%%PORTDOCS%%share/doc/euler/reference/euler.css
+%%PORTDOCS%%share/doc/euler/reference/euler.html
+%%PORTDOCS%%share/doc/euler/reference/euler_credits.html
+%%PORTDOCS%%share/doc/euler/reference/euler_download.html
+%%PORTDOCS%%share/doc/euler/reference/euler_features.html
+%%PORTDOCS%%share/doc/euler/reference/euler_links.html
+%%PORTDOCS%%share/doc/euler/reference/euler_list.html
+%%PORTDOCS%%share/doc/euler/reference/euler_systems.html
+%%PORTDOCS%%share/doc/euler/reference/eulerdoc.html
+%%PORTDOCS%%share/doc/euler/reference/examples.html
+%%PORTDOCS%%share/doc/euler/reference/expressions.html
+%%PORTDOCS%%share/doc/euler/reference/fft1.gif
+%%PORTDOCS%%share/doc/euler/reference/fft2.gif
+%%PORTDOCS%%share/doc/euler/reference/fft3.gif
+%%PORTDOCS%%share/doc/euler/reference/files.html
+%%PORTDOCS%%share/doc/euler/reference/functions.html
+%%PORTDOCS%%share/doc/euler/reference/german.gif
+%%PORTDOCS%%share/doc/euler/reference/graphics.html
+%%PORTDOCS%%share/doc/euler/reference/index.html
+%%PORTDOCS%%share/doc/euler/reference/intervall.html
+%%PORTDOCS%%share/doc/euler/reference/introduction.html
+%%PORTDOCS%%share/doc/euler/reference/knot.gif
+%%PORTDOCS%%share/doc/euler/reference/linearalgebra.html
+%%PORTDOCS%%share/doc/euler/reference/links.html
+%%PORTDOCS%%share/doc/euler/reference/logo.gif
+%%PORTDOCS%%share/doc/euler/reference/polynomials.html
+%%PORTDOCS%%share/doc/euler/reference/programming.html
+%%PORTDOCS%%share/doc/euler/reference/rene.gif
+%%PORTDOCS%%share/doc/euler/reference/settings.html
+%%PORTDOCS%%share/doc/euler/reference/sin1.gif
+%%PORTDOCS%%share/doc/euler/reference/sin2.gif
+%%PORTDOCS%%share/doc/euler/reference/somefiles.html
+%%PORTDOCS%%share/doc/euler/reference/special.html
+%%PORTDOCS%%share/doc/euler/reference/statistics.html
+%%PORTDOCS%%share/doc/euler/reference/version.html
+%%PORTDOCS%%share/doc/euler/screenshots.html
+%%PORTDOCS%%share/doc/euler/style.css
 share/euler/help.txt
 share/euler/progs/3body.e
 share/euler/progs/3body.en
@@ -18,6 +115,8 @@ 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
@@ -27,6 +126,7 @@ 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/flower.e
 share/euler/progs/fmin.en
 share/euler/progs/fminmax.e
@@ -45,7 +145,6 @@ share/euler/progs/kepler.e
 share/euler/progs/kette.dat
 share/euler/progs/kettenlinie.en
 share/euler/progs/linear.en
-share/euler/progs/logplot.e
 share/euler/progs/logplot.en
 share/euler/progs/lorenz.e
 share/euler/progs/mandog.e
@@ -98,89 +197,10 @@ share/euler/progs/x.e
 share/euler/progs/xdis.e
 @dirrm share/euler/progs/user
 @dirrm share/euler/progs
-share/doc/euler/developpers
-share/doc/euler/doc.html
-share/doc/euler/download.html
-share/doc/euler/images/.xvpics/pref1.gif
-share/doc/euler/images/.xvpics/pref2.gif
-share/doc/euler/images/.xvpics/pref3.gif
-share/doc/euler/images/.xvpics/pref4.gif
-share/doc/euler/images/.xvpics/shot1.gif
-share/doc/euler/images/.xvpics/shot2.gif
-share/doc/euler/images/.xvpics/shot3.gif
-share/doc/euler/images/.xvpics/shot4.gif
-share/doc/euler/images/.xvpics/shot5.gif
-share/doc/euler/images/.xvpics/shot6.gif
-share/doc/euler/images/euler.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/shot1.gif
-share/doc/euler/images/shot2.gif
-share/doc/euler/images/shot3.gif
-share/doc/euler/images/shot4.gif
-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/index.html
-share/doc/euler/links.html
-share/doc/euler/news.html
-share/doc/euler/reference/about.html
-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/euler.html
-share/doc/euler/reference/euler_credits.html
-share/doc/euler/reference/euler_download.html
-share/doc/euler/reference/euler_features.html
-share/doc/euler/reference/euler_links.html
-share/doc/euler/reference/euler_list.html
-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/screenshots.html
-share/doc/euler/style.css
-@dirrm share/doc/euler/images/.xvpics
-@dirrm share/doc/euler/images
-@dirrm share/doc/euler/reference/german
-@dirrm share/doc/euler/reference
-@dirrm share/doc/euler
 @dirrm share/euler
+%%PORTDOCS%%@dirrm share/doc/euler/reference
+%%PORTDOCS%%@dirrm share/doc/euler/images
+%%PORTDOCS%%@dirrm share/doc/euler/german/images
+%%PORTDOCS%%@dirrm share/doc/euler/german
+%%PORTDOCS%%@dirrm share/doc/euler/french
+%%PORTDOCS%%@dirrm share/doc/euler