7 files changed, 33 insertions, 73 deletions
diff --git a/finance/xquote/Makefile b/finance/xquote/Makefile
index e31bdc8f499..43979c962fa 100644
--- a/finance/xquote/Makefile
+++ b/finance/xquote/Makefile
@@ -1,23 +1,22 @@
-# $NetBSD: Makefile,v 1.9 2004/10/03 00:14:41 tv Exp $
+# $NetBSD: Makefile,v 1.10 2004/11/23 17:07:35 wiz Exp $
 
-DISTNAME=		xquote-2.2
-PKGREVISION=	1
+DISTNAME=		xquote-2.6.9
 CATEGORIES=		finance x11
-MASTER_SITES=		http://sunsite.dk/xinvest/ \
-			${MASTER_SITE_XCONTRIB:=applications/}
+MASTER_SITES=		http://xinvest.sunsite.dk/
 
 MAINTAINER=		root@garbled.net
-HOMEPAGE=		http://sunsite.dk/xinvest/xquote.html
+HOMEPAGE=		http://xinvest.sunsite.dk/xquote.html
 COMMENT=		WWW ticker symbol quote retrieval program
 
 USE_BUILDLINK3=		YES
 USE_IMAKE=		YES
 NO_INSTALL_MANPAGES=	YES
 
-post-patch:
-	${TOUCH} ${WRKSRC}/Xquote.man
+# needs a symbol that appeared after 4.9.1
+BUILDLINK_DEPENDS.Xbae+=        Xbae>=4.50
 
 .include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/Xbae/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/finance/xquote/distinfo b/finance/xquote/distinfo
index fed059dcc03..b81d22cb92c 100644
--- a/finance/xquote/distinfo
+++ b/finance/xquote/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.4 2002/10/08 12:35:16 jlam Exp $
+$NetBSD: distinfo,v 1.5 2004/11/23 17:07:35 wiz Exp $
 
-SHA1 (xquote-2.2.tar.gz) = 2b32bfe25f826e9ae0bb28ee608ccbeae39350a6
-Size (xquote-2.2.tar.gz) = 82814 bytes
-SHA1 (patch-aa) = f3a8209dd3d25e1ec6b85a3d5c42ecd85e9f380a
-SHA1 (patch-ab) = 26c943dc5e22ea91641503cb7da35e6eeb47cec4
-SHA1 (patch-ac) = 2d9b18f22724f2ba92931077cafca38115a10eb4
-SHA1 (patch-ad) = 36f3d15cddd53b4cf0de17a96213a6fee84c38a2
-SHA1 (patch-ae) = 4aeb6076e76b40bd07d29530a5d2ed029bff7a63
+SHA1 (xquote-2.6.9.tar.gz) = 8dbe8e7eb1b3447098a88000f6a3ad8416a6529e
+Size (xquote-2.6.9.tar.gz) = 97913 bytes
+SHA1 (patch-aa) = 16262c1f2412a5fd686cc0a294811a948bdefdc1
diff --git a/finance/xquote/patches/patch-aa b/finance/xquote/patches/patch-aa
index 148fdc6bcb9..4b80d75cc5b 100644
--- a/finance/xquote/patches/patch-aa
+++ b/finance/xquote/patches/patch-aa
@@ -1,12 +1,25 @@
-$NetBSD: patch-aa,v 1.1 2000/12/28 03:54:58 fredb Exp $
+$NetBSD: patch-aa,v 1.2 2004/11/23 17:07:35 wiz Exp $
 
---- file.c.orig	Mon Nov 20 18:20:39 2000
-+++ file.c	Wed Dec 27 20:25:21 2000
-@@ -24,6 +24,7 @@
- */
+--- Imakefile.orig	2004-05-01 16:45:28.000000000 +0200
++++ Imakefile
+@@ -13,16 +13,16 @@ XCOMM price communication.
  
- #include <errno.h>
-+#include <stdio.h>
- #include <sys/stat.h>
+ DEFINES = -DSHAPE -DXQUOTE
+ INCLUDES = -I$(INCROOT)/X11
+-SYS_LIBRARIES = -lXm -lXpm $(XMULIB) $(XTOOLLIB) -lXext $(XLIB) -lm
++SYS_LIBRARIES = -lXbae -lXm -lXpm $(XMULIB) $(XTOOLLIB) -lXext $(XLIB) -lm
+ DEPLIBS = 
  
- #include <Xm/XmAll.h>
+ SRCS =  about.c color.c fileXq.c help.c optdetail.c option.c optnet.c \
+ 	opttick.c optupdate.c parse.c pixmap.c remoteXq.c server.c session.c \
+-	sessionXq.c status.c tape.c util.c view.c xquote.c xutil.c
++	sessionXi.c status.c tape.c util.c view.c xquote.c xutil.c
+ 
+ OBJS =  about.o color.o fileXq.o help.o optdetail.o option.o optnet.o \
+ 	opttick.o optupdate.o parse.o pixmap.o remoteXq.o server.o session.o \
+-	sessionXq.o status.o tape.o util.o view.o xquote.o xutil.o
++	sessionXi.o status.o tape.o util.o view.o xquote.o xutil.o
+ 
+-ComplexProgramTarget(Xquote)
++ComplexProgramTargetNoMan(Xquote)
+ InstallAppDefaults(Xquote)
diff --git a/finance/xquote/patches/patch-ab b/finance/xquote/patches/patch-ab
deleted file mode 100644
index 911d92ca6b4..00000000000
--- a/finance/xquote/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2000/12/28 03:54:58 fredb Exp $
-
---- optdetail.c.orig	Mon Nov 20 18:20:39 2000
-+++ optdetail.c	Wed Dec 27 21:35:04 2000
-@@ -23,6 +23,7 @@
- */
- 
- #include <stdlib.h>
-+#include <stdio.h>
- #include <string.h>
- #include <time.h>
- 
diff --git a/finance/xquote/patches/patch-ac b/finance/xquote/patches/patch-ac
deleted file mode 100644
index 215683be38a..00000000000
--- a/finance/xquote/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2000/12/28 03:54:58 fredb Exp $
-
---- option.c.orig	Mon Nov 20 18:20:39 2000
-+++ option.c	Wed Dec 27 21:40:15 2000
-@@ -24,6 +24,7 @@
- */
- 
- #include <stdlib.h>
-+#include <stdio.h>
- #include <string.h>
- 
- #include <Xm/XmAll.h>
diff --git a/finance/xquote/patches/patch-ad b/finance/xquote/patches/patch-ad
deleted file mode 100644
index 38b9a482e35..00000000000
--- a/finance/xquote/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2000/12/28 03:54:58 fredb Exp $
-
---- optnet.c.orig	Mon Nov 20 18:20:39 2000
-+++ optnet.c	Wed Dec 27 21:45:08 2000
-@@ -25,6 +25,7 @@
- 
- #include <sys/types.h>
- #include <stdlib.h>
-+#include <stdio.h>
- #include <arpa/inet.h>
- #include <netinet/in.h>
- #include <sys/socket.h>
diff --git a/finance/xquote/patches/patch-ae b/finance/xquote/patches/patch-ae
deleted file mode 100644
index 13a8156d7f7..00000000000
--- a/finance/xquote/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2000/12/28 03:54:59 fredb Exp $
-
---- status.c.orig	Mon Nov 20 18:20:40 2000
-+++ status.c	Wed Dec 27 21:47:06 2000
-@@ -23,6 +23,7 @@
- */
- 
- #include <stdlib.h>
-+#include <stdio.h>
- 
- #include <Xm/DialogS.h>
- #include <Xm/Form.h>