sync ports with The Matrix

README

@@ -2,7 +2,7 @@ Compiling your own source code is discouraged for everyone except for experts,
 as difficult build-time crossing-points can occur often, and no assistance will
 be provided. 
 
-In case of failure, please install our compiled ports.
+In case of failure, please install our pre-compiled binary packages.
 
 Documentation for the ports tree includes:
 

astro/py-jplephem/Makefile

@@ -1,33 +1,32 @@
-FIX_EXTRACT_PERMISSIONS =	Yes
+FIX_EXTRACT_PERMISSIONS=	Yes
 
-COMMENT =	use a JPL ephemeris to predict planet positions
+COMMENT=	use a JPL ephemeris to predict planet positions
 
-MODPY_EGG_VERSION =	2.18
+MODPY_EGG_VERSION=	2.19
 
-DISTNAME =	jplephem-${MODPY_EGG_VERSION}
+DISTNAME=	jplephem-${MODPY_EGG_VERSION}
-PKGNAME =	py-${DISTNAME}
+PKGNAME=	py-${DISTNAME}
-REVISION =	0
 
-CATEGORIES =	astro
+CATEGORIES=	astro
 
 # MIT
-PERMIT_PACKAGE =	Yes
+PERMIT_PACKAGE=	Yes
 
 SITES.jpl=	https://naif.jpl.nasa.gov/pub/naif/generic_kernels/spk/planets/a_old_versions/
-DISTFILES =	${DISTNAME}${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-DISTFILES.jpl = de405.bsp de421.bsp
+DISTFILES.jpl=	de405.bsp de421.bsp
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MODULES =	lang/python
+MODULES=	lang/python
-MODPY_PI =	Yes
+MODPY_PI=	Yes
-MODPY_PYBUILD =	setuptools
+MODPY_PYBUILD=	setuptools
-MODPY_PYTEST_ARGS = jplephem/test.py
+MODPY_PYTEST_ARGS= jplephem/test.py
 
-FLAVORS =	python3
+FLAVORS=	python3
-FLAVOR =	python3
+FLAVOR=		python3
 
-RUN_DEPENDS =	math/py-numpy${MODPY_FLAVOR}
+RUN_DEPENDS=	math/py-numpy${MODPY_FLAVOR}
-TEST_DEPENDS =	astro/py-de421${MODPY_FLAVOR}
+TEST_DEPENDS=	astro/py-de421${MODPY_FLAVOR}
 
 pre-test:
 	cd ${FULLDISTDIR}; cp de405.bsp de421.bsp ${WRKSRC}/

astro/py-jplephem/distinfo

@@ -1,6 +1,6 @@
 SHA256 (de405.bsp) = MKcRN5PuW2vx5VRsbfwh2Wgtn/q/6bF7S6snuirHXIk=
 SHA256 (de421.bsp) = CLINsq4iSIZQZBxakDPlv9pLHEtEDP6vIPYhz6GOzbM=
-SHA256 (jplephem-2.18.tar.gz) = SSkR6KTEeDB5GwO5oP/ff8ZfaF0cuzoXkLHqKIrn+uU=
+SHA256 (jplephem-2.19.tar.gz) = wWJFTGVtblID/5cB2CZnH6+fMgnZccu2jdtGAD3/bc8=
 SIZE (de405.bsp) = 10898432
 SIZE (de421.bsp) = 16790528
-SIZE (jplephem-2.18.tar.gz) = 40886
+SIZE (jplephem-2.19.tar.gz) = 43698

astro/py-jplephem/pkg/DESCR

@@ -12,3 +12,6 @@ Most users will use jplephem with the Satellite Planet Kernel (SPK)
 files that the NAIF facility at NASA JPL offers for use with their own
 SPICE toolkit. They have collected their most useful kernels beneath the
 directory: http://naif.jpl.nasa.gov/pub/naif/generic_kernels/spk/
+
+See the project description, https://pypi.org/project/jplephem/#description
+for more information.

audio/amused/Makefile

@@ -1,6 +1,6 @@
 COMMENT =	minimalistic music player
 
-DISTNAME =	amused-0.12
+DISTNAME =	amused-0.13
 
 CATEGORIES =	audio
 
@@ -12,7 +12,7 @@ MAINTAINER =	Omar Polo <op@openbsd.org>
 PERMIT_PACKAGE = Yes
 
 # uses pledge
-WANTLIB += FLAC c event mpg123 opusfile sndio util vorbisfile
+WANTLIB += FLAC c mpg123 opusfile sndio util vorbisfile
 
 SITES =		https://ftp.omarpolo.com/
 
@@ -24,6 +24,9 @@ LIB_DEPENDS =	audio/flac \
 CONFIGURE_STYLE = simple
 CONFIGURE_ARGS = --backend=sndio
 
+ALL_TARGET =	all web
+FAKE_TARGET =	install install-web
+
 NO_TEST =	Yes
 
 .include <bsd.port.mk>

audio/amused/distinfo

@@ -1,2 +1,2 @@
-SHA256 (amused-0.12.tar.gz) = YIFHrQENOjRJjKG4XESiuBYe/+v7WflFNDbCBgE9DuI=
+SHA256 (amused-0.13.tar.gz) = JZjI4JwxWIboPEhe/b8AR2KTP2WNPRfU7s0JFtEmmqk=
-SIZE (amused-0.12.tar.gz) = 56972
+SIZE (amused-0.13.tar.gz) = 74243

audio/amused/patches/patch-configure

@@ -1,11 +0,0 @@
-Index: configure
---- configure.orig
-+++ configure
-@@ -711,6 +711,7 @@ cat << __HEREDOC__
- #define HAVE_GETDTABLECOUNT ${HAVE_GETDTABLECOUNT}
- #define HAVE_GETEXECNAME ${HAVE_GETEXECNAME}
- #define HAVE_GETPROGNAME ${HAVE_GETPROGNAME}
-+#define HAVE_IMSG ${HAVE_IMSG}
- #define HAVE_INFTIM ${HAVE_INFTIM}
- #define HAVE_LANDLOCK ${HAVE_LANDLOCK}
- #define HAVE_MEMMEM ${HAVE_MEMMEM}

audio/amused/pkg/DESCR

@@ -1,3 +1,5 @@
 amused is a minimalistic music player that doesn't have many amazing
 features but instead aims to work well with other standard Unix tools.
 It supports flac, mp3, ogg vorbis and opus files.
+
+amused-web is a simple web interface to control amused remotely.

audio/amused/pkg/PLIST

@@ -1,2 +1,4 @@
 @bin bin/amused
+@bin bin/amused-web
+@man man/man1/amused-web.1
 @man man/man1/amused.1

audio/aqualung/Makefile

@@ -3,6 +3,7 @@ COMMENT=	advanced music player
 VERSION=	1.2
 DISTNAME=	aqualung-${VERSION}
 EPOCH=		0
+REVISION=	0
 CATEGORIES=	audio
 
 HOMEPAGE=	https://github.com/jeremyevans/aqualung
@@ -18,11 +19,16 @@ WANTLIB += freetype gio-2.0 glib-2.0 gobject-2.0 gthread-2.0
 WANTLIB += harfbuzz iconv intl m mp3lame ogg pango-1.0 pangocairo-1.0
 WANTLIB += pangoft2-1.0 pthread samplerate sndfile sndio ${COMPILER_LIBCXX}
 WANTLIB += vorbis vorbisenc vorbisfile z gtk-x11-2.0 gdk-x11-2.0
-WANTLIB += gdk_pixbuf-2.0 xml2 mac mad mpcdec FLAC avcodec
+WANTLIB += gdk_pixbuf-2.0 xml2 MAC mad mpcdec FLAC avcodec
 WANTLIB += avformat avutil wavpack lrdf oggz speex cddb cdio
 WANTLIB += cdio_cdda cdio_paranoia modplug ${MODLUA_WANTLIB}
 
 SITES=	https://github.com/jeremyevans/aqualung/releases/download/${VERSION}/
+SITES.github =	https://github.com/jeremyevans/aqualung/commit/
+PATCHFILES.github =	aqualung-lavc-fix{0ecc6721d5078c0bc9cae771d485c8d676443c23}.diff \
+			aqualung-mac-fix1{a991c13d0df734a5d0fea7db6b181176858f3e58}.diff \
+			aqualung-mac-fix2{d2c88317b6042a05c236faf3c09f600337c6379e}.diff
+PATCH_DIST_STRIP=       -p1
 
 COMPILER =		base-clang ports-gcc base-gcc
 
@@ -57,7 +63,10 @@ DEBUG_PACKAGES=${BUILD_PACKAGES}
 CFLAGS+=	-DPTHREAD_MIN_PRIORITY=0 -DPTHREAD_MAX_PRIORITY=31 \
 		-I${LOCALBASE}/include -I${MODLUA_INCL_DIR}
 
-CONFIGURE_STYLE= gnu
+BUILD_DEPENDS=	devel/gettext,-tools
+AUTOCONF_VERSION=2.69
+AUTOMAKE_VERSION=1.16
+CONFIGURE_STYLE= gnu autoreconf
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib " \
 		lua_CFLAGS="`pkg-config --cflags ${MODLUA_DEP}`" \
 		lua_LIBS="`pkg-config --libs ${MODLUA_DEP}`"
@@ -70,7 +79,7 @@ CONFIGURE_ARGS=	--with-cdda \
 		--with-lame \
 		--with-lavc \
 		--with-lua \
-		--with-mac \
+		--with-MAC \
 		--with-mod \
 		--with-mpc \
 		--with-mpeg \

audio/aqualung/distinfo

@@ -1,2 +1,8 @@
 SHA256 (aqualung-1.2.tar.gz) = Myv6Dqni97/ZZrl5h7dTf2i42o1WO6xKuYb6RBjc7TI=
+SHA256 (aqualung-lavc-fix.diff) = Gn02s7AupRnhFaok5eSqXUPEkNUBSg8oFI/ghurzd8Y=
+SHA256 (aqualung-mac-fix1.diff) = dlWy85euQNvffxULYNtW+lzI/7oKjoEIMgl2A7zvXAs=
+SHA256 (aqualung-mac-fix2.diff) = FQZt6MN1QNv1uVLhjVLjVbzz1csBY/eFSpkt8CZXDSI=
 SIZE (aqualung-1.2.tar.gz) = 1974910
+SIZE (aqualung-lavc-fix.diff) = 745
+SIZE (aqualung-mac-fix1.diff) = 7159
+SIZE (aqualung-mac-fix2.diff) = 1641

audio/mac/Makefile

@@ -2,32 +2,30 @@ ONLY_FOR_ARCHS= aarch64 amd64 arm i386
 
 COMMENT=	Monkey's audio lossless codec
 
-DISTNAME=	mac-3.99-u4-b5
+VERSION=	10.20
-PKGNAME=	mac-3.99.4.5
+DISTNAME=	MAC_1020_SDK
-REVISION =	5
+PKGNAME=	mac-${VERSION}
-SHARED_LIBS +=  mac                  0.0      # .2.0
+SHARED_LIBS +=  MAC                  0.0      # .0.0
 CATEGORIES=	audio
+EXTRACT_SUFX=	.zip
 
-HOMEPAGE=	http://www.monkeysaudio.com/
+HOMEPAGE=	https://monkeysaudio.com
 
-# Monkey's Audio Source Code License Agreement
+# BSD-3-Clause
-# http://www.monkeysaudio.com/license.html
 PERMIT_PACKAGE=	Yes
 
 WANTLIB=	c m ${COMPILER_LIBCXX}
 
 COMPILER =	base-clang ports-gcc base-gcc
 
-SITES=		http://bsd.cenkes.org/myports/
+MODULES =	devel/cmake
 
+SITES=		https://monkeysaudio.com/files/
+WRKDIST=	${WRKDIR}/mac-${VERSION}
+FIX_CRLF_FILES=	Shared/*.h
 
-CONFIGURE_STYLE=gnu
+post-extract:
-
+	mkdir ${WRKSRC}
-.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
+	mv ${WRKDIR}/!(mac-${VERSION}|bin) ${WRKSRC}
-BUILD_DEPENDS=	devel/yasm
-CONFIGURE_ARGS= --enable-assembly=yes
-.else
-CONFIGURE_ARGS= --enable-assembly=no
-.endif
 
 .include <bsd.port.mk>

audio/mac/distinfo

@@ -1,2 +1,2 @@
-SHA256 (mac-3.99-u4-b5.tar.gz) = 1ZrFsfo3Wnjq29XZu2OK0CKRhbQrVi27BLDatkdbZlE=
+SHA256 (MAC_1020_SDK.zip) = CYchq+lXqaUcL4NUudqPd7cOMDVmAH1uV+wYB7L0hr8=
-SIZE (mac-3.99-u4-b5.tar.gz) = 421234
+SIZE (MAC_1020_SDK.zip) = 1653346

audio/mac/patches/patch-Shared_All_h

@@ -0,0 +1,13 @@
+Index: Shared/All.h
+--- Shared/All.h.orig
++++ Shared/All.h
+@@ -10,8 +10,7 @@ PLATFORM_LINUX
+ PLATFORM_ANDROID
+ **************************************************************************************************/
+ #if !defined(PLATFORM_WINDOWS) && !defined(PLATFORM_APPLE) && !defined(PLATFORM_LINUX)
+-    #pragma message("No platform set for MACLib, defaulting to Windows")
+-    #define PLATFORM_WINDOWS
++    #define PLATFORM_LINUX
+ #endif
+ 
+ #ifdef PLATFORM_ANDROID

audio/mac/patches/patch-Shared_NoWindows_h

@@ -0,0 +1,16 @@
+Index: Shared/NoWindows.h
+--- Shared/NoWindows.h.orig
++++ Shared/NoWindows.h
+@@ -38,8 +38,12 @@ typedef struct _GUID {
+ #undef ZeroMemory
+ #define ZeroMemory(POINTER, BYTES) memset(POINTER, 0, BYTES);
+ 
++#ifndef TRUE
+ #define TRUE 1
++#endif
++#ifndef FALSE
+ #define FALSE 0
++#endif
+ 
+ #define CALLBACK
+ 

audio/mac/patches/patch-configure

@@ -1,11 +0,0 @@
---- configure.orig	Sat Jul 14 11:22:11 2007
-+++ configure	Sat Jul 14 11:22:20 2007
-@@ -1978,7 +1978,7 @@ fi
- 
- 
- # Checks for programs.
--CXXFLAGS="$CXXFLAGS -O3 -Wall -pedantic -Wno-long-long"
-+CXXFLAGS="$CXXFLAGS -Wall -pedantic -Wno-long-long"
- ac_ext=cc
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

audio/mac/patches/patch-src_Console_Console_cpp

@@ -1,27 +0,0 @@
---- src/Console/Console.cpp.orig	Mon Jul 16 23:50:51 2007
-+++ src/Console/Console.cpp	Mon Jul 16 23:53:13 2007
-@@ -27,8 +27,10 @@ Displays the proper usage for MAC.exe
- ***************************************************************************************/
- void DisplayProperUsage(FILE * pFile) 
- {
--	fprintf(pFile, "Proper Usage: [EXE] [Input File] [Output File] [Mode]\n\n");
-+	extern char *__progname;
- 
-+	fprintf(pFile, "Proper Usage: %s [Input File] [Output File] [Mode]\n\n", __progname);
-+
- 	fprintf(pFile, "Modes: \n");
- 	fprintf(pFile, "    Compress (fast): '-c1000'\n");
- 	fprintf(pFile, "    Compress (normal): '-c2000'\n");
-@@ -40,9 +42,9 @@ void DisplayProperUsage(FILE * pFile) 
- 	fprintf(pFile, "    Convert: '-nXXXX'\n\n");
- 
- 	fprintf(pFile, "Examples:\n");
--	fprintf(pFile, "    Compress: mac.exe \"Metallica - One.wav\" \"Metallica - One.ape\" -c2000\n");
--	fprintf(pFile, "    Decompress: mac.exe \"Metallica - One.ape\" \"Metallica - One.wav\" -d\n");
--	fprintf(pFile, "    Verify: mac.exe \"Metallica - One.ape\" -v\n");
-+	fprintf(pFile, "    Compress: %s \"Metallica - One.wav\" \"Metallica - One.ape\" -c2000\n", __progname);
-+	fprintf(pFile, "    Decompress: %s \"Metallica - One.ape\" \"Metallica - One.wav\" -d\n", __progname);
-+	fprintf(pFile, "    Verify: %s \"Metallica - One.ape\" -v\n", __progname);
- 	fprintf(pFile, "    (note: int filenames must be put inside of quotations)\n");
- }
- 

audio/mac/patches/patch-src_MACLib_APEDecompress_cpp

@@ -1,11 +0,0 @@
---- src/MACLib/APEDecompress.cpp.orig	Thu Jun  1 13:00:58 2006
-+++ src/MACLib/APEDecompress.cpp	Sat Jul 14 10:16:11 2007
-@@ -369,7 +369,7 @@ Get information from the decompressor
- *****************************************************************************************/
- intptr_t CAPEDecompress::GetInfo(APE_DECOMPRESS_FIELDS Field, intptr_t nParam1, intptr_t nParam2)
- {
--    int nRetVal = 0;
-+    intptr_t nRetVal = 0;
-     BOOL bHandled = TRUE;
- 
-     switch (Field)

audio/mac/patches/patch-src_MACLib_APELink_cpp

@@ -1,26 +0,0 @@
---- src/MACLib/APELink.cpp.orig	Thu Jun  1 11:00:57 2006
-+++ src/MACLib/APELink.cpp	Sun Apr 16 11:51:08 2017
-@@ -63,10 +63,10 @@ void CAPELink::ParseData(const char * pData, const str
-     if (pData != NULL)
-     {
-         // parse out the information
--        char * pHeader = strstr(pData, APE_LINK_HEADER);
--        char * pImageFile = strstr(pData, APE_LINK_IMAGE_FILE_TAG);
--        char * pStartBlock = strstr(pData, APE_LINK_START_BLOCK_TAG);
--        char * pFinishBlock = strstr(pData, APE_LINK_FINISH_BLOCK_TAG);
-+        const char * pHeader = strstr(pData, APE_LINK_HEADER);
-+        const char * pImageFile = strstr(pData, APE_LINK_IMAGE_FILE_TAG);
-+        const char * pStartBlock = strstr(pData, APE_LINK_START_BLOCK_TAG);
-+        const char * pFinishBlock = strstr(pData, APE_LINK_FINISH_BLOCK_TAG);
- 
-         if (pHeader && pImageFile && pStartBlock && pFinishBlock)
-         {
-@@ -81,7 +81,7 @@ void CAPELink::ParseData(const char * pData, const str
-                 
-                 // get the path
-                 char cImageFile[MAX_PATH + 1]; int nIndex = 0;
--                char * pImageCharacter = &pImageFile[strlen(APE_LINK_IMAGE_FILE_TAG)];
-+                const char * pImageCharacter = &pImageFile[strlen(APE_LINK_IMAGE_FILE_TAG)];
-                 while ((*pImageCharacter != 0) && (*pImageCharacter != '\r') && (*pImageCharacter != '\n'))
-                     cImageFile[nIndex++] = *pImageCharacter++;
-                 cImageFile[nIndex] = 0;

audio/mac/patches/patch-src_MACLib_MACLib_h

@@ -1,11 +0,0 @@
---- src/MACLib/MACLib.h.orig	Thu Jun  1 13:00:58 2006
-+++ src/MACLib/MACLib.h	Sat Jul 14 10:16:11 2007
-@@ -29,6 +29,8 @@ or, if necessary, matt @ monkeysaudio.com
- #ifndef APE_MACLIB_H
- #define APE_MACLIB_H
- 
-+#include <sys/stdint.h>
-+
- /*************************************************************************************************
- APE File Format Overview: (pieces in order -- only valid for the latest version APE files)
- 

audio/mac/pkg/PLIST

@@ -1,26 +1,14 @@
 @bin bin/mac
-include/mac/
+include/MAC/
-include/mac/APECompress.h
+include/MAC/APETag.h
-include/mac/APECompressCore.h
+include/MAC/All.h
-include/mac/APECompressCreate.h
+include/MAC/CharacterHelper.h
-include/mac/APEDecompress.h
+include/MAC/IO.h
-include/mac/APEHeader.h
+include/MAC/MACDll.h
-include/mac/APEInfo.h
+include/MAC/MACLib.h
-include/mac/APELink.h
+include/MAC/NoWindows.h
-include/mac/APETag.h
+include/MAC/SmartPtr.h
-include/mac/All.h
+include/MAC/Version.h
-include/mac/CharacterHelper.h
+include/MAC/Warnings.h
-include/mac/CircleBuffer.h
+include/MAC/WindowsEnvironment.h
-include/mac/GlobalFunctions.h
+@lib lib/libMAC.so.${LIBMAC_VERSION}
-include/mac/ID3Genres.h
-include/mac/IO.h
-include/mac/MACLib.h
-include/mac/MACProgressHelper.h
-include/mac/MACUtils.h
-include/mac/NoWindows.h
-include/mac/SmartPtr.h
-include/mac/StdLibFileIO.h
-include/mac/config.h
-lib/libmac.a
-lib/libmac.la
-@lib lib/libmac.so.${LIBmac_VERSION}

audio/sratom/Makefile

@@ -1,8 +1,7 @@
 COMMENT=	library for serialising LV2 atoms to/from RDF
 
-V=		0.6.8
+V=		0.6.10
 DISTNAME=	sratom-${V}
-REVISION=	2
 
 SHARED_LIBS=	sratom-0	0.0 # 0.6
 

audio/sratom/distinfo

@@ -1,2 +1,2 @@
-SHA256 (sratom-0.6.8.tar.bz2) = Ossysa3Forf6za3i4IGLzWxx8j+EoevBeBW7eg0tAt8=
+SHA256 (sratom-0.6.10.tar.bz2) = 5ZUcDX8GGGcmKClVNqJx1hxV7w2rM7qfxXZ+1NsKY00=
-SIZE (sratom-0.6.8.tar.bz2) = 327027
+SIZE (sratom-0.6.10.tar.bz2) = 327047

audio/sratom/patches/patch-wscript

@@ -11,7 +11,7 @@ Index: wscript
  
  # Library and package version (UNIX style major, minor, micro)
  # major increment <=> incompatible changes
-@@ -119,7 +120,7 @@ def build(bld):
+@@ -120,7 +121,7 @@ def build(bld):
              uselib          = 'SERD SORD LV2',
              name            = 'libsratom',
              target          = 'sratom-%s' % SRATOM_MAJOR_VERSION,

cad/gtkwave/Makefile

@@ -1,8 +1,7 @@
 COMMENT=		GTK+-based electronic waveform viewer
 
-DISTNAME=		gtkwave-3.3.113
+DISTNAME=		gtkwave-3.3.114
 CATEGORIES=		cad
-REVISION=		0
 
 HOMEPAGE=		http://gtkwave.sourceforge.net/
 

cad/gtkwave/distinfo

@@ -1,2 +1,2 @@
-SHA256 (gtkwave-3.3.113.tar.gz) = 1sVG7gvfpeUhHb/lGlzfoyvoVhpvItUxSL1oWyFzE/8=
+SHA256 (gtkwave-3.3.114.tar.gz) = eN85/Cs/3d2V8KkVBDqgQhXetN5O2eFtGVzHn6QzB0w=
-SIZE (gtkwave-3.3.113.tar.gz) = 3458793
+SIZE (gtkwave-3.3.114.tar.gz) = 3458908

devel/autoconf/2.71/Makefile

@@ -10,5 +10,6 @@ MAKE_FLAGS =		EMACS=no
 FAKE_FLAGS =		EMACS=no
 TEST_DEPENDS =	devel/automake/1.16
 TEST_FLAGS +=	AUTOMAKE_VERSION=1.16
+PORTROACH =
 
 .include <bsd.port.mk>

devel/autoconf/Makefile.inc

@@ -26,4 +26,4 @@ CONFIGURE_ARGS += 	--program-suffix=${SUFFIX}
 MAKE_FLAGS +=		pkgdatadir=${PREFIX}/share/autoconf${SUFFIX}
 FAKE_FLAGS +=		lispdir=
 
-PORTROACH =		limit:^${VERSION}
+PORTROACH ?=		limit:^${VERSION}

devel/automake/1.16/Makefile

@@ -2,6 +2,7 @@ VERSION=	1.16
 DISTNAME=	automake-${VERSION}.5
 PKGSPEC=	automake->=${VERSION},<1.17
 EXTRACT_SUFX=	.tar.xz
+PORTROACH =
 
 AUTOCONF_VERSION=	2.69
 

devel/automake/Makefile.inc

@@ -13,7 +13,7 @@ PERMIT_PACKAGE ?=	Yes
 # we're not a python port, don't subst py- prefix
 UPDATE_PLIST_ARGS +=	-i MODPY_PY_PREFIX
 
-PORTROACH =		limit:^${VERSION}
+PORTROACH ?=		limit:^${VERSION}
 
 BUILD_DEPENDS +=	${RUN_DEPENDS}
 CONFIGURE_ARGS +=	--infodir=${PREFIX}/info

devel/gtest/Makefile

@@ -5,6 +5,7 @@ GH_ACCOUNT=	google
 GH_PROJECT=	googletest
 GH_TAGNAME=	v${V}
 DISTNAME=	gtest-${V}
+REVISION=	0
 
 SHARED_LIBS +=	gmock		2.0   # .0.0
 SHARED_LIBS +=	gmock_main	1.0   # .0.0

devel/gtest/patches/patch-googletest_src_gtest_cc

@@ -0,0 +1,13 @@
+Missing include needed for ports-gcc to have raise in scope
+
+Index: googletest/src/gtest.cc
+--- googletest/src/gtest.cc.orig
++++ googletest/src/gtest.cc
+@@ -44,6 +44,7 @@
+ #include <chrono>  // NOLINT
+ #include <cmath>
+ #include <cstdint>
++#include <csignal>
+ #include <cstdlib>
+ #include <cstring>
+ #include <initializer_list>

devel/harfbuzz/Makefile

@@ -3,15 +3,15 @@ BROKEN-hppa=		no atomic primitives
 COMMENT-main=		text shaping library
 COMMENT-icu=		ICU support for libharfbuzz
 
-V=			8.1.1
+V=			8.2.0
 DISTNAME=		harfbuzz-${V}
 EXTRACT_SUFX=		.tar.xz
 
-SHARED_LIBS += harfbuzz                  18.5 # 0.60810.0
+SHARED_LIBS += harfbuzz                  18.6 # 0.60820.0
-SHARED_LIBS += harfbuzz-subset           2.4 # 0.60810.0
+SHARED_LIBS += harfbuzz-subset           2.4 # 0.60820.0
-SHARED_LIBS += harfbuzz-cairo            0.1 # 0.60810.0
+SHARED_LIBS += harfbuzz-cairo            0.1 # 0.60820.0
-SHARED_LIBS += harfbuzz-icu              2.1 # 0.60810.0
+SHARED_LIBS += harfbuzz-icu              2.1 # 0.60820.0
-SHARED_LIBS += harfbuzz-gobject          1.1 # 0.60810.0
+SHARED_LIBS += harfbuzz-gobject          1.1 # 0.60820.0
 
 CATEGORIES=		devel graphics textproc
 

devel/harfbuzz/distinfo

@@ -1,2 +1,2 @@
-SHA256 (harfbuzz-8.1.1.tar.xz) = AwWtcC4RkGpfwMG6EcJwt/ZKj1OQ1naqz9cdsSnWVl8=
+SHA256 (harfbuzz-8.2.0.tar.xz) = jLcRemL0LVrSXUppfhu/xlkzs+7S7n8kcgPHnJ8bUUw=
-SIZE (harfbuzz-8.1.1.tar.xz) = 18820088
+SIZE (harfbuzz-8.2.0.tar.xz) = 18892496

devel/libgit2/py-git2/Makefile

@@ -1,9 +1,8 @@
 COMMENT=		libgit2 bindings in Python
 
-MODPY_EGG_VERSION=	1.12.2
+MODPY_EGG_VERSION=	1.13.0
 DISTNAME=		pygit2-${MODPY_EGG_VERSION}
 PKGNAME=		py-git2-${MODPY_EGG_VERSION}
-REVISION=		0
 
 MODULES=		lang/python
 MODPY_PI=		Yes

devel/libgit2/py-git2/distinfo

@@ -1,2 +1,2 @@
-SHA256 (libgit/pygit2-1.12.2.tar.gz) = VuhdDmbelX1ZnR77JAnTmv7v2PAQCb/aB5a0Kktng1g=
+SHA256 (libgit/pygit2-1.13.0.tar.gz) = bd43Q2+rFCZK09bLxarj/VVeualoCnv91uVkzXe14rg=
-SIZE (libgit/pygit2-1.12.2.tar.gz) = 738453
+SIZE (libgit/pygit2-1.13.0.tar.gz) = 738850

devel/libgit2/py-git2/patches/patch-pygit2_decl_diff_h

@@ -1,16 +0,0 @@
-From 1473e8eb6eb59dc7521dcd5f8a4c9390e9b53223 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=2E=20David=20Ib=C3=A1=C3=B1ez?= <jdavid.ibp@gmail.com>
-Date: Mon, 17 Jul 2023 22:23:30 +0200
-Subject: [PATCH] Upgrade to libgit2 v1.7.0
-
-Index: pygit2/decl/diff.h
---- pygit2/decl/diff.h.orig
-+++ pygit2/decl/diff.h
-@@ -54,6 +54,7 @@ typedef struct {
- 	void                *payload;
- 	uint32_t    context_lines;
- 	uint32_t    interhunk_lines;
-+	git_oid_t   oid_type;
- 	uint16_t    id_abbrev;
- 	git_off_t   max_size;
- 	const char *old_prefix;

devel/libgit2/py-git2/patches/patch-pygit2_decl_oid_h

@@ -1,16 +0,0 @@
-From 1473e8eb6eb59dc7521dcd5f8a4c9390e9b53223 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=2E=20David=20Ib=C3=A1=C3=B1ez?= <jdavid.ibp@gmail.com>
-Date: Mon, 17 Jul 2023 22:23:30 +0200
-Subject: [PATCH] Upgrade to libgit2 v1.7.0
-
-Index: pygit2/decl/oid.h
---- pygit2/decl/oid.h.orig
-+++ pygit2/decl/oid.h
-@@ -1,3 +1,7 @@
-+typedef enum {
-+	GIT_OID_SHA1 = 1,  /**< SHA1 */
-+} git_oid_t;
-+
- typedef struct git_oid {
- 	unsigned char id[20];
- } git_oid;

devel/libgit2/py-git2/patches/patch-pygit2_decl_remote_h

@@ -1,16 +0,0 @@
-From 1473e8eb6eb59dc7521dcd5f8a4c9390e9b53223 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=2E=20David=20Ib=C3=A1=C3=B1ez?= <jdavid.ibp@gmail.com>
-Date: Mon, 17 Jul 2023 22:23:30 +0200
-Subject: [PATCH] Upgrade to libgit2 v1.7.0
-
-Index: pygit2/decl/remote.h
---- pygit2/decl/remote.h.orig
-+++ pygit2/decl/remote.h
-@@ -83,6 +83,7 @@ typedef struct {
- 	int update_fetchhead;
- 	git_remote_autotag_option_t download_tags;
- 	git_proxy_options proxy_opts;
-+	int depth;
- 	git_remote_redirect_t follow_redirects;
- 	git_strarray custom_headers;
- } git_fetch_options;

devel/libgit2/py-git2/patches/patch-src_types_h

@@ -1,19 +0,0 @@
-From 1473e8eb6eb59dc7521dcd5f8a4c9390e9b53223 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=2E=20David=20Ib=C3=A1=C3=B1ez?= <jdavid.ibp@gmail.com>
-Date: Mon, 17 Jul 2023 22:23:30 +0200
-Subject: [PATCH] Upgrade to libgit2 v1.7.0
-
-Index: src/types.h
---- src/types.h.orig
-+++ src/types.h
-@@ -32,8 +32,8 @@
- #include <Python.h>
- #include <git2.h>
- 
--#if !(LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR == 6)
--#error You need a compatible libgit2 version (1.6.x)
-+#if !(LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR == 7)
-+#error You need a compatible libgit2 version (1.7.x)
- #endif
- 
- /*

devel/llvm/13/Makefile

@@ -2,7 +2,7 @@ LLVM_MAJOR =	13
 LLVM_VERSION =	${LLVM_MAJOR}.0.0
 LLVM_PKGSPEC =	>=13,<14
 
-REVISION-main =		10
+REVISION-main =		11
 REVISION-lldb =		4
 REVISION-python =	3
 

devel/llvm/16/Makefile

@@ -2,7 +2,7 @@ LLVM_MAJOR =	16
 LLVM_VERSION =	${LLVM_MAJOR}.0.6
 LLVM_PKGSPEC =	>=16,<17
 
-REVISION-main =		4
+REVISION-main =		5
 REVISION-lldb =		1
 REVISION-python =	0
 

devel/llvm/Makefile.inc

@@ -69,7 +69,7 @@ CONFIGURE_ARGS +=	\
 	-DLLVM_ENABLE_OCAMLDOC=OFF \
 	-DLLVM_ENABLE_PLUGINS=OFF \
 	-DLLVM_ENABLE_TERMINFO=OFF \
-	-DLLVM_ENABLE_RTTI=OFF \
+	-DLLVM_ENABLE_RTTI=ON \
 	-DLLVM_ENABLE_Z3_SOLVER=OFF \
 	-DLLVM_ENABLE_ZSTD=OFF \
 	-DLLVM_INCLUDE_TESTS=OFF \

devel/py-build/Makefile

@@ -1,6 +1,6 @@
 COMMENT=	simple, correct PEP 517 build frontend
 
-MODPY_EGG_VERSION=	0.10.0
+MODPY_EGG_VERSION=	1.0.3
 
 DISTNAME=	build-${MODPY_EGG_VERSION}
 PKGNAME=	py-${DISTNAME}

devel/py-build/distinfo

@@ -1,2 +1,2 @@
-SHA256 (build-0.10.0.tar.gz) = 1bcSZK/bWVHWcESCqseN6IfIBpHFK4iprRlZg8oskmk=
+SHA256 (build-1.0.3.tar.gz) = U4qrG2T5gol3+EvGOuVwsGCo7RvkGeeHC4tPxebqVTs=
-SIZE (build-0.10.0.tar.gz) = 16465
+SIZE (build-1.0.3.tar.gz) = 40797

devel/py-build/pkg/PLIST

@@ -13,10 +13,19 @@ lib/python${MODPY_VERSION}/site-packages/build/${MODPY_PYCACHE}__init__.${MODPY_
 lib/python${MODPY_VERSION}/site-packages/build/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/build/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/build/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/build/${MODPY_PYCACHE}_exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/build/${MODPY_PYCACHE}_exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/build/${MODPY_PYCACHE}_importlib.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/build/${MODPY_PYCACHE}_importlib.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/build/${MODPY_PYCACHE}_util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/build/${MODPY_PYCACHE}_util.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/build/${MODPY_PYCACHE}env.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/build/${MODPY_PYCACHE}env.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/build/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/build/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/build/_exceptions.py
+lib/python${MODPY_VERSION}/site-packages/build/_importlib.py
+lib/python${MODPY_VERSION}/site-packages/build/_util.py
 lib/python${MODPY_VERSION}/site-packages/build/env.py
 lib/python${MODPY_VERSION}/site-packages/build/py.typed
 lib/python${MODPY_VERSION}/site-packages/build/util.py

devel/py-dill/Makefile

@@ -1,6 +1,6 @@
 COMMENT =		serialize all of python
 
-MODPY_EGG_VERSION =	0.3.6
+MODPY_EGG_VERSION =	0.3.7
 DISTNAME =		dill-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		devel
@@ -8,7 +8,7 @@ CATEGORIES =		devel
 # https://github.com/uqfoundation/dill
 HOMEPAGE =		https://dill.readthedocs.io/
 
-# Apache v2
+# BSD
 PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python

devel/py-dill/distinfo

@@ -1,2 +1,2 @@
-SHA256 (dill-0.3.6.tar.gz) = 5dtV82h4Vtj72rAC7XhUThxFWaEwMCaT2Dnf6Pk/I3M=
+SHA256 (dill-0.3.7.tar.gz) = zByLGC6zAT4kvUdf8ukpWvhsGjjrGv8SjayJYqnOPAM=
-SIZE (dill-0.3.6.tar.gz) = 179026
+SIZE (dill-0.3.7.tar.gz) = 183355

devel/py-dill/pkg/PLIST

@@ -1,4 +1,5 @@
 @pkgpath devel/py-dill
+bin/get_gprof
 bin/get_objgraph
 bin/undill
 lib/python${MODPY_VERSION}/site-packages/dill/
@@ -59,6 +60,8 @@ lib/python${MODPY_VERSION}/site-packages/dill/tests/${MODPY_PYCACHE}__init__.${M
 lib/python${MODPY_VERSION}/site-packages/dill/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/dill/tests/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dill/tests/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dill/tests/${MODPY_PYCACHE}test_abc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/dill/tests/${MODPY_PYCACHE}test_abc.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/dill/tests/${MODPY_PYCACHE}test_check.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dill/tests/${MODPY_PYCACHE}test_check.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/dill/tests/${MODPY_PYCACHE}test_classdef.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -113,6 +116,7 @@ lib/python${MODPY_VERSION}/site-packages/dill/tests/${MODPY_PYCACHE}test_temp.${
 lib/python${MODPY_VERSION}/site-packages/dill/tests/${MODPY_PYCACHE}test_temp.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/dill/tests/${MODPY_PYCACHE}test_weakref.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dill/tests/${MODPY_PYCACHE}test_weakref.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dill/tests/test_abc.py
 lib/python${MODPY_VERSION}/site-packages/dill/tests/test_check.py
 lib/python${MODPY_VERSION}/site-packages/dill/tests/test_classdef.py
 lib/python${MODPY_VERSION}/site-packages/dill/tests/test_dataclasses.py

devel/py-jupyter_core/Makefile

@@ -1,9 +1,8 @@
 COMMENT =		Jupyter core package
 
-MODPY_EGG_VERSION =	4.6.3
+MODPY_EGG_VERSION =	4.7.0
 DISTNAME =		jupyter_core-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		4
 
 CATEGORIES =		devel
 

devel/py-jupyter_core/distinfo

@@ -1,2 +1,2 @@
-SHA256 (jupyter_core-4.6.3.tar.gz) = OU/V3Xh+fIhhdBiAvfigDOOfld5dGOV5x0uIJSIhnn4=
+SHA256 (jupyter_core-4.7.0.tar.gz) = qh+Ulqs6vnLaTv4NqrDLIjOZeRRYH5oHHgdJjGrdjtM=
-SIZE (jupyter_core-4.6.3.tar.gz) = 67305
+SIZE (jupyter_core-4.7.0.tar.gz) = 66444

devel/py-jupyter_core/patches/patch-jupyter_core_tests_test_command_py

@@ -1,7 +1,7 @@
 Index: jupyter_core/tests/test_command.py
 --- jupyter_core/tests/test_command.py.orig
 +++ jupyter_core/tests/test_command.py
-@@ -99,20 +99,24 @@ def test_subcommand_not_found():
+@@ -114,20 +114,24 @@ def test_subcommand_not_found():
  
  @patch.object(sys, 'argv', [__file__] + sys.argv[1:])
  def test_subcommand_list(tmpdir):
@@ -29,7 +29,7 @@ Index: jupyter_core/tests/test_command.py
      
      path = os.pathsep.join(map(str, [a, b]))
  
-@@ -132,13 +136,17 @@ def test_subcommand_list(tmpdir):
+@@ -147,13 +151,17 @@ def test_subcommand_list(tmpdir):
              ]
  
  def test_not_on_path(tmpdir):
@@ -48,7 +48,7 @@ Index: jupyter_core/tests/test_command.py
      witness_src = '#!%s\n%s\n' % (sys.executable, 'print("WITNESS ME")')
      write_executable(witness, witness_src)
  
-@@ -148,23 +156,27 @@ def test_not_on_path(tmpdir):
+@@ -163,23 +171,27 @@ def test_not_on_path(tmpdir):
      if sys.platform == 'win32':
          env[str('PATHEXT')] = '.EXE'
      # This won't work on windows unless
@@ -79,7 +79,7 @@ Index: jupyter_core/tests/test_command.py
      witness_b_src = '#!%s\n%s\n' % (sys.executable, 'print("WITNESS B")')
      write_executable(witness_b, witness_b_src)
  
-@@ -173,5 +185,5 @@ def test_path_priority(tmpdir):
+@@ -188,5 +200,5 @@ def test_path_priority(tmpdir):
          env[str('SYSTEMROOT')] = os.environ['SYSTEMROOT']
      if sys.platform == 'win32':
          env[str('PATHEXT')] = '.EXE'

devel/py-jupyter_core/pkg/PLIST

@@ -110,7 +110,4 @@ lib/python${MODPY_VERSION}/site-packages/jupyter_core/utils/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jupyter_core/utils/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/jupyter_core/utils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jupyter_core/utils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/utils/${MODPY_PYCACHE}shutil_which.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/utils/${MODPY_PYCACHE}shutil_which.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/utils/shutil_which.py
 lib/python${MODPY_VERSION}/site-packages/jupyter_core/version.py

devel/py-nbval/Makefile

@@ -1,9 +1,8 @@
 COMMENT =		py.test plugin to validate Jupyter notebooks
 
-MODPY_EGG_VERSION =	0.9.5
+MODPY_EGG_VERSION =	0.9.6
 DISTNAME =		nbval-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		3
 
 CATEGORIES =		devel
 

devel/py-nbval/distinfo

@@ -1,2 +1,2 @@
-SHA256 (nbval-0.9.5.tar.gz) = 6HJ7tUroRDaP0XpAwV878q5kvm7DqawUM+AVXd65AvY=
+SHA256 (nbval-0.9.6.tar.gz) = z+/NLvZu4tM30LJSxrzsQCM4TrMui55fzDrICrjNfUA=
-SIZE (nbval-0.9.5.tar.gz) = 60761
+SIZE (nbval-0.9.6.tar.gz) = 60932

devel/qt-creator/Makefile

@@ -97,8 +97,6 @@ pre-configure:
 	cd ${WRKSRC}; sed -i 's,"gdb","egdb",g' ${GDB_ADJ_FILES}
 	# use system qbs/syntax-highlighting (qtcreator.pro)
 	rm -rf ${WRKSRC}/src/shared/qbs
-	# custom code fails to find yaml-cpp>=0.8.0
-	rm -f ${WRKSRC}/cmake/Findyaml-cpp.cmake
 
 post-install:
 .for _l _v in ${SHARED_LIBS}

games/speeddreams/Makefile

@@ -1,5 +1,3 @@
-BROKEN =		failure on startup
-
 ONLY_FOR_ARCHS =	amd64 i386
 
 MULTI_PACKAGES =	-main -data
@@ -7,12 +5,10 @@ MULTI_PACKAGES =	-main -data
 COMMENT-main =		open source motorsport simulation
 COMMENT-data =		open source motorsport simulation, data files
 
-V =			2.2.1
+V =			2.3.0
-REV =			r6404
+REV =			r8786
 DISTNAME =		speed-dreams-src-base-$V-${REV}
 PKGNAME =		speeddreams-$V
-REVISION-data =		1
-REVISION-main =		1
 
 CATEGORIES =		games
 
@@ -23,10 +19,10 @@ MAINTAINER =		Pascal Stumpf <pascal@stumpf.co>
 # GPLv2+
 PERMIT_PACKAGE =	Yes
 
-WANTLIB-main += GL GLU ICE OpenThreads SDL2 SM X11 Xext Xrandr c enet
+WANTLIB-main += ${COMPILER_LIBCXX} GL GLU ICE OpenThreads SDL2 SDL2_mixer
-WANTLIB-main += expat jpeg m ogg openal osg osgDB osgFX osgGA osgParticle
+WANTLIB-main += SM X11 Xext Xrandr c curl enet expat jpeg m openal
-WANTLIB-main += osgShadow osgUtil osgViewer png pthread ${COMPILER_LIBCXX} vorbis
+WANTLIB-main += osg osgDB osgFX osgGA osgParticle osgShadow osgText
-WANTLIB-main += vorbisfile z
+WANTLIB-main += osgUtil osgViewer png z
 WANTLIB-data = #empty
 
 COMPILER =		base-clang ports-gcc base-gcc
@@ -51,6 +47,7 @@ BUILD_DEPENDS =		devel/plib \
 			archivers/gtar
 LIB_DEPENDS-main =	net/enet \
 			devel/sdl2 \
+			devel/sdl2-mixer \
 			audio/openal \
 			graphics/png \
 			graphics/jpeg \

games/speeddreams/distinfo

@@ -1,10 +1,10 @@
-SHA256 (speed-dreams-src-base-2.2.1-r6404.tar.xz) = fV1aYWvfjtN96PL/M1bp+m94GvNreYwI3V631dHUhww=
+SHA256 (speed-dreams-src-base-2.3.0-r8786.tar.xz) = DUyMs9Hr1PYgmNVwBY/e6snVeGl9GX0AnZ7S+TFABKQ=
-SHA256 (speed-dreams-src-hq-cars-and-tracks-2.2.1-r6404.tar.xz) = eHywuVOGOP0BNGunkx6TuT6uR4SezSENzlYQC0KgoMA=
+SHA256 (speed-dreams-src-hq-cars-and-tracks-2.3.0-r8786.tar.xz) = WT+W6uuw4BRSbF1Cw123q3v9qSCvBQ7TcQ/Y0RV/7Js=
-SHA256 (speed-dreams-src-more-hq-cars-and-tracks-2.2.1-r6404.tar.xz) = jbPmO/wCCcpt5W6YCAp85LIRzM7109ek0w/LARp/ow4=
+SHA256 (speed-dreams-src-more-hq-cars-and-tracks-2.3.0-r8786.tar.xz) = psApv+Z1HDFvh5bzt125mo/ZvO5rjee/KhOf45iKnKk=
-SHA256 (speed-dreams-src-unmaintained-2.2.1-r6404.tar.xz) = p1bRuSrzL+mQwkfjCFwOc+wb0xyX6fc6cQ3/AzOr6xM=
+SHA256 (speed-dreams-src-unmaintained-2.3.0-r8786.tar.xz) = 0Ws4MOzm4nhZ3H2Ey9zB8e3XH4rFLPGvVBaBIqrMrLM=
-SHA256 (speed-dreams-src-wip-cars-and-tracks-2.2.1-r6404.tar.xz) = tcN02cooTeWhvzT5TFj+zyYhVgVQ1s3v7ySJlk05U3s=
+SHA256 (speed-dreams-src-wip-cars-and-tracks-2.3.0-r8786.tar.xz) = OEAbqFfO2PzHP7+eAtPNn3Ql6fYNTKzzQW8lHe9KDXM=
-SIZE (speed-dreams-src-base-2.2.1-r6404.tar.xz) = 161631948
+SIZE (speed-dreams-src-base-2.3.0-r8786.tar.xz) = 250870100
-SIZE (speed-dreams-src-hq-cars-and-tracks-2.2.1-r6404.tar.xz) = 452311688
+SIZE (speed-dreams-src-hq-cars-and-tracks-2.3.0-r8786.tar.xz) = 698564396
-SIZE (speed-dreams-src-more-hq-cars-and-tracks-2.2.1-r6404.tar.xz) = 530667780
+SIZE (speed-dreams-src-more-hq-cars-and-tracks-2.3.0-r8786.tar.xz) = 795460296
-SIZE (speed-dreams-src-unmaintained-2.2.1-r6404.tar.xz) = 58004
+SIZE (speed-dreams-src-unmaintained-2.3.0-r8786.tar.xz) = 58280
-SIZE (speed-dreams-src-wip-cars-and-tracks-2.2.1-r6404.tar.xz) = 250477112
+SIZE (speed-dreams-src-wip-cars-and-tracks-2.3.0-r8786.tar.xz) = 414204048

games/speeddreams/patches/patch-cmake_macros_cmake

@@ -1,6 +1,7 @@
---- cmake/macros.cmake.orig	Wed Jun 18 16:19:18 2014
+Index: cmake/macros.cmake
-+++ cmake/macros.cmake	Fri Jul 11 14:32:00 2014
+--- cmake/macros.cmake.orig
-@@ -81,22 +81,18 @@ MARK_AS_ADVANCED(SD_TOOLS_EXECPREFIX)
++++ cmake/macros.cmake
+@@ -85,22 +85,18 @@ MARK_AS_ADVANCED(SD_TOOLS_EXECPREFIX)
  
  # Determine the default value of the data, bin and lib (and man) folders.
  IF(IN_SOURCETREE)

games/speeddreams/patches/patch-src_drivers_shadow_src_WheelModel_h

@@ -0,0 +1,14 @@
+Index: src/drivers/shadow/src/WheelModel.h
+--- src/drivers/shadow/src/WheelModel.h.orig
++++ src/drivers/shadow/src/WheelModel.h
+@@ -22,6 +22,10 @@
+ #include <track.h>
+ #include <math.h>
+ 
++#undef _B
++#undef _C
++#undef _X
++
+ //#include "CarModel.h"
+ class CarModel;
+ 

games/speeddreams/patches/patch-src_drivers_usr_src_mod_cpp

@@ -1,8 +0,0 @@
---- src/drivers/usr/src/mod.cpp.orig	Fri Jul 11 16:38:05 2014
-+++ src/drivers/usr/src/mod.cpp	Fri Jul 11 16:38:24 2014
-@@ -1,4 +1,4 @@
--/***************************************************************************
-+/***************************************************************************
- 
-     file                 : mod.cpp
-     created              : Wed May 14 19:53:00 CET 2003

games/speeddreams/patches/patch-src_libs_learning_policy_cpp

@@ -1,29 +0,0 @@
---- src/libs/learning/policy.cpp.orig	Mon Apr 18 17:37:10 2016
-+++ src/libs/learning/policy.cpp	Tue Sep 20 01:28:40 2016
-@@ -437,7 +437,7 @@ int DiscretePolicy::SelectAction (int s, real r, int f
- 					// if P[][] remains unchanged between updates.
- 					// -- removed because it doesn't work! --
- 					//P[i][j] += 0.01*delta * e[i][j] * (1.-P[i][j]);
--					if ((fabs (Q[i][j])>1000.0)||(isnan(Q[i][j]))) {
-+					if ((fabs (Q[i][j])>1000.0)||(std::isnan(Q[i][j]))) {
- 						printf ("u: %d %d %f %f\n", i,j,Q[i][j], ad * e[i][j]);
- 					}
- 					
-@@ -523,7 +523,7 @@ void DiscretePolicy::loadFile (char* f)
- 		if( readSize < (int unsigned)n_actions )
- 			fprintf(stderr, "Error when reading file");
- 		for (j=0; j<n_actions; j++) {
--			if ((fabs (Q[i][j])>100.0)||(isnan(Q[i][j]))) {
-+			if ((fabs (Q[i][j])>100.0)||(std::isnan(Q[i][j]))) {
- 				printf ("l: %d %d %f\n", i,j,Q[i][j]);
- 				Q[i][j] = 0.0;
- 			}
-@@ -586,7 +586,7 @@ void DiscretePolicy::saveFile (char* f) {
- 		if( writeSize < (int unsigned)n_actions)
- 			fprintf( stderr, "Failed to write all data to file %s\n", f);
- 		for (int j=0; j<n_actions; j++) {
--			if ((fabs (Q[i][j])>100.0)||(isnan(Q[i][j]))) {
-+			if ((fabs (Q[i][j])>100.0)||(std::isnan(Q[i][j]))) {
- 				printf ("s: %d %d %f\n", i,j,Q[i][j]);
- 			}
- 		}

games/speeddreams/patches/patch-src_libs_robottools_rthumandriver_cpp

@@ -1,6 +1,7 @@
---- src/libs/robottools/rthumandriver.cpp.orig	Mon Apr 18 17:37:11 2016
+Index: src/libs/robottools/rthumandriver.cpp
-+++ src/libs/robottools/rthumandriver.cpp	Tue Sep 20 01:28:40 2016
+--- src/libs/robottools/rthumandriver.cpp.orig
-@@ -1406,7 +1406,7 @@ static void common_drive(const int index, tCarElt* car
++++ src/libs/robottools/rthumandriver.cpp
+@@ -1462,7 +1462,7 @@ static void common_drive(const int index, tCarElt* car
          }
          ax0 = ax0 * cmd[CMD_THROTTLE].pow;
          car->_accelCmd =  pow(fabs(ax0), 1.0f / cmd[CMD_THROTTLE].sens) / (1.0 + cmd[CMD_THROTTLE].spdSens * car->_speed_x / 1000.0);

games/speeddreams/patches/patch-src_libs_tgf_linuxspec_cpp

@@ -1,42 +1,30 @@
---- src/libs/tgf/linuxspec.cpp.orig	Mon Apr 18 17:37:10 2016
+Index: src/libs/tgf/linuxspec.cpp
-+++ src/libs/tgf/linuxspec.cpp	Tue Sep 20 11:45:53 2016
+--- src/libs/tgf/linuxspec.cpp.orig
-@@ -632,9 +632,9 @@ unsigned linuxGetNumberOfCPUs()
++++ src/libs/tgf/linuxspec.cpp
- 	{
+@@ -641,7 +641,7 @@ unsigned linuxGetNumberOfCPUs()
- 		
+ 		// MacOS X, OpenBSD, NetBSD, etc ...
- 		// MacOS X, FreeBSD, OpenBSD, NetBSD, etc ...
+ #if (defined(__APPLE__) && !defined(USE_MACPORTS)) || defined(__OpenBSD__) || defined(__NetBSD__)
--#if (defined(__APPLE__) && !defined(USE_MACPORTS)) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+#if (defined(__APPLE__) && !defined(USE_MACPORTS)) || defined(__FreeBSD__) || defined(__NetBSD__)
  		
 -		nt mib[4];
 +		int mib[4];
  		size_t len; 
  		
  		// Set the mib for hw.ncpu
-@@ -642,7 +642,7 @@ unsigned linuxGetNumberOfCPUs()
+@@ -649,7 +649,7 @@ unsigned linuxGetNumberOfCPUs()
  		// Get the number of CPUs from the system
  		// 1) Try HW_AVAILCPU first.
  		mib[0] = CTL_HW;
 -		mib[1] = HW_AVAILCPU;  // alternatively, try HW_NCPU;
-+		mib[1] = HW_AVAILCPU;
++		mib[1] = HW_NCPU;  // alternatively, try HW_NCPU;
  		sysctl(mib, 2, &nCPUs, &len, NULL, 0);
  		
  		if (nCPUs < 1) 
-@@ -653,7 +653,8 @@ unsigned linuxGetNumberOfCPUs()
+@@ -699,7 +699,7 @@ unsigned linuxGetNumberOfCPUs()
- 		}
- 		
- 		// Linux, Solaris, AIX
--#elif defined(linux) || defined(__linux__) || defined(USE_MACPORTS)
-+#elif defined(linux) || defined(__linux__) || defined(USE_MACPORTS) || \
-+	defined(__OpenBSD__)
- 		
- 		nCPUs = (unsigned)sysconf(_SC_NPROCESSORS_ONLN);
- 		
-@@ -692,7 +693,7 @@ unsigned linuxGetNumberOfCPUs()
  * Remarks
  *    
  */
--#if !defined(USE_MACPORTS)
+-#if !defined(USE_MACPORTS) && !defined(__HAIKU__)
-+#if !defined(USE_MACPORTS) && !defined(__OpenBSD__)
++#if !defined(USE_MACPORTS) && !defined(__HAIKU__) && !defined(__OpenBSD__)
  std::string cpuSet2String(const cpu_set_t* pCPUSet)
  {
  	std::ostringstream ossCPUSet;

games/speeddreams/patches/patch-src_libs_tgfclient_CMakeLists_txt

@@ -1,8 +1,9 @@
---- src/libs/tgfclient/CMakeLists.txt.orig	Mon Apr 18 17:37:10 2016
+Index: src/libs/tgfclient/CMakeLists.txt
-+++ src/libs/tgfclient/CMakeLists.txt	Tue Sep 20 01:28:40 2016
+--- src/libs/tgfclient/CMakeLists.txt.orig
-@@ -116,6 +116,7 @@ ENDIF(WIN32)
++++ src/libs/tgfclient/CMakeLists.txt
+@@ -82,6 +82,7 @@ ENDIF(WIN32)
  
- IF(UNIX)
+ IF(UNIX AND NOT HAIKU)
      ADD_X11_LIBRARY(tgfclient)
 +    INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR})
      IF(OPTION_XRANDR)

games/speeddreams/patches/patch-src_modules_graphic_ssggraph_CMakeLists_txt

@@ -1,6 +1,7 @@
---- src/modules/graphic/ssggraph/CMakeLists.txt.orig	Mon Apr 18 17:37:09 2016
+Index: src/modules/graphic/ssggraph/CMakeLists.txt
-+++ src/modules/graphic/ssggraph/CMakeLists.txt	Tue Sep 20 01:28:41 2016
+--- src/modules/graphic/ssggraph/CMakeLists.txt.orig
-@@ -49,6 +49,10 @@ IF(COMMAND CMAKE_POLICY)
++++ src/modules/graphic/ssggraph/CMakeLists.txt
+@@ -48,6 +48,10 @@ IF(COMMAND CMAKE_POLICY)
      CMAKE_POLICY(SET CMP0003 NEW)
  ENDIF(COMMAND CMAKE_POLICY)
  

games/speeddreams/patches/patch-src_modules_graphic_ssggraph_grbackground_cpp

@@ -1,8 +0,0 @@
---- src/modules/graphic/ssggraph/grbackground.cpp.orig	Fri Jul 11 16:44:38 2014
-+++ src/modules/graphic/ssggraph/grbackground.cpp	Fri Jul 11 16:44:42 2014
-@@ -1,4 +1,4 @@
--/***************************************************************************
-+/***************************************************************************
- 
-     file                 : grbackground.cpp
-     created              : Thu Nov 25 21:09:40 CEST 2010

games/speeddreams/patches/patch-src_modules_simu_simuv2_1_simu_cpp

@@ -1,6 +1,7 @@
---- src/modules/simu/simuv2.1/simu.cpp.orig	Tue Jul 30 00:54:58 2013
+Index: src/modules/simu/simuv2.1/simu.cpp
-+++ src/modules/simu/simuv2.1/simu.cpp	Tue Jul 30 00:55:26 2013
+--- src/modules/simu/simuv2.1/simu.cpp.orig
-@@ -57,11 +57,11 @@ ctrlCheck(tCar *car)
++++ src/modules/simu/simuv2.1/simu.cpp
+@@ -57,10 +57,10 @@ ctrlCheck(tCar *car)
  
      /* sanity check */
  #ifndef WIN32
@@ -8,12 +9,10 @@
 -    if (isnan(car->ctrl->brakeCmd) || isinf(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
 -    if (isnan(car->ctrl->clutchCmd) || isinf(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0;
 -    if (isnan(car->ctrl->steer) || isinf(car->ctrl->steer)) car->ctrl->steer = 0;
--    if (isnan(car->ctrl->gear) || isinf(car->ctrl->gear)) car->ctrl->gear = 0;
++    if (std::isnan(car->ctrl->accelCmd) || isinf(car->ctrl->accelCmd)) car->ctrl->accelCmd = 0;
-+    if (std::isnan(car->ctrl->accelCmd) || std::isinf(car->ctrl->accelCmd)) car->ctrl->accelCmd = 0;
++    if (std::isnan(car->ctrl->brakeCmd) || isinf(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
-+    if (std::isnan(car->ctrl->brakeCmd) || std::isinf(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
++    if (std::isnan(car->ctrl->clutchCmd) || isinf(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0;
-+    if (std::isnan(car->ctrl->clutchCmd) || std::isinf(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0;
++    if (std::isnan(car->ctrl->steer) || isinf(car->ctrl->steer)) car->ctrl->steer = 0;
-+    if (std::isnan(car->ctrl->steer) || std::isinf(car->ctrl->steer)) car->ctrl->steer = 0;
-+    if (std::isnan(car->ctrl->gear) || std::isinf(car->ctrl->gear)) car->ctrl->gear = 0;
  #else
      if (isnan(car->ctrl->accelCmd)) car->ctrl->accelCmd = 0;
      if (isnan(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;

games/speeddreams/patches/patch-src_modules_simu_simuv2_simu_cpp

@@ -1,6 +1,7 @@
---- src/modules/simu/simuv2/simu.cpp.orig	Tue Jul 30 00:53:58 2013
+Index: src/modules/simu/simuv2/simu.cpp
-+++ src/modules/simu/simuv2/simu.cpp	Tue Jul 30 00:54:36 2013
+--- src/modules/simu/simuv2/simu.cpp.orig
-@@ -57,11 +57,11 @@ ctrlCheck(tCar *car)
++++ src/modules/simu/simuv2/simu.cpp
+@@ -57,10 +57,10 @@ ctrlCheck(tCar *car)
  
      /* sanity check */
  #ifndef WIN32
@@ -8,12 +9,10 @@
 -    if (isnan(car->ctrl->brakeCmd) || isinf(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
 -    if (isnan(car->ctrl->clutchCmd) || isinf(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0;
 -    if (isnan(car->ctrl->steer) || isinf(car->ctrl->steer)) car->ctrl->steer = 0;
--    if (isnan(car->ctrl->gear) || isinf(car->ctrl->gear)) car->ctrl->gear = 0;
++    if (std::isnan(car->ctrl->accelCmd) || isinf(car->ctrl->accelCmd)) car->ctrl->accelCmd = 0;
-+    if (std::isnan(car->ctrl->accelCmd) || std::isinf(car->ctrl->accelCmd)) car->ctrl->accelCmd = 0;
++    if (std::isnan(car->ctrl->brakeCmd) || isinf(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
-+    if (std::isnan(car->ctrl->brakeCmd) || std::isinf(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
++    if (std::isnan(car->ctrl->clutchCmd) || isinf(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0;
-+    if (std::isnan(car->ctrl->clutchCmd) || std::isinf(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0;
++    if (std::isnan(car->ctrl->steer) || isinf(car->ctrl->steer)) car->ctrl->steer = 0;
-+    if (std::isnan(car->ctrl->steer) || std::isinf(car->ctrl->steer)) car->ctrl->steer = 0;
-+    if (std::isnan(car->ctrl->gear) || std::isinf(car->ctrl->gear)) car->ctrl->gear = 0;
  #else
      if (isnan(car->ctrl->accelCmd)) car->ctrl->accelCmd = 0;
      if (isnan(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;

games/speeddreams/patches/patch-src_modules_simu_simuv3_simu_cpp

@@ -1,6 +1,7 @@
---- src/modules/simu/simuv3/simu.cpp.orig	Tue Jul 30 00:47:44 2013
+Index: src/modules/simu/simuv3/simu.cpp
-+++ src/modules/simu/simuv3/simu.cpp	Tue Jul 30 00:48:56 2013
+--- src/modules/simu/simuv3/simu.cpp.orig
-@@ -75,11 +75,11 @@ ctrlCheck(tCar *car)
++++ src/modules/simu/simuv3/simu.cpp
+@@ -75,10 +75,10 @@ ctrlCheck(tCar *car)
  
      /* sanity check */
  #ifndef WIN32
@@ -8,12 +9,10 @@
 -    if (isnan(car->ctrl->brakeCmd) || isinf(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
 -    if (isnan(car->ctrl->clutchCmd) || isinf(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0;
 -    if (isnan(car->ctrl->steer) || isinf(car->ctrl->steer)) car->ctrl->steer = 0;
--    if (isnan(car->ctrl->gear) || isinf(car->ctrl->gear)) car->ctrl->gear = 0;
++    if (std::isnan(car->ctrl->accelCmd) || isinf(car->ctrl->accelCmd)) car->ctrl->accelCmd = 0;
-+    if (std::isnan(car->ctrl->accelCmd) || std::isinf(car->ctrl->accelCmd)) car->ctrl->accelCmd = 0;
++    if (std::isnan(car->ctrl->brakeCmd) || isinf(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
-+    if (std::isnan(car->ctrl->brakeCmd) || std::isinf(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
++    if (std::isnan(car->ctrl->clutchCmd) || isinf(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0;
-+    if (std::isnan(car->ctrl->clutchCmd) || std::isinf(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0;
++    if (std::isnan(car->ctrl->steer) || isinf(car->ctrl->steer)) car->ctrl->steer = 0;
-+    if (std::isnan(car->ctrl->steer) || std::isinf(car->ctrl->steer)) car->ctrl->steer = 0;
-+    if (std::isnan(car->ctrl->gear) || std::isinf(car->ctrl->gear)) car->ctrl->gear = 0;
  #else
      if (isnan(car->ctrl->accelCmd)) car->ctrl->accelCmd = 0;
      if (isnan(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;

games/speeddreams/patches/patch-src_modules_simu_simuv4_simu_cpp

@@ -1,6 +1,7 @@
---- src/modules/simu/simuv4/simu.cpp.orig	Fri Jul 11 16:43:39 2014
+Index: src/modules/simu/simuv4/simu.cpp
-+++ src/modules/simu/simuv4/simu.cpp	Fri Jul 11 16:43:39 2014
+--- src/modules/simu/simuv4/simu.cpp.orig
-@@ -57,29 +57,29 @@ ctrlCheck(tCar *car)
++++ src/modules/simu/simuv4/simu.cpp
+@@ -68,16 +68,16 @@ ctrlCheck(tCar *car)
  
      /* sanity check */
  #ifndef WIN32
@@ -8,47 +9,22 @@
 -    if (isnan(car->ctrl->brakeCmd) || isinf(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
 -    if (isnan(car->ctrl->clutchCmd) || isinf(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0;
 -    if (isnan(car->ctrl->steer) || isinf(car->ctrl->steer)) car->ctrl->steer = 0;
--    if (isnan(car->ctrl->gear) || isinf(car->ctrl->gear)) car->ctrl->gear = 0;
 -    if (isnan(car->ctrl->wingFrontCmd) || isinf(car->ctrl->wingFrontCmd)) car->ctrl->wingFrontCmd = 0;
 -    if (isnan(car->ctrl->wingRearCmd) || isinf(car->ctrl->wingRearCmd)) car->ctrl->wingRearCmd = 0;
 -    if (isnan(car->ctrl->brakeFrontLeftCmd) || isinf(car->ctrl->brakeFrontLeftCmd)) car->ctrl->brakeFrontLeftCmd = 0;
 -    if (isnan(car->ctrl->brakeFrontRightCmd) || isinf(car->ctrl->brakeFrontRightCmd)) car->ctrl->brakeFrontRightCmd = 0;
 -    if (isnan(car->ctrl->brakeRearLeftCmd) || isinf(car->ctrl->brakeRearLeftCmd)) car->ctrl->brakeRearLeftCmd = 0;
 -    if (isnan(car->ctrl->brakeRearRightCmd) || isinf(car->ctrl->brakeRearRightCmd)) car->ctrl->brakeRearRightCmd = 0;
-+    if (std::isnan(car->ctrl->accelCmd) || std::isinf(car->ctrl->accelCmd)) car->ctrl->accelCmd = 0;
++    if (std::isnan(car->ctrl->accelCmd) || isinf(car->ctrl->accelCmd)) car->ctrl->accelCmd = 0;
-+    if (std::isnan(car->ctrl->brakeCmd) || std::isinf(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
++    if (std::isnan(car->ctrl->brakeCmd) || isinf(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
-+    if (std::isnan(car->ctrl->clutchCmd) || std::isinf(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0;
++    if (std::isnan(car->ctrl->clutchCmd) || isinf(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0;
-+    if (std::isnan(car->ctrl->steer) || std::isinf(car->ctrl->steer)) car->ctrl->steer = 0;
++    if (std::isnan(car->ctrl->steer) || isinf(car->ctrl->steer)) car->ctrl->steer = 0;
-+    if (std::isnan(car->ctrl->gear) || std::isinf(car->ctrl->gear)) car->ctrl->gear = 0;
++    if (std::isnan(car->ctrl->wingFrontCmd) || isinf(car->ctrl->wingFrontCmd)) car->ctrl->wingFrontCmd = 0;
-+	if (std::isnan(car->ctrl->wingFrontCmd) || std::isinf(car->ctrl->wingFrontCmd)) car->ctrl->wingFrontCmd = 0;
++    if (std::isnan(car->ctrl->wingRearCmd) || isinf(car->ctrl->wingRearCmd)) car->ctrl->wingRearCmd = 0;
-+	if (std::isnan(car->ctrl->wingRearCmd) || std::isinf(car->ctrl->wingRearCmd)) car->ctrl->wingRearCmd = 0;
++    if (std::isnan(car->ctrl->brakeFrontLeftCmd) || isinf(car->ctrl->brakeFrontLeftCmd)) car->ctrl->brakeFrontLeftCmd = 0;
-+	if (std::isnan(car->ctrl->brakeFrontLeftCmd) || std::isinf(car->ctrl->brakeFrontLeftCmd)) car->ctrl->brakeFrontLeftCmd = 0;
++    if (std::isnan(car->ctrl->brakeFrontRightCmd) || isinf(car->ctrl->brakeFrontRightCmd)) car->ctrl->brakeFrontRightCmd = 0;
-+	if (std::isnan(car->ctrl->brakeFrontRightCmd) || std::isinf(car->ctrl->brakeFrontRightCmd)) car->ctrl->brakeFrontRightCmd = 0;
++    if (std::isnan(car->ctrl->brakeRearLeftCmd) || isinf(car->ctrl->brakeRearLeftCmd)) car->ctrl->brakeRearLeftCmd = 0;
-+	if (std::isnan(car->ctrl->brakeRearLeftCmd) || std::isinf(car->ctrl->brakeRearLeftCmd)) car->ctrl->brakeRearLeftCmd = 0;
++    if (std::isnan(car->ctrl->brakeRearRightCmd) || isinf(car->ctrl->brakeRearRightCmd)) car->ctrl->brakeRearRightCmd = 0;
-+	if (std::isnan(car->ctrl->brakeRearRightCmd) || std::isinf(car->ctrl->brakeRearRightCmd)) car->ctrl->brakeRearRightCmd = 0;
  #else
--	if (isnan(car->ctrl->accelCmd)) car->ctrl->accelCmd = 0;
+     if (isnan(car->ctrl->accelCmd)) car->ctrl->accelCmd = 0;
--    if (isnan(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
+     if (isnan(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
--    if (isnan(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0;
--    if (isnan(car->ctrl->steer)) car->ctrl->steer = 0;
--    if (isnan(car->ctrl->gear)) car->ctrl->gear = 0;
--	if (isnan(car->ctrl->wingFrontCmd)) car->ctrl->wingFrontCmd = 0;
--	if (isnan(car->ctrl->wingRearCmd)) car->ctrl->wingRearCmd = 0;
--	if (isnan(car->ctrl->brakeFrontLeftCmd)) car->ctrl->brakeFrontLeftCmd = 0;
--	if (isnan(car->ctrl->brakeFrontRightCmd)) car->ctrl->brakeFrontRightCmd = 0;
--	if (isnan(car->ctrl->brakeRearLeftCmd)) car->ctrl->brakeRearLeftCmd = 0;
--	if (isnan(car->ctrl->brakeRearRightCmd)) car->ctrl->brakeRearRightCmd = 0;
-+	if (std::isnan(car->ctrl->accelCmd)) car->ctrl->accelCmd = 0;
-+    if (std::isnan(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
-+    if (std::isnan(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0;
-+    if (std::isnan(car->ctrl->steer)) car->ctrl->steer = 0;
-+    if (std::isnan(car->ctrl->gear)) car->ctrl->gear = 0;
-+	if (std::isnan(car->ctrl->wingFrontCmd)) car->ctrl->wingFrontCmd = 0;
-+	if (std::isnan(car->ctrl->wingRearCmd)) car->ctrl->wingRearCmd = 0;
-+	if (std::isnan(car->ctrl->brakeFrontLeftCmd)) car->ctrl->brakeFrontLeftCmd = 0;
-+	if (std::isnan(car->ctrl->brakeFrontRightCmd)) car->ctrl->brakeFrontRightCmd = 0;
-+	if (std::isnan(car->ctrl->brakeRearLeftCmd)) car->ctrl->brakeRearLeftCmd = 0;
-+	if (std::isnan(car->ctrl->brakeRearRightCmd)) car->ctrl->brakeRearRightCmd = 0;
- #endif
- 
-     /* When the car is broken try to send it on the track side */

games/speeddreams/patches/patch-src_modules_userinterface_legacymenu_CMakeLists_txt

@@ -1,6 +1,7 @@
---- src/modules/userinterface/legacymenu/CMakeLists.txt.orig	Mon Apr 18 17:37:07 2016
+Index: src/modules/userinterface/legacymenu/CMakeLists.txt
-+++ src/modules/userinterface/legacymenu/CMakeLists.txt	Tue Sep 20 01:28:41 2016
+--- src/modules/userinterface/legacymenu/CMakeLists.txt.orig
-@@ -63,6 +63,10 @@ ENDIF(OPTION_SDL2)
++++ src/modules/userinterface/legacymenu/CMakeLists.txt
+@@ -78,6 +78,10 @@ ADD_SDL2_INCLUDEDIR()
  
  ADD_ENET_INCLUDEDIR()
  

games/speeddreams/patches/patch-src_tools_accc_ac3dload_cpp

@@ -1,11 +0,0 @@
---- src/tools/accc/ac3dload.cpp.orig	Fri Jul 11 14:50:39 2014
-+++ src/tools/accc/ac3dload.cpp	Fri Jul 11 14:50:54 2014
-@@ -576,7 +576,7 @@ int computeNorm(point_t * pv1, point_t *pv2, point_t *
-     norm->y = (p3 * q1 - q3 * p1) / dd;
-     norm->z = (p1 * q2 - q1 * p2) / dd;
- 
--    if (isnan(norm->x) || isnan(norm->y) || isnan(norm->z))
-+    if (std::isnan(norm->x) || std::isnan(norm->y) || std::isnan(norm->z))
-     {
-         norm->x = 0;
-         norm->y = 1.0;

games/speeddreams/patches/patch-src_tools_nfsperf_CMakeLists_txt

@@ -1,11 +0,0 @@
---- src/tools/nfsperf/CMakeLists.txt.orig	Wed Jun 18 16:20:25 2014
-+++ src/tools/nfsperf/CMakeLists.txt	Fri Jul 11 14:32:00 2014
-@@ -17,7 +17,7 @@ SD_ADD_EXECUTABLE(${_TARGET_NAME} ${NFSPERF_SOURCES})
- ADD_SDLIB_LIBRARY(${_TARGET_NAME} portability tgf txml) # txml ignored if OPTION_3RDPARTY_EXPAT
- 
- IF(UNIX)
--    TARGET_LINK_LIBRARIES(${_TARGET_NAME} dl)
-+    TARGET_LINK_LIBRARIES(${_TARGET_NAME})
- ENDIF(UNIX)
- 
- IF(UNIX)

games/speeddreams/patches/patch-src_tools_trackgen_CMakeLists_txt

@@ -1,6 +1,7 @@
---- src/tools/trackgen/CMakeLists.txt.orig	Mon Apr 18 17:37:07 2016
+Index: src/tools/trackgen/CMakeLists.txt
-+++ src/tools/trackgen/CMakeLists.txt	Tue Sep 20 01:28:42 2016
+--- src/tools/trackgen/CMakeLists.txt.orig
-@@ -60,6 +60,7 @@ ENDIF(MINGW)
++++ src/tools/trackgen/CMakeLists.txt
+@@ -52,6 +52,7 @@ ENDIF(MINGW)
  
  IF(UNIX)
      SD_INSTALL_FILES(MAN man6 PREFIX ${SOURCE_DIR}/doc/man FILES ${_TARGET_NAME}.6)

games/speeddreams/patches/patch-src_tools_xmlversion_CMakeLists_txt

@@ -1,11 +0,0 @@
---- src/tools/xmlversion/CMakeLists.txt.orig	Mon Apr 18 17:37:07 2016
-+++ src/tools/xmlversion/CMakeLists.txt	Tue Sep 20 01:28:43 2016
-@@ -24,7 +24,7 @@ ELSE(CMAKE_SKIP_RPATH OR CMAKE_SKIP_BUILD_RPATH)
- ENDIF(CMAKE_SKIP_RPATH OR CMAKE_SKIP_BUILD_RPATH)
- 
- IF(UNIX)
--  TARGET_LINK_LIBRARIES(xmlversion dl)
-+  TARGET_LINK_LIBRARIES(xmlversion)
- ENDIF(UNIX)
- 
- # Note: we don't install xmlversion, as it's a only a build-time tool.

games/speeddreams/pkg/PLIST-main

@@ -51,6 +51,7 @@ include/speed-dreams-2/racemanagers.h
 include/speed-dreams-2/replay.h
 include/speed-dreams-2/robot.h
 include/speed-dreams-2/robottools.h
+include/speed-dreams-2/sound.h
 include/speed-dreams-2/teammanager.h
 include/speed-dreams-2/telemetry.h
 include/speed-dreams-2/tgf.h
@@ -86,111 +87,121 @@ include/speed-dreams-2/tracks.h
 lib/speed-dreams-2/
 lib/speed-dreams-2/drivers/
 lib/speed-dreams-2/drivers/dandroid/
-lib/speed-dreams-2/drivers/dandroid/dandroid.so
+@so lib/speed-dreams-2/drivers/dandroid/dandroid.so
 lib/speed-dreams-2/drivers/dandroid_36GP/
-lib/speed-dreams-2/drivers/dandroid_36GP/dandroid_36GP.so
+@so lib/speed-dreams-2/drivers/dandroid_36GP/dandroid_36GP.so
 lib/speed-dreams-2/drivers/dandroid_67GP/
-lib/speed-dreams-2/drivers/dandroid_67GP/dandroid_67GP.so
+@so lib/speed-dreams-2/drivers/dandroid_67GP/dandroid_67GP.so
-lib/speed-dreams-2/drivers/dandroid_lp1/
-lib/speed-dreams-2/drivers/dandroid_lp1/dandroid_lp1.so
 lib/speed-dreams-2/drivers/dandroid_ls1/
-lib/speed-dreams-2/drivers/dandroid_ls1/dandroid_ls1.so
+@so lib/speed-dreams-2/drivers/dandroid_ls1/dandroid_ls1.so
 lib/speed-dreams-2/drivers/dandroid_ls2/
-lib/speed-dreams-2/drivers/dandroid_ls2/dandroid_ls2.so
+@so lib/speed-dreams-2/drivers/dandroid_ls2/dandroid_ls2.so
 lib/speed-dreams-2/drivers/dandroid_mpa1/
-lib/speed-dreams-2/drivers/dandroid_mpa1/dandroid_mpa1.so
+@so lib/speed-dreams-2/drivers/dandroid_mpa1/dandroid_mpa1.so
 lib/speed-dreams-2/drivers/dandroid_mpa11/
-lib/speed-dreams-2/drivers/dandroid_mpa11/dandroid_mpa11.so
+@so lib/speed-dreams-2/drivers/dandroid_mpa11/dandroid_mpa11.so
 lib/speed-dreams-2/drivers/dandroid_mpa12/
-lib/speed-dreams-2/drivers/dandroid_mpa12/dandroid_mpa12.so
+@so lib/speed-dreams-2/drivers/dandroid_mpa12/dandroid_mpa12.so
 lib/speed-dreams-2/drivers/dandroid_rs/
-lib/speed-dreams-2/drivers/dandroid_rs/dandroid_rs.so
+@so lib/speed-dreams-2/drivers/dandroid_rs/dandroid_rs.so
 lib/speed-dreams-2/drivers/dandroid_sc/
-lib/speed-dreams-2/drivers/dandroid_sc/dandroid_sc.so
+@so lib/speed-dreams-2/drivers/dandroid_sc/dandroid_sc.so
 lib/speed-dreams-2/drivers/dandroid_srw/
-lib/speed-dreams-2/drivers/dandroid_srw/dandroid_srw.so
+@so lib/speed-dreams-2/drivers/dandroid_srw/dandroid_srw.so
 lib/speed-dreams-2/drivers/dandroid_trb1/
-lib/speed-dreams-2/drivers/dandroid_trb1/dandroid_trb1.so
+@so lib/speed-dreams-2/drivers/dandroid_trb1/dandroid_trb1.so
 lib/speed-dreams-2/drivers/human/
-lib/speed-dreams-2/drivers/human/human.so
+@so lib/speed-dreams-2/drivers/human/human.so
-lib/speed-dreams-2/drivers/kilo2008/
-lib/speed-dreams-2/drivers/kilo2008/kilo2008.so
 lib/speed-dreams-2/drivers/networkhuman/
-lib/speed-dreams-2/drivers/networkhuman/networkhuman.so
+@so lib/speed-dreams-2/drivers/networkhuman/networkhuman.so
+lib/speed-dreams-2/drivers/shadow/
+@so lib/speed-dreams-2/drivers/shadow/shadow.so
+lib/speed-dreams-2/drivers/shadow_36GP/
+@so lib/speed-dreams-2/drivers/shadow_36GP/shadow_36GP.so
+lib/speed-dreams-2/drivers/shadow_67GP/
+@so lib/speed-dreams-2/drivers/shadow_67GP/shadow_67GP.so
+lib/speed-dreams-2/drivers/shadow_ls1/
+@so lib/speed-dreams-2/drivers/shadow_ls1/shadow_ls1.so
+lib/speed-dreams-2/drivers/shadow_ls2/
+@so lib/speed-dreams-2/drivers/shadow_ls2/shadow_ls2.so
+lib/speed-dreams-2/drivers/shadow_mp1/
+@so lib/speed-dreams-2/drivers/shadow_mp1/shadow_mp1.so
+lib/speed-dreams-2/drivers/shadow_mpa1/
+@so lib/speed-dreams-2/drivers/shadow_mpa1/shadow_mpa1.so
+lib/speed-dreams-2/drivers/shadow_mpa11/
+@so lib/speed-dreams-2/drivers/shadow_mpa11/shadow_mpa11.so
+lib/speed-dreams-2/drivers/shadow_mpa12/
+@so lib/speed-dreams-2/drivers/shadow_mpa12/shadow_mpa12.so
+lib/speed-dreams-2/drivers/shadow_sc/
+@so lib/speed-dreams-2/drivers/shadow_sc/shadow_sc.so
+lib/speed-dreams-2/drivers/shadow_trb1/
+@so lib/speed-dreams-2/drivers/shadow_trb1/shadow_trb1.so
 lib/speed-dreams-2/drivers/simplix/
-lib/speed-dreams-2/drivers/simplix/simplix.so
+@so lib/speed-dreams-2/drivers/simplix/simplix.so
 lib/speed-dreams-2/drivers/simplix_36GP/
-lib/speed-dreams-2/drivers/simplix_36GP/simplix_36GP.so
+@so lib/speed-dreams-2/drivers/simplix_36GP/simplix_36GP.so
-lib/speed-dreams-2/drivers/simplix_lp1/
+lib/speed-dreams-2/drivers/simplix_67GP/
-lib/speed-dreams-2/drivers/simplix_lp1/simplix_lp1.so
+@so lib/speed-dreams-2/drivers/simplix_67GP/simplix_67GP.so
 lib/speed-dreams-2/drivers/simplix_ls1/
-lib/speed-dreams-2/drivers/simplix_ls1/simplix_ls1.so
+@so lib/speed-dreams-2/drivers/simplix_ls1/simplix_ls1.so
 lib/speed-dreams-2/drivers/simplix_ls2/
-lib/speed-dreams-2/drivers/simplix_ls2/simplix_ls2.so
+@so lib/speed-dreams-2/drivers/simplix_ls2/simplix_ls2.so
 lib/speed-dreams-2/drivers/simplix_mp5/
-lib/speed-dreams-2/drivers/simplix_mp5/simplix_mp5.so
+@so lib/speed-dreams-2/drivers/simplix_mp5/simplix_mp5.so
-lib/speed-dreams-2/drivers/simplix_mpa1/
-lib/speed-dreams-2/drivers/simplix_mpa1/simplix_mpa1.so
-lib/speed-dreams-2/drivers/simplix_mpa11/
-lib/speed-dreams-2/drivers/simplix_mpa11/simplix_mpa11.so
-lib/speed-dreams-2/drivers/simplix_mpa12/
-lib/speed-dreams-2/drivers/simplix_mpa12/simplix_mpa12.so
-lib/speed-dreams-2/drivers/simplix_ref/
-lib/speed-dreams-2/drivers/simplix_ref/simplix_ref.so
 lib/speed-dreams-2/drivers/simplix_sc/
-lib/speed-dreams-2/drivers/simplix_sc/simplix_sc.so
+@so lib/speed-dreams-2/drivers/simplix_sc/simplix_sc.so
 lib/speed-dreams-2/drivers/simplix_srw/
-lib/speed-dreams-2/drivers/simplix_srw/simplix_srw.so
+@so lib/speed-dreams-2/drivers/simplix_srw/simplix_srw.so
 lib/speed-dreams-2/drivers/simplix_trb1/
-lib/speed-dreams-2/drivers/simplix_trb1/simplix_trb1.so
+@so lib/speed-dreams-2/drivers/simplix_trb1/simplix_trb1.so
 lib/speed-dreams-2/drivers/usr/
-lib/speed-dreams-2/drivers/usr/usr.so
+@so lib/speed-dreams-2/drivers/usr/usr.so
 lib/speed-dreams-2/drivers/usr_36GP/
-lib/speed-dreams-2/drivers/usr_36GP/usr_36GP.so
+@so lib/speed-dreams-2/drivers/usr_36GP/usr_36GP.so
-lib/speed-dreams-2/drivers/usr_lp1/
+lib/speed-dreams-2/drivers/usr_67GP/
-lib/speed-dreams-2/drivers/usr_lp1/usr_lp1.so
+@so lib/speed-dreams-2/drivers/usr_67GP/usr_67GP.so
 lib/speed-dreams-2/drivers/usr_ls1/
-lib/speed-dreams-2/drivers/usr_ls1/usr_ls1.so
+@so lib/speed-dreams-2/drivers/usr_ls1/usr_ls1.so
 lib/speed-dreams-2/drivers/usr_ls2/
-lib/speed-dreams-2/drivers/usr_ls2/usr_ls2.so
+@so lib/speed-dreams-2/drivers/usr_ls2/usr_ls2.so
 lib/speed-dreams-2/drivers/usr_mpa1/
-lib/speed-dreams-2/drivers/usr_mpa1/usr_mpa1.so
+@so lib/speed-dreams-2/drivers/usr_mpa1/usr_mpa1.so
 lib/speed-dreams-2/drivers/usr_mpa11/
-lib/speed-dreams-2/drivers/usr_mpa11/usr_mpa11.so
+@so lib/speed-dreams-2/drivers/usr_mpa11/usr_mpa11.so
 lib/speed-dreams-2/drivers/usr_mpa12/
-lib/speed-dreams-2/drivers/usr_mpa12/usr_mpa12.so
+@so lib/speed-dreams-2/drivers/usr_mpa12/usr_mpa12.so
 lib/speed-dreams-2/drivers/usr_rs/
-lib/speed-dreams-2/drivers/usr_rs/usr_rs.so
+@so lib/speed-dreams-2/drivers/usr_rs/usr_rs.so
 lib/speed-dreams-2/drivers/usr_sc/
-lib/speed-dreams-2/drivers/usr_sc/usr_sc.so
+@so lib/speed-dreams-2/drivers/usr_sc/usr_sc.so
 lib/speed-dreams-2/drivers/usr_trb1/
-lib/speed-dreams-2/drivers/usr_trb1/usr_trb1.so
+@so lib/speed-dreams-2/drivers/usr_trb1/usr_trb1.so
 lib/speed-dreams-2/lib/
-lib/speed-dreams-2/lib/liblearning.so
+@so lib/speed-dreams-2/lib/liblearning.so
-lib/speed-dreams-2/lib/libnetworking.so
+@so lib/speed-dreams-2/lib/libnetworking.so
-lib/speed-dreams-2/lib/libportability.so
+@so lib/speed-dreams-2/lib/libportability.so
-lib/speed-dreams-2/lib/librobottools.so
+@so lib/speed-dreams-2/lib/librobottools.so
-lib/speed-dreams-2/lib/libtgf.so
+@so lib/speed-dreams-2/lib/libtgf.so
-lib/speed-dreams-2/lib/libtgfclient.so
+@so lib/speed-dreams-2/lib/libtgfclient.so
-lib/speed-dreams-2/lib/libtgfdata.so
+@so lib/speed-dreams-2/lib/libtgfdata.so
 lib/speed-dreams-2/modules/
 lib/speed-dreams-2/modules/graphic/
-lib/speed-dreams-2/modules/graphic/osggraph.so
+@so lib/speed-dreams-2/modules/graphic/osggraph.so
-lib/speed-dreams-2/modules/graphic/ssggraph.so
+@so lib/speed-dreams-2/modules/graphic/ssggraph.so
 lib/speed-dreams-2/modules/racing/
-lib/speed-dreams-2/modules/racing/standardgame.so
+@so lib/speed-dreams-2/modules/racing/standardgame.so
 lib/speed-dreams-2/modules/simu/
-lib/speed-dreams-2/modules/simu/simuv2.1.so
+@so lib/speed-dreams-2/modules/simu/simuv2.1.so
-lib/speed-dreams-2/modules/simu/simuv4.so
+@so lib/speed-dreams-2/modules/simu/simuv4.so
 lib/speed-dreams-2/modules/sound/
-lib/speed-dreams-2/modules/sound/snddefault.so
+@so lib/speed-dreams-2/modules/sound/snddefault.so
 lib/speed-dreams-2/modules/telemetry/
-lib/speed-dreams-2/modules/telemetry/telemetryv1.so
+@so lib/speed-dreams-2/modules/telemetry/telemetryv1.so
 lib/speed-dreams-2/modules/track/
-lib/speed-dreams-2/modules/track/trackv1.so
+@so lib/speed-dreams-2/modules/track/trackv1.so
 lib/speed-dreams-2/modules/userinterface/
-lib/speed-dreams-2/modules/userinterface/legacymenu.so
+@so lib/speed-dreams-2/modules/userinterface/legacymenu.so
-lib/speed-dreams-2/modules/userinterface/textonly.so
+@so lib/speed-dreams-2/modules/userinterface/textonly.so
 @man man/man6/sd2-accc.6
 @man man/man6/sd2-nfs2ac.6
 @man man/man6/sd2-nfsperf.6

games/taisei/Makefile

@@ -7,7 +7,7 @@ COMMENT =		clone of the touhou games
 VERSION =		v1.3.2
 DISTNAME =		taisei-${VERSION}
 PKGNAME =		taisei-${VERSION:S/^v//}
-REVISION =		3
+REVISION =		4
 
 CATEGORIES =		games
 

graphics/krita-gmic-plugin/Makefile

@@ -27,6 +27,8 @@ WANTLIB += ${COMPILER_LIBCXX} ICE KF5CoreAddons Qt5Core Qt5Gui
 WANTLIB += Qt5Network Qt5Widgets SM X11 Xext curl fftw3 fftw3_threads
 WANTLIB += kritaqmicinterface m png z
 
+BUILD_DEPENDS =	shells/bash
+
 LIB_DEPENDS =	graphics/krita \
 		net/curl \
 		math/fftw3

infrastructure/bin/check-lib-depends

@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $OpenBSD: check-lib-depends,v 1.50 2023/06/18 09:17:01 espie Exp $
+# $OpenBSD: check-lib-depends,v 1.51 2023/09/09 14:56:17 espie Exp $
 # Copyright (c) 2004-2010 Marc Espie <espie@openbsd.org>
 #
 # Permission to use, copy, modify, and distribute this software for any
@@ -25,7 +25,6 @@ use lib ("$ports1/infrastructure/lib", "$FindBin::Bin/../lib");
 
 use File::Spec;
 use OpenBSD::PackingList;
-use OpenBSD::SharedLibs2;
 use OpenBSD::LibSpec;
 use OpenBSD::Temp;
 use OpenBSD::AddCreateDelete;
@@ -227,7 +226,6 @@ sub handle_options($state)
 	if ($state->opt('D')) {
 		$state->{logger} = Logger->new($state->opt('D'));
 	}
-	$state->{shlibs} = OpenBSD::SharedLibs->new($state);
 }
 
 sub init($self, @parms)
@@ -269,10 +267,10 @@ sub set_context($state, $plist)
 sub perllibs($state)
 {
 	if (!defined $state->{perllibs}) {
-		$state->{shlibs}->add_libs_from_system('/');
+		$state->shlibs->add_libs_from_system('/');
 		eval {
-		    my $perl = $state->{shlibs}->find_best('perl');
+		    my $perl = $state->shlibs->find_best('perl');
-		    my $c = $state->{shlibs}->find_best('c');
+		    my $c = $state->shlibs->find_best('c');
 		    if (!defined $perl || !defined $c) {
 			    $state->fatal("can't find system perl and c");
 		    }
@@ -382,7 +380,7 @@ sub handle_dependency($self, $state, $pkgname, $pkgpath)
 	}
 
 	register_dependencies($plist);
-	$state->{shlibs}->add_libs_from_plist($plist);
+	$state->shlibs->add_libs_from_plist($plist);
 
 	return $plist->pkgname;
 }
@@ -390,7 +388,7 @@ sub handle_dependency($self, $state, $pkgname, $pkgpath)
 sub lookup_library($state, $dir, $spec)
 {
 	my $libspec = OpenBSD::LibSpec->from_string($spec);
-	my $r = $state->{shlibs}->lookup_libspec($dir, $libspec);
+	my $r = $state->shlibs->lookup_libspec($dir, $libspec);
 	if (!defined $r) {
 		return ();
 	} else {
@@ -401,7 +399,7 @@ sub lookup_library($state, $dir, $spec)
 sub report_lib_issue($self, $state, $plist, $lib, $binary)
 {
 
-	$state->{shlibs}->add_libs_from_system('/');
+	$state->shlibs->add_libs_from_system('/');
 	my $libspec = "$lib.0";
 	my $want = $lib;
 	$want =~ s/\.\d+$//;
@@ -532,7 +530,7 @@ sub analyze($self, $state, $plist)
 
 	if (!defined $dependencies->{$pkgname}) {
 		register_dependencies($plist);
-		$state->{shlibs}->add_libs_from_plist($plist);
+		$state->shlibs->add_libs_from_plist($plist);
 	}
 	my $r = { wantlib => {}, libdepends => {}, wantlib2 => {} };
 	for my $lib (sort $needed_libs->libs) {

infrastructure/lib/OpenBSD/SharedLibs2.pm

@@ -1,152 +0,0 @@
-# ex:ts=8 sw=4:
-# $OpenBSD: SharedLibs2.pm,v 1.2 2023/05/30 05:37:23 espie Exp $
-#
-# Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org>
-#
-# Permission to use, copy, modify, and distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-use v5.36;
-
-use OpenBSD::Paths;
-use OpenBSD::LibSpec;
-
-package OpenBSD::PackingElement;
-
-sub mark_available_lib($, $, $)
-{
-}
-
-package OpenBSD::PackingElement::Lib;
-
-sub mark_available_lib($self, $pkgname, $object)
-{
-	$object->register_libname($self->fullname, $pkgname);
-}
-
-package OpenBSD::SharedLibs;
-use File::Basename;
-use OpenBSD::Error;
-
-sub _basestate($)
-{
-	require OpenBSD::Basestate;
-	return 'OpenBSD::BaseState';
-}
-
-sub new($class, $state = $class->_basestate)
-{
-	bless {
-	    state => $state,
-	    repo => OpenBSD::LibRepo->new,
-	    printed => {},
-	    done_plist => {},
-	    done_system => 0
-	    }, $class;
-}
-
-
-sub register_library($self, $lib, $pkgname)
-{
-	$self->{repo}->register($lib, $pkgname);
-}
-
-sub register_libname($self, $name, $pkgname)
-{
-	my $lib = OpenBSD::Library->from_string($name);
-	if ($lib->is_valid) {
-		$self->register_library($lib, $pkgname);
-	} else {
-		$self->{state}->errsay("Bogus library in #1: #2", $pkgname, 
-		    $name) unless $pkgname eq 'system';
-	}
-
-}
-
-sub find_best($self, $stem)
-{
-	return $self->{repo}->find_best($stem);
-}
-
-sub system_dirs($)
-{
-	return OpenBSD::Paths->library_dirs;
-}
-
-sub add_libs_from_system($self, $destdir)
-{
-	return if $self->{done_system};
-	$self->{done_system} = 1;
-	for my $dirname ($self->system_dirs) {
-		opendir(my $dir, $destdir.$dirname."/lib") or next;
-		while (my $d = readdir($dir)) {
-			next unless $d =~ m/\.so/;
-			$self->register_libname("$dirname/lib/$d", 'system');
-		}
-		closedir($dir);
-	}
-}
-
-sub add_libs_from_installed_package($self, $pkgname)
-{
-	return if $self->{done_plist}{$pkgname};
-	$self->{done_plist}{$pkgname} = 1;
-	my $plist = OpenBSD::PackingList->from_installation($pkgname,
-	    \&OpenBSD::PackingList::LibraryOnly);
-	return if !defined $plist;
-
-	$plist->mark_available_lib($pkgname, $self);
-}
-
-sub add_libs_from_plist($self, $plist)
-{
-	my $pkgname = $plist->pkgname;
-	return if $self->{done_plist}{$pkgname};
-	$self->{done_plist}{$pkgname} = 1;
-	$plist->mark_available_lib($pkgname, $self);
-}
-
-sub lookup_libspec($self, $base, $spec)
-{
-	return $spec->lookup($self->{repo}, $base);
-}
-
-
-sub report_problem($self, $spec)
-{
-	my $name = $spec->to_string;
-	my $state = $self->{state};
-	my $base = $state->{localbase};
-	my $approx = $spec->lookup_stem($self->{repo});
-	my $printed = $self->{printed};
-
-	my $r = "";
-	if (!$spec->is_valid) {
-		$r = "| bad library specification\n";
-	} elsif (!defined $approx) {
- 		$r = "| not found anywhere\n";
-	} else {
-		for my $bad (sort {$a->compare($b)} @$approx) {
-			my $ouch = $spec->no_match($bad, $base);
-			$ouch //= "not reachable";
-			$r .= "| ".$bad->to_string." (".$bad->origin."): ".
-			    $ouch."\n";
-		}
-	}
-	if (!defined $printed->{$name} || $printed->{$name} ne $r) {
-		$printed->{$name} = $r;
-		$state->errsay("|library #1 not found", $name);
-		$state->print("#1", $r);
-	}
-}
-
-1;

infrastructure/mk/bsd.port.mk

@@ -1,6 +1,6 @@
 #-*- mode: Makefile; tab-width: 4; -*-
 # ex:ts=4 sw=4 filetype=make:
-#	$OpenBSD: bsd.port.mk,v 1.1616 2023/09/06 20:46:23 espie Exp $
+#	$OpenBSD: bsd.port.mk,v 1.1620 2023/09/09 13:06:25 espie Exp $
 #
 #	bsd.port.mk - 940820 Jordan K. Hubbard.
 #	This file is in the public domain.
@@ -77,7 +77,6 @@ _BSD_PORT_MK = Done
 FETCH_PACKAGES ?= No
 CLEANDEPENDS ?= No
 BULK ?= Auto
-WRKDIR_LINKNAME ?=
 INSTALL_DEBUG_PACKAGES ?= No
  
 .if ${FETCH_PACKAGES:L} == "yes"
@@ -741,15 +740,8 @@ PATCHORIG ?= .orig.port
 PATCH_STRIP ?= -p0
 PATCH_DIST_STRIP ?= -p0
 
-PATCH_DEBUG ?= Yes
-.if ${PATCH_DEBUG:L} != "no"
 PATCH_ARGS ?= -d ${WRKDIST} -z ${PATCHORIG} -E ${PATCH_STRIP}
 PATCH_DIST_ARGS ?= -z ${DISTORIG} -d ${WRKDIST} -E ${PATCH_DIST_STRIP}
-.else
-PATCH_ARGS ?= -d ${WRKDIST} -z ${PATCHORIG} --forward --quiet -E ${PATCH_STRIP}
-PATCH_DIST_ARGS ?= -z ${DISTORIG} -d ${WRKDIST} --forward --quiet -E \
-	${PATCH_DIST_STRIP}
-.endif
 
 .if ${PATCH_CHECK_ONLY:L} == "yes"
 PATCH_ARGS += -C
@@ -1269,13 +1261,11 @@ _warn_checksum = :
 ${v:S/MASTER_//} ?= ${$v}
 .endfor
 
-# stash .VARIABLES, because it's expensive to compute
+.if empty(.VARIABLES)
-_CACHE_VARIABLES := ${.VARIABLES}
-.if empty(_CACHE_VARIABLES)
 ERRORS += "Fatal: requires make(1) with .VARIABLES support"
 .endif
 
-_ALL_SITES_VARIABLES = ${_CACHE_VARIABLES:MSITES*:NSITES_*}
+_ALL_SITES_VARIABLES = ${.VARIABLES:MSITES*:NSITES_*}
 
 
 # All variables relevant to the port's description (see dump-vars)
@@ -1316,7 +1306,7 @@ _ALL_VARIABLES += BROKEN COMES_WITH \
 	FIX_CRLF_FILES EXTRACT_FILES DIST_TUPLE DIST_TUPLE_MV
 .if !empty(MODULES)
 .  for _m in ${MODULES}
-_ALL_VARIABLES += ${_CACHE_VARIABLES:MMOD${_m:T:U}*}
+_ALL_VARIABLES += ${.VARIABLES:MMOD${_m:T:U}*}
 .  endfor
 .endif
 _ALL_VARIABLES_PER_ARCH += BROKEN
@@ -1339,13 +1329,11 @@ EXTRACT_SUFX ?= .tar.gz
 GH_DISTFILE = ${DISTNAME}-${GH_COMMIT:C/(........).*/\1/}{${GH_COMMIT}}${EXTRACT_SUFX}
 .  if !defined(DISTFILES)
 DISTFILES = ${GH_DISTFILE}
-_CACHE_VARIABLES += DISTFILES
 .  endif
 .elif defined(DISTNAME)
 .  if !defined(DISTFILES)
-.    if !empty(SITES) || empty(_CACHE_VARIABLES:MDISTFILES*)
+.    if !empty(SITES) || empty(.VARIABLES:MDISTFILES*)
 DISTFILES = ${DISTNAME}${EXTRACT_SUFX}
-_CACHE_VARIABLES += DISTFILES
 .    endif
 .  endif
 .endif
@@ -1356,7 +1344,7 @@ _ROACH_DISTFILE ?= $d
 .  endfor
 .endif
 .if !defined(ROACH_URL)
-.  for w in ${_CACHE_VARIABLES:MDISTFILES*}
+.  for w in ${.VARIABLES:MDISTFILES*}
 .    for d in ${$w}
 _ROACH_DISTFILE ?= $d
 .    endfor
@@ -1385,7 +1373,7 @@ _ALL_DISTFILES_VARIABLES =
 # - SUPDISTFILES has to happen later
 _FILES=
 .for v in DISTFILES PATCHFILES SUPDISTFILES
-.  for w in ${_CACHE_VARIABLES:M$v*}
+.  for w in ${.VARIABLES:M$v*}
 .    if !empty($w)
 _ALL_DISTFILES_VARIABLES += $w
 _T =${w:N$v:N$v.*}
@@ -2199,6 +2187,10 @@ fix-permissions:
 .  for _p in ${_pkg${_S}}
 # run under _pfetch
 ${_CACHE_REPO}${_p}:
+.    if ${_FETCH_RECURSE_HELPER:L} == "no"
+	@${ECHO_MSG} "===> Looking for pre-built ${@F} on the mirrors"
+	@${ECHO_MSG} "     (probably not what you want, but FETCH_PACKAGES is set)"
+.    endif
 	@install -d ${PACKAGE_REPOSITORY_MODE} ${@D}
 	@${ECHO_MSG} -n "===>  Looking for ${@F} in \$$PKG_PATH - "
 	@if ${SETENV} ${_TERM_ENV} PKG_CACHE=${_CACHE_REPO} TRUSTED_PKG_PATH=${_CACHE_REPO}:${_PKG_REPO}:${PACKAGE_REPOSITORY}/${NO_ARCH}/:${TRUSTED_PKG_PATH} PKG_PATH=${_PKG_PATH} ${PKG_ADD} -I -x -n -q ${_PKG_ADD_FORCE} -r -D installed -D downgrade ${FETCH_PACKAGES} ${@F}; then \
@@ -2748,9 +2740,6 @@ ${_WRKDIR_COOKIE}:
 	@${_PBUILD} install -d ${WRKOBJDIR_MODE} `dirname ${WRKDIR}`
 	@${_PBUILD} mkdir -p ${WRKDIR} ${WRKDIR}/bin
 	@${_wrap_install_commands}
-.if !empty(WRKDIR_LINKNAME)
-	@${_PBUILD} ln -sf ${WRKDIR} ${.CURDIR}/${WRKDIR_LINKNAME}
-.endif
 # poison some common binaries unless the relevant BUILD_DEPENDS is used
 .if empty(_BUILD_DEP:Mdevel/gettext,-tools) && \
 		empty(_BUILD_DEP:Mtextproc/intltool)
@@ -2837,10 +2826,7 @@ do-distpatch:
 	@${ECHO_MSG} "===>  Applying distribution patches for ${FULLPKGNAME}${_MASTER}"
 	@cd ${FULLDISTDIR}; \
 	  for patchfile in ${ALL_PATCHFILES}; do \
-	  	case "${PATCH_DEBUG:L}" in \
+		${ECHO_MSG} "===>   Applying distribution patch $$patchfile" ; \
-			no) ;; \
-			*) ${ECHO_MSG} "===>   Applying distribution patch $$patchfile" ;; \
-		esac; \
 		case $$patchfile in \
 			${PATCH_CASES} \
 		esac; \
@@ -2894,10 +2880,7 @@ ${_PATCH_COOKIE}: ${_EXTRACT_COOKIE}
 					;; \
 				*) \
 				    if [ -e $$i ]; then \
-						case "${PATCH_DEBUG:L}" in \
+						${ECHO_MSG} "===>   Applying OpenBSD patch $$i"; \
-							no) ;; \
-							*) ${ECHO_MSG} "===>   Applying OpenBSD patch $$i" ;; \
-						esac; \
 						if [ -s $$i ]; then \
 							${_PBUILD} ${PATCH} ${PATCH_ARGS} < $$i || \
 								{ echo "***>   $$i did not apply cleanly"; \

lang/binaryen/Makefile

@@ -2,7 +2,7 @@ COMMENT =	WebAssembly compiler and toolchain infrastructure library
 
 GH_ACCOUNT =	WebAssembly
 GH_PROJECT =	binaryen
-GH_TAGNAME =	version_112
+GH_TAGNAME =	version_114
 
 PKGNAME =	${DISTNAME:L:S/version_//}
 

lang/binaryen/distinfo

@@ -1,2 +1,2 @@
-SHA256 (binaryen-version_112.tar.gz) = gVy1vjItl4KbOLokbBplfCJ+nupr+rdM3w5ULJ5SIPg=
+SHA256 (binaryen-version_114.tar.gz) = VPeUqEPZbMhBv4BFqd/qrYFhNB8LUKxbGXUYwtOUgs4=
-SIZE (binaryen-version_112.tar.gz) = 4424435
+SIZE (binaryen-version_114.tar.gz) = 4728373

lang/binaryen/patches/patch-CMakeLists_txt

@@ -1,23 +1,17 @@
-- Remove hardcoded optimizations.
 - Partially revert upstream commit b76d2fb1e5bb839249b25b7094db94219695f515,
   it breaks the build on OpenBSD.
 
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -283,15 +283,10 @@ else()
+@@ -296,10 +296,6 @@ else()
-   endif()
-   add_debug_compile_flag("-O0")
-   add_debug_compile_flag("-g3")
--  add_nondebug_compile_flag("-O2")
-   if(BYN_ENABLE_ASSERTIONS)
-     # On non-Debug builds cmake automatically defines NDEBUG, so we
      # explicitly undefine it:
      add_nondebug_compile_flag("-UNDEBUG")
--  endif()
+   endif()
 -  if(NOT APPLE AND NOT "${CMAKE_CXX_FLAGS}" MATCHES "-fsanitize")
 -    # This flag only applies to shared libraries so don't use add_link_flag
 -    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
-   endif()
+-  endif()
  endif()
  
+ if(EMSCRIPTEN)

lang/go/Makefile

@@ -7,7 +7,7 @@ COMMENT =		Go programming language
 
 # increment _MODGO_SYSTEM_VERSION in go.port.mk after updating to a new
 # version, to trigger updates of go-compiled ports
-VERSION =		1.21.0
+VERSION =		1.21.1
 DISTNAME =		go${VERSION}.src
 PKGNAME =		go-${VERSION}
 PKGSPEC =		${FULLPKGNAME:S/go-/go-=/}

lang/go/distinfo

@@ -2,9 +2,9 @@ SHA256 (go-openbsd-386-bootstrap-1.20.4.tar.gz) = TnujxhLC6RBpp+Yq6G7jkz7dM+znj0
 SHA256 (go-openbsd-amd64-bootstrap-1.20.4.tar.gz) = 8WlSsDZ/ZLtSJ6I8s0FKX6CChU8ULsxaA1PEQZw2nWQ=
 SHA256 (go-openbsd-arm-bootstrap-1.20.4.tar.gz) = MFK9DdbKJSqyYFLANhKbD6KWT1x+wX8+w9NTJ21o1/4=
 SHA256 (go-openbsd-arm64-bootstrap-1.20.4.tar.gz) = G3sZhx63D+QLEgbwU1+d3ECiVJjVrFD5RqD2/qutXmI=
-SHA256 (go1.21.0.src.tar.gz) = gY1G7ehWgt1VGtN47zek0kcAbxLsWbW3VWAdLOEUNpo=
+SHA256 (go1.21.1.src.tar.gz) = v6Nr916aHpy725q8+dFwfkeb06B4gKiuNWTK7lcRy5k=
 SIZE (go-openbsd-386-bootstrap-1.20.4.tar.gz) = 100681343
 SIZE (go-openbsd-amd64-bootstrap-1.20.4.tar.gz) = 107075675
 SIZE (go-openbsd-arm-bootstrap-1.20.4.tar.gz) = 104680775
 SIZE (go-openbsd-arm64-bootstrap-1.20.4.tar.gz) = 102706601
-SIZE (go1.21.0.src.tar.gz) = 26942359
+SIZE (go1.21.1.src.tar.gz) = 26974429

lang/go/patches/patch-src_cmd_link_internal_ld_lib_go

@@ -1,7 +1,7 @@
 Index: src/cmd/link/internal/ld/lib.go
 --- src/cmd/link/internal/ld/lib.go.orig
 +++ src/cmd/link/internal/ld/lib.go
-@@ -1419,6 +1419,7 @@ func (ctxt *Link) hostlink() {
+@@ -1424,6 +1424,7 @@ func (ctxt *Link) hostlink() {
  		}
  	case objabi.Hopenbsd:
  		argv = append(argv, "-Wl,-nopie")

lang/go/pkg/PLIST

@@ -256,9 +256,9 @@ go/src/cmd/addr2line/
 go/src/cmd/addr2line/addr2line_test.go
 go/src/cmd/addr2line/main.go
 go/src/cmd/api/
-go/src/cmd/api/api.go
 go/src/cmd/api/api_test.go
 go/src/cmd/api/boring_test.go
+go/src/cmd/api/main_test.go
 go/src/cmd/api/testdata/
 go/src/cmd/api/testdata/src/
 go/src/cmd/api/testdata/src/issue21181/
@@ -668,8 +668,6 @@ go/src/cmd/cgo/internal/testplugin/testdata/common/
 go/src/cmd/cgo/internal/testplugin/testdata/common/common.go
 go/src/cmd/cgo/internal/testplugin/testdata/forkexec/
 go/src/cmd/cgo/internal/testplugin/testdata/forkexec/main.go
-go/src/cmd/cgo/internal/testplugin/testdata/generic/
-go/src/cmd/cgo/internal/testplugin/testdata/generic/plugin.go
 go/src/cmd/cgo/internal/testplugin/testdata/host/
 go/src/cmd/cgo/internal/testplugin/testdata/host/host.go
 go/src/cmd/cgo/internal/testplugin/testdata/iface/
@@ -725,6 +723,8 @@ go/src/cmd/cgo/internal/testplugin/testdata/issue53989/main.go
 go/src/cmd/cgo/internal/testplugin/testdata/issue53989/p/
 go/src/cmd/cgo/internal/testplugin/testdata/issue53989/p/p.go
 go/src/cmd/cgo/internal/testplugin/testdata/issue53989/plugin.go
+go/src/cmd/cgo/internal/testplugin/testdata/mangle/
+go/src/cmd/cgo/internal/testplugin/testdata/mangle/plugin.go
 go/src/cmd/cgo/internal/testplugin/testdata/method/
 go/src/cmd/cgo/internal/testplugin/testdata/method/main.go
 go/src/cmd/cgo/internal/testplugin/testdata/method/plugin.go
@@ -2035,6 +2035,8 @@ go/src/cmd/go/internal/test/internal/genflags/
 go/src/cmd/go/internal/test/internal/genflags/testflag.go
 go/src/cmd/go/internal/test/internal/genflags/vetflag.go
 go/src/cmd/go/internal/test/test.go
+go/src/cmd/go/internal/test/test_nonunix.go
+go/src/cmd/go/internal/test/test_unix.go
 go/src/cmd/go/internal/test/testflag.go
 go/src/cmd/go/internal/tool/
 go/src/cmd/go/internal/tool/tool.go
@@ -2555,6 +2557,7 @@ go/src/cmd/go/testdata/script/gopath_paths.txt
 go/src/cmd/go/testdata/script/gopath_std_vendor.txt
 go/src/cmd/go/testdata/script/gopath_vendor_dup_err.txt
 go/src/cmd/go/testdata/script/goroot_executable.txt
+go/src/cmd/go/testdata/script/goroot_executable_trimpath.txt
 go/src/cmd/go/testdata/script/gotoolchain_local.txt
 go/src/cmd/go/testdata/script/gotoolchain_loop.txt
 go/src/cmd/go/testdata/script/gotoolchain_modcmds.txt
@@ -2728,6 +2731,7 @@ go/src/cmd/go/testdata/script/mod_get_go_file.txt
 go/src/cmd/go/testdata/script/mod_get_hash.txt
 go/src/cmd/go/testdata/script/mod_get_incompatible.txt
 go/src/cmd/go/testdata/script/mod_get_indirect.txt
+go/src/cmd/go/testdata/script/mod_get_insecure_redirect.txt
 go/src/cmd/go/testdata/script/mod_get_issue37438.txt
 go/src/cmd/go/testdata/script/mod_get_issue47979.txt
 go/src/cmd/go/testdata/script/mod_get_issue48511.txt
@@ -2942,6 +2946,7 @@ go/src/cmd/go/testdata/script/mod_tidy_temp.txt
 go/src/cmd/go/testdata/script/mod_tidy_version.txt
 go/src/cmd/go/testdata/script/mod_tidy_version_tooold.txt
 go/src/cmd/go/testdata/script/mod_toolchain.txt
+go/src/cmd/go/testdata/script/mod_toolchain_slash.txt
 go/src/cmd/go/testdata/script/mod_update_sum_readonly.txt
 go/src/cmd/go/testdata/script/mod_upgrade_patch.txt
 go/src/cmd/go/testdata/script/mod_vcs_missing.txt
@@ -7330,6 +7335,9 @@ go/src/internal/types/testdata/fixedbugs/issue60906.go
 go/src/internal/types/testdata/fixedbugs/issue60933.go
 go/src/internal/types/testdata/fixedbugs/issue60946.go
 go/src/internal/types/testdata/fixedbugs/issue61486.go
+go/src/internal/types/testdata/fixedbugs/issue61879.go
+go/src/internal/types/testdata/fixedbugs/issue61903.go
+go/src/internal/types/testdata/fixedbugs/issue62157.go
 go/src/internal/types/testdata/fixedbugs/issue6977.go
 go/src/internal/types/testdata/spec/
 go/src/internal/types/testdata/spec/assignability.go
@@ -12829,6 +12837,10 @@ go/test/fixedbugs/issue61127.go
 go/test/fixedbugs/issue61187.go
 go/test/fixedbugs/issue6131.go
 go/test/fixedbugs/issue6140.go
+go/test/fixedbugs/issue61778.go
+go/test/fixedbugs/issue61908.go
+go/test/fixedbugs/issue61992.go
+go/test/fixedbugs/issue62203.go
 go/test/fixedbugs/issue6247.go
 go/test/fixedbugs/issue6269.go
 go/test/fixedbugs/issue6295.dir/

mail/mutt/Makefile

@@ -1,6 +1,6 @@
 COMMENT=	tty-based e-mail client
 
-DISTNAME=	mutt-2.2.11
+DISTNAME=	mutt-2.2.12
 EPOCH=		3
 
 CATEGORIES=	mail

mail/mutt/distinfo

@@ -1,2 +1,2 @@
-SHA256 (mutt-2.2.11.tar.gz) = EjJc9m1f+KxL2H+sjbUshp3lLdJ4/DAc/VfVofn0Zcw=
+SHA256 (mutt-2.2.12.tar.gz) = BDrzEvZLjlb3/Qv3f4SiBdTEmAML2VhkV2ZcR7sYzjg=
-SIZE (mutt-2.2.11.tar.gz) = 5538204
+SIZE (mutt-2.2.12.tar.gz) = 5539244

math/cglm/Makefile

@@ -2,9 +2,9 @@ COMMENT =	highly optimized graphics math library
 
 GH_ACCOUNT =	recp
 GH_PROJECT =	cglm
-GH_TAGNAME =	v0.9.0
+GH_TAGNAME =	v0.9.1
 
-SHARED_LIBS =	cglm	0.3	# 0.8.9
+SHARED_LIBS =	cglm	0.4
 
 CATEGORIES =	math
 

math/cglm/distinfo

@@ -1,2 +1,2 @@
-SHA256 (cglm-0.9.0.tar.gz) = m2iLxSkVzdSti31AgO9ZzJJnTVJoVtjxa7OhFNsd15Q=
+SHA256 (cglm-0.9.1.tar.gz) = uhbuSEydXoCO8B5VAIoVaDHo/1KX8Qu8owet64J6CRM=
-SIZE (cglm-0.9.0.tar.gz) = 642861
+SIZE (cglm-0.9.1.tar.gz) = 657554

math/cglm/patches/patch-CMakeLists_txt

@@ -1,14 +1,14 @@
- - don't hardcode optimization flags and drop -Werror
+ - drop hardcoded -O3
 
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -38,7 +38,7 @@ if(MSVC)
+@@ -43,7 +43,7 @@ if(MSVC)
      string(REGEX REPLACE "/RTC(su|[1su])" "" ${flag_var} "${${flag_var}}")
    endforeach(flag_var)
  else()
--  add_compile_options(-Wall -Werror -O3)
+-  add_compile_options(-Wall -O3)
 +  add_compile_options(-Wall)
  endif()
  
- if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+ get_directory_property(hasParent PARENT_DIRECTORY)

math/cglm/pkg/PLIST

@@ -38,8 +38,14 @@ include/cglm/call/ivec2.h
 include/cglm/call/ivec3.h
 include/cglm/call/ivec4.h
 include/cglm/call/mat2.h
+include/cglm/call/mat2x3.h
+include/cglm/call/mat2x4.h
 include/cglm/call/mat3.h
+include/cglm/call/mat3x2.h
+include/cglm/call/mat3x4.h
 include/cglm/call/mat4.h
+include/cglm/call/mat4x2.h
+include/cglm/call/mat4x3.h
 include/cglm/call/plane.h
 include/cglm/call/project.h
 include/cglm/call/quat.h
@@ -79,8 +85,14 @@ include/cglm/ivec2.h
 include/cglm/ivec3.h
 include/cglm/ivec4.h
 include/cglm/mat2.h
+include/cglm/mat2x3.h
+include/cglm/mat2x4.h
 include/cglm/mat3.h
+include/cglm/mat3x2.h
+include/cglm/mat3x4.h
 include/cglm/mat4.h
+include/cglm/mat4x2.h
+include/cglm/mat4x3.h
 include/cglm/plane.h
 include/cglm/project.h
 include/cglm/quat.h
@@ -113,6 +125,7 @@ include/cglm/simd/x86.h
 include/cglm/sphere.h
 include/cglm/struct/
 include/cglm/struct.h
+include/cglm/struct/affine-mat.h
 include/cglm/struct/affine-post.h
 include/cglm/struct/affine-pre.h
 include/cglm/struct/affine.h
@@ -140,8 +153,14 @@ include/cglm/struct/euler.h
 include/cglm/struct/frustum.h
 include/cglm/struct/io.h
 include/cglm/struct/mat2.h
+include/cglm/struct/mat2x3.h
+include/cglm/struct/mat2x4.h
 include/cglm/struct/mat3.h
+include/cglm/struct/mat3x2.h
+include/cglm/struct/mat3x4.h
 include/cglm/struct/mat4.h
+include/cglm/struct/mat4x2.h
+include/cglm/struct/mat4x3.h
 include/cglm/struct/plane.h
 include/cglm/struct/project.h
 include/cglm/struct/quat.h

math/py-ecos/Makefile

@@ -1,11 +1,10 @@
 COMMENT =		Python interface to ECOS
 
-MODPY_EGG_VERSION =	2.0.7.post1
+MODPY_EGG_VERSION =	2.0.10
 DISTNAME =		ecos-${MODPY_EGG_VERSION}
 V =			${MODPY_EGG_VERSION:S/post//}
 PKGNAME =		py-ecos-${V}
 CATEGORIES =		math
-REVISION =		7
 
 WANTLIB =  pthread
 MAINTAINER =		Paul Irofti <paul@irofti.net>
@@ -15,14 +14,16 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
 
-BUILD_DEPENDS =		${RUN_DEPENDS}
+FLAVORS =		python3
-RUN_DEPENDS =		math/py-numpy${MODPY_FLAVOR} \
+FLAVOR =		python3
-			math/py-scipy${MODPY_FLAVOR}
 
 MODPY_PI =		Yes
 MODPY_PYBUILD =		setuptools
 
-FLAVORS =		python3
+BUILD_DEPENDS =		math/py-numpy${MODPY_FLAVOR} \
-FLAVOR =		python3
+			math/py-oldest-supported-numpy${MODPY_FLAVOR}
+
+RUN_DEPENDS =		math/py-numpy${MODPY_FLAVOR}>=1.6 \
+			math/py-scipy${MODPY_FLAVOR}>=0.9
 
 .include <bsd.port.mk>

math/py-ecos/distinfo

@@ -1,2 +1,2 @@
-SHA256 (ecos-2.0.7.post1.tar.gz) = g+kPQrPzLiqT8lXDz60tp429hZEZ6ThExF0vyiC9x1g=
+SHA256 (ecos-2.0.10.tar.gz) = k5GnP9JbL8VrFjoqcMeJc0WLsZT+R1tsJ2csDZgKR88=
-SIZE (ecos-2.0.7.post1.tar.gz) = 126583
+SIZE (ecos-2.0.10.tar.gz) = 135246

math/py-scipy/Makefile

@@ -1,6 +1,6 @@
 COMMENT=		maths, science and engineering modules for Python
 
-MODPY_EGG_VERSION=	1.7.3
+MODPY_EGG_VERSION=	1.10.1
 DISTNAME=		scipy-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME}
 
@@ -37,10 +37,14 @@ LIB_DEPENDS=		${MODFORTRAN_LIB_DEPENDS} \
 			math/cblas \
 			math/lapack
 
-RUN_DEPENDS=		math/py-numpy${MODPY_FLAVOR}>=1.16.5 \
+RUN_DEPENDS=		math/py-numpy${MODPY_FLAVOR}>=1.19.5 \
 			devel/swig
 
-TEST_DEPENDS=		devel/py-test${MODPY_FLAVOR}
+
+# XXX: requires py-pooch
+NO_TEST=		Yes
+# TEST_DEPENDS=		devel/py-test${MODPY_FLAVOR} \
+#			devel/py-pooch${MODPY_FLAVOR}
 
 MAKE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include"
 MAKE_ENV+=		LDFLAGS="-shared -L${LOCALBASE}/lib -pthread -lutil"
@@ -48,6 +52,8 @@ MAKE_ENV+=		LDFLAGS="-shared -L${LOCALBASE}/lib -pthread -lutil"
 post-install:
 	${MODPY_BIN} -m compileall ${WRKINST}/${MODPY_SITEPKG}/scipy
 
+PORTHOME=	${WRKDIR}
+
 do-test: fake
 	cd ${WRKDIR} && ${MAKE_ENV} PYTHONPATH=${WRKINST}${MODPY_SITEPKG} \
 		${MODPY_BIN} -c 'import scipy ; scipy.test("full")'

math/py-scipy/distinfo

@@ -1,2 +1,2 @@
-SHA256 (scipy-1.7.3.tar.gz) = q1h1+s/e934KR9X9OeoXi1jmDkVKTIWqHlL8uA23ur8=
+SHA256 (scipy-1.10.1.tar.gz) = LPnfuAp7RYm6TEDOdYiYbW1c68VFfK0sKID2vC1C86U=
-SIZE (scipy-1.7.3.tar.gz) = 36102562
+SIZE (scipy-1.10.1.tar.gz) = 42407997