8 files changed, 144 insertions, 0 deletions

diff --git a/astro/Makefile b/astro/Makefile
index 0f7ecf76e9ce..0ed5b69bfb41 100644
--- a/astro/Makefile
+++ b/astro/Makefile
@@ -45,6 +45,7 @@
     SUBDIR += x3arth
     SUBDIR += xearth
     SUBDIR += xephem
+    SUBDIR += xglobe
     SUBDIR += xphoon
     SUBDIR += xplanet
     SUBDIR += xtide
diff --git a/astro/xglobe/Makefile b/astro/xglobe/Makefile
new file mode 100644
index 000000000000..f29b49a4ec41
--- /dev/null
+++ b/astro/xglobe/Makefile
@@ -0,0 +1,25 @@
+# New ports collection makefile for:   xglobe
+# Date created:        20 January 1998
+# Whom:                Kris Kennaway <kris@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xglobe
+PORTVERSION=	0.5
+CATEGORIES=	astro
+MASTER_SITES=	http://www.uni-karlsruhe.de/~uddn/xglobe/
+
+MAINTAINER=	kris@FreeBSD.org
+
+USE_QT_VER=	1
+USE_X_PREFIX=	yes
+USE_GMAKE=	yes
+
+do-install:
+	@${MKDIR} ${PREFIX}/share/xglobe/
+	@${INSTALL_PROGRAM} ${WRKSRC}/xglobe ${PREFIX}/bin/
+	@${INSTALL_DATA} ${WRKSRC}/map.bmp ${PREFIX}/share/xglobe/
+	@${INSTALL_DATA} ${WRKSRC}/xglobe-markers ${PREFIX}/share/xglobe/
+
+.include <bsd.port.mk>
diff --git a/astro/xglobe/distinfo b/astro/xglobe/distinfo
new file mode 100644
index 000000000000..fdb8623afb24
--- /dev/null
+++ b/astro/xglobe/distinfo
@@ -0,0 +1 @@
+MD5 (xglobe-0.5.tar.gz) = 87caf7803f1d71a0b024188e3a2c759c
diff --git a/astro/xglobe/files/patch-aa b/astro/xglobe/files/patch-aa
new file mode 100644
index 000000000000..66a0983403d4
--- /dev/null
+++ b/astro/xglobe/files/patch-aa
@@ -0,0 +1,60 @@
+--- Makefile.orig	Mon Jul 19 05:56:27 1999
++++ Makefile	Sun May  5 01:53:17 2002
+@@ -4,29 +4,30 @@
+ 
+ ####### Installation directory
+ 
+-XGLOBE_DIR     = /usr/local
+-XGLOBE_LIB_DIR = $(XGLOBE_DIR)/lib/xglobe
++XGLOBE_DIR     = $(PREFIX)
++XGLOBE_LIB_DIR = $(XGLOBE_DIR)/share/xglobe
+ XGLOBE_BIN_DIR = $(XGLOBE_DIR)/bin
+ 
+ ####### Library directories - you may need to modify these
+ 
+-X11_INCLUDE_DIR = /usr/X11R6/include
+-QT_INCLUDE_DIR  = $(QTDIR)/include
++X11_INCLUDE_DIR = $(X11BASE)/include
++QT_INCLUDE_DIR  = $(X11BASE)/include/X11/qt1
+ 
+-QT_LIB_DIR      = $(QTDIR)/lib
+-X11_LIB_DIR     = /usr/X11R6/lib
++QT_LIB_DIR      = $(X11BASE)/lib
++X11_LIB_DIR     = $(X11BASE)/lib
+ 
+ 
+ ####### Compiler and tools
+ 
+-CPP     = g++
+-LINK    = g++
+-MOC     = moc
++CXX    ?= c++
++CPP     = ${CXX} 
++LINK    = ${CXX} 
++MOC     = moc1
+ INSTALL = install
+ 
+ ####### compile and link options
+ 
+-CFLAGS       = $(INCLUDE_DIRS) -DXGLOBE_LIB_DIR=\"$(XGLOBE_LIB_DIR)\" $(WITH_QIMGIO) -O2 -Wall
++CFLAGS       += $(INCLUDE_DIRS) -DXGLOBE_LIB_DIR=\"$(XGLOBE_LIB_DIR)\" $(WITH_QIMGIO)
+ 
+ LFLAGS       =
+ 
+@@ -34,13 +35,13 @@
+ 
+ LIB_DIRS     = -L$(QT_LIB_DIR) -L$(X11_LIB_DIR)
+ 
+-LIBS         = -lX11 -lqt -lm
++LIBS         = -lX11 -lqt1 -lm
+ # 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
+-#LIBS         = -lX11 -lqt -lm -lqimgio
++#LIBS         = -lX11 -lqt1 -lm -lqimgio
+ # If the linker complains about unresolved references try this:
+-#LIBS         = -lX11 -lqt -lm -lqimgio -lpng -lz -ljpeg
++#LIBS         = -lX11 -lqt1 -lm -lqimgio -lpng -lz -ljpeg
+ 
+ ####### Target
+ 
diff --git a/astro/xglobe/files/patch-random b/astro/xglobe/files/patch-random
new file mode 100644
index 000000000000..ba9f41cf8b9e
--- /dev/null
+++ b/astro/xglobe/files/patch-random
@@ -0,0 +1,47 @@
+--- earthapp.cpp.orig	Sat Feb 24 10:13:10 2001
++++ earthapp.cpp	Sat Feb 24 10:13:29 2001
+@@ -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.;
+ }
+ 
+ /* ------------------------------------------------------------------------*/
+--- renderer.cpp.orig	Sat Feb 24 10:12:53 2001
++++ renderer.cpp	Sat Feb 24 10:13:04 2001
+@@ -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);
+--- main.cpp.orig	Tue Jul 13 10:32:55 1999
++++ main.cpp	Sat Feb 24 10:14:56 2001
+@@ -24,6 +24,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <qstring.h>
+ #include "config.h"
+@@ -36,6 +37,8 @@
+ int main(int argc, char **argv)
+ {
+   EarthApplication myApp(argc, argv);
++
++  srandomdev();
+ 
+ #ifdef WITH_QIMAGEIO
+   qInitImageIO();
diff --git a/astro/xglobe/pkg-comment b/astro/xglobe/pkg-comment
new file mode 100644
index 000000000000..9fb7fa1689c3
--- /dev/null
+++ b/astro/xglobe/pkg-comment
@@ -0,0 +1 @@
+Displays a view of the Earth (like xearth) with a rendered photo map
diff --git a/astro/xglobe/pkg-descr b/astro/xglobe/pkg-descr
new file mode 100644
index 000000000000..b7481b6f56a6
--- /dev/null
+++ b/astro/xglobe/pkg-descr
@@ -0,0 +1,5 @@
+Displays a rendered view of the earth in your root window, similar to
+xearth, but instead uses a satellite image map of the earth. You can also
+substitute surface maps of other planets if you're feeling cosmic.
+
+WWW: http://www.stud.uni-karlsruhe.de/~uddn/xglobe/
diff --git a/astro/xglobe/pkg-plist b/astro/xglobe/pkg-plist
new file mode 100644
index 000000000000..e705ced823b4
--- /dev/null
+++ b/astro/xglobe/pkg-plist
@@ -0,0 +1,4 @@
+bin/xglobe
+share/xglobe/map.bmp
+share/xglobe/xglobe-markers
+@dirrm share/xglobe