8 files changed, 111 insertions, 90 deletions

diff --git a/math/qalculate/Makefile b/math/qalculate/Makefile
index 91f9af8e78cb..1bd41da2fc94 100644
--- a/math/qalculate/Makefile
+++ b/math/qalculate/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	qalculate
-PORTVERSION=	0.6.3
-PORTREVISION=	1
+PORTVERSION=	0.7.2
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-gtk-${PORTVERSION}
+#DISTNAME=	${PORTNAME}-gtk-${PORTVERSION}
 
-MAINTAINER=	asa@gascom.ru
+MAINTAINER=	asa@agava.com
 COMMENT=	Very powerful GUI calculator for GNOME
 
 LIB_DEPENDS=	cln.3:${PORTSDIR}/math/cln
@@ -22,8 +21,10 @@ RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot \
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_INC_LIBTOOL_VER=15
 USE_GNOME=	gnomeprefix gnomehack intlhack libglade2 libgnome
+INSTALLS_OMF=	yes
+INSTALLS_SHLIB=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/math/qalculate/distinfo b/math/qalculate/distinfo
index d6af4b659a2b..f4ac87b06f3d 100644
--- a/math/qalculate/distinfo
+++ b/math/qalculate/distinfo
@@ -1,2 +1,2 @@
-MD5 (qalculate-gtk-0.6.3.tar.gz) = 6deb12cb5b457c42f26f0da9abf442f4
-SIZE (qalculate-gtk-0.6.3.tar.gz) = 1387128
+MD5 (qalculate-0.7.2.tar.gz) = 75af1f213829fb0905ce6784ee0e1017
+SIZE (qalculate-0.7.2.tar.gz) = 1504796
diff --git a/math/qalculate/files/extra-patch-FreeBSD4 b/math/qalculate/files/extra-patch-FreeBSD4
index a58aaaa1701e..7c28930a8593 100644
--- a/math/qalculate/files/extra-patch-FreeBSD4
+++ b/math/qalculate/files/extra-patch-FreeBSD4
@@ -1,5 +1,5 @@
---- src/calclib/Calculator.cc.orig	Sun Aug 29 17:22:28 2004
-+++ src/calclib/Calculator.cc	Sun Aug 29 17:27:37 2004
+--- src/libqalculate/Calculator.cc.orig	Sun Aug 29 17:22:28 2004
++++ src/libqalculate/Calculator.cc	Sun Aug 29 17:27:37 2004
 @@ -225,7 +225,7 @@
  
  	saved_locale = strdup(setlocale(LC_NUMERIC, NULL));
diff --git a/math/qalculate/files/patch-src::Makefile.in b/math/qalculate/files/patch-src::Makefile.in
deleted file mode 100644
index 8a39fe6ce887..000000000000
--- a/math/qalculate/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Wed Sep  1 10:41:43 2004
-+++ src/Makefile.in	Wed Sep  1 10:41:50 2004
-@@ -110,7 +110,7 @@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
--LN_S = @LN_S@
-+LN_S = @LN_S@ -f
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
diff --git a/math/qalculate/files/patch-src::calclib::Calculator.cc b/math/qalculate/files/patch-src::calclib::Calculator.cc
deleted file mode 100644
index 01119f0b6ded..000000000000
--- a/math/qalculate/files/patch-src::calclib::Calculator.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/calclib/Calculator.cc.orig	Thu Jul  8 12:00:01 2004
-+++ src/calclib/Calculator.cc	Thu Jul  8 12:05:08 2004
-@@ -27,9 +27,11 @@
- #include <unistd.h>
- #include <time.h>
- #include <sys/types.h>
-+#include <sys/wait.h>
- #include <sys/stat.h>
-+#include <sys/time.h>
-+#include <sys/resource.h>
- #include <dirent.h>
--#include <wait.h>
- #include <queue>
- #include <stack>
- 
diff --git a/math/qalculate/files/patch-src_libqalculate_Calculator.cc b/math/qalculate/files/patch-src_libqalculate_Calculator.cc
new file mode 100644
index 000000000000..7bd59d32a76a
--- /dev/null
+++ b/math/qalculate/files/patch-src_libqalculate_Calculator.cc
@@ -0,0 +1,11 @@
+--- src/libqalculate/Calculator.cc.orig	Fri Mar 11 14:36:10 2005
++++ src/libqalculate/Calculator.cc	Fri Mar 11 14:36:17 2005
+@@ -33,7 +33,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <dirent.h>
+-#include <wait.h>
++#include <sys/wait.h>
+ #include <queue>
+ #include <glib.h>
+ 
diff --git a/math/qalculate/files/patch-src_qalc.cc b/math/qalculate/files/patch-src_qalc.cc
new file mode 100644
index 000000000000..6da583f1b7fb
--- /dev/null
+++ b/math/qalculate/files/patch-src_qalc.cc
@@ -0,0 +1,11 @@
+--- src/qalc.cc.orig	Fri Mar 11 14:50:18 2005
++++ src/qalc.cc	Fri Mar 11 14:50:31 2005
+@@ -16,7 +16,7 @@
+ #include <time.h>
+ #include <pthread.h>
+ #include <dirent.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <vector>
+ #include <glib.h>
diff --git a/math/qalculate/pkg-plist b/math/qalculate/pkg-plist
index a1f6bc5a3faa..08098802b302 100644
--- a/math/qalculate/pkg-plist
+++ b/math/qalculate/pkg-plist
@@ -1,67 +1,91 @@
+bin/qalc
 bin/qalculate
 bin/qalculate-gtk
+include/libqalculate/Function.h
+include/libqalculate/Calculator.h
+include/libqalculate/DataSet.h
+include/libqalculate/Variable.h
+include/libqalculate/ExpressionItem.h
+include/libqalculate/Number.h
+include/libqalculate/MathStructure.h
+include/libqalculate/Prefix.h
+include/libqalculate/util.h
+include/libqalculate/includes.h
+include/libqalculate/Unit.h
+include/libqalculate/BuiltinFunctions.h
+include/libqalculate/qalculate.h
+lib/libqalculate.so.0
+lib/libqalculate.so
+lib/libqalculate.la
+lib/libqalculate.a
+libdata/pkgconfig/libqalculate.pc
 share/gnome/applnk/Utilities/qalculate.desktop
 share/gnome/applications/qalculate.desktop
-share/gnome/help/qalculate-gtk/C/legal.xml
-share/gnome/help/qalculate-gtk/C/qalculate-gtk.xml
-share/gnome/help/qalculate-gtk/C/figures/calculation-history.png
-share/gnome/help/qalculate-gtk/C/figures/calculator-buttons-screen.png
-share/gnome/help/qalculate-gtk/C/figures/calculator-buttons.png
-share/gnome/help/qalculate-gtk/C/figures/completion.png
-share/gnome/help/qalculate-gtk/C/figures/convert-number-bases.png
-share/gnome/help/qalculate-gtk/C/figures/convert-unit.png
-share/gnome/help/qalculate-gtk/C/figures/edit-function.png
-share/gnome/help/qalculate-gtk/C/figures/edit-matrix.png
-share/gnome/help/qalculate-gtk/C/figures/edit-unit.png
-share/gnome/help/qalculate-gtk/C/figures/function-manager.png
-share/gnome/help/qalculate-gtk/C/figures/gnuplot.png
-share/gnome/help/qalculate-gtk/C/figures/import-csv.png
-share/gnome/help/qalculate-gtk/C/figures/insert-function-screen.png
-share/gnome/help/qalculate-gtk/C/figures/insert-function.png
-share/gnome/help/qalculate-gtk/C/figures/mainwindow-screen.png
-share/gnome/help/qalculate-gtk/C/figures/mainwindow.png
-share/gnome/help/qalculate-gtk/C/figures/plot-data.png
-share/gnome/help/qalculate-gtk/C/figures/plot-settings.png
-share/gnome/help/qalculate-gtk/C/figures/store-variable.png
-share/gnome/help/qalculate-gtk/C/figures/unit-manager.png
-share/gnome/help/qalculate-gtk/C/figures/variable-manager.png
-share/gnome/omf/qalculate-gtk/qalculate-gtk-C.omf
-share/gnome/qalculate-gtk/glade/about.glade
-share/gnome/qalculate-gtk/glade/argumentrules.glade
-share/gnome/qalculate-gtk/glade/csvexport.glade
-share/gnome/qalculate-gtk/glade/csvimport.glade
-share/gnome/qalculate-gtk/glade/decimals.glade
-share/gnome/qalculate-gtk/glade/functionedit.glade
-share/gnome/qalculate-gtk/glade/functions.glade
-share/gnome/qalculate-gtk/glade/main.glade
-share/gnome/qalculate-gtk/glade/matrixedit.glade
-share/gnome/qalculate-gtk/glade/namesedit.glade
-share/gnome/qalculate-gtk/glade/nbases.glade
-share/gnome/qalculate-gtk/glade/nbexpression.glade
-share/gnome/qalculate-gtk/glade/periodictable.glade
-share/gnome/qalculate-gtk/glade/plot.glade
-share/gnome/qalculate-gtk/glade/precision.glade
-share/gnome/qalculate-gtk/glade/preferences.glade
-share/gnome/qalculate-gtk/glade/unit.glade
-share/gnome/qalculate-gtk/glade/unitedit.glade
-share/gnome/qalculate-gtk/glade/units.glade
-share/gnome/qalculate-gtk/glade/unknownedit.glade
-share/gnome/qalculate-gtk/glade/variableedit.glade
-share/gnome/qalculate-gtk/glade/variables.glade
+share/gnome/help/qalculate/C/appendixa.xml
+share/gnome/help/qalculate/C/appendixb.xml
+share/gnome/help/qalculate/C/appendixc.xml
+share/gnome/help/qalculate/C/legal.xml
+share/gnome/help/qalculate/C/qalculate.xml
+share/gnome/help/qalculate/C/figures/calculation-history.png
+share/gnome/help/qalculate/C/figures/calculator-buttons-screen.png
+share/gnome/help/qalculate/C/figures/calculator-buttons.png
+share/gnome/help/qalculate/C/figures/completion.png
+share/gnome/help/qalculate/C/figures/convert-number-bases.png
+share/gnome/help/qalculate/C/figures/convert-unit.png
+share/gnome/help/qalculate/C/figures/edit-function.png
+share/gnome/help/qalculate/C/figures/edit-matrix.png
+share/gnome/help/qalculate/C/figures/edit-unit.png
+share/gnome/help/qalculate/C/figures/function-manager.png
+share/gnome/help/qalculate/C/figures/gnuplot.png
+share/gnome/help/qalculate/C/figures/import-csv.png
+share/gnome/help/qalculate/C/figures/insert-function-screen.png
+share/gnome/help/qalculate/C/figures/insert-function.png
+share/gnome/help/qalculate/C/figures/mainwindow-screen.png
+share/gnome/help/qalculate/C/figures/mainwindow.png
+share/gnome/help/qalculate/C/figures/plot-data.png
+share/gnome/help/qalculate/C/figures/plot-settings.png
+share/gnome/help/qalculate/C/figures/store-variable.png
+share/gnome/help/qalculate/C/figures/unit-manager.png
+share/gnome/help/qalculate/C/figures/variable-manager.png
+share/gnome/omf/qalculate/qalculate-C.omf
+share/gnome/qalculate/glade/about.glade
+share/gnome/qalculate/glade/argumentrules.glade
+share/gnome/qalculate/glade/csvexport.glade
+share/gnome/qalculate/glade/csvimport.glade
+share/gnome/qalculate/glade/datasetedit.glade
+share/gnome/qalculate/glade/datasets.glade
+share/gnome/qalculate/glade/decimals.glade
+share/gnome/qalculate/glade/functionedit.glade
+share/gnome/qalculate/glade/functions.glade
+share/gnome/qalculate/glade/main.glade
+share/gnome/qalculate/glade/matrixedit.glade
+share/gnome/qalculate/glade/namesedit.glade
+share/gnome/qalculate/glade/nbases.glade
+share/gnome/qalculate/glade/nbexpression.glade
+share/gnome/qalculate/glade/periodictable.glade
+share/gnome/qalculate/glade/plot.glade
+share/gnome/qalculate/glade/precision.glade
+share/gnome/qalculate/glade/preferences.glade
+share/gnome/qalculate/glade/unit.glade
+share/gnome/qalculate/glade/unitedit.glade
+share/gnome/qalculate/glade/units.glade
+share/gnome/qalculate/glade/unknownedit.glade
+share/gnome/qalculate/glade/variableedit.glade
+share/gnome/qalculate/glade/variables.glade
+share/gnome/qalculate/datasets.xml
 share/gnome/qalculate/elements.xml
 share/gnome/qalculate/functions.xml
+share/gnome/qalculate/planets.xml
 share/gnome/qalculate/prefixes.xml
 share/gnome/qalculate/units.xml
 share/gnome/qalculate/variables.xml
-share/locale/sv/LC_MESSAGES/qalculate-gtk.mo
-@exec scrollkeeper-install -q %D/share/gnome/omf/qalculate-gtk/qalculate-gtk-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/qalculate-gtk/qalculate-gtk-C.omf 2>/dev/null || /usr/bin/true
+share/locale/sv/LC_MESSAGES/qalculate.mo
+@dirrm include/libqalculate
 @dirrm share/gnome/applnk/Utilities
 @dirrm share/gnome/applnk
-@dirrm share/gnome/help/qalculate-gtk/C/figures
-@dirrm share/gnome/help/qalculate-gtk/C
-@dirrm share/gnome/help/qalculate-gtk
-@dirrm share/gnome/omf/qalculate-gtk
+@dirrm share/gnome/help/qalculate/C/figures
+@dirrm share/gnome/help/qalculate/C
+@dirrm share/gnome/help/qalculate
+@dirrm share/gnome/omf/qalculate
+@dirrm share/gnome/qalculate/glade
 @dirrm share/gnome/qalculate
-@dirrm share/gnome/qalculate-gtk/glade
-@dirrm share/gnome/qalculate-gtk