From 73cda50ab6a21e3716e2453fed86ff49a1cbbfe2 Mon Sep 17 00:00:00 2001
From: mark <mark@openbsd.org>
Date: Mon, 7 Jan 2002 05:33:05 +0000
Subject: [PATCH] o updated HOMEPAGE o added jcs@ and mark@ to OpenBSD-markers
 (i love this feature) o tab delimited the Makefile for readability o bumped
 VERSION

ok espie@
---
 x11/xglobe/Makefile                | 32 +++++++++++++++---------------
 x11/xglobe/{files/md5 => distinfo} |  0
 x11/xglobe/files/OpenBSD-markers   |  4 +++-
 3 files changed, 19 insertions(+), 17 deletions(-)
 rename x11/xglobe/{files/md5 => distinfo} (100%)

diff --git a/x11/xglobe/Makefile b/x11/xglobe/Makefile
index e2c6932d31b..379a33a1981 100644
--- a/x11/xglobe/Makefile
+++ b/x11/xglobe/Makefile
@@ -1,14 +1,14 @@
-# $OpenBSD: Makefile,v 1.16 2001/10/28 12:30:14 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2002/01/07 05:33:05 mark Exp $
 
 COMMENT=	"display the Earth on X11"
 
-CATEGORIES=x11
-HOMEPAGE=http://wwwrzstud.rz.uni-karlsruhe.de/%7Euddn/xglobe/
-#MASTER_SITES=${HOMEPAGE}
+CATEGORIES=	x11
+HOMEPAGE=	http://www.cs.unc.edu/~scheuerm/xglobe/
+#MASTER_SITES=	${HOMEPAGE}
 # Temporary release
-MASTER_SITES=ftp://quatramaran.ens.fr/pub/espie/
-DISTNAME=xglobe-0.5p2
-NEED_VERSION=1.483
+MASTER_SITES=	ftp://quatramaran.ens.fr/pub/espie/
+DISTNAME=	xglobe-0.5p2
+NEED_VERSION=	1.500
 
 MAINTAINER=	Marc Espie <espie@openbsd.org>
 
@@ -21,12 +21,12 @@ PERMIT_DISTFILES_FTP=	Yes
 USE_X11=		Yes
 MODULES=		qt2
 
-MAKE_FLAGS=XGLOBE_DIR=${PREFIX}
+MAKE_FLAGS=	XGLOBE_DIR=${PREFIX}
 
-FLAVORS=no_map
+FLAVORS=	no_map
 FLAVOR?=
 .if ${FLAVOR:L:Mno_map}
-DISTFILES=${DISTNAME}-no-map${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME}-no-map${EXTRACT_SUFX}
 
 # Kludge install for no map around
 pre-install:
@@ -37,12 +37,12 @@ post-install::
 .endif
 
 
-MAKE_FLAGS+=QT_INCLUDE_DIR=${MODQT_INCDIR}
-MAKE_FLAGS+=QT_LIB_DIR=${MODQT_LIBDIR}
+MAKE_FLAGS+=	QT_INCLUDE_DIR=${MODQT_INCDIR}
+MAKE_FLAGS+=	QT_LIB_DIR=${MODQT_LIBDIR}
 
 # for linking against libpng
-MAKE_FLAGS+='LIB_DIRS=-L$$(QT_LIB_DIR) -L$$(X11_LIB_DIR) -L$(LOCALBASE)/lib'
-MAKE_FLAGS+=COPTS='${COPTS}'
+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
@@ -51,8 +51,8 @@ post-install::
 	${INSTALL_SCRIPT} ${FILESDIR}/getcloudmap ${PREFIX}/bin
 	${INSTALL_DATA} ${FILESDIR}/OpenBSD-markers ${PREFIX}/lib/xglobe
 
-SUPDISTFILES=${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-no-map${EXTRACT_SUFX}
+SUPDISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-no-map${EXTRACT_SUFX}
 
-FAKE_FLAGS=XGLOBE_DIR=${WRKINST}${PREFIX}
+FAKE_FLAGS=	XGLOBE_DIR=${WRKINST}${PREFIX}
 
 .include <bsd.port.mk>
diff --git a/x11/xglobe/files/md5 b/x11/xglobe/distinfo
similarity index 100%
rename from x11/xglobe/files/md5
rename to x11/xglobe/distinfo
diff --git a/x11/xglobe/files/OpenBSD-markers b/x11/xglobe/files/OpenBSD-markers
index 16282dfb58c..87d673908bc 100644
--- a/x11/xglobe/files/OpenBSD-markers
+++ b/x11/xglobe/files/OpenBSD-markers
@@ -1,9 +1,10 @@
-# $OpenBSD: OpenBSD-markers,v 1.16 2001/08/21 00:11:32 miod Exp $
+# $OpenBSD: OpenBSD-markers,v 1.17 2002/01/07 05:33:05 mark Exp $
 # This is a list of OpenBSD developers and related people.
 #
 -27.48		153.20		"Leonard"	# David
 -34.67  	-58.50 		"Schwindt"	# Federico G.
 25.0		121.400		"Lo"		# Kevin
+32.857736	117.211507	"Grimes"	# Mark
 35.67  		139.75 		"Itojun"	# Jun-ichiro
 37.515049	-122.339528	"Hyman"		# Marco S.
 38.9693		-77.3863	"Wright"	# Jason L.
@@ -14,6 +15,7 @@
 40.7517		-73.9942	"Shalayeff"	# Michael
 40.85		-96.75		"Phillips"	# James, OpenBSD journal
 41.881		-87.628		"Creighton"	# Brandon
+42.1230		-88.261		"Stein"		# Joshua
 42.2731		-83.782		"Campbell"	# Aaron
 42.2775		-83.754167	"Provos"	# Niels
 42.280556	-83.754722 	"Rees"		# Jim