update to 0.9.3

This switches from Qt3 to Qt4.

6 files changed, 42 insertions, 49 deletions

diff --git a/math/extcalc/Makefile b/math/extcalc/Makefile
index 531348fa59f..cfb7915ae89 100644
--- a/math/extcalc/Makefile
+++ b/math/extcalc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/02/03 14:05:01 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2010/05/20 17:48:59 drochner Exp $
 #
 
-DISTNAME=	extcalc-0.9.2
+DISTNAME=	extcalc-0.9.3-1
+PKGNAME=	extcalc-0.9.3
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=extcalc-linux/}
 
@@ -9,16 +10,12 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://extcalc-linux.sourceforge.net/
 COMMENT=	Scientific graphic calculator
 
-GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
 USE_DIRS+=	xdg-1.1
 PKG_DESTDIR_SUPPORT= user-destdir
-
-SUBST_CLASSES+=	iconpath
-SUBST_STAGE.iconpath=	pre-configure
-SUBST_FILES.iconpath=	share/extcalc.desktop
-SUBST_VARS.iconpath=	PREFIX
+USE_CMAKE=	yes
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/qt3-libs/buildlink3.mk"
+.include "../../x11/qt4-libs/buildlink3.mk"
+.include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/extcalc/PLIST b/math/extcalc/PLIST
index d3193228215..e50f424ee4c 100644
--- a/math/extcalc/PLIST
+++ b/math/extcalc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/02/03 14:05:01 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2010/05/20 17:48:59 drochner Exp $
 bin/extcalc
 share/applications/extcalc.desktop
 share/extcalc/data/angle.png
@@ -22,8 +22,7 @@ share/extcalc/data/forward.png
 share/extcalc/data/free.png
 share/extcalc/data/french.qm
 share/extcalc/data/german.qm
-share/extcalc/data/icon22.png
-share/extcalc/data/icon48.png
+share/extcalc/data/icons.qrc
 share/extcalc/data/license.txt
 share/extcalc/data/line.png
 share/extcalc/data/matrix-vector
@@ -67,6 +66,7 @@ share/extcalc/doc/randbutton.jpg
 share/extcalc/doc/random.jpg
 share/extcalc/doc/screenshot.jpg
 share/extcalc/doc/scriptedit.jpg
+share/extcalc/doc/scriptedit2.jpg
 share/extcalc/doc/scriptrun.jpg
 share/extcalc/doc/setbutton.jpg
 share/extcalc/doc/setvar.jpg
@@ -78,9 +78,5 @@ share/extcalc/doc/stat1.jpg
 share/extcalc/doc/stat2.jpg
 share/extcalc/doc/table.jpg
 share/extcalc/doc/usevar.jpg
-share/extcalc/icons/icon48.png
-@dirrm share/extcalc/icons
-@dirrm share/extcalc/doc
-@dirrm share/extcalc/data
-@dirrm share/extcalc
-@comment in xdg-dirs: @dirrm share/applications
+share/icons/extcalc22.png
+share/icons/extcalc48.png
diff --git a/math/extcalc/distinfo b/math/extcalc/distinfo
index 8a12421ae7b..ae92446e03a 100644
--- a/math/extcalc/distinfo
+++ b/math/extcalc/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/02/03 14:05:01 drochner Exp $
+$NetBSD: distinfo,v 1.2 2010/05/20 17:48:59 drochner Exp $
 
-SHA1 (extcalc-0.9.2.tar.gz) = 96799e277578d37a8c73a8ee04812b026c6ea7e6
-RMD160 (extcalc-0.9.2.tar.gz) = 9b0922bc4f6454ada96c0c6bb85f77e6153a715f
-Size (extcalc-0.9.2.tar.gz) = 1081868 bytes
-SHA1 (patch-aa) = 272a39d2e616f364670afd42d11aefe5e0558c10
-SHA1 (patch-ab) = b2b504c186b4c898addb0f762c18c108063ca12f
+SHA1 (extcalc-0.9.3-1.tar.gz) = bca456f2defe9df88d20cbce8ce9d02b68c0f8d2
+RMD160 (extcalc-0.9.3-1.tar.gz) = 3626ca6e59c27b1cde88e088b79e24b9cf509b81
+Size (extcalc-0.9.3-1.tar.gz) = 1011983 bytes
+SHA1 (patch-aa) = fe0f4cb8fb88768df5675f90b643cf5307d111e4
+SHA1 (patch-ac) = 1284a5526a027e4844303479159804825ae7b203
diff --git a/math/extcalc/patches/patch-aa b/math/extcalc/patches/patch-aa
index d469183a48b..0334abfe2fe 100644
--- a/math/extcalc/patches/patch-aa
+++ b/math/extcalc/patches/patch-aa
@@ -1,16 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2010/02/03 14:05:01 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2010/05/20 17:49:00 drochner Exp $
 
---- share/Makefile.in.orig	2008-03-02 18:38:15.000000000 +0100
-+++ share/Makefile.in
-@@ -153,9 +153,9 @@ target_alias = @target_alias@
- licensedir = $(datadir)/extcalc/data
- icondir = $(datadir)/extcalc/data
- exampledir = $(datadir)/extcalc/data
--menuicondir = /usr/share/icons
-+menuicondir = $(datadir)/extcalc/icons
- translationsdir = $(datadir)/extcalc/data
--applicationdir = /usr/share/applications
-+applicationdir = $(prefix)/share/applications
- license_DATA = license.txt
- icon_DATA = icon22.png icon48.png modified.png circle.png free.png line.png open.png rect.png rubber.png text.png editcopy.png editcut.png editdelete.png editpaste.png exec.png fileexport.png fileimport.png filenew.png filesaveas.png save_all.png redo.png undo.png view_top_bottom.png angle.png binary.png scientific.png view_remove.png catalog.png print.png exit.png forward.png back.png zoomin.png zoomout.png
- menuicon_DATA = icon48.png
+--- CMakeLists.txt.orig	2010-04-05 09:12:04.000000000 +0000
++++ CMakeLists.txt
+@@ -158,7 +158,7 @@ QT4_WRAP_UI(ui_h ${src_ui})

+ 

+ 

+ 

+-SET(CMAKE_INSTALL_PREFIX "/usr/local")

++#SET(CMAKE_INSTALL_PREFIX "/usr/local")

+ SET(SHAREDIR "share/extcalc/data")

+ SET(DOCDIR "share/extcalc/doc")

+ SET(DESKTOPDIR "share/applications")

diff --git a/math/extcalc/patches/patch-ab b/math/extcalc/patches/patch-ab
deleted file mode 100644
index c6960c45227..00000000000
--- a/math/extcalc/patches/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2010/02/03 14:05:01 drochner Exp $
-
---- share/extcalc.desktop.orig	2007-10-27 21:02:25.000000000 +0200
-+++ share/extcalc.desktop
-@@ -5,4 +5,4 @@ Exec=extcalc
- Terminal=false
- Type=Application
- Categories=Qt;Utility
--Icon=/usr/share/icons/icon48.png
-+Icon=@PREFIX@/share/extcalc/icons/icon48.png
diff --git a/math/extcalc/patches/patch-ac b/math/extcalc/patches/patch-ac
new file mode 100644
index 00000000000..b819e268dba
--- /dev/null
+++ b/math/extcalc/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2010/05/20 17:49:00 drochner Exp $
+
+--- src/global.h.orig	2010-04-05 08:37:05.000000000 +0000
++++ src/global.h
+@@ -40,6 +40,8 @@ file.
+ #include "list.h"
+ #include "calclocale.h"
+ 
++#define NO_LONG_DOUBLE
++
+ using namespace std;
+ 
+