update to 3.6.3

changes:
-many images and maps added
-UI improvements
-HTML help
-A4 printing
-extensions to database format
-bugfixes

4 files changed, 37 insertions, 31 deletions

diff --git a/x11/xephem/Makefile b/x11/xephem/Makefile
index 4c8507138ca..7a2b31ed12c 100644
--- a/x11/xephem/Makefile
+++ b/x11/xephem/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2004/12/03 15:15:13 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2005/02/25 17:45:19 drochner Exp $
 
-DISTNAME=	xephem-3.5.2
-PKGREVISION=	2
+DISTNAME=	xephem-3.6.3
 CATEGORIES=	x11
 MASTER_SITES=	http://www.clearskyinstitute.com/xephem/ \
 		ftp://iphcip1.physik.uni-mainz.de/pub/xephem/
@@ -15,12 +14,13 @@ LICENSE=	no-commercial-use
 WRKSRC=		${WRKDIR}/${DISTNAME}/GUI/xephem
 USE_BUILDLINK3=	yes
 USE_IMAKE=	yes
-PERL_SCRIPTS=	astorb2edb.pl mpcorb2edb.pl
 
 LIBSRC1=	${WRKDIR}/${DISTNAME}/libastro
 LIBSRC2=	${WRKDIR}/${DISTNAME}/libip
+LIBSRC3=	${WRKDIR}/${DISTNAME}/liblilxml
+LIBSRC4=	${WRKDIR}/${DISTNAME}/libjpegd
 BUILD_TARGET=	# empty
-BUILD_DIRS=	${LIBSRC1} ${LIBSRC2} ${WRKSRC}
+BUILD_DIRS=	${LIBSRC1} ${LIBSRC2} ${LIBSRC3} ${LIBSRC4} ${WRKSRC}
 INSTALL_DIRS=	${WRKSRC}
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
@@ -33,13 +33,8 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/xephem/tools
 	cd ${WRKSRC}; ${CP} -R auxil catalogs fifos fits		\
 		${PREFIX}/share/xephem
-	for file in ${PERL_SCRIPTS}; do					\
-		${INSTALL_SCRIPT} ${WRKSRC}/tools/$${file}		\
-			${PREFIX}/share/xephem/tools;			\
-	done
 	${CHOWN} -R ${SHAREOWN} ${PREFIX}/share/xephem
 
 .include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xephem/PLIST b/x11/xephem/PLIST
index 1ca20b62768..a99f7eac55a 100644
--- a/x11/xephem/PLIST
+++ b/x11/xephem/PLIST
@@ -1,23 +1,35 @@
-@comment $NetBSD: PLIST,v 1.3 2003/03/03 04:17:38 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/02/25 17:45:19 drochner Exp $
 bin/xephem
-${IMAKE_MAN_DIR}/xephem.${IMAKE_MANNEWSUFFIX}
 lib/X11/app-defaults/XEphem
+man/cat1/xephem.0
 share/xephem/auxil/README
+share/xephem/auxil/SOHO_512_20030809_0719_eit_304.gif
 share/xephem/auxil/analemma.plt
+share/xephem/auxil/astorb2edb.pl
+share/xephem/auxil/dearth.gif
+share/xephem/auxil/eyepieces.eyp
+share/xephem/auxil/favorites.fav
 share/xephem/auxil/jupiter.9910
 share/xephem/auxil/jupitermap.gif
 share/xephem/auxil/logo.gif
 share/xephem/auxil/mars.9910
 share/xephem/auxil/mars_db
-share/xephem/auxil/marsmap.fts
+share/xephem/auxil/marsmap.jpg
 share/xephem/auxil/moon.fts
-share/xephem/auxil/moon_db
+share/xephem/auxil/mpcorb2edb.pl
+share/xephem/auxil/nearth.gif
 share/xephem/auxil/sample.hzn
+share/xephem/auxil/saturn00.gif
+share/xephem/auxil/saturn04.gif
+share/xephem/auxil/saturn10.gif
+share/xephem/auxil/saturn16.gif
+share/xephem/auxil/saturn20.gif
+share/xephem/auxil/saturn24.gif
 share/xephem/auxil/saturne.9910
 share/xephem/auxil/starcensus.txt
 share/xephem/auxil/uranus.9910
-share/xephem/auxil/xephem.hlp
-share/xephem/auxil/xephem.sit
+share/xephem/auxil/wmm.cof
+share/xephem/auxil/xephem_sites
 share/xephem/auxil/xephem_skyhist
 share/xephem/catalogs/Messier.edb
 share/xephem/catalogs/YBS.edb
@@ -25,11 +37,10 @@ share/xephem/fifos/Makefile
 share/xephem/fifos/README
 share/xephem/fits/Abell426.fts
 share/xephem/fits/horsehead.fts
-share/xephem/tools/astorb2edb.pl
-share/xephem/tools/mpcorb2edb.pl
+@exec ${MKDIR} %D/share/xephem/tools
 @dirrm share/xephem/tools
+@dirrm share/xephem/fits
+@dirrm share/xephem/fifos
 @dirrm share/xephem/catalogs
 @dirrm share/xephem/auxil
-@dirrm share/xephem/fifos
-@dirrm share/xephem/fits
 @dirrm share/xephem
diff --git a/x11/xephem/distinfo b/x11/xephem/distinfo
index aa5b6503081..618c2269098 100644
--- a/x11/xephem/distinfo
+++ b/x11/xephem/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 17:36:22 wiz Exp $
+$NetBSD: distinfo,v 1.6 2005/02/25 17:45:19 drochner Exp $
 
-SHA1 (xephem-3.5.2.tar.gz) = ec3bee509b9fa2679c4a80e52c2c8763ad1f4f24
-RMD160 (xephem-3.5.2.tar.gz) = 65132013fe6d7fe150600ff264523c9b03a5da6e
-Size (xephem-3.5.2.tar.gz) = 2523508 bytes
-SHA1 (patch-aa) = dd2564928714170a365747a93c5565b1122aa9a0
+SHA1 (xephem-3.6.3.tar.gz) = 51d03aa0cc02676b7c4c62d9360686380896237f
+RMD160 (xephem-3.6.3.tar.gz) = ef7457f24fe291a6f7b730f72e96ca3bc9b47d89
+Size (xephem-3.6.3.tar.gz) = 10013287 bytes
+SHA1 (patch-aa) = 735179176b04d7a21f410714e9a1c596ed949274
diff --git a/x11/xephem/patches/patch-aa b/x11/xephem/patches/patch-aa
index 8790dcd89b4..5694053bf6d 100644
--- a/x11/xephem/patches/patch-aa
+++ b/x11/xephem/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2002/01/19 11:39:44 drochner Exp $
+$NetBSD: patch-aa,v 1.5 2005/02/25 17:45:19 drochner Exp $
 
---- Imakefile.orig	Wed Oct 10 08:07:58 2001
-+++ Imakefile	Mon Jan 14 16:01:25 2002
-@@ -71,7 +71,7 @@
+--- Imakefile.orig	2004-04-18 09:00:57.000000000 +0200
++++ Imakefile
+@@ -78,7 +78,7 @@ OBJS =			\
  SRCS = 	$(OBJS:.o=.c)
  
  XCOMM Sometimes you need -lXp after -lXm
 -          XMLIB = -lXm
 +          XMLIB = ${MOTIFLIB}
          DEPLIBS = $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB)
-  EXTRA_INCLUDES = -I../../libastro -I../../libip
-   LOCAL_LDFLAGS = -L../../libastro -L../../libip
+  EXTRA_INCLUDES = -I../../libastro -I../../libip -I../../liblilxml -I../../libjpegd
+   LOCAL_LDFLAGS = -L../../libastro -L../../libip -L../../liblilxml -L../../libjpegd