- Update to version 0.11.4(a), with better FreeBSD support out of the box

- Drop leading indefinite article from COMMENT line per recent agreements

Submitted by:	Alexander Wolf (version update)

3 files changed, 23 insertions, 14 deletions

diff --git a/astro/stellarium/Makefile b/astro/stellarium/Makefile
index 73023b160c1e..d1f6b81d4ec7 100644
--- a/astro/stellarium/Makefile
+++ b/astro/stellarium/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	stellarium
-PORTVERSION=	0.11.3
-PORTREVISION=	1
+PORTVERSION=	0.11.4
 CATEGORIES=	astro
 MASTER_SITES=	SF/${PORTNAME}/Stellarium-sources/${PORTVERSION}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME}a${EXTRACT_SUFX}
 EXTRACT_ONLY:=	${DISTFILES}
 
 MAINTAINER=	danfe@FreeBSD.org
-COMMENT=	A 3D photo-realistic sky renderer (planetarium)
+COMMENT=	3D photo-realistic sky renderer (planetarium)
 
 LICENSE=	GPLv2
 
@@ -26,7 +25,7 @@ USE_QT4=	moc_build rcc_build uic_build qmake_build \
 		corelib gui network opengl script
 MAKE_JOBS_SAFE=	yes
 
-MAN1=		stellarium.1
+MAN1=		${PORTNAME}.1
 PORTDOCS=	AUTHORS ChangeLog README
 
 OPTIONS=	MORE_STARS	"Install extra star catalogs (1.2GB)"	off
@@ -46,14 +45,7 @@ PLIST_SUB+=	MORE_STARS="@comment "
 .endif
 
 post-patch: .SILENT
-	${REINPLACE_CMD} -e '/typedef.*void.*__GLXextFuncPtr/d' \
-		${WRKSRC}/src/core/external/GLee.h
 	${REINPLACE_CMD} -e '/QTTEST/d' ${WRKSRC}/CMakeLists.txt
-	${REINPLACE_CMD} -e 's|share/man/man1|man/man1|' \
-		${WRKSRC}/doc/CMakeLists.txt
-# Remove options which our old GCC does not know about (GCC 4.6 specific)
-	${REINPLACE_CMD} -e 's| -Wno-unused-but-set-[[:alpha:]]*||g' \
-		${WRKSRC}/plugins/Satellites/src/CMakeLists.txt
 # Avoid picking up the wrong `fixx11h.h' (`x11/kdelibs3' port installs one
 # that does not handle FontChange)
 	${GREP} -Rl --null fixx11h\\.h ${WRKSRC}/src ${WRKSRC}/plugins | \
diff --git a/astro/stellarium/distinfo b/astro/stellarium/distinfo
index c190ec5a59f0..79c86e88e678 100644
--- a/astro/stellarium/distinfo
+++ b/astro/stellarium/distinfo
@@ -1,5 +1,5 @@
-SHA256 (stellarium-0.11.3.tar.gz) = f7c7eeaefcdc54c0fb8766f09e0c838acb742719adcdf12a6c1e12d55ecd6ac3
-SIZE (stellarium-0.11.3.tar.gz) = 53620675
+SHA256 (stellarium-0.11.4a.tar.gz) = 29184ba647fa14f9a59787aa8ea4d59620b18cb5ab0bd13d7b90050384a3433f
+SIZE (stellarium-0.11.4a.tar.gz) = 54863608
 SHA256 (stars_4_1v0_0.cat) = e0373d869d08ffac2ba78e7fbe29add6511073cd74a52b9918d8b77fb05827e7
 SIZE (stars_4_1v0_0.cat) = 17275482
 SHA256 (stars_5_2v0_0.cat) = d093e25e8cb8350ef74706d7bf05455d224acb076da87bf1b784b5cf0e0d9931
diff --git a/astro/stellarium/pkg-plist b/astro/stellarium/pkg-plist
index 03dd0886dc9e..5682aa646ad1 100644
--- a/astro/stellarium/pkg-plist
+++ b/astro/stellarium/pkg-plist
@@ -222,13 +222,26 @@ bin/stellarium
 %%DATADIR%%/nebulae/default/ngc2000names.dat
 %%DATADIR%%/nebulae/default/pleiades.png
 %%DATADIR%%/nebulae/default/textures.json
+%%DATADIR%%/scripts/analemma.ssc
 %%DATADIR%%/scripts/common_objects.inc
+%%DATADIR%%/scripts/constellations_tour.ssc
+%%DATADIR%%/scripts/earth_1.ssc
 %%DATADIR%%/scripts/landscapes.ssc
 %%DATADIR%%/scripts/lunar_partial.ssc
 %%DATADIR%%/scripts/lunar_total.ssc
+%%DATADIR%%/scripts/phobos_phun_1.ssc
+%%DATADIR%%/scripts/phobos_phun_2.ssc
+%%DATADIR%%/scripts/phobos_phun_3.ssc
+%%DATADIR%%/scripts/phobos_phun_4.ssc
+%%DATADIR%%/scripts/phobos_phun_5.ssc
 %%DATADIR%%/scripts/screensaver.ssc
 %%DATADIR%%/scripts/solar_eclipse.ssc
+%%DATADIR%%/scripts/solar_system_screensaver.ssc
 %%DATADIR%%/scripts/startup.ssc
+%%DATADIR%%/scripts/sun.ssc
+%%DATADIR%%/scripts/supernova.ssc
+%%DATADIR%%/scripts/transit_of_venus.ssc
+%%DATADIR%%/scripts/triple_sunrise_and_sunsets.ssc
 %%DATADIR%%/scripts/zodiac.ssc
 %%DATADIR%%/skycultures/arabic/Bearer-of-the-Demons-Head.png
 %%DATADIR%%/skycultures/arabic/Book_of_Fixed_Stars3.png
@@ -847,6 +860,8 @@ share/locale/ro/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/ro/LC_MESSAGES/stellarium.mo
 share/locale/ru/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/ru/LC_MESSAGES/stellarium.mo
+share/locale/sah/LC_MESSAGES/stellarium-skycultures.mo
+share/locale/sah/LC_MESSAGES/stellarium.mo
 share/locale/sco/LC_MESSAGES/stellarium.mo
 share/locale/se/LC_MESSAGES/stellarium-skycultures.mo
 share/locale/se/LC_MESSAGES/stellarium.mo
@@ -917,6 +932,8 @@ share/pixmaps/stellarium.xpm
 @dirrmtry share/locale/se
 @dirrmtry share/locale/sco/LC_MESSAGES
 @dirrmtry share/locale/sco
+@dirrmtry share/locale/sah/LC_MESSAGES
+@dirrmtry share/locale/sah
 @dirrmtry share/locale/os/LC_MESSAGES
 @dirrmtry share/locale/os
 @dirrmtry share/locale/nan/LC_MESSAGES