stellarium: updated to 0.18.0

The major changes of this version:
* Added support Hierarchical Progressive Surveys [HiPS] (Hello visualization of
  multiwavelength universe in the Stellarium)
* Updated and extended AstroCalc tool
* Added support a Hickson Compact Group collection
* Updated code and data

4 files changed, 55 insertions, 40 deletions

diff --git a/misc/stellarium/Makefile b/misc/stellarium/Makefile
index a76065f4d13..c8d0f9179c8 100644
--- a/misc/stellarium/Makefile
+++ b/misc/stellarium/Makefile
@@ -1,18 +1,16 @@
-# $NetBSD: Makefile,v 1.86 2018/03/12 11:17:09 wiz Exp $
+# $NetBSD: Makefile,v 1.87 2018/04/02 19:37:35 adam Exp $
 
-DISTNAME=	stellarium-0.17.0
-PKGREVISION=	1
+DISTNAME=	stellarium-0.18.0
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=Stellarium/}
+GITHUB_PROJECT=	stellarium
+GITHUB_RELEASE=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.stellarium.org/
 COMMENT=	Generate photorealistic skies with OpenGL
 LICENSE=	gnu-gpl-v2
 
-GITHUB_PROJECT=	stellarium
-GITHUB_RELEASE=	v${PKGVERSION_NOREV}
-
 USE_CMAKE=		yes
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		msgfmt perl pod2man
diff --git a/misc/stellarium/PLIST b/misc/stellarium/PLIST
index a1b0bae11fb..ef7c26b02ef 100644
--- a/misc/stellarium/PLIST
+++ b/misc/stellarium/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2018/02/23 11:29:38 adam Exp $
+@comment $NetBSD: PLIST,v 1.26 2018/04/02 19:37:35 adam Exp $
 bin/stellarium
 man/man1/stellarium.1
 ${PLIST.desktop}share/applications/stellarium.desktop
@@ -332,14 +332,24 @@ share/stellarium/models/s7hyperion_21_MLfix.obj.mtl
 share/stellarium/nebulae/default/barnard142-vasey.png
 share/stellarium/nebulae/default/barnard173-vasey.png
 share/stellarium/nebulae/default/barnard22-vasey.png
+share/stellarium/nebulae/default/barnard_loop-1.png
+share/stellarium/nebulae/default/barnard_loop-2.png
+share/stellarium/nebulae/default/barnard_loop-3.png
+share/stellarium/nebulae/default/barnard_loop-4.png
 share/stellarium/nebulae/default/cas.png
 share/stellarium/nebulae/default/catalog.dat
+share/stellarium/nebulae/default/coma_cluster.png
 share/stellarium/nebulae/default/etaCarinae_gzotti.png
+share/stellarium/nebulae/default/fornax_cluster.png
+share/stellarium/nebulae/default/ic10.png
+share/stellarium/nebulae/default/ic1396.png
 share/stellarium/nebulae/default/ic1805.png
 share/stellarium/nebulae/default/ic1848.png
 share/stellarium/nebulae/default/ic2118.png
+share/stellarium/nebulae/default/ic2177.png
 share/stellarium/nebulae/default/ic2944-virgo.png
 share/stellarium/nebulae/default/ic2948-trev.png
+share/stellarium/nebulae/default/ic342.png
 share/stellarium/nebulae/default/ic405-vasey.png
 share/stellarium/nebulae/default/ic410.png
 share/stellarium/nebulae/default/ic434-marc.png
@@ -434,7 +444,7 @@ share/stellarium/nebulae/default/m73.png
 share/stellarium/nebulae/default/m74-vasey.png
 share/stellarium/nebulae/default/m75.png
 share/stellarium/nebulae/default/m76.png
-share/stellarium/nebulae/default/m77-dss.png
+share/stellarium/nebulae/default/m77.png
 share/stellarium/nebulae/default/m78-vasey.png
 share/stellarium/nebulae/default/m79.png
 share/stellarium/nebulae/default/m80.png
@@ -460,6 +470,7 @@ share/stellarium/nebulae/default/m97dumont.png
 share/stellarium/nebulae/default/m98.png
 share/stellarium/nebulae/default/m99.png
 share/stellarium/nebulae/default/n104.png
+share/stellarium/nebulae/default/n1316.png
 share/stellarium/nebulae/default/n1333oleg.png
 share/stellarium/nebulae/default/n1365.png
 share/stellarium/nebulae/default/n1499bousquet.png
@@ -481,15 +492,18 @@ share/stellarium/nebulae/default/n300.png
 share/stellarium/nebulae/default/n3190oleg.png
 share/stellarium/nebulae/default/n3310-vasey.png
 share/stellarium/nebulae/default/n3324-n3293-trev.png
+share/stellarium/nebulae/default/n3603.png
 share/stellarium/nebulae/default/n3628.png
 share/stellarium/nebulae/default/n3690h.png
 share/stellarium/nebulae/default/n3718oleg.png
 share/stellarium/nebulae/default/n3938-vasey.png
 share/stellarium/nebulae/default/n40.png
 share/stellarium/nebulae/default/n4038-9-dss.png
+share/stellarium/nebulae/default/n4244.png
 share/stellarium/nebulae/default/n4438-mtod.png
 share/stellarium/nebulae/default/n4490oleg.png
 share/stellarium/nebulae/default/n4559-vasey.png
+share/stellarium/nebulae/default/n4565.png
 share/stellarium/nebulae/default/n4631-4627.png
 share/stellarium/nebulae/default/n4656-4657.png
 share/stellarium/nebulae/default/n4945.png
@@ -499,6 +513,8 @@ share/stellarium/nebulae/default/n5257h.png
 share/stellarium/nebulae/default/n55.png
 share/stellarium/nebulae/default/n5982oleg.png
 share/stellarium/nebulae/default/n6050h.png
+share/stellarium/nebulae/default/n6334.png
+share/stellarium/nebulae/default/n6357.png
 share/stellarium/nebulae/default/n6543kepler.png
 share/stellarium/nebulae/default/n6726.png
 share/stellarium/nebulae/default/n6744.png
@@ -507,6 +523,7 @@ share/stellarium/nebulae/default/n6822.png
 share/stellarium/nebulae/default/n6888_dn.png
 share/stellarium/nebulae/default/n6946dumont.png
 share/stellarium/nebulae/default/n6960kepler.png
+share/stellarium/nebulae/default/n7000.png
 share/stellarium/nebulae/default/n7008-vasey.png
 share/stellarium/nebulae/default/n7023kepler.png
 share/stellarium/nebulae/default/n7129oleg.png
@@ -529,6 +546,9 @@ share/stellarium/nebulae/default/rho-a10.png
 share/stellarium/nebulae/default/rho-a11.png
 share/stellarium/nebulae/default/sadr.png
 share/stellarium/nebulae/default/sh2-101-vasey.png
+share/stellarium/nebulae/default/sh2-155.png
+share/stellarium/nebulae/default/sh2-264.png
+share/stellarium/nebulae/default/sh2-308.png
 share/stellarium/nebulae/default/smc29-1.png
 share/stellarium/nebulae/default/smc29-2.png
 share/stellarium/nebulae/default/smc29-3.png
@@ -900,13 +920,9 @@ share/stellarium/skycultures/hawaiian_starlines/manaia1c.png
 share/stellarium/skycultures/hawaiian_starlines/star_names.fab
 share/stellarium/skycultures/hawaiian_starlines/waa.png
 share/stellarium/skycultures/hawaiian_starlines/waa2.png
-share/stellarium/skycultures/indian/aquarius.png
-share/stellarium/skycultures/indian/aries.png
-share/stellarium/skycultures/indian/cancer.png
-share/stellarium/skycultures/indian/canis-major.png
-share/stellarium/skycultures/indian/capricornus.png
+share/stellarium/skycultures/indian/asterism_lines.fab
+share/stellarium/skycultures/indian/asterism_names.eng.fab
 share/stellarium/skycultures/indian/constellation_names.eng.fab
-share/stellarium/skycultures/indian/constellationsart.fab
 share/stellarium/skycultures/indian/constellationship.fab
 share/stellarium/skycultures/indian/description.ar.utf8
 share/stellarium/skycultures/indian/description.be.utf8
@@ -918,18 +934,9 @@ share/stellarium/skycultures/indian/description.fr.utf8
 share/stellarium/skycultures/indian/description.pt_BR.utf8
 share/stellarium/skycultures/indian/description.ru.utf8
 share/stellarium/skycultures/indian/description.uk.utf8
-share/stellarium/skycultures/indian/gemini.png
 share/stellarium/skycultures/indian/info.ini
-share/stellarium/skycultures/indian/leo.png
-share/stellarium/skycultures/indian/libra.png
-share/stellarium/skycultures/indian/orion.png
-share/stellarium/skycultures/indian/pisces.png
 share/stellarium/skycultures/indian/planet_names.fab
-share/stellarium/skycultures/indian/sagittarius.png
-share/stellarium/skycultures/indian/scorpius.png
 share/stellarium/skycultures/indian/star_names.fab
-share/stellarium/skycultures/indian/taurus.png
-share/stellarium/skycultures/indian/virgo.png
 share/stellarium/skycultures/inuit/blubber-container.png
 share/stellarium/skycultures/inuit/breastbone.png
 share/stellarium/skycultures/inuit/caribou.png
@@ -1386,6 +1393,12 @@ share/stellarium/skycultures/western/ursa-minor.png
 share/stellarium/skycultures/western/virgo.png
 share/stellarium/skycultures/western/volans.png
 share/stellarium/skycultures/western/vulpecula.png
+share/stellarium/skycultures/western_hlad/constellation_names.eng.fab
+share/stellarium/skycultures/western_hlad/constellationship.fab
+share/stellarium/skycultures/western_hlad/description.en.utf8
+share/stellarium/skycultures/western_hlad/hvezdna_obloha_2000.png
+share/stellarium/skycultures/western_hlad/info.ini
+share/stellarium/skycultures/western_hlad/obloha_na_dlani.png
 share/stellarium/skycultures/western_rey/Rey_cover.png
 share/stellarium/skycultures/western_rey/constellation_names.eng.fab
 share/stellarium/skycultures/western_rey/constellationship.fab
@@ -1408,6 +1421,7 @@ share/stellarium/stars/default/stars_3_1v0_4.cat
 share/stellarium/stars/default/stars_hip_cids_0v0_0.cat
 share/stellarium/stars/default/stars_hip_sp_0v0_3.cat
 share/stellarium/stars/default/wds_hip_part.dat
+share/stellarium/textures/2007OR10.png
 share/stellarium/textures/TestSquare.png
 share/stellarium/textures/amalthea.png
 share/stellarium/textures/ariel.png
@@ -1424,6 +1438,7 @@ share/stellarium/textures/deimos.png
 share/stellarium/textures/dione.png
 share/stellarium/textures/earth-clouds.png
 share/stellarium/textures/earth-shadow-new.png
+share/stellarium/textures/earth-shadow.png
 share/stellarium/textures/earth_cmap.png
 share/stellarium/textures/earthmap.png
 share/stellarium/textures/enceladus.png
@@ -1438,6 +1453,7 @@ share/stellarium/textures/gray10.png
 share/stellarium/textures/gray25.png
 share/stellarium/textures/halo.png
 share/stellarium/textures/haloLune.png
+share/stellarium/textures/haumea.png
 share/stellarium/textures/hyperion.png
 share/stellarium/textures/iapetus.png
 share/stellarium/textures/ida.png
@@ -1476,6 +1492,7 @@ share/stellarium/textures/proteus.png
 share/stellarium/textures/rhea.png
 share/stellarium/textures/saturn.png
 share/stellarium/textures/saturn_rings_radial.png
+share/stellarium/textures/sedna.png
 share/stellarium/textures/star16x16.png
 share/stellarium/textures/sun.png
 share/stellarium/textures/telescope.png
diff --git a/misc/stellarium/distinfo b/misc/stellarium/distinfo
index 12a21f839a7..c889238e813 100644
--- a/misc/stellarium/distinfo
+++ b/misc/stellarium/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.35 2018/02/23 11:29:38 adam Exp $
+$NetBSD: distinfo,v 1.36 2018/04/02 19:37:35 adam Exp $
 
-SHA1 (stellarium-0.17.0.tar.gz) = dd76beae36ad2360c85ae7115a23b29ff194cc15
-RMD160 (stellarium-0.17.0.tar.gz) = 68c48c3c88c1d713365282e34d94fd884dca6975
-SHA512 (stellarium-0.17.0.tar.gz) = 9737a190b505f1814c7cacfb95f5e7383e902383bea3db3da5785986a48416c58ae3ebe1b888b80f84589eb115b6610f75d41358aed48dcd19460e8352cb5c4a
-Size (stellarium-0.17.0.tar.gz) = 252377198 bytes
-SHA1 (patch-CMakeLists.txt) = 944936b0ce90b62b68a1395e275553c557cbce24
+SHA1 (stellarium-0.18.0.tar.gz) = 62fb901527e4263e6733f5ee54790432d856e4ea
+RMD160 (stellarium-0.18.0.tar.gz) = 2f02ba8280dd2efeaa64375cd0ec818434a59a07
+SHA512 (stellarium-0.18.0.tar.gz) = cbbc35f1f0f065b2d540010b753c9686dbf6045eee059c9ea8383d9940ed3101f53da069119f9c611288902b79e4ce4005bf3088e402cc83aebd93257e36a3e7
+Size (stellarium-0.18.0.tar.gz) = 257070563 bytes
+SHA1 (patch-CMakeLists.txt) = 9faab37daafe63ad854c151ed2317fc7245e8382
 SHA1 (patch-doc_CMakeLists.txt) = 69f0a716968e119f6632996b780e33453afec2d9
 SHA1 (patch-src_core_StelFileMgr.cpp) = 4e0b6ef254d4f86a3049668dbaa783254a75a9e3
diff --git a/misc/stellarium/patches/patch-CMakeLists.txt b/misc/stellarium/patches/patch-CMakeLists.txt
index f5a6b8aec71..5ff7d5d8b82 100644
--- a/misc/stellarium/patches/patch-CMakeLists.txt
+++ b/misc/stellarium/patches/patch-CMakeLists.txt
@@ -1,11 +1,11 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2018/02/23 11:29:39 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2018/04/02 19:37:36 adam Exp $
 
 Do not use ccache.
 Do not use application bundle on Darwin.
 
---- CMakeLists.txt.orig	2017-12-21 10:39:44.000000000 +0000
+--- CMakeLists.txt.orig	2018-03-25 08:19:33.000000000 +0000
 +++ CMakeLists.txt
-@@ -72,12 +72,6 @@ IF(OPENGL_DEBUG_LOGGING)
+@@ -76,12 +76,6 @@ IF(OPENGL_DEBUG_LOGGING)
       ADD_DEFINITIONS(-DQ_ENABLE_OPENGL_FUNCTIONS_DEBUG)
  ENDIF()
  
@@ -18,7 +18,7 @@ Do not use application bundle on Darwin.
  
  # Add gprof build options if necessary.  Note gmon.out will be created in working directory when Stellarium is executed
  IF(${CMAKE_BUILD_TYPE} MATCHES "GProf")
-@@ -93,7 +87,6 @@ IF(${CMAKE_BUILD_TYPE} MATCHES "Valgrind
+@@ -97,7 +91,6 @@ IF(${CMAKE_BUILD_TYPE} MATCHES "Valgrind
  ENDIF()
  
  IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@@ -26,7 +26,7 @@ Do not use application bundle on Darwin.
       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
  ENDIF()
  
-@@ -179,7 +172,7 @@ IF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBS
+@@ -183,7 +176,7 @@ IF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBS
  ENDIF()
  
  # best way to get to APPLE?
@@ -35,7 +35,7 @@ Do not use application bundle on Darwin.
       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-common -Wall -Wextra")
       # using regular Clang or AppleClang
       IF("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-@@ -500,7 +493,7 @@ ENDIF()
+@@ -505,7 +498,7 @@ ENDIF()
  
  ########### Set some global variables ###########
  IF(UNIX AND NOT WIN32)
@@ -43,13 +43,13 @@ Do not use application bundle on Darwin.
 +     IF(ELPPA)
            SET(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/Stellarium.app/Contents")
       ELSE()
-           ADD_DEFINITIONS(-DINSTALL_DATADIR="${CMAKE_INSTALL_PREFIX}/share/stellarium")
-@@ -747,7 +740,7 @@ IF(GENERATE_PACKAGE_TARGET)
+           ADD_DEFINITIONS(-DINSTALL_DATADIR="${CMAKE_INSTALL_PREFIX}/share/${PACKAGE}")
+@@ -671,7 +664,7 @@ IF(GENERATE_PACKAGE_TARGET)
  ENDIF()
  
  ########### OS X Bundling ###############
 -IF(APPLE)
 +IF(ELPPA)
-      CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/Info.plist.cmake ${CMAKE_SOURCE_DIR}/data/Info.plist @ONLY)
- 
-      # ${Qt5Core_INCLUDE_DIRS} is a list; I'm expecting the first entry to always be QtCore.framework.
+      IF(CMAKE_OSX_DEPLOYMENT_TARGET)
+           SET(PACKAGE_OSX_TARGET ${CMAKE_OSX_DEPLOYMENT_TARGET})
+      ELSE()