Update Genius Calculator to version 1.0.7.

Changes to 1.0.7:

* SYNTAX: Added a possibility to exactly specify which variables are copied
  into a function's extra dictionary when it is being returned.
    E.g. "`(x) [x0] = (x-x0)" will copy x0 from the current context.  This
  is a lot more efficient than the current behaviour which tries to copy
  everything referenced.
* SYNTAX: Add "local" variables by specifying "local x,y,z" or "local *" as
  the first statement in a function.  Local variables are not visible from
  higher contexts (functions called within)
* CHANGE: all system parameters are now protected and cannot be redefined
  using the "parameter" keyword
* Add UserVariables, UndefineAll, ProtectAll, and add Undefine as an alias to
  undefine.
* Add trigonometric Fourier series related functions:
  NumericalFourierSeriesFunction, NumericalFourierSineSeriesFunction,
  NumericalFourierCosineSeriesFunction, FourierSeriesFunction,
  NumericalFourierSeriesCoefficients, NumericalFourierSineSeriesCoefficients,
  NumericalFourierCosineSeriesCoefficients, PeriodicExtension,
  EvenPeriodicExtension, OddPeriodicExtension
* Fix changing floating point precision!
* Fix uninitialized variable in graphing (Matthias Drochner)
* Improve variable substitution for returned functions to be more efficient.
  Slightly changes behaviour with respect to global functions and variables
  used.
* Plot windows now not treated annoyingly as dialogs
* Fix compilation/decompilation of all function attributes.
* Parse/Evaluate with a syntax error at end of string no longer terminate
  genius
* Updated Mersenne stuff for the newest data from mersenne.org and
  fix MersennePrimeExponents
* Fix opening new files from the command line.
* Update the gel library to use the new language features.
* Various other minor fixes
* Translation updates (Philip Withnall, Jen Ockwell,
  Rodrigo Luiz Marques Flores, Daniel Nylander, Mario BlæÖttermann, me)

* For some of the changes the author (Jiri) was partially supported by
  NSF grant DMS 0900885 and the University of Illinois at Urbana-Champaign

5 files changed, 40 insertions, 32 deletions

diff --git a/math/genius/Makefile b/math/genius/Makefile
index 3f44726e90c..a71cf09d907 100644
--- a/math/genius/Makefile
+++ b/math/genius/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.25 2009/08/26 19:57:58 sno Exp $
+# $NetBSD: Makefile,v 1.26 2009/09/03 13:15:19 asau Exp $
 #
 
-DISTNAME=		genius-1.0.6
-PKGREVISION=		4
+DISTNAME=		genius-1.0.7
 CATEGORIES=		math
 MASTER_SITES=		http://ftp.5z.com/pub/genius/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.jirka.org/genius.html
 COMMENT=		Calculator and math tool
+LICENSE=		gnu-gpl-v3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 MAKE_JOBS_SAFE=		no
@@ -19,19 +19,14 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		pkg-config gmake intltool msgfmt
 USE_GNU_READLINE=	yes
 
+.include "options.mk"
+
 do-test:
 	(cd ${WRKSRC}/src; perl geniustest.pl)
 
 .include "../../databases/shared-mime-info/mimedb.mk"
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../math/mpfr/buildlink3.mk"
-.include "../../mk/omf-scrollkeeper.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/gtksourceview2/buildlink3.mk"
-.include "../../x11/vte/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/genius/PLIST b/math/genius/PLIST
index 07b42244528..b8ed1a7b1bd 100644
--- a/math/genius/PLIST
+++ b/math/genius/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:05:43 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/09/03 13:15:20 asau Exp $
 bin/genius
-bin/gnome-genius
+${PLIST.x11}bin/gnome-genius
 include/genius/compil.h
 include/genius/dict.h
 include/genius/eval.h
@@ -16,10 +16,11 @@ include/genius/plug_api.h
 include/genius/structs.h
 include/genius/utype.h
 lib/genius/libtestplugin.la
-libexec/genius-readline-helper-fifo
+${PLIST.x11}libexec/genius-readline-helper-fifo
 share/application-registry/genius.applications
-share/applications/gnome-genius.desktop
+${PLIST.x11}share/applications/gnome-genius.desktop
 share/genius/gel/calculus/differentiation.gel
+share/genius/gel/calculus/fourier.gel
 share/genius/gel/calculus/integration.gel
 share/genius/gel/calculus/limits.gel
 share/genius/gel/calculus/loader.gel
diff --git a/math/genius/distinfo b/math/genius/distinfo
index 8dcb4965130..57ccc5a9dc5 100644
--- a/math/genius/distinfo
+++ b/math/genius/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2009/04/08 18:22:54 drochner Exp $
+$NetBSD: distinfo,v 1.8 2009/09/03 13:15:20 asau Exp $
 
-SHA1 (genius-1.0.6.tar.gz) = 37d6af0931e4eda0cc18f90ae6f3dc6671c39d77
-RMD160 (genius-1.0.6.tar.gz) = 04739e1756186acc58fa8b269066d5b718bb334e
-Size (genius-1.0.6.tar.gz) = 2195097 bytes
-SHA1 (patch-aa) = 1fac171f0b22c3d6a269cca99c575142c201088e
+SHA1 (genius-1.0.7.tar.gz) = 2ef70f28876fe27c8cfa83bc87661e1d64f2072c
+RMD160 (genius-1.0.7.tar.gz) = 23067a39dade023ec2fc910c666967073d3f76cb
+Size (genius-1.0.7.tar.gz) = 2144469 bytes
+SHA1 (patch-aa) = da39a3ee5e6b4b0d3255bfef95601890afd80709
diff --git a/math/genius/options.mk b/math/genius/options.mk
new file mode 100644
index 00000000000..333faef9b4a
--- /dev/null
+++ b/math/genius/options.mk
@@ -0,0 +1,24 @@
+# $NetBSD: options.mk,v 1.1 2009/09/03 13:15:20 asau Exp $
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.genius
+PKG_SUPPORTED_OPTIONS=		x11
+PKG_SUGGESTED_OPTIONS=		x11
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=		${PKG_SUPPORTED_OPTIONS}
+
+.if !empty(PKG_OPTIONS:Mx11)
+PLIST.x11=		yes
+
+.include "../../devel/libglade/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../mk/omf-scrollkeeper.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gtksourceview2/buildlink3.mk"
+.include "../../x11/vte/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-gnome
+.endif
diff --git a/math/genius/patches/patch-aa b/math/genius/patches/patch-aa
deleted file mode 100644
index 525da1867a2..00000000000
--- a/math/genius/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2009/04/08 18:22:54 drochner Exp $
-
---- src/graphing.c.orig	2009-04-08 20:15:12.000000000 +0200
-+++ src/graphing.c
-@@ -4629,6 +4629,7 @@ plot_from_dialog_lineplot (void)
- 
- 	line_plot_clear_funcs ();
- 
-+	j = 0;
- 	for (i = 0; i < MAXFUNC; i++) {
- 		if (func[i] != NULL) {
- 			plot_func[j] = func[i];