update to 1.2

changes:
-Added deg, rad, pol and rect commands
-Added engineer notation
-New function "mod"=remainder introduced
-minor cleanup
-Locale determines the decimal separator point or comma
-Compiles against gtk2

pkgsrc change: DESTDIR support

6 files changed, 79 insertions, 33 deletions

diff --git a/math/grpn/Makefile b/math/grpn/Makefile
index 830d65ba689..f8a7f7009a3 100644
--- a/math/grpn/Makefile
+++ b/math/grpn/Makefile
@@ -1,17 +1,23 @@
-# $NetBSD: Makefile,v 1.20 2009/10/04 15:50:47 zafer Exp $
+# $NetBSD: Makefile,v 1.21 2009/11/15 13:32:16 drochner Exp $
 #
 
-DISTNAME=	grpn-1.1.2
-PKGREVISION=	5
+DISTNAME=	grpn
+PKGNAME=	grpn-1.2
+DIST_SUBDIR=	grpn-1.2
 CATEGORIES=	math
-MASTER_SITES=	http://lashwhip.com/grpn/
+#MASTER_SITES=	http://lashwhip.com/grpn/
+MASTER_SITES=	http://www.getreu.net/public/downloads/
 
 MAINTAINER=	dmcmahill@NetBSD.org
-HOMEPAGE=	http://lashwhip.com/grpn.html
+# the original gtk1 version
+#HOMEPAGE=	http://lashwhip.com/grpn.html
+HOMEPAGE=	http://www.getreu.net/
 COMMENT=	Graphical reverse polish notation (RPN) calculator
 
 BUILD_TARGET=	grpn
 USE_TOOLS+=	mkdirhier
+WRKSRC=		${WRKDIR}/grpn-1.2
+PKG_DESTDIR_SUPPORT= user-destdir
 
-.include "../../x11/gtk/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/grpn/distinfo b/math/grpn/distinfo
index 2ba776a285b..c07cc3f9c41 100644
--- a/math/grpn/distinfo
+++ b/math/grpn/distinfo
@@ -1,17 +1,19 @@
-$NetBSD: distinfo,v 1.7 2005/10/07 12:31:25 rillig Exp $
+$NetBSD: distinfo,v 1.8 2009/11/15 13:32:16 drochner Exp $
 
-SHA1 (grpn-1.1.2.tar.gz) = c7a6b89d9d9316f89d02b000b77e35a48ec3343b
-RMD160 (grpn-1.1.2.tar.gz) = 28a432ec8e4d2095a59440c4e401f12f85d75249
-Size (grpn-1.1.2.tar.gz) = 46153 bytes
-SHA1 (patch-aa) = 633c81b1bbe2537a61425b0e070cdc47eebb8a43
+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) = e9fdbefd046221e1210b45974205a604543934d3
+SHA1 (patch-al) = 4ba21e2297d35c09a00286372c41bcd4401bb70b
 SHA1 (patch-am) = dd32bc6dfe5560e6fb65cacd65455ab52093b49a
 SHA1 (patch-an) = d752dc3232a08542d6e40a908c476b22096e56dd
 SHA1 (patch-ao) = f0d609dd12b040e4b49042309b75ee3aeff291ab
 SHA1 (patch-ap) = 121f85c9e25832f2309f490c056e6fde9d4e7a43
 SHA1 (patch-aq) = e34e4b2b3e31133bb741c7f9d870e1f6c6c6d26d
+SHA1 (patch-ar) = c912f002db495588e2bd9292a00009f2dc4324a0
+SHA1 (patch-as) = 4ce5e5ac5fe5900771cfd7206b91f4a941d2d5f2
diff --git a/math/grpn/patches/patch-aa b/math/grpn/patches/patch-aa
index b4027f7c50e..0e9b655180f 100644
--- a/math/grpn/patches/patch-aa
+++ b/math/grpn/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2002/09/23 22:08:13 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2009/11/15 13:32:17 drochner Exp $
 
---- Makefile.orig	Thu Apr  4 22:56:05 2002
+--- Makefile.orig	2009-11-14 01:25:54.000000000 +0100
 +++ Makefile
 @@ -3,10 +3,10 @@
  # Please read the next few lines and enter the correct values.
@@ -15,16 +15,33 @@ $NetBSD: patch-aa,v 1.3 2002/09/23 22:08:13 jlam Exp $
  
  # Where to find the gtk-config script
  GTK_DIR =
-@@ -20,9 +20,10 @@
+@@ -20,9 +20,10 @@ GTK_DIR =
  # add -DUSE_GNOME if you want to make grpn GNOME compliant.
  
  
--CFLAGS = -g -O2 -I/usr/X11/include  `$(GTK_DIR)gtk-config --cflags` -DGTK_VER_1_1
-+#CFLAGS = -g -O2 -I/usr/X11/include  `$(GTK_DIR)gtk-config --cflags` -DGTK_VER_1_1
-+CFLAGS+=`gtk-config --cflags` -DGTK_VER_1_1
+-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
  
--DFLAGS =  -L/usr/X11/lib 
-+#DFLAGS =  -L/usr/X11/lib 
+-DFLAGS =  -L/usr/lib/X11 
++#DFLAGS =  -L/usr/lib/X11 
  
  # end of user configurable section
  
+@@ -49,12 +50,10 @@ pure:	$(OBJS)
+ 	$(PURIFY) $(CC) $(DFLAGS) -o $@ $(OBJS) $(LIBS) 
+ 
+ install:	grpn
+-	mkdirhier $(PREFIX)/bin
+-	cp grpn $(PREFIX)/bin
+-	chmod 755 $(PREFIX)/bin/grpn
+-	mkdirhier $(PREFIX)/man/man1
+-	cp grpn.1 $(PREFIX)/man/man1
+-	chmod 644 $(PREFIX)/man/man1/grpn.1
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PREFIX)/bin
++	$(BSD_INSTALL_PROGRAM) grpn $(DESTDIR)$(PREFIX)/bin
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PREFIX)/man/man1
++	$(BSD_INSTALL_DATA) grpn.1 $(DESTDIR)$(PREFIX)/man/man1
+ 
+ .c.o:
+ 	$(CC) -c -o $@ $(CFLAGS) $*.c
diff --git a/math/grpn/patches/patch-al b/math/grpn/patches/patch-al
index fd56087dc6e..6ff9ef3a6c3 100644
--- a/math/grpn/patches/patch-al
+++ b/math/grpn/patches/patch-al
@@ -1,12 +1,9 @@
-$NetBSD: patch-al,v 1.1 2005/10/07 12:31:25 rillig Exp $
+$NetBSD: patch-al,v 1.2 2009/11/15 13:32:17 drochner Exp $
 
-The patches patch-al upto patch-aq add the physical constants k, q, e0,
-mu0, and c.
-
---- button_def.c.orig	Thu Apr  4 05:46:10 2002
-+++ button_def.c	Fri Oct  7 14:24:25 2005
-@@ -34,6 +34,16 @@ Foundation, Inc., 59 Temple Place - Suit
- extern void baseCmdCB(GtkWidget *, gpointer);
+--- button_def.c.orig	2009-11-14 01:25:54.000000000 +0100
++++ button_def.c
+@@ -38,6 +38,16 @@ extern void radixCmdCB(GtkWidget *, gpoi
+ 
  
  FuncInfo invisible1[] = {
 +   { "k", "k", "Boltzmann's constant (Joules/Kelvin).",
@@ -19,15 +16,15 @@ mu0, and c.
 +      genericButtonCB, (void *)Mu0Stack },
 +   { "c", "c", "Free space speed of light (meters/second).",
 +      genericButtonCB, (void *)LightSpeedStack },
+    { "Modulo", "mod", "Remainder of division.",
+       genericButtonCB, (void *)ModStack },
     { "Hex", "hex", "Hexidecimal display mode.",
-       baseCmdCB, (void *)HEXIDECIMAL },
-    { "Dec", "dec", "Decimal display mode.",
-@@ -137,7 +147,7 @@ struct RowInfo rowinf[] = {
+@@ -159,7 +169,7 @@ struct RowInfo rowinf[] = {
     { 8, 8, num456 },
     { 8, 8, num123 },
     { 8, 8, num0 },
--   { 14, 0, invisible1 }
-+   { 19, 0, invisible1 }
+-   { 20, 0, invisible1 }
++   { 25, 0, invisible1 }
  };
  
  
diff --git a/math/grpn/patches/patch-ar b/math/grpn/patches/patch-ar
new file mode 100644
index 00000000000..512405ba458
--- /dev/null
+++ b/math/grpn/patches/patch-ar
@@ -0,0 +1,12 @@
+$NetBSD: patch-ar,v 1.1 2009/11/15 13:32:17 drochner Exp $
+
+--- real.h.orig	2009-11-14 01:25:54.000000000 +0100
++++ real.h
+@@ -90,6 +90,7 @@ Real * mulReal(Real *, Real *);
+ Real * mulEqReal(Real *, Real *);
+ Real * divReal(Real *, Real *);
+ Real * divEqReal(Real *, Real *);
++Real * modReal(Real *, Real *);
+ Real * addReal(Real *, Real *);
+ Real * addEqReal(Real *, Real *);
+ Real * subReal(Real *, Real *);
diff --git a/math/grpn/patches/patch-as b/math/grpn/patches/patch-as
new file mode 100644
index 00000000000..a04ce325bfe
--- /dev/null
+++ b/math/grpn/patches/patch-as
@@ -0,0 +1,12 @@
+$NetBSD: patch-as,v 1.1 2009/11/15 13:32:17 drochner Exp $
+
+--- number.h.orig	2009-11-14 01:25:54.000000000 +0100
++++ number.h
+@@ -77,6 +77,7 @@ Number * atanNumber(Number *);
+ 
+ Number * mulNumber(Number *, Number *);
+ Number * divNumber(Number *, Number *);
++Number * modNumber(Number *, Number *);
+ Number * addNumber(Number *, Number *);
+ Number * subNumber(Number *, Number *);
+