*/*: sync with upstream

Taken from: HardenedBSD
carystudio · Dec 25, 2017 · 5267866 · 5267866
1 parent 265acde
commit 5267866
Show file tree

Hide file tree

Showing 293 changed files with 3,404 additions and 1,597 deletions.
diff --git a/archivers/py-lz4/Makefile b/archivers/py-lz4/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	lz4
-PORTVERSION=	0.12.0
+PORTVERSION=	0.13.0
 CATEGORIES=	archivers python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

diff --git a/archivers/py-lz4/distinfo b/archivers/py-lz4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1513859767
-SHA256 (lz4-0.12.0.tar.gz) = 7d98158f9851c791187789d6e4410fde953c8c2b3b4dfff175ce02e479300ca8
-SIZE (lz4-0.12.0.tar.gz) = 100876
+TIMESTAMP = 1514030240
+SHA256 (lz4-0.13.0.tar.gz) = c226cf0270319b0468de819aeb5c164e164c1389ea80088044749b80371de25f
+SIZE (lz4-0.13.0.tar.gz) = 101074
diff --git a/archivers/snappy/Makefile b/archivers/snappy/Makefile
@@ -10,17 +10,16 @@ COMMENT=	Fast compressor/decompressor library
 
 LICENSE=	BSD3CLAUSE
 
-OPTIONS_DEFINE=	DOCS
-
 USES=		autoreconf libtool pathfix pkgconfig
 CONFIGURE_ARGS=	--disable-gtest
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CFLAGS+=	-DNDEBUG
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
+TEST_TARGET=	check
 
-BROKEN_sparc64=	Does not compile on sparc64
+OPTIONS_DEFINE=	DOCS
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/lib/libsnappy.so.1.1.6

diff --git a/astro/boinc-setiathome-v7/Makefile b/astro/boinc-setiathome-v7/Makefile
@@ -18,9 +18,8 @@ BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:math/fftw3
 RUN_DEPENDS=	boinc_client:net/boinc-client
 LIB_DEPENDS=	libfftw3f.so:math/fftw3-float
 
-USES=		tar:xz gmake pkgconfig
-USE_AUTOTOOLS=	autoconf:env automake:env
 GNU_CONFIGURE=	yes
+USES=		autoreconf gmake libtool pkgconfig tar:xz
 
 CFLAGS+=	-O2 -I${LOCALBASE}/include/boinc -I${LOCALBASE}/include \
 		-L${LOCALBASE}/lib
@@ -89,9 +88,6 @@ post-patch:
 		${WRKSRC}/client/timecvt.cpp \
 		${WRKSRC}/db/xml_util.cpp
 
-pre-configure:
-	(cd ${WRKSRC} ; ./_autosetup)
-
 do-install:
 	${INSTALL} -d ${STAGEDIR}${BOINC_CLIENT_HOME}/projects
 	${INSTALL} -d ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE}

diff --git a/astro/gpsbabel14/Makefile b/astro/gpsbabel14/Makefile
@@ -17,10 +17,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libexpat.so:textproc/expat2
 
-USE_AUTOTOOLS=	autoconf
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-expathdr=${LOCALBASE}/include \
 		--with-libexpat=${LOCALBASE}/lib
+USES=		autoreconf
 
 PLIST_FILES=	bin/gpsbabel
 

diff --git a/astro/stellarium-qt4/Makefile b/astro/stellarium-qt4/Makefile
@@ -14,7 +14,7 @@ COMMENT=	3D photo-realistic sky renderer (planetarium)
 
 LICENSE=	GPLv2+
 
-CONFLICTS_INSTALL=	${PORTNAME}-0.13.*
+CONFLICTS_INSTALL=	${PORTNAME}-0.17.*
 PORTSCOUT=	limit:^0\.12\.			# track only 0.12.x (legacy)
 
 USES=		cmake gettext iconv

diff --git a/astro/stellarium/Makefile b/astro/stellarium/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	stellarium
-PORTVERSION=	0.16.1
+PORTVERSION=	0.17.0
+DISTVERSIONPREFIX=	v
 CATEGORIES=	astro
-MASTER_SITES=	SF/${PORTNAME}/Stellarium-sources/${PORTVERSION}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_ONLY=	${_DISTFILES:Nstars_*.cat:N*.pdf}
 
 MAINTAINER=	[email protected]
@@ -15,15 +14,18 @@ LICENSE=	GPLv2+
 
 CONFLICTS_INSTALL=	${PORTNAME}-qt4-0.12.*
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	Stellarium
+
 USES=		cmake gettext
 USE_QT5=	qmake_build buildtools_build linguisttools_build \
 		concurrent core gui network opengl printsupport widgets
 
 CMAKE_ARGS=	-DENABLE_GPS:BOOL=OFF	# XXX: requires Qt5Positioning
 
-GUIDE_VERSION=	${PORTVERSION}
+GUIDE_VERSION=	0.16.1
 
-PORTDOCS=	AUTHORS ChangeLog README \
+PORTDOCS=	CREDITS.md ChangeLog README.md \
 		stellarium_user_guide-${GUIDE_VERSION}-1.pdf
 
 OPTIONS_DEFINE=		DOCS MORE_STARS MULTIMEDIA SCRIPTING TEXTURES \
@@ -70,12 +72,20 @@ CMAKE_ARGS+=	-DENABLE_SCRIPTING:BOOL=OFF
 PLIST_SUB+=	SCRIPTS="@comment "
 .endif
 
+# Work-around the vestige of bzr->git conversion upstream
+post-extract:
+	@${MV} ${WRKSRC}/textures/earth-shadow-new.png \
+		${WRKSRC}/textures/earth-shadow.png
+
 post-extract-DOCS-on:
 	@${LN} -sf ${_DISTDIR}/stellarium_user_guide-${GUIDE_VERSION}-1.pdf \
 		${WRKSRC}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's, -Wno-unused-result,,' ${WRKSRC}/CMakeLists.txt
+	@${REINPLACE_CMD} -e '/<netinet\/in\.h>/ { x ; \
+		s,.*,#include <sys/socket.h>, ; G ; }' \
+		${WRKSRC}/src/external/libindi/libs/indibase/baseclient.cpp
 
 post-install-MORE_STARS-on:
 	${INSTALL_DATA} ${DISTDIR}/stars_[45678]_[12]v0_1.cat \

diff --git a/astro/stellarium/distinfo b/astro/stellarium/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1506084780
-SHA256 (stellarium-0.16.1.tar.gz) = b001c252afddaa1c470fb444fcbb5595b7f7a7db028d884743d20bcb5635fd20
-SIZE (stellarium-0.16.1.tar.gz) = 206118721
+TIMESTAMP = 1513853534
+SHA256 (Stellarium-stellarium-v0.17.0_GH0.tar.gz) = c5be273f880de06bf02d0432d2caf8e2beb8b1695beda86ce7eb75988f237436
+SIZE (Stellarium-stellarium-v0.17.0_GH0.tar.gz) = 252733565
 SHA256 (stellarium_user_guide-0.16.1-1.pdf) = 8767feca7d36e63678e9daa107273084d84c7231e187d258d45cb0f801e18edd
 SIZE (stellarium_user_guide-0.16.1-1.pdf) = 25945137
 SHA256 (stars_4_1v0_1.cat) = 7a2084e5e45610bbffae9448d9552d8a8dd191e5b1a07b0e47d27622fab4a979