- fix with gcc4, from gentoo via wen heping

- mirror distfile
- drop maintainer
- sync wantlib, plist

maintainer timeout

math/hexcalc/Makefile

@@ -1,26 +1,25 @@
-# $OpenBSD: Makefile,v 1.13 2010/10/24 21:25:51 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2011/06/16 11:45:53 sthen Exp $
 
 COMMENT=	multi-radix calculator for x11
 
 DATE=		19951219
 DISTNAME=	hexcalc
 PKGNAME=	${DISTNAME}-${DATE}
-REVISION=	0
+REVISION=	1
 CATEGORIES=	math
 EXTRACT_SUFX=	..tar.Z
 
-MAINTAINER=	Peter Valchev <pvalchev@openbsd.org>
-
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		X11 Xaw Xext Xmu Xt c pthread-stubs xcb
 
-MASTER_SITES=	ftp://aixpdslib.seas.ucla.edu/pub/hexcalc/RISC/3.2/src/
+WANTLIB += X11 Xaw Xext Xmu Xt c
+
+MASTER_SITES=	http://spacehopper.org/mirrors/ \
+		ftp://aixpdslib.seas.ucla.edu/pub/hexcalc/RISC/3.2/src/
 
 NO_REGRESS=	Yes
-USE_GROFF =	Yes
 
 post-extract:
 	@rm -f ${WRKSRC}/*.orig

math/hexcalc/patches/patch-hexcalc_c

@@ -0,0 +1,55 @@
+$OpenBSD: patch-hexcalc_c,v 1.1 2011/06/16 11:45:53 sthen Exp $
+
+Fix with GCC4. From http://bugs.gentoo.org/show_bug.cgi?id=140987
+
+--- hexcalc.c.orig	Sun May 15 11:30:39 2011
++++ hexcalc.c	Sun May 15 11:34:23 2011
+@@ -37,6 +37,7 @@ static char *sccsid = "@(#)hexcalc.c	1.11  11/21/89";
+ #endif	
+ 
+ #include	<stdio.h>
++#include	<stdlib.h>
+ #include	<ctype.h>
+ #include	<X11/IntrinsicP.h>
+ #include	<X11/StringDefs.h>
+@@ -509,14 +510,16 @@ caddr_t		data;
+ 
+ 		switch(topOp) {
+ 		case '+' :
+-			ac = PopArg()  + PopArg();
++			temp = PopArg();
++			ac = PopArg() + temp;
+ 			break;
+ 		case '-' :
+ 			temp = PopArg();
+ 			ac = PopArg() - temp;
+ 			break;
+ 		case '*' :
+-			ac = PopArg()  * PopArg();
++			temp = PopArg();
++			ac = temp * PopArg();
+ 			break;
+ 		case '/' :
+ 			temp = PopArg();
+@@ -528,15 +531,18 @@ caddr_t		data;
+ 			break;
+ 			
+ 		case '|' :
+-			ac = PopArg() | PopArg();
++			temp = PopArg();
++			ac = temp | PopArg();
+ 			break;
+ 
+ 		case '&' :
+-			ac = PopArg() & PopArg();
++			temp = PopArg();
++			ac = temp & PopArg();
+ 			break;
+ 
+ 		case '^' :
+-			ac = PopArg() ^ PopArg();
++			temp = PopArg();
++			ac = temp ^ PopArg();
+ 			break;
+ 
+ 		case '<' :

math/hexcalc/pkg/PLIST

@@ -1,3 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2004/09/15 09:11:59 espie Exp $
+@comment $OpenBSD: PLIST,v 1.3 2011/06/16 11:45:53 sthen Exp $
-bin/hexcalc
+@bin bin/hexcalc
 @man man/man1/hexcalc.1