Make this package use state-of-the-bloat^Wart QT, i.e. version 3

(qt-1 doesn't seem to build with recent gcc).

Patch based on PR 23443 submitted by Ron Roskens

5 files changed, 33 insertions, 22 deletions

diff --git a/x11/xglobe/Makefile b/x11/xglobe/Makefile
index ec7443c7e51..44c2ebea650 100644
--- a/x11/xglobe/Makefile
+++ b/x11/xglobe/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2004/01/24 15:30:34 grant Exp $
+# $NetBSD: Makefile,v 1.20 2004/07/06 22:08:17 hubertf Exp $
 #
 
 DISTNAME=	xglobe-0.5
+PKGREVISION=	1
 CATEGORIES=	x11
 #
 # The original MASTER_SITE for the program responds "200 OK"
@@ -17,16 +18,13 @@ MAINTAINER=	hubertf@NetBSD.org
 HOMEPAGE=	http://www.cs.unc.edu/~scheuerm/xglobe/
 COMMENT=	Displays the earth as seen from space, similar to xearth
 
-DEPENDS+=	qt1-1.44:../../x11/qt1
-
 DIST_SUBDIR=	xglobe
 MAPS=		LE.400.gif Brill.400.gif mggd.gif
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 USE_X11BASE=	YES
 USE_GNU_TOOLS+=	make
-EVAL_PREFIX+=	QT1DIR=qt1
-MAKE_ENV+=	QTDIR=${QT1DIR}/qt1
+USE_BUILDLINK3=	yes
 
 post-install:
 	${INSTALL_DATA_DIR} ${X11PREFIX}/lib/xglobe
@@ -38,4 +36,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README.maps	 ${X11PREFIX}/share/doc/xglobe
 	${INSTALL_DATA} ${WRKSRC}/getcloudmap.sh ${X11PREFIX}/bin/xglobe-getcloudmap.sh
 
+.include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xglobe/distinfo b/x11/xglobe/distinfo
index 0fa711e8855..c3785d75405 100644
--- a/x11/xglobe/distinfo
+++ b/x11/xglobe/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2004/01/18 23:27:46 kristerw Exp $
+$NetBSD: distinfo,v 1.4 2004/07/06 22:08:17 hubertf Exp $
 
 SHA1 (xglobe/LE.400.gif) = acfe3f73a9513b312e2c65403b6b4242c53d9c1a
 Size (xglobe/LE.400.gif) = 50083 bytes
@@ -8,7 +8,7 @@ SHA1 (xglobe/mggd.gif) = d5ae718be9d6a8be98acf92991fc97940c194e85
 Size (xglobe/mggd.gif) = 899276 bytes
 SHA1 (xglobe/xglobe-0.5.tar.gz) = ba436e1105462577dd9fb1cbedcec93dd58e4e3a
 Size (xglobe/xglobe-0.5.tar.gz) = 982309 bytes
-SHA1 (patch-aa) = c49daeced419d152cb102884a2fd334f5e2e3400
-SHA1 (patch-ab) = 505aecb15dfbde425463322b9d372bea5be2c217
+SHA1 (patch-aa) = 1721613b6f73a3cd7e911aaada9f29abe5b47f73
+SHA1 (patch-ab) = d3629dd5e0c4940127938491e1911f1f88a4e1b7
 SHA1 (patch-ac) = 3548c21bad7c95f1a5abd8884fa474a297c33b90
-SHA1 (patch-ad) = 0da8a3a6ec05802746291344373d26c57dcd567e
+SHA1 (patch-ad) = fcc4b34402ec7ff2ceedb5391bb9553f891783fc
diff --git a/x11/xglobe/patches/patch-aa b/x11/xglobe/patches/patch-aa
index 79fdb9db688..a7ce3fb0e5e 100644
--- a/x11/xglobe/patches/patch-aa
+++ b/x11/xglobe/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.7 2000/04/03 03:24:48 hubertf Exp $
+$NetBSD: patch-aa,v 1.8 2004/07/06 22:08:17 hubertf Exp $
 
---- Makefile.BAK	Mon Apr  3 04:49:02 2000
-+++ Makefile	Mon Apr  3 04:51:14 2000
+--- Makefile.orig	1999-07-19 07:56:27.000000000 -0500
++++ Makefile	2003-11-14 12:31:20.000000000 -0600
 @@ -4,25 +4,25 @@
  
  ####### Installation directory
@@ -41,7 +41,7 @@ $NetBSD: patch-aa,v 1.7 2000/04/03 03:24:48 hubertf Exp $
 +LIB_DIRS     = -L$(QT_LIB_DIR) -Wl,-R${QT_LIB_DIR} -L$(X11_LIB_DIR) -Wl,-R$(X11_LIB_DIR)
  
 -LIBS         = -lX11 -lqt -lm
-+LIBS         = -lqt -lm -lXext -lX11
++LIBS         = -lqt-mt -lm -lXext -lX11
  # If you want to use the QImageIO lib (to support jpg and png maps) use the
  # next two lines and comment the one above
  #WITH_QIMGIO  = -DWITH_QIMAGEIO
diff --git a/x11/xglobe/patches/patch-ab b/x11/xglobe/patches/patch-ab
index b427df38ba7..592cc3a66dd 100644
--- a/x11/xglobe/patches/patch-ab
+++ b/x11/xglobe/patches/patch-ab
@@ -1,7 +1,18 @@
-$NetBSD: patch-ab,v 1.1 2000/04/03 03:24:48 hubertf Exp $
+$NetBSD: patch-ab,v 1.2 2004/07/06 22:08:17 hubertf Exp $
 
---- renderer.cpp.orig	Mon Apr  3 05:07:37 2000
-+++ renderer.cpp	Mon Apr  3 05:08:40 2000
+--- renderer.cpp.orig	1999-12-06 10:13:35.000000000 -0600
++++ renderer.cpp	2003-11-14 12:32:03.000000000 -0600
+@@ -1483,8 +1483,8 @@
+   labelstring.sprintf("%s, %s %d. %d, %d:%02d %s\n"
+                       "View pos %2.2f° %c %2.2f° %c\n"
+                       "Sun pos %2.2f° %c %2.2f° %c",
+-                      dt.date().dayName(dt.date().dayOfWeek()),
+-                      dt.date().monthName(dt.date().month()),
++                      dt.date().dayName(dt.date().dayOfWeek()).ascii(),
++                      dt.date().monthName(dt.date().month()).ascii(),
+                       dt.date().day(), dt.date().year(),
+                       dt.time().hour(), dt.time().minute(),
+                       tzname[tm->tm_isdst],
 @@ -1562,9 +1562,9 @@
    
    for(int i=0; i<numstars; i++)
diff --git a/x11/xglobe/patches/patch-ad b/x11/xglobe/patches/patch-ad
index 600e52fab5d..2a8f6595984 100644
--- a/x11/xglobe/patches/patch-ad
+++ b/x11/xglobe/patches/patch-ad
@@ -1,11 +1,12 @@
-$NetBSD: patch-ad,v 1.1 2004/01/18 23:27:46 kristerw Exp $
---- desktopwidget.cpp.orig	Mon Jan 19 00:17:43 2004
-+++ desktopwidget.cpp	Mon Jan 19 00:18:09 2004
-@@ -18,6 +18,7 @@
+$NetBSD: patch-ad,v 1.2 2004/07/06 22:08:17 hubertf Exp $
+
+--- desktopwidget.cpp.orig	1998-12-09 19:15:52.000000000 +0100
++++ desktopwidget.cpp
+@@ -17,6 +17,7 @@
+  *
   */
  
++#include <cstdlib>
  #include <stdio.h>
-+#include <stdlib.h>
  #include "desktopwidget.h"
  
- DesktopWidget::DesktopWidget(QWidget *parent, const char *name)