3 files changed, 133 insertions, 11 deletions

diff --git a/astro/xephem/Makefile b/astro/xephem/Makefile
index c267561e17fd..42ca8c8f971f 100644
--- a/astro/xephem/Makefile
+++ b/astro/xephem/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xephem
-PORTVERSION=	3.5.2
+PORTVERSION=	3.6
 CATEGORIES=	astro
 MASTER_SITES=	# http://www.clearskyinstitute.com/xephem/
 
@@ -22,6 +22,8 @@ MAN1=		xephem.1
 
 LIBASTROSRC=	${WRKDIR}/${DISTNAME}/libastro
 LIBIPSRC=	${WRKDIR}/${DISTNAME}/libip
+LIBJPEGDSRC=	${WRKDIR}/${DISTNAME}/libjpegd
+LIBLILXMLSRC=	${WRKDIR}/${DISTNAME}/liblilxml
 
 NO_CDROM=	Personal use only
 
@@ -42,12 +44,14 @@ post-patch:
 pre-build:
 	@cd ${LIBASTROSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE}
 	@cd ${LIBIPSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE}
+	@cd ${LIBJPEGDSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE}
+	@cd ${LIBLILXMLSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE}
 	@${ECHO_CMD} 'XEphem.ShareDir: ${PREFIX}/lib/X11/xephem' > ${WRKSRC}/XEphem.ad
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/XEphem.ad ${PREFIX}/lib/X11/app-defaults/XEphem
 	@${MKDIR} ${PREFIX}/lib/X11/xephem
-	${TAR} -C ${WRKSRC} -cf - auxil catalogs fits fifos tools \
+	${TAR} -C ${WRKSRC} -cf - auxil catalogs fits fifos help tools \
 		| ${TAR} -C ${PREFIX}/lib/X11/xephem --unlink -xf -
 	@${FIND} ${PREFIX}/lib/X11/xephem | ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREMODE}
 	@${FIND} ${PREFIX}/lib/X11/xephem -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
diff --git a/astro/xephem/distinfo b/astro/xephem/distinfo
index ecf64c27f6b5..75a2826cd2df 100644
--- a/astro/xephem/distinfo
+++ b/astro/xephem/distinfo
@@ -1,2 +1,2 @@
-MD5 (xephem-3.5.2.tar.gz) = 5820b51667531743d0db0e7f712a9fae
-SIZE (xephem-3.5.2.tar.gz) = 2523508
+MD5 (xephem-3.6.tar.gz) = 7ee5d9e1b4c089036643c9d931ca30ed
+SIZE (xephem-3.6.tar.gz) = 7160040
diff --git a/astro/xephem/pkg-plist b/astro/xephem/pkg-plist
index 1abf9cb9d1e1..66cbfa7c660c 100644
--- a/astro/xephem/pkg-plist
+++ b/astro/xephem/pkg-plist
@@ -1,21 +1,33 @@
 bin/xephem
 lib/X11/app-defaults/XEphem
 lib/X11/xephem/auxil/README
+lib/X11/xephem/auxil/SOHO_512_20030809_0719_eit_304.gif
 lib/X11/xephem/auxil/analemma.plt
+lib/X11/xephem/auxil/astorb2edb.pl
+lib/X11/xephem/auxil/dearth.gif
+lib/X11/xephem/auxil/eyepieces.eyp
+lib/X11/xephem/auxil/favorites.fav
 lib/X11/xephem/auxil/jupiter.9910
 lib/X11/xephem/auxil/jupitermap.gif
 lib/X11/xephem/auxil/logo.gif
 lib/X11/xephem/auxil/mars.9910
 lib/X11/xephem/auxil/mars_db
-lib/X11/xephem/auxil/marsmap.fts
+lib/X11/xephem/auxil/marsmap.jpg
 lib/X11/xephem/auxil/moon.fts
-lib/X11/xephem/auxil/moon_db
+lib/X11/xephem/auxil/mpcorb2edb.pl
+lib/X11/xephem/auxil/nearth.gif
 lib/X11/xephem/auxil/sample.hzn
+lib/X11/xephem/auxil/saturn00.gif
+lib/X11/xephem/auxil/saturn04.gif
+lib/X11/xephem/auxil/saturn10.gif
+lib/X11/xephem/auxil/saturn16.gif
+lib/X11/xephem/auxil/saturn20.gif
+lib/X11/xephem/auxil/saturn24.gif
 lib/X11/xephem/auxil/saturne.9910
 lib/X11/xephem/auxil/starcensus.txt
 lib/X11/xephem/auxil/uranus.9910
-lib/X11/xephem/auxil/xephem.hlp
-lib/X11/xephem/auxil/xephem.sit
+lib/X11/xephem/auxil/wmm.cof
+lib/X11/xephem/auxil/xephem_sites
 lib/X11/xephem/auxil/xephem_skyhist
 lib/X11/xephem/catalogs/Messier.edb
 lib/X11/xephem/catalogs/YBS.edb
@@ -23,14 +35,115 @@ lib/X11/xephem/fifos/Makefile
 lib/X11/xephem/fifos/README
 lib/X11/xephem/fits/Abell426.fts
 lib/X11/xephem/fits/horsehead.fts
-lib/X11/xephem/tools/astorb2edb.pl
-lib/X11/xephem/tools/lx200xed/GPL
+lib/X11/xephem/help/png/aavso.png
+lib/X11/xephem/help/png/annotation.png
+lib/X11/xephem/help/png/close-pairs.png
+lib/X11/xephem/help/png/coordconv.png
+lib/X11/xephem/help/png/data-index.png
+lib/X11/xephem/help/png/data-table-setup.png
+lib/X11/xephem/help/png/data-table.png
+lib/X11/xephem/help/png/db.png
+lib/X11/xephem/help/png/each-control-objects.png
+lib/X11/xephem/help/png/earth.png
+lib/X11/xephem/help/png/external-input.png
+lib/X11/xephem/help/png/favorites.png
+lib/X11/xephem/help/png/fieldstars.png
+lib/X11/xephem/help/png/gallery.png
+lib/X11/xephem/help/png/indiconfig.png
+lib/X11/xephem/help/png/indicontrol.png
+lib/X11/xephem/help/png/internet-update.png
+lib/X11/xephem/help/png/jupiter-view-more-info.png
+lib/X11/xephem/help/png/jupiter.png
+lib/X11/xephem/help/png/listing.png
+lib/X11/xephem/help/png/lo.png
+lib/X11/xephem/help/png/logo.png
+lib/X11/xephem/help/png/main-calendar.png
+lib/X11/xephem/help/png/main-local.png
+lib/X11/xephem/help/png/main-looping.png
+lib/X11/xephem/help/png/main-night.png
+lib/X11/xephem/help/png/main-time.png
+lib/X11/xephem/help/png/main.png
+lib/X11/xephem/help/png/mars-moon-more-info.png
+lib/X11/xephem/help/png/mars-moons.png
+lib/X11/xephem/help/png/mars-more-info.png
+lib/X11/xephem/help/png/mars.png
+lib/X11/xephem/help/png/moon-more-info.png
+lib/X11/xephem/help/png/moon.png
+lib/X11/xephem/help/png/naag.png
+lib/X11/xephem/help/png/network-setup.png
+lib/X11/xephem/help/png/obslog.png
+lib/X11/xephem/help/png/plot-sample.png
+lib/X11/xephem/help/png/plot.png
+lib/X11/xephem/help/png/print.png
+lib/X11/xephem/help/png/saturn-more-info.png
+lib/X11/xephem/help/png/saturn.png
+lib/X11/xephem/help/png/save-colors.png
+lib/X11/xephem/help/png/save-fonts.png
+lib/X11/xephem/help/png/save-resources.png
+lib/X11/xephem/help/png/seti@home.png
+lib/X11/xephem/help/png/sites.png
+lib/X11/xephem/help/png/sky-binary.png
+lib/X11/xephem/help/png/sky-control-eyepieces.png
+lib/X11/xephem/help/png/sky-control-filter.png
+lib/X11/xephem/help/png/sky-control-horizon.png
+lib/X11/xephem/help/png/sky-control-list.png
+lib/X11/xephem/help/png/sky-control-options.png
+lib/X11/xephem/help/png/sky-history.png
+lib/X11/xephem/help/png/sky-images-fits.png
+lib/X11/xephem/help/png/sky-images-ia-contrast-tb.png
+lib/X11/xephem/help/png/sky-images-ia-contrast.png
+lib/X11/xephem/help/png/sky-images-ia-gauss-tb.png
+lib/X11/xephem/help/png/sky-images-ia-gauss.png
+lib/X11/xephem/help/png/sky-images-ia-glass-tb.png
+lib/X11/xephem/help/png/sky-images-ia-glass.png
+lib/X11/xephem/help/png/sky-images-ia-roi-tb.png
+lib/X11/xephem/help/png/sky-images-ia-roi.png
+lib/X11/xephem/help/png/sky-images-ia-slice-tb.png
+lib/X11/xephem/help/png/sky-images-ia-slice.png
+lib/X11/xephem/help/png/sky-images-ia-snap-tb.png
+lib/X11/xephem/help/png/sky-popup-menu.png
+lib/X11/xephem/help/png/sky-upperleft-delta-roaming.png
+lib/X11/xephem/help/png/sky-upperleft-roaming.png
+lib/X11/xephem/help/png/sky-upperright-delta-roaming.png
+lib/X11/xephem/help/png/sky-upperright-roaming.png
+lib/X11/xephem/help/png/sky-view-how-tb.png
+lib/X11/xephem/help/png/sky-view-what-tb.png
+lib/X11/xephem/help/png/sky-view-where-tb.png
+lib/X11/xephem/help/png/sky-view.png
+lib/X11/xephem/help/png/solsys.png
+lib/X11/xephem/help/png/solver.png
+lib/X11/xephem/help/png/sun-view.png
+lib/X11/xephem/help/png/syslog.png
+lib/X11/xephem/help/png/trails.png
+lib/X11/xephem/help/png/uranus-more-info.png
+lib/X11/xephem/help/png/uranus.png
+lib/X11/xephem/help/png/valid-html401.png
+lib/X11/xephem/help/xephem.html
+lib/X11/xephem/tools/indi/LICENSE
+lib/X11/xephem/tools/indi/Makefile
+lib/X11/xephem/tools/indi/README
+lib/X11/xephem/tools/indi/cam.c
+lib/X11/xephem/tools/indi/eventloop.c
+lib/X11/xephem/tools/indi/eventloop.h
+lib/X11/xephem/tools/indi/indiapi.h
+lib/X11/xephem/tools/indi/indidevapi.h
+lib/X11/xephem/tools/indi/indidrivermain.c
+lib/X11/xephem/tools/indi/indiserver.c
+lib/X11/xephem/tools/indi/ota.c
+lib/X11/xephem/tools/indi/security.c
+lib/X11/xephem/tools/indi/tmount.c
+lib/X11/xephem/tools/indi/wx.c
+lib/X11/xephem/tools/lx200xed/LICENSE
 lib/X11/xephem/tools/lx200xed/Makefile
 lib/X11/xephem/tools/lx200xed/README
 lib/X11/xephem/tools/lx200xed/liblx200.c
 lib/X11/xephem/tools/lx200xed/liblx200.h
 lib/X11/xephem/tools/lx200xed/lx200xed.c
-lib/X11/xephem/tools/mpcorb2edb.pl
+lib/X11/xephem/tools/xedb/Makefile
+lib/X11/xephem/tools/xedb/README
+lib/X11/xephem/tools/xedb/print.c
+lib/X11/xephem/tools/xedb/sample.res
+lib/X11/xephem/tools/xedb/xedb.c
 lib/X11/xephem/tools/xephemdbd/INSTALL
 lib/X11/xephem/tools/xephemdbd/Makefile
 lib/X11/xephem/tools/xephemdbd/README
@@ -38,13 +151,18 @@ lib/X11/xephem/tools/xephemdbd/cgi-lib.pl
 lib/X11/xephem/tools/xephemdbd/db.c
 lib/X11/xephem/tools/xephemdbd/fsfetch.c
 lib/X11/xephem/tools/xephemdbd/request.c
+lib/X11/xephem/tools/xephemdbd/start-xephemdbd.pl
 lib/X11/xephem/tools/xephemdbd/stubs.c
 lib/X11/xephem/tools/xephemdbd/xephemdbd.c
 lib/X11/xephem/tools/xephemdbd/xephemdbd.html
 lib/X11/xephem/tools/xephemdbd/xephemdbd.pl
 @dirrm lib/X11/xephem/tools/xephemdbd
+@dirrm lib/X11/xephem/tools/xedb
 @dirrm lib/X11/xephem/tools/lx200xed
+@dirrm lib/X11/xephem/tools/indi
 @dirrm lib/X11/xephem/tools
+@dirrm lib/X11/xephem/help/png
+@dirrm lib/X11/xephem/help
 @dirrm lib/X11/xephem/fits
 @dirrm lib/X11/xephem/fifos
 @dirrm lib/X11/xephem/catalogs