Fix build without libXp. PKGREVISION -> 3 as a precaution.

5 files changed, 64 insertions, 3 deletions

diff --git a/finance/xinvest/Makefile b/finance/xinvest/Makefile
index 707536c890b..2ca13d4d96f 100644
--- a/finance/xinvest/Makefile
+++ b/finance/xinvest/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2008/07/14 12:56:03 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2011/12/09 00:48:44 dholland Exp $
 
 DISTNAME=		xinvest-2.6.9
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		finance x11
 MASTER_SITES=		http://xinvest.sunsite.dk/
 
diff --git a/finance/xinvest/distinfo b/finance/xinvest/distinfo
index c2e422b48bd..6a6dafd2ff2 100644
--- a/finance/xinvest/distinfo
+++ b/finance/xinvest/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2006/01/12 21:46:13 joerg Exp $
+$NetBSD: distinfo,v 1.8 2011/12/09 00:48:44 dholland Exp $
 
 SHA1 (xinvest-2.6.9.tar.gz) = 1f87a257d89e68525348098ecf8fb88feb2d95f4
 RMD160 (xinvest-2.6.9.tar.gz) = 2ece846070061ac25654b63bcd9a67f1e61bba42
@@ -6,3 +6,6 @@ Size (xinvest-2.6.9.tar.gz) = 282748 bytes
 SHA1 (patch-aa) = 040b78259210c6202243ff39043217c784529ef3
 SHA1 (patch-ab) = 93ff1e31d29673a71bf0cd312b14b6b7334a659c
 SHA1 (patch-ac) = 2cb208eaa80d484188b82b52760a354bbc6e425d
+SHA1 (patch-report_c) = 8da7185230414e7bd3798052d3c2b72574563c73
+SHA1 (patch-xinvest_c) = d80b803272ee01db393d3da2dbbc1a548445094e
+SHA1 (patch-xinvest_h) = 7ce6ab69a733ab4f6ddf8fda307ac0dd42f8e318
diff --git a/finance/xinvest/patches/patch-report_c b/finance/xinvest/patches/patch-report_c
new file mode 100644
index 00000000000..32af418a404
--- /dev/null
+++ b/finance/xinvest/patches/patch-report_c
@@ -0,0 +1,22 @@
+$NetBSD: patch-report_c,v 1.1 2011/12/09 00:48:45 dholland Exp $
+
+Fix build without xprint.
+
+--- report.c~	2004-05-01 18:57:42.000000000 +0000
++++ report.c
+@@ -1536,6 +1536,7 @@ void reportDestroy(Widget w, Widget clie
+ 
+ void reportPageCB(Widget w, Widget client, XtPointer call)
+ {
++#ifdef XPRINT
+ 	Widget				drawing = (Widget)client;
+ 	XmPrintShellCallbackStruct	*cbp = (XmPrintShellCallbackStruct *)call;
+ 	int				i = 0;
+@@ -1565,6 +1566,7 @@ void reportPageCB(Widget w, Widget clien
+ 	}
+ 
+ 	per = &Global[0];
++#endif /* XPRINT */
+ }
+ 
+ void reportPrintOk(Widget w, Widget client, XtPointer call)
diff --git a/finance/xinvest/patches/patch-xinvest_c b/finance/xinvest/patches/patch-xinvest_c
new file mode 100644
index 00000000000..cabea0facaf
--- /dev/null
+++ b/finance/xinvest/patches/patch-xinvest_c
@@ -0,0 +1,22 @@
+$NetBSD: patch-xinvest_c,v 1.1 2011/12/09 00:48:45 dholland Exp $
+
+Fix build without xprint.
+
+--- xinvest.c~	2004-05-01 18:57:42.000000000 +0000
++++ xinvest.c
+@@ -1652,6 +1652,7 @@ int main (int argc, char **argv)
+ 
+ void PageCB(Widget w, XtPointer client, XtPointer call)
+ {
++#ifdef XPRINT
+ 	XmPrintShellCallbackStruct *cbp = (XmPrintShellCallbackStruct *)call;
+ 
+ 	per = &Global[1];
+@@ -1659,6 +1660,7 @@ void PageCB(Widget w, XtPointer client, 
+ 	per = &Global[0];
+ 
+ 	cbp->last_page = True;
++#endif
+ }
+ 
+ void PrintCB(Widget w, XtPointer client, XtPointer call)
diff --git a/finance/xinvest/patches/patch-xinvest_h b/finance/xinvest/patches/patch-xinvest_h
new file mode 100644
index 00000000000..304fd791d2c
--- /dev/null
+++ b/finance/xinvest/patches/patch-xinvest_h
@@ -0,0 +1,14 @@
+$NetBSD: patch-xinvest_h,v 1.1 2011/12/09 00:48:45 dholland Exp $
+
+Don't use libXp; it's deprecated.
+
+--- xinvest.h~	2004-05-01 18:57:42.000000000 +0000
++++ xinvest.h
+@@ -34,7 +34,6 @@
+ #define	__XINVEST_H_
+ 
+ #include <X11/Intrinsic.h>
+-#include <X11/extensions/Print.h>
+ #include "color.h"
+ 
+ /* Globals */