0.5p2, all my changes, including QT_XFT support.

x11/xglobe/Makefile

@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2000/12/04 14:22:02 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2001/04/20 15:07:35 espie Exp $
 
 CATEGORIES=x11
 HOMEPAGE=http://wwwrzstud.rz.uni-karlsruhe.de/%7Euddn/xglobe/
 #MASTER_SITES=${HOMEPAGE}
 # Temporary release
 MASTER_SITES=ftp://quatramaran.ens.fr/pub/espie/
-DISTNAME=xglobe-0.5p1
+DISTNAME=xglobe-0.5p2
 NEED_VERSION=1.295
 
 MAINTAINER=	Marc Espie <espie@openbsd.org>
@@ -21,7 +21,7 @@ USE_X11=		Yes
 MAKE_FLAGS=XGLOBE_DIR=${PREFIX}
 
 FLAVORS=no_map gfx qt2
-FLAVOR?=
+FLAVOR?=qt2
 .if ${FLAVOR:L:Mno_map}
 DISTFILES=${DISTNAME}-no-map${EXTRACT_SUFX}
 
@@ -53,6 +53,7 @@ LIB_DEPENDS+=png.::graphics/png
 
 # for linking against libpng
 MAKE_FLAGS+='LIB_DIRS=-L$$(QT_LIB_DIR) -L$$(X11_LIB_DIR) -L$(LOCALBASE)/lib'
+MAKE_FLAGS+=COPTS='${COPTS}'
 
 post-install::
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xglobe

x11/xglobe/files/md5

@@ -1,6 +1,6 @@
-MD5 (xglobe-0.5p1-no-map.tar.gz) = 4a423043d3949ddd35bc14a53fee91a9
-MD5 (xglobe-0.5p1.tar.gz) = 049e266c9e32cbd30ad75cd0512209c4
-RMD160 (xglobe-0.5p1-no-map.tar.gz) = 0a2397fc0103e4cb79f5d2175cb09e91f6d355a8
-RMD160 (xglobe-0.5p1.tar.gz) = 1262cee9fa514a3a52b2957e67d5921babb7f332
-SHA1 (xglobe-0.5p1-no-map.tar.gz) = 64dde39cd36eda21271d332d009de5b447013ed4
-SHA1 (xglobe-0.5p1.tar.gz) = 5f92c1278995c11249c0d7d70acc0eb7ce91ed07
+MD5 (xglobe-0.5p2-no-map.tar.gz) = 95dab47347e9c3824bc5e13c97050f43
+MD5 (xglobe-0.5p2.tar.gz) = 068520cc8e835338e90ecc6e42f7d77b
+RMD160 (xglobe-0.5p2-no-map.tar.gz) = ce49ccb278370627595110d858de782454a6d8c9
+RMD160 (xglobe-0.5p2.tar.gz) = 2b24b7031454e46de4164a0caaeb99dc0bfdf170
+SHA1 (xglobe-0.5p2-no-map.tar.gz) = 7058b9788ac50da6d689fe5b96f990cf8fec4c98
+SHA1 (xglobe-0.5p2.tar.gz) = fbab58616199a6c1d438906f805031da567982eb

x11/xglobe/patches/patch-markerlist_cpp

@@ -1,15 +0,0 @@
-$OpenBSD: patch-markerlist_cpp,v 1.1 2001/02/24 21:09:23 espie Exp $
---- markerlist.cpp.orig	Sat Feb 24 22:04:28 2001
-+++ markerlist.cpp	Sat Feb 24 22:05:04 2001
-@@ -398,7 +398,11 @@ void MarkerList::render_monochrome(unsig
-     
-     for(int wx=0 ; wx<visiblerect.width(); wx++)
-     {
-+#if QT_VERSION >= 200
-+      switch(*src++ & 0x00FFFFFF)
-+#else
-       switch(*src++)
-+#endif
-       {
-         case 0x00000000:
-           *dest++ = 0;

x11/xglobe/patches/patch-renderer_cpp

@@ -1,17 +0,0 @@
-$OpenBSD: patch-renderer_cpp,v 1.3 2001/03/05 02:07:44 espie Exp $
---- renderer.cpp.orig	Mon Mar  5 02:56:24 2001
-+++ renderer.cpp	Mon Mar  5 02:56:59 2001
-@@ -1170,8 +1170,13 @@ void Renderer::drawLabel()
-   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",
-+#if QT_VERSION >= 200
-+                      dt.date().dayName(dt.date().dayOfWeek()).latin1(),
-+                      dt.date().monthName(dt.date().month()).latin1(),
-+#else
-                       dt.date().dayName(dt.date().dayOfWeek()),
-                       dt.date().monthName(dt.date().month()),
-+#endif
-                       dt.date().day(), dt.date().year(),
-                       dt.time().hour(), dt.time().minute(),
-                       tzname[tm->tm_isdst],