Changes 0.8.1:

Remove requirement glib-2.0 >= 2.4 and require libxml2 >= 2.3.8
Do not use unicode prefix names for long names
Add even(), odd() and shift() functions and operators "<<" and ">>"
Compile with kdelibs and Qt >= 3.1 (KDE)
Add glib-2.0 and libxml-2.0 to PKG_CHECK_MODULES (KDE)
Display prefix in object info (KDE)
Confirm overwriting result and plot image files (KDE)
Use KIO instead of wget for fetching exchange rates (KDE)
Close gnuplot and disable save button when no series defined (KDE)

5 files changed, 21 insertions, 84 deletions

diff --git a/math/qalculate/Makefile b/math/qalculate/Makefile
index 3ca572197e0..b017d0d06b6 100644
--- a/math/qalculate/Makefile
+++ b/math/qalculate/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:14 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/03 13:36:05 adam Exp $
 
-DISTNAME=	qalculate-0.7.2
+DISTNAME=	libqalculate-0.8.1.1
+PKGNAME=	qalculate-0.8.1.1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qalculate/}
 
@@ -8,24 +9,19 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://qalculate.sourceforge.net/
 COMMENT=	Qalculate is a modern multi-purpose desktop calculator
 
-DEPENDS+=	gnuplot>=3.7:../../graphics/gnuplot
-DEPENDS+=	wget>=1.8:../../net/wget
-
-USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
-USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		gmake
 USE_GNU_READLINE=	yes
+USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	${WRKSRC}/src/libqalculate/libqalculate.pc.in
 
 UNLIMIT_RESOURCES=	datasize
 
-.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/libgnome/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../math/cln/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
-.include "../../textproc/scrollkeeper/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/qalculate/PLIST b/math/qalculate/PLIST
index b0ec0d2a6ee..592369fe52a 100644
--- a/math/qalculate/PLIST
+++ b/math/qalculate/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/11/19 12:30:08 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/08/03 13:36:05 adam Exp $
 bin/qalc
 bin/qalculate
-bin/qalculate-gtk
 include/libqalculate/BuiltinFunctions.h
 include/libqalculate/Calculator.h
 include/libqalculate/DataSet.h
@@ -17,71 +16,13 @@ include/libqalculate/qalculate.h
 include/libqalculate/util.h
 lib/libqalculate.la
 lib/pkgconfig/libqalculate.pc
-share/applications/qalculate.desktop
-share/applnk/Utilities/qalculate.desktop
-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/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/help/qalculate/C/legal.xml
-share/gnome/help/qalculate/C/qalculate.xml
-share/omf/qalculate/qalculate-C.omf
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/libqalculate.mo
 share/qalculate/datasets.xml
 share/qalculate/elements.xml
 share/qalculate/functions.xml
-share/qalculate/glade/about.glade
-share/qalculate/glade/argumentrules.glade
-share/qalculate/glade/csvexport.glade
-share/qalculate/glade/csvimport.glade
-share/qalculate/glade/datasetedit.glade
-share/qalculate/glade/datasets.glade
-share/qalculate/glade/decimals.glade
-share/qalculate/glade/functionedit.glade
-share/qalculate/glade/functions.glade
-share/qalculate/glade/main.glade
-share/qalculate/glade/matrixedit.glade
-share/qalculate/glade/namesedit.glade
-share/qalculate/glade/nbases.glade
-share/qalculate/glade/nbexpression.glade
-share/qalculate/glade/periodictable.glade
-share/qalculate/glade/plot.glade
-share/qalculate/glade/precision.glade
-share/qalculate/glade/preferences.glade
-share/qalculate/glade/unit.glade
-share/qalculate/glade/unitedit.glade
-share/qalculate/glade/units.glade
-share/qalculate/glade/unknownedit.glade
-share/qalculate/glade/variableedit.glade
-share/qalculate/glade/variables.glade
 share/qalculate/planets.xml
 share/qalculate/prefixes.xml
 share/qalculate/units.xml
 share/qalculate/variables.xml
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/qalculate.mo
-@dirrm share/qalculate/glade
 @dirrm share/qalculate
-@dirrm share/omf/qalculate
-@dirrm share/gnome/help/qalculate/C/figures
-@dirrm share/gnome/help/qalculate/C
-@dirrm share/gnome/help/qalculate
 @dirrm include/libqalculate
diff --git a/math/qalculate/distinfo b/math/qalculate/distinfo
index 510d3f05e28..a8a33891c2d 100644
--- a/math/qalculate/distinfo
+++ b/math/qalculate/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 12:06:57 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/08/03 13:36:05 adam Exp $
 
-SHA1 (qalculate-0.7.2.tar.gz) = b0a915ad1de2c7c848f5872c793d5909f71b45f2
-RMD160 (qalculate-0.7.2.tar.gz) = fc5ae6592df08472b623e46144952beb9868df35
-Size (qalculate-0.7.2.tar.gz) = 1504796 bytes
-SHA1 (patch-aa) = 138badf3dbb1d011720f980b8cf653e662c5e073
-SHA1 (patch-ab) = 05f21b9ff3a4fc567fd38befd4eb43b47cd347a0
+SHA1 (libqalculate-0.8.1.1.tar.gz) = 187c84267ca1a96119006ae309057d9c2cfdbb81
+RMD160 (libqalculate-0.8.1.1.tar.gz) = 616646fcd791cf91c311aa24033203c3ac62f49d
+Size (libqalculate-0.8.1.1.tar.gz) = 678122 bytes
+SHA1 (patch-aa) = 400dd8d44dc517433ebcf4fbaa8c701414d89340
+SHA1 (patch-ab) = 2e45b0a4213b682c476ec1b7d7c693772dd600d1
diff --git a/math/qalculate/patches/patch-aa b/math/qalculate/patches/patch-aa
index ecd797c7adf..8c4f1b87ae5 100644
--- a/math/qalculate/patches/patch-aa
+++ b/math/qalculate/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/11/19 12:30:08 adam Exp $
+$NetBSD: patch-aa,v 1.2 2005/08/03 13:36:05 adam Exp $
 
---- src/libqalculate/Calculator.cc.orig	2004-10-18 12:30:49.000000000 +0000
-+++ src/libqalculate/Calculator.cc
+--- libqalculate/Calculator.cc.orig	2004-10-18 12:30:49.000000000 +0000
++++ libqalculate/Calculator.cc
 @@ -33,7 +33,11 @@
  #include <sys/types.h>
  #include <sys/stat.h>
diff --git a/math/qalculate/patches/patch-ab b/math/qalculate/patches/patch-ab
index e0d8f9e9181..a258dbbd8c5 100644
--- a/math/qalculate/patches/patch-ab
+++ b/math/qalculate/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/11/19 12:30:08 adam Exp $
+$NetBSD: patch-ab,v 1.2 2005/08/03 13:36:05 adam Exp $
 
---- configure.orig	2004-11-19 12:07:16.000000000 +0000
+--- configure.orig	2005-06-11 08:39:34.000000000 +0000
 +++ configure
-@@ -20460,12 +20460,10 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
+@@ -20980,12 +20980,10 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
  if test "x$GCC" = "xyes"; then
  	case $CFLAGS in
  	*-Os*)