*/*: sync with upstream

Taken from: FreeBSD
intecsov · Mar 30, 2022 · 3e185b8 · 3e185b8
1 parent 6967f74
commit 3e185b8
Show file tree

Hide file tree

Showing 1,228 changed files with 10,604 additions and 3,652 deletions.
diff --git a/archivers/nfpm/Makefile b/archivers/nfpm/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	nfpm
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.15.0
+PORTREVISION=	1
 CATEGORIES=	archivers
 
 MAINTAINER=	[email protected]

diff --git a/archivers/rubygem-libarchive/files/patch-ext_libarchive__internal.h b/archivers/rubygem-libarchive/files/patch-ext_libarchive__internal.h
@@ -0,0 +1,10 @@
+--- ext/libarchive_internal.h.orig	2022-03-08 07:22:32 UTC
++++ ext/libarchive_internal.h
+@@ -28,7 +28,6 @@
+ #include <archive_entry.h>
+
+ #include <ruby.h>
+-#include <rubysig.h>
+
+ #ifdef _WIN32
+ #include "libarchive_win32.h"
diff --git a/astro/mkgmap-splitter/Makefile b/astro/mkgmap-splitter/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	splitter
-PORTVERSION=	r647
+PORTVERSION=	r650
 CATEGORIES=	astro converters java
 MASTER_SITES=	https://www.mkgmap.org.uk/download/
 PKGNAMEPREFIX=	mkgmap-

diff --git a/astro/mkgmap-splitter/distinfo b/astro/mkgmap-splitter/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1646407578
-SHA256 (splitter-r647.tar.gz) = 456b6859290343856d4d6658ccfb485fa6a83277a4a459bcb29ef97f5fa600f4
-SIZE (splitter-r647.tar.gz) = 1577403
+TIMESTAMP = 1648563284
+SHA256 (splitter-r650.tar.gz) = 9f42465e55503999b8213b1e4cbfa9efe81637bb6542bf778bd47ae4eb111a07
+SIZE (splitter-r650.tar.gz) = 1577490
diff --git a/astro/stellarium/Makefile b/astro/stellarium/Makefile
@@ -1,11 +1,14 @@
 # Created by: Jean-Yves Lefort <[email protected]>
 
 PORTNAME=	${GH_ACCOUNT:tl}
-PORTVERSION=	0.21.3
+PORTVERSION=	0.22.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	astro
 EXTRACT_ONLY=	${_DISTFILES:Nstars_*.cat:N*.pdf}
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES=	710d1c5acd9e962260ce.patch:-p1
+
 MAINTAINER=	[email protected]
 COMMENT=	3D photo-realistic sky renderer (planetarium)
 
@@ -17,24 +20,26 @@ GH_ACCOUNT=	Stellarium
 USES=		cmake compiler:c++11-lang desktop-file-utils \
 		qt:5 shared-mime-info
 USE_QT=		qmake_build buildtools_build \
-		concurrent core gui network opengl printsupport widgets
+		charts concurrent core gui network opengl \
+		printsupport widgets
 
 GUIDE_VERSION=	${PORTVERSION}
 
 PORTDOCS=	CREDITS.md ChangeLog README.md \
 		stellarium_user_guide-${GUIDE_VERSION}-1.pdf
 
 OPTIONS_DEFINE=		DOCS GPS MORE_STARS MULTIMEDIA NLS SCRIPTS \
-			TELESCOPE TEST TEXTURES
-OPTIONS_DEFAULT=	GPS MULTIMEDIA SCRIPTS TELESCOPE
+			TELESCOPE TEST TEXTURES WEBENGINE
+OPTIONS_DEFAULT=	GPS MULTIMEDIA SCRIPTS TELESCOPE WEBENGINE
 OPTIONS_SUB=		yes
 
 GPS_DESC=		GPS (NMEA handling) support
-MORE_STARS_DESC=	Install extra star catalogs (1.0GB)
+MORE_STARS_DESC=	Install additional star catalogs (1.0GB)
 MULTIMEDIA_DESC=	Sound and video support
 SCRIPTS_DESC=		Remote control and scripting support
 TELESCOPE_DESC=		Telescope control plugin
 TEXTURES_DESC=		Install better quality textures
+WEBENGINE_DESC=		Get and show extra object information
 
 DOCS_MASTER_SITES=	https://github.com/Stellarium/stellarium/releases/download/v${GUIDE_VERSION}/:ug
 DOCS_DISTFILES=		stellarium_user_guide-${GUIDE_VERSION}-1.pdf:ug
@@ -43,9 +48,6 @@ GPS_LIB_DEPENDS=	libgps.so:astro/gpsd
 GPS_USE=		QT=location,serialport
 GPS_CMAKE_OFF=		-DENABLE_GPS:BOOL=OFF
 
-TEXTURES_MASTER_SITES=	SF/${PORTNAME}/Extra-data-files/textures:gfx
-TEXTURES_DISTFILES=	textures-1K.zip:gfx
-
 MULTIMEDIA_USE=		QT=multimedia
 MULTIMEDIA_CMAKE_OFF=	-DENABLE_MEDIA:BOOL=OFF
 
@@ -61,6 +63,12 @@ TELESCOPE_CMAKE_OFF=	-DUSE_PLUGIN_TELESCOPECONTROL:BOOL=OFF
 TEST_USE=		QT=testlib_build
 TEST_CMAKE_ON=		-DENABLE_TESTING:BOOL=ON
 
+TEXTURES_MASTER_SITES=	SF/${PORTNAME}/Extra-data-files/textures:gfx
+TEXTURES_DISTFILES=	textures-1K.zip:gfx
+
+WEBENGINE_USE=		QT=declarative,webchannel,webengine
+WEBENGINE_CMAKE_OFF=	-DENABLE_QTWEBENGINE:BOOL=OFF
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMORE_STARS}
@@ -76,10 +84,6 @@ post-extract-DOCS-on:
 	@${LN} -sf ${_DISTDIR}/stellarium_user_guide-${GUIDE_VERSION}-1.pdf \
 		${WRKSRC}
 
-post-patch:
-	@${REINPLACE_CMD} -e '/ADD_PLUGIN(OnlineQueries/s,1,0,' \
-		${WRKSRC}/CMakeLists.txt
-
 post-install:
 	@${RMDIR} ${STAGEDIR}${DATADIR}/skycultures/greek_almagest/almstars
 

diff --git a/astro/stellarium/distinfo b/astro/stellarium/distinfo
@@ -1,8 +1,8 @@
-TIMESTAMP = 1640426104
-SHA256 (Stellarium-stellarium-v0.21.3_GH0.tar.gz) = 25199c3a4edd44536e0ac9807c4ad66b9e9786ef3be8a2e87934af9815055145
-SIZE (Stellarium-stellarium-v0.21.3_GH0.tar.gz) = 390277712
-SHA256 (stellarium_user_guide-0.21.3-1.pdf) = 06413945e71309c22e1b84343f5bb6a158a7a302ea506f3608117167ebc6a6f8
-SIZE (stellarium_user_guide-0.21.3-1.pdf) = 31253904
+TIMESTAMP = 1648378630
+SHA256 (Stellarium-stellarium-v0.22.0_GH0.tar.gz) = 02d14a321b2b2edd14e2e87fc704e77cdb371a6e35fe290914d0dfe29e9f2471
+SIZE (Stellarium-stellarium-v0.22.0_GH0.tar.gz) = 406832672
+SHA256 (stellarium_user_guide-0.22.0-1.pdf) = 214db7eef9e0a63230372df017844cdad7ca2930a7657157a45f2dbc6aa07519
+SIZE (stellarium_user_guide-0.22.0-1.pdf) = 35945660
 SHA256 (stars_4_1v0_2.cat) = 15589d9193b850cac68a031bd02dcb59da36c03946ca1be373fbabdb6b1edd63
 SIZE (stars_4_1v0_2.cat) = 16948302
 SHA256 (stars_5_2v0_1.cat) = c4ebd18d05a805308cfac85fe224e3f0a75db6579cae65c935a0954da13f4164
@@ -15,3 +15,5 @@ SHA256 (stars_8_2v0_1.cat) = f1c0b3f25737f405ed4a2a045091d348885ffceb47258c3e32a
 SIZE (stars_8_2v0_1.cat) = 559068934
 SHA256 (textures-1K.zip) = 3622b73e9cfb65ba537072b0ed3b5ef92951e70878ace7557931d841c5bb3bec
 SIZE (textures-1K.zip) = 20216182
+SHA256 (710d1c5acd9e962260ce.patch) = ef656aef636a803f9d692988df6d8be916b6faa9c2b42919901605f7f1be6367
+SIZE (710d1c5acd9e962260ce.patch) = 1570