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!

3 files changed, 58 insertions, 21 deletions

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.;
+ }
+ 
+ /* ------------------------------------------------------------------------*/