update to 1.3.3

changes:
-UI improvements
-bugfixes

9 files changed, 27 insertions, 95 deletions

diff --git a/math/grpn/Makefile b/math/grpn/Makefile
index 30e662c6731..17c3677303f 100644
--- a/math/grpn/Makefile
+++ b/math/grpn/Makefile
@@ -1,13 +1,11 @@
-# $NetBSD: Makefile,v 1.27 2011/04/22 13:44:06 obache Exp $
+# $NetBSD: Makefile,v 1.28 2011/06/09 17:01:39 drochner Exp $
 #
 
-DISTNAME=	grpn
-PKGNAME=	grpn-1.2
-DIST_SUBDIR=	grpn-1.2
-PKGREVISION=	5
+DISTNAME=	grpn_1.3.3-1
+PKGNAME=	grpn-1.3.3
 CATEGORIES=	math
 #MASTER_SITES=	http://lashwhip.com/grpn/
-MASTER_SITES=	http://www.getreu.net/public/downloads/
+MASTER_SITES=	http://www.getreu.net/public/downloads/software/grpn/grpn-1.3.3/
 
 MAINTAINER=	dmcmahill@NetBSD.org
 # the original gtk1 version
@@ -17,7 +15,7 @@ COMMENT=	Graphical reverse polish notation (RPN) calculator
 
 BUILD_TARGET=	grpn
 USE_TOOLS+=	mkdirhier pkg-config
-WRKSRC=		${WRKDIR}/grpn-1.2
+WRKSRC=		${WRKDIR}/grpn-1.3.3
 PKG_DESTDIR_SUPPORT= user-destdir
 
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/math/grpn/distinfo b/math/grpn/distinfo
index c07cc3f9c41..cc7a7234198 100644
--- a/math/grpn/distinfo
+++ b/math/grpn/distinfo
@@ -1,15 +1,10 @@
-$NetBSD: distinfo,v 1.8 2009/11/15 13:32:16 drochner Exp $
+$NetBSD: distinfo,v 1.9 2011/06/09 17:01:39 drochner Exp $
 
-SHA1 (grpn-1.2/grpn.tar.gz) = a77500d1393b0e3da4e0bbb74b72c011dc8cc9e0
-RMD160 (grpn-1.2/grpn.tar.gz) = b1393a2b028e71abfb59a968955bc4cbe4ec0c16
-Size (grpn-1.2/grpn.tar.gz) = 51939 bytes
-SHA1 (patch-aa) = a29c63a8b0f929225b9a4cd93c680922f3705df4
-SHA1 (patch-ag) = c7e24d2786203b9eff6d1921bd82885ad412db09
-SHA1 (patch-ah) = eaa503abd7ae9ee08efe63462eb9aae6591aad3a
-SHA1 (patch-ai) = 01ae0b6476d5280f2420aec9f0bc878bfdb87c12
-SHA1 (patch-aj) = cfc11e0ec11e188351fbaa64783bedca02b927e9
-SHA1 (patch-ak) = e77349f7f81253064dfd60cdb2f0f148b765e70b
-SHA1 (patch-al) = 4ba21e2297d35c09a00286372c41bcd4401bb70b
+SHA1 (grpn_1.3.3-1.tar.gz) = 3efee25264aa524a34464a1b2fa0946605de3259
+RMD160 (grpn_1.3.3-1.tar.gz) = 4af8964e9e1d67d89706cc617f72e7e01f0c49d6
+Size (grpn_1.3.3-1.tar.gz) = 58832 bytes
+SHA1 (patch-aa) = 80465d620e61c43553f6ab79e04a3d736fbfec19
+SHA1 (patch-al) = 2a3b3012644d5b5504c1d8801f00bc3f6dd7ef28
 SHA1 (patch-am) = dd32bc6dfe5560e6fb65cacd65455ab52093b49a
 SHA1 (patch-an) = d752dc3232a08542d6e40a908c476b22096e56dd
 SHA1 (patch-ao) = f0d609dd12b040e4b49042309b75ee3aeff291ab
diff --git a/math/grpn/patches/patch-aa b/math/grpn/patches/patch-aa
index 0e9b655180f..b246b8b264a 100644
--- a/math/grpn/patches/patch-aa
+++ b/math/grpn/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2009/11/15 13:32:17 drochner Exp $
+$NetBSD: patch-aa,v 1.5 2011/06/09 17:01:39 drochner Exp $
 
---- Makefile.orig	2009-11-14 01:25:54.000000000 +0100
+--- Makefile.orig	2011-05-10 16:58:46.000000000 +0000
 +++ Makefile
 @@ -3,10 +3,10 @@
  # Please read the next few lines and enter the correct values.
@@ -13,22 +13,22 @@ $NetBSD: patch-aa,v 1.4 2009/11/15 13:32:17 drochner Exp $
 -CC = gcc 
 +#CC = gcc 
  
- # Where to find the gtk-config script
- GTK_DIR =
-@@ -20,9 +20,10 @@ GTK_DIR =
+ # NOTE:
+ #
+@@ -15,9 +15,10 @@ CC = gcc 
  # add -DUSE_GNOME if you want to make grpn GNOME compliant.
  
  
--CFLAGS = -g -O2 -I/usr/include/X11  `$(GTK_DIR)pkg-config --cflags gtk+-2.0` -DGTK_VER_2_0 
-+#CFLAGS = -g -O2 -I/usr/include/X11  `$(GTK_DIR)pkg-config --cflags gtk+-2.0` -DGTK_VER_2_0 
-+CFLAGS+= `pkg-config --cflags gtk+-2.0` -DGTK_VER_2_0
+-CFLAGS = -g -O2 -I/usr/X11/include  `pkg-config --cflags gtk+-2.0` -DGTK_VER_1_1
++#CFLAGS = -g -O2 -I/usr/X11/include  `pkg-config --cflags gtk+-2.0` -DGTK_VER_1_1
++CFLAGS+= `pkg-config --cflags gtk+-2.0` -DGTK_VER_1_1
  
--DFLAGS =  -L/usr/lib/X11 
-+#DFLAGS =  -L/usr/lib/X11 
+-DFLAGS =  -L/usr/X11/lib 
++#DFLAGS =  -L/usr/X11/lib 
  
  # end of user configurable section
  
-@@ -49,12 +50,10 @@ pure:	$(OBJS)
+@@ -39,12 +40,10 @@ pure:	$(OBJS)
  	$(PURIFY) $(CC) $(DFLAGS) -o $@ $(OBJS) $(LIBS) 
  
  install:	grpn
diff --git a/math/grpn/patches/patch-ag b/math/grpn/patches/patch-ag
deleted file mode 100644
index ac693e62a9c..00000000000
--- a/math/grpn/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2002/04/02 02:01:24 dmcmahill Exp $
-
---- complex.c.orig	Mon May 31 19:41:31 1999
-+++ complex.c
-@@ -21,6 +21,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <math.h>
- 
- #include "complex.h"
diff --git a/math/grpn/patches/patch-ah b/math/grpn/patches/patch-ah
deleted file mode 100644
index e3a58c42bdb..00000000000
--- a/math/grpn/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2002/04/02 02:01:24 dmcmahill Exp $
-
---- run_cmd.c.orig	Wed May 26 11:50:33 1999
-+++ run_cmd.c
-@@ -20,6 +20,7 @@
- /* run_cmd.c  by Paul Wilkins */
- 
- #include <stdio.h>
-+#include <string.h>
- #include <gtk/gtk.h>
- 
- #include "buttons.h"
diff --git a/math/grpn/patches/patch-ai b/math/grpn/patches/patch-ai
deleted file mode 100644
index 6ad219d720a..00000000000
--- a/math/grpn/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2002/04/02 02:01:24 dmcmahill Exp $
-
---- lcd.c.orig	Mon May 31 19:43:37 1999
-+++ lcd.c
-@@ -20,6 +20,8 @@
- /* lcd.c   by Paul Wilkins 3/22/97 */
- 
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
- #include <gtk/gtk.h>
- #include <gdk/gdkkeysyms.h>
- 
diff --git a/math/grpn/patches/patch-aj b/math/grpn/patches/patch-aj
deleted file mode 100644
index 76c088a022e..00000000000
--- a/math/grpn/patches/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2002/04/02 02:01:25 dmcmahill Exp $
-
---- help.c.orig	Mon May 31 21:44:01 1999
-+++ help.c
-@@ -19,6 +19,7 @@
- */
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <gtk/gtk.h>
- 
- #include "help.h"
diff --git a/math/grpn/patches/patch-ak b/math/grpn/patches/patch-ak
deleted file mode 100644
index 47a20aef7f2..00000000000
--- a/math/grpn/patches/patch-ak
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2002/04/02 02:01:25 dmcmahill Exp $
-
---- mode.c.orig	Wed May 26 11:50:33 1999
-+++ mode.c
-@@ -20,6 +20,7 @@
- /* setup mode.c  by Paul Wilkins  2/8/98 */
- 
- #include <stdio.h>
-+#include <string.h>
- #include <gtk/gtk.h>
- 
- #include "mode.h"
diff --git a/math/grpn/patches/patch-al b/math/grpn/patches/patch-al
index 6ff9ef3a6c3..673cc221200 100644
--- a/math/grpn/patches/patch-al
+++ b/math/grpn/patches/patch-al
@@ -1,9 +1,9 @@
-$NetBSD: patch-al,v 1.2 2009/11/15 13:32:17 drochner Exp $
+$NetBSD: patch-al,v 1.3 2011/06/09 17:01:39 drochner Exp $
 
---- button_def.c.orig	2009-11-14 01:25:54.000000000 +0100
+--- button_def.c.orig	2011-05-10 16:58:46.000000000 +0000
 +++ button_def.c
-@@ -38,6 +38,16 @@ extern void radixCmdCB(GtkWidget *, gpoi
- 
+@@ -36,6 +36,16 @@ extern void cmodeCmdCB(GtkWidget *, gpoi
+ extern void radixCmdCB(GtkWidget *, gpointer);
  
  FuncInfo invisible1[] = {
 +   { "k", "k", "Boltzmann's constant (Joules/Kelvin).",
@@ -19,7 +19,7 @@ $NetBSD: patch-al,v 1.2 2009/11/15 13:32:17 drochner Exp $
     { "Modulo", "mod", "Remainder of division.",
        genericButtonCB, (void *)ModStack },
     { "Hex", "hex", "Hexidecimal display mode.",
-@@ -159,7 +169,7 @@ struct RowInfo rowinf[] = {
+@@ -155,7 +165,7 @@ struct RowInfo rowinf[] = {
     { 8, 8, num456 },
     { 8, 8, num123 },
     { 8, 8, num0 },