Update to xglobe V0.2.

Changes: Can now draw a grid on the globe, improved xearth command
line compatibility, world map is included in the distribution, some
minor fixes and enhancements.

4 files changed, 22 insertions, 15 deletions

diff --git a/x11/xglobe/Makefile b/x11/xglobe/Makefile
index da7c354aed2..4bd9e5004cc 100644
--- a/x11/xglobe/Makefile
+++ b/x11/xglobe/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 1999/01/07 01:03:59 frueauf Exp $
+# $NetBSD: Makefile,v 1.4 1999/01/20 20:24:11 hubertf Exp $
 #
 
-DISTNAME=	xglobe-0.1
+DISTNAME=	xglobe-0.2
 CATEGORIES=	x11
 MASTER_SITES=	http://www.uni-karlsruhe.de/~uddn/xglobe/ \
 		http://livingearth.com/LE/images/ \
@@ -22,7 +22,8 @@ USE_GMAKE=	YES
 MAKE_ENV+=	QTDIR=${X11BASE}
 
 post-install:
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/mggd.gif      ${X11BASE}/lib/X11/xglobe/map.bmp
+	${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
 
diff --git a/x11/xglobe/files/md5 b/x11/xglobe/files/md5
index f51eacb7211..1dcde3388df 100644
--- a/x11/xglobe/files/md5
+++ b/x11/xglobe/files/md5
@@ -1,6 +1,6 @@
-$NetBSD: md5,v 1.2 1999/01/06 14:02:33 frueauf Exp $
+$NetBSD: md5,v 1.3 1999/01/20 20:24:11 hubertf Exp $
 
 MD5 (xglobe/LE.400.gif) = 2950d9d315db019f8ce9142ddbfc992a
 MD5 (xglobe/Brill.400.gif) = da9f9061201b9da2ace1d988e9f99954
 MD5 (xglobe/mggd.gif) = 7980806c25a35c2801a89a7d1223cf49
-MD5 (xglobe/xglobe-0.1.tar.gz) = cc5da3a7c541aac09bd19e8caa17e110
+MD5 (xglobe/xglobe-0.2.tar.gz) = a6852863764b22cc9cf484dea848315a
diff --git a/x11/xglobe/patches/patch-aa b/x11/xglobe/patches/patch-aa
index 107c4d7ed4a..bb79b839116 100644
--- a/x11/xglobe/patches/patch-aa
+++ b/x11/xglobe/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 1999/01/07 14:33:07 hubertf Exp $
+$NetBSD: patch-aa,v 1.3 1999/01/20 20:24:11 hubertf Exp $
 
---- Makefile.orig	Thu Dec 10 21:33:10 1998
-+++ Makefile	Fri Jan  1 19:43:28 1999
+--- Makefile.orig	Tue Jan 19 20:32:59 1999
++++ Makefile	Wed Jan 20 21:00:00 1999
 @@ -4,17 +4,17 @@
  
  ####### Installation directory
@@ -15,12 +15,13 @@ $NetBSD: patch-aa,v 1.2 1999/01/07 14:33:07 hubertf Exp $
  ####### Library directories - you may need to modify these
  
 -X11_INCLUDE_DIR = /usr/X11R6/include
--QT_INCLUDE_DIR  = $(QTDIR)/include
+-QT_INCLUDE_DIR  = /usr/lib/qt/include
 +X11_INCLUDE_DIR = ${X11BASE}/include
 +QT_INCLUDE_DIR  = $(QTDIR)/include/qt
  
- QT_LIB_DIR      = $(QTDIR)/lib
+-QT_LIB_DIR      = /usr/lib/qt/lib
 -X11_LIB_DIR     = /usr/X11R6/lib
++QT_LIB_DIR      = $(QTDIR)/lib
 +X11_LIB_DIR     = ${X11BASE}/lib
  
  
@@ -34,16 +35,20 @@ $NetBSD: patch-aa,v 1.2 1999/01/07 14:33:07 hubertf Exp $
  
  ####### compile and link options
  
-@@ -32,9 +32,9 @@
+@@ -32,7 +32,7 @@
  
  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) -L$(X11_LIB_DIR) -Wl,-R$(X11_LIB_DIR)
  
--LIBS         = -lX11 -lqt -lm
-+LIBS         = -lqt -lm -ltermcap -lXext -lX11
+ #LIBS         = -lX11 -lqt -lm
+ # If you want to use the QImageIO lib (to support jpg and png maps) use this
+@@ -40,6 +40,7 @@
+ #LIBS         = -lX11 -lqt -lm -lqimgio
+ # If the linker complains about unresolved references try this:
+ #LIBS         = -lX11 -lqt -lm -lqimgio -lpng -lz
++LIBS	= -lqt -lm -lXext -lX11
  
  ####### Target
  
-
diff --git a/x11/xglobe/pkg/PLIST b/x11/xglobe/pkg/PLIST
index e2248e8b407..94a4d34d9c8 100644
--- a/x11/xglobe/pkg/PLIST
+++ b/x11/xglobe/pkg/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/01/05 01:17:48 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.2 1999/01/20 20:24:11 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