Update to version 0.5. Changes:

- added -outfile command line switch
- added -rot command line switch by Andrew Sumner:
- implemented cloud map rendering (-cloudmapfile and -cloudfilter switches)
  (see README.maps for details)

For NetBSD 1.4.x, (s)rand() was replaced by (s)random() to get a better
image of stars. Thanks a lot to Marcello Balduccini <marcy@cs.utep.edu>
for the hint!

8 files changed, 88 insertions, 42 deletions

diff --git a/x11/xglobe/Makefile b/x11/xglobe/Makefile
index 755bf017b43..0af164819b5 100644
--- a/x11/xglobe/Makefile
+++ b/x11/xglobe/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.9 2000/03/28 00:09:23 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.10 2000/04/03 03:24:47 hubertf Exp $
 #
 
-DISTNAME=	xglobe-0.2
+DISTNAME=	xglobe-0.5
 CATEGORIES=	x11
 #
 # The original MASTER_SITE for the program responds "200 OK"
 # and produces a page explaining how the user "uddn" no longer
 # has web pages on their system.
 #
-#MASTER_SITES=	http://www.uni-karlsruhe.de/~uddn/xglobe/ \
-#
-MASTER_SITES=	http://livingearth.com/LE/images/ \
+MASTER_SITES=	http://www.uni-karlsruhe.de/~uddn/xglobe/ \
+		http://livingearth.com/LE/images/ \
 		http://www.ngdc.noaa.gov/mgg/image/
 DISTFILES+=	${MAPS} ${DISTNAME}${EXTRACT_SUFX}
 
@@ -28,9 +27,13 @@ USE_GMAKE=	YES
 MAKE_ENV+=	QTDIR=${X11BASE}/qt1
 
 post-install:
-	${INSTALL_DATA_DIR} ${X11BASE}/lib/X11/xglobe
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/mggd.gif      ${X11BASE}/lib/X11/xglobe/mggd.gif
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/LE.400.gif    ${X11BASE}/lib/X11/xglobe/daymap.gif
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/Brill.400.gif ${X11BASE}/lib/X11/xglobe/nightmap.gif
+	${INSTALL_DATA_DIR} ${X11BASE}/lib/xglobe
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/mggd.gif      ${X11BASE}/lib/xglobe/mggd.gif
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/LE.400.gif    ${X11BASE}/lib/xglobe/daymap.gif
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/Brill.400.gif ${X11BASE}/lib/xglobe/nightmap.gif
+	${INSTALL_DATA_DIR} ${X11BASE}/share/doc/xglobe
+	${INSTALL_DATA} ${WRKSRC}/README	 ${X11BASE}/share/doc/xglobe
+	${INSTALL_DATA} ${WRKSRC}/README.maps	 ${X11BASE}/share/doc/xglobe
+	${INSTALL_DATA} ${WRKSRC}/getcloudmap.sh ${X11BASE}/bin/xglobe-getcloudmap.sh
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xglobe/files/md5 b/x11/xglobe/files/md5
index 8a51a1466aa..a8c02abe5b5 100644
--- a/x11/xglobe/files/md5
+++ b/x11/xglobe/files/md5
@@ -1,6 +1,6 @@
-$NetBSD: md5,v 1.4 1999/05/24 23:02:13 wrstuden Exp $
+$NetBSD: md5,v 1.5 2000/04/03 03:24:48 hubertf Exp $
 
 MD5 (xglobe/LE.400.gif) = 2950d9d315db019f8ce9142ddbfc992a
 MD5 (xglobe/Brill.400.gif) = da9f9061201b9da2ace1d988e9f99954
 MD5 (xglobe/mggd.gif) = 7980806c25a35c2801a89a7d1223cf49
-MD5 (xglobe/xglobe-0.2.tar.gz) = edd3958237e6eeb20e2720342350bd7b
+MD5 (xglobe/xglobe-0.5.tar.gz) = 87caf7803f1d71a0b024188e3a2c759c
diff --git a/x11/xglobe/files/patch-sum b/x11/xglobe/files/patch-sum
index f8a6cc92993..741e25d5638 100644
--- a/x11/xglobe/files/patch-sum
+++ b/x11/xglobe/files/patch-sum
@@ -1,3 +1,5 @@
-$NetBSD: patch-sum,v 1.4 2000/03/28 00:09:24 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.5 2000/04/03 03:24:48 hubertf Exp $
 
-MD5 (patch-aa) = df9a88ec39172c32584e77d1fe19a161
+MD5 (patch-aa) = 92c6c17bcafc7ee6ecdc191af520a203
+MD5 (patch-ab) = 63d55d9f95dda832dfa3033062ffe06b
+MD5 (patch-ac) = eddd1ae463ac2ba00b860a6c5aeeefeb
diff --git a/x11/xglobe/patches/patch-aa b/x11/xglobe/patches/patch-aa
index 9d598aeae6f..79fdb9db688 100644
--- a/x11/xglobe/patches/patch-aa
+++ b/x11/xglobe/patches/patch-aa
@@ -1,30 +1,29 @@
-$NetBSD: patch-aa,v 1.6 2000/03/28 00:09:24 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.7 2000/04/03 03:24:48 hubertf Exp $
 
---- Makefile.orig	Mon Apr 19 05:21:04 1999
-+++ Makefile	Wed Mar 22 16:07:59 2000
-@@ -5,15 +5,15 @@
+--- Makefile.BAK	Mon Apr  3 04:49:02 2000
++++ Makefile	Mon Apr  3 04:51:14 2000
+@@ -4,25 +4,25 @@
+ 
  ####### Installation directory
  
 -XGLOBE_DIR     = /usr/local
--XGLOBE_LIB_DIR = $(XGLOBE_DIR)/lib/xglobe
 +XGLOBE_DIR     = ${PREFIX}
-+XGLOBE_LIB_DIR = $(XGLOBE_DIR)/lib/X11/xglobe
+ XGLOBE_LIB_DIR = $(XGLOBE_DIR)/lib/xglobe
  XGLOBE_BIN_DIR = $(XGLOBE_DIR)/bin
  
  ####### Library directories - you may need to modify these
  
 -X11_INCLUDE_DIR = /usr/X11R6/include
--QT_INCLUDE_DIR  = /usr/lib/qt/include
 +X11_INCLUDE_DIR = ${X11BASE}/include
-+QT_INCLUDE_DIR  = $(QTDIR)/include
+ QT_INCLUDE_DIR  = $(QTDIR)/include
  
--QT_LIB_DIR      = /usr/lib/qt/lib
+ QT_LIB_DIR      = $(QTDIR)/lib
 -X11_LIB_DIR     = /usr/X11R6/lib
-+QT_LIB_DIR      = $(QTDIR)/lib
 +X11_LIB_DIR     = ${X11BASE}/lib
  
  
-@@ -22,6 +22,6 @@
+ ####### Compiler and tools
+ 
  CPP     = g++
  LINK    = g++
 -MOC     = moc
@@ -33,19 +32,16 @@ $NetBSD: patch-aa,v 1.6 2000/03/28 00:09:24 dmcmahill Exp $
 +INSTALL = install -c
  
  ####### compile and link options
-@@ -33,7 +33,7 @@
+ 
+@@ -32,9 +32,9 @@
+ 
  INCLUDE_DIRS = -I$(QT_INCLUDE_DIR) -I$(X11_INCLUDE_DIR)
  
 -LIB_DIRS     = -L$(QT_LIB_DIR) -L$(X11_LIB_DIR)
 +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         = -lX11 -lqt -lm
- # If you want to use the QImageIO lib (to support jpg and png maps) use this
- # line and comment the one above (don't forget to edit config.h as well!)
-@@ -41,4 +41,5 @@
- # If the linker complains about unresolved references try this:
- #LIBS         = -lX11 -lqt -lm -lqimgio -lpng -lz
-+LIBS	= -lqt -lm -lXext -lX11
- 
- ####### Target
++LIBS         = -lqt -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
new file mode 100644
index 00000000000..b427df38ba7
--- /dev/null
+++ b/x11/xglobe/patches/patch-ab
@@ -0,0 +1,17 @@
+$NetBSD: patch-ab,v 1.1 2000/04/03 03:24:48 hubertf Exp $
+
+--- renderer.cpp.orig	Mon Apr  3 05:07:37 2000
++++ renderer.cpp	Mon Apr  3 05:08:40 2000
+@@ -1562,9 +1562,9 @@
+   
+   for(int i=0; i<numstars; i++)
+   {
+-    x = rand() % renderedImage->width();
+-    y = rand() % renderedImage->height();
+-    brightness = 150+ (rand() % 106);
++    x = random() % renderedImage->width();
++    y = random() % renderedImage->height();
++    brightness = 150+ (random() % 106);
+     p = (unsigned int *)renderedImage->scanLine(y);
+     p += x;
+     *p = qRgb(brightness, brightness, brightness);
diff --git a/x11/xglobe/patches/patch-ac b/x11/xglobe/patches/patch-ac
new file mode 100644
index 00000000000..0cb5d5db1de
--- /dev/null
+++ b/x11/xglobe/patches/patch-ac
@@ -0,0 +1,24 @@
+$NetBSD: patch-ac,v 1.1 2000/04/03 03:24:48 hubertf Exp $
+
+--- earthapp.cpp.orig	Mon Apr  3 05:07:30 2000
++++ earthapp.cpp	Mon Apr  3 05:08:24 2000
+@@ -371,7 +371,7 @@
+   if(strncmp(argv()[i], "random", 6) == 0)
+   {
+     p_type = RANDOM;
+-    srand((int)time(NULL) + (int)getpid());
++    srandom((int)time(NULL) + (int)getpid());
+     return;
+   }
+   else if(strncmp(argv()[i], "fixed", 5) == 0)
+@@ -937,8 +937,8 @@
+ 
+ void EarthApplication::randomPosition()
+ {
+-  view_lat = ((rand()%30001)/30000.)*180. - 90.;
+-  view_long = ((rand()%30001)/30000.)*360. - 180.;
++  view_lat = ((random()%30001)/30000.)*180. - 90.;
++  view_long = ((random()%30001)/30000.)*360. - 180.;
+ }
+ 
+ /* ------------------------------------------------------------------------*/
diff --git a/x11/xglobe/pkg/COMMENT b/x11/xglobe/pkg/COMMENT
index d1daa9cd083..944f22f5904 100644
--- a/x11/xglobe/pkg/COMMENT
+++ b/x11/xglobe/pkg/COMMENT
@@ -1 +1 @@
-Displays the earth as seen from space on your X Desktop, similar to xearth
+Displays the earth as seen from space, similar to xearth
diff --git a/x11/xglobe/pkg/PLIST b/x11/xglobe/pkg/PLIST
index 94a4d34d9c8..6776a53d3f1 100644
--- a/x11/xglobe/pkg/PLIST
+++ b/x11/xglobe/pkg/PLIST
@@ -1,8 +1,12 @@
-@comment $NetBSD: PLIST,v 1.2 1999/01/20 20:24:11 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/04/03 03:24:48 hubertf Exp $
 bin/xglobe
-lib/X11/xglobe/xglobe-markers
-lib/X11/xglobe/map.bmp
-lib/X11/xglobe/mggd.gif
-lib/X11/xglobe/daymap.gif
-lib/X11/xglobe/nightmap.gif
-@dirrm lib/X11/xglobe
+bin/xglobe-getcloudmap.sh
+lib/xglobe/xglobe-markers
+lib/xglobe/map.bmp
+lib/xglobe/mggd.gif
+lib/xglobe/daymap.gif
+lib/xglobe/nightmap.gif
+share/doc/xglobe/README
+share/doc/xglobe/README.maps
+@dirrm lib/xglobe
+@dirrm share/doc/xglobe