*/*: sync with upstream

Taken from: FreeBSD

archivers/libarchive/Makefile

@@ -1,13 +1,12 @@
 PORTNAME=	libarchive
-DISTVERSION=	3.6.1
-PORTREVISION=	1
+DISTVERSION=	3.6.2
 PORTEPOCH=	1
 CATEGORIES=	archivers
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/ \
 		https://libarchive.org/downloads/
 
 PATCH_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/commit/
-PATCHFILES=	bff38efe8c110469c5080d387bec62a6ca15b1a5.patch:-p1
+PATCHFILES=	1f35c466aaa9444335a1b854b0b7223b0d2346c2.patch:-p1
 
 MAINTAINER=	[email protected]
 COMMENT=	Library to create and read several streaming archive formats
@@ -27,7 +26,8 @@ OPTIONS_RADIO_CRYPTO=	OPENSSL MBEDTLS NETTLE
 CRYPTO_DESC=	Crypto and hashing support
 NETTLE_DESC=	Crypto support via Nettle
 
-USES=		cpe iconv libtool localbase:ldflags pathfix tar:xz
+USES=		autoreconf cpe iconv libtool localbase:ldflags pathfix \
+		pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
@@ -117,4 +117,12 @@ CONFIGURE_ENV+=	ac_cv_header_localcharset_h=no \
 		ac_cv_lib_charset_locale_charset=no
 .endif
 
+# Prior to 1301508 we didn't ship openssl.pc which libarchive now excepts
+# so we need to use the old approach on older versions of FreeBSD
+# which is not to define Requires.private in libarchive.pc
+
+.if ${PORT_OPTIONS:MOPENSSL} && ${OPSYS} == FreeBSD && ${OSVERSION} < 1301508
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-pkgconfig-compat
+.endif
+
 .include <bsd.port.post.mk>

archivers/libarchive/distinfo

@@ -1,5 +1,5 @@
-TIMESTAMP = 1670315616
-SHA256 (libarchive-3.6.1.tar.xz) = 5a411aceb978f43e626f0c2d1812ddd8807b645ed892453acabd532376c148e6
-SIZE (libarchive-3.6.1.tar.xz) = 5241148
-SHA256 (bff38efe8c110469c5080d387bec62a6ca15b1a5.patch) = 4f93c5a102cce1fc672d59888471017b545704bfa9d762c630e84b28215162e7
-SIZE (bff38efe8c110469c5080d387bec62a6ca15b1a5.patch) = 1124
+TIMESTAMP = 1672469724
+SHA256 (libarchive-3.6.2.tar.xz) = 9e2c1b80d5fbe59b61308fdfab6c79b5021d7ff4ff2489fb12daf0a96a83551d
+SIZE (libarchive-3.6.2.tar.xz) = 5213196
+SHA256 (1f35c466aaa9444335a1b854b0b7223b0d2346c2.patch) = 6db4da971fb4d5b3974bfec4c75a4d920a98b1b3bc9a9ccc381055a02205a272
+SIZE (1f35c466aaa9444335a1b854b0b7223b0d2346c2.patch) = 1329

archivers/libarchive/files/extra-patch-pkgconfig-compat

@@ -0,0 +1,7 @@
+--- build/pkgconfig/libarchive.pc.in.orig	2022-12-09 13:38:31 UTC
++++ build/pkgconfig/libarchive.pc.in
+@@ -10,4 +10,3 @@ Cflags: -I${includedir}
+ Cflags.private: -DLIBARCHIVE_STATIC
+ Libs: -L${libdir} -larchive
+ Libs.private: @LIBS@
+-Requires.private: @LIBSREQUIRED@

astro/josm/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	josm
-PORTVERSION=	18583
+PORTVERSION=	18622
 CATEGORIES=	astro java
 MASTER_SITES=	https://josm.openstreetmap.de/download/
 DISTNAME=	${PORTNAME}-snapshot-${PORTVERSION}.jar

astro/josm/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1667500070
-SHA256 (josm-snapshot-18583.jar) = e92e84ee78130815dbd1ea4f7d8c48b302ef7e6f6bd90974c203acfcfc699883
-SIZE (josm-snapshot-18583.jar) = 16269996
+TIMESTAMP = 1673265731
+SHA256 (josm-snapshot-18622.jar) = 02d57b2e3fb3d46382125f3151aba661c37ce3ca4cb0b21f3069815ef79de965
+SIZE (josm-snapshot-18622.jar) = 16311954

astro/routino/Makefile

@@ -15,16 +15,11 @@ USE_LDCONFIG=	yes
 
 CONFLICTS_INSTALL=	jabberd # bin/router
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	${REINPLACE_CMD} 's|doc/routino|share/doc/routino|' \
 		${WRKSRC}/Makefile.conf
 	${REINPLACE_CMD} 's|gcc|${CC}|' \
 		${WRKSRC}/Makefile.conf
-.if ${CHOSEN_COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42
-	${REINPLACE_CMD} -e '/pragma/d' ${WRKSRC}/src/xmlparse.c
-.endif
 
 post-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
@@ -40,4 +35,4 @@ post-install:
 	${LN} -sf lib${f:R:R} ${STAGEDIR}${PREFIX}/lib/lib${f:R:R:R}
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

audio/bespokesynth/Makefile

@@ -10,6 +10,8 @@ WWW=		https://www.bespokesynth.com/
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BROKEN=		incompatible with the latest JUCE (juce-7.0.3), see https://github.com/BespokeSynth/BespokeSynth/issues/1047
+
 BUILD_DEPENDS=	juce>0:devel/juce \
 		pybind11>0:devel/pybind11
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \

audio/libopenmpt/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	libopenmpt
-PORTVERSION=	0.6.6
+DISTVERSION=	0.6.7
 DISTVERSIONSUFFIX=	+release.autotools
 CATEGORIES=	audio
 MASTER_SITES=	https://lib.openmpt.org/files/libopenmpt/src/ \
@@ -12,32 +12,42 @@ WWW=		https://lib.openmpt.org/
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		compiler:c++11-lang cpe gmake libtool pkgconfig
+LIB_DEPENDS=	libmpg123.so:audio/mpg123 \
+		libvorbis.so:audio/libvorbis
+
+USES=		compiler:c++17-lang cpe gmake libtool pathfix pkgconfig
 CPE_VENDOR=	openmpt
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-doxygen-doc \
+		--with-mpg123 \
+		--with-vorbis \
+		--with-vorbisfile \
+		--without-portaudiocpp
+
+TEST_TARGET=	check
 
-CONFIGURE_ARGS+=	--without-portaudiocpp
+OPTIONS_DEFINE=		DOCS EXAMPLES OPENMPT123 PULSEAUDIO
+OPTIONS_DEFAULT=	OPENMPT123
+OPTIONS_SUB=		yes
 
-OPTIONS_DEFINE=		DOCS EXAMPLES FLAC MPG123 OGG PORTAUDIO PULSEAUDIO \
-			SNDFILE VORBIS
-OPTIONS_DEFAULT=	FLAC MPG123 OGG PORTAUDIO SNDFILE VORBIS
+OPENMPT123_DESC=	Enable command line player
+PULSEAUDIO_DESC=	Enable PulseAudio support for openmpt123
 
-FLAC_LIB_DEPENDS=		libFLAC.so:audio/flac
-FLAC_CONFIGURE_WITH=		flac
-MPG123_LIB_DEPENDS=		libmpg123.so:audio/mpg123
-MPG123_CONFIGURE_WITH=		mpg123
-OGG_LIB_DEPENDS=		libogg.so:audio/libogg
-OGG_CONFIGURE_WITH=		ogg
-PORTAUDIO_LIB_DEPENDS=		libportaudio.so:audio/portaudio
-PORTAUDIO_CONFIGURE_WITH=	portaudio
+OPENMPT123_LIB_DEPENDS=		libFLAC.so:audio/flac \
+				libportaudio.so:audio/portaudio \
+				libsndfile.so:audio/libsndfile
+OPENMPT123_CONFIGURE_OFF=	--disable-openmpt123
+OPENMPT123_CONFIGURE_WITH=	flac portaudio sndfile
+
+PULSEAUDIO_IMPLIES=		OPENMPT123
 PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_WITH=	pulseaudio
-SNDFILE_LIB_DEPENDS=		libsndfile.so:audio/libsndfile
-SNDFILE_CONFIGURE_WITH=		sndfile
-VORBIS_LIB_DEPENDS=		libvorbis.so:audio/libvorbis
-VORBIS_CONFIGURE_WITH=		vorbis vorbisfile
+
+pre-configure:
+	@${REINPLACE_CMD} -e 's/+release.autotools//' \
+		${PATCH_WRKSRC}/configure
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libopenmpt.so.*

audio/libopenmpt/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1664212817
-SHA256 (libopenmpt-0.6.6+release.autotools.tar.gz) = 6ddb9e26a430620944891796fefb1bbb38bd9148f6cfc558810c0d3f269876c7
-SIZE (libopenmpt-0.6.6+release.autotools.tar.gz) = 1554516
+TIMESTAMP = 1673247806
+SHA256 (libopenmpt-0.6.7+release.autotools.tar.gz) = 2174ac0f5a148ba684db768a47edf783eff9084fbca5fef6c997501643100163
+SIZE (libopenmpt-0.6.7+release.autotools.tar.gz) = 1556248

audio/libopenmpt/pkg-plist

@@ -1,4 +1,4 @@
-bin/openmpt123
+%%OPENMPT123%%bin/openmpt123
 include/libopenmpt/libopenmpt.h
 include/libopenmpt/libopenmpt.hpp
 include/libopenmpt/libopenmpt_config.h
@@ -13,7 +13,7 @@ lib/libopenmpt.so
 lib/libopenmpt.so.0
 lib/libopenmpt.so.0.3.3
 libdata/pkgconfig/libopenmpt.pc
-man/man1/openmpt123.1.gz
+%%OPENMPT123%%man/man1/openmpt123.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/libopenmpt_example_c.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/libopenmpt_example_c_mem.c

audio/py-pyradio/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	pyradio
-DISTVERSION=	0.8.9.32
+DISTVERSION=	0.8.9.34
 CATEGORIES=	audio python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -40,7 +40,8 @@ MPV_DESC=	Mpv media player support
 VLC_DESC=	VLC media player support
 
 DOCS_PLIST_FILES=	man/man1/pyradio.1.gz \
-			man/man1/pyradio_rb.1.gz
+			man/man1/pyradio_rb.1.gz \
+			man/man1/pyradio_server.1.gz
 MPLAYER_RUN_DEPENDS+=	mplayer:multimedia/mplayer
 MPV_RUN_DEPENDS+=	mpv:multimedia/mpv
 VLC_RUN_DEPENDS+=	vlc:multimedia/vlc

audio/py-pyradio/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1670604676
-SHA256 (coderholic-pyradio-0.8.9.32_GH0.tar.gz) = d86f13849151aa9ea5d40310cfb827a3bd7138e8809affa9a0442fbc427b5df6
-SIZE (coderholic-pyradio-0.8.9.32_GH0.tar.gz) = 635875
+TIMESTAMP = 1673366338
+SHA256 (coderholic-pyradio-0.8.9.34_GH0.tar.gz) = e2868f7240d702eecb814dc6b44ec36dbf829304a5c7d2527a3bd75f195a2c90
+SIZE (coderholic-pyradio-0.8.9.34_GH0.tar.gz) = 661455

audio/supercollider/Makefile

@@ -1,10 +1,13 @@
 PORTNAME=	supercollider
 DISTVERSION=	3.11.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/supercollider/supercollider/releases/download/Version-${PORTVERSION}/
 DISTNAME=	SuperCollider-${PORTVERSION}-Source
 
+PATCH_SITES=	https://github.com/supercollider/supercollider/commit/
+PATCHFILES=	b9dd70c4c8d61c93d7a70645e0bd18fa76e6834e.patch:-p1
+
 MAINTAINER=	[email protected]
 COMMENT=	Programming language for real time audio synthesis
 WWW=		https://supercollider.github.io

audio/supercollider/distinfo

@@ -1,3 +1,5 @@
-TIMESTAMP = 1619062594
+TIMESTAMP = 1672258513
 SHA256 (SuperCollider-3.11.2-Source.tar.bz2) = c22c32c6bc482671d4fb8f51672df712d97a6a6277235c4da2312910303a0506
 SIZE (SuperCollider-3.11.2-Source.tar.bz2) = 18130954
+SHA256 (b9dd70c4c8d61c93d7a70645e0bd18fa76e6834e.patch) = 49d15a62a467143412850595c11a910e70e5ff1e20d7d0608940f8ffa9ce586f
+SIZE (b9dd70c4c8d61c93d7a70645e0bd18fa76e6834e.patch) = 9133

biology/hyphy/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	hyphy
-DISTVERSION=	2.5.43
+DISTVERSION=	2.5.46hf1
 CATEGORIES=	biology
 
 MAINTAINER=	[email protected]
@@ -12,6 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 ONLY_FOR_ARCHS=	aarch64 amd64 armv7 i386 powerpc powerpc64 powerpc64le
 
 LIB_DEPENDS=	libcurl.so:ftp/curl
+TEST_DEPENDS=	bash:shells/bash
 
 USES=		cmake:insource,testing localbase:ldflags # tests fail in outsource build, see https://github.com/veg/hyphy/issues/1528
 
@@ -23,6 +24,6 @@ AVX_DESC=	Advanced vector extensions support
 
 AVX_CMAKE_OFF=	-DNOAVX:BOOL=ON
 
-# 2 tests fail, see https://github.com/veg/hyphy/issues/1529
+# All tests pass as of DISTVERSION=2.5.46hf1
 
 .include <bsd.port.mk>

biology/hyphy/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1672008666
-SHA256 (veg-hyphy-2.5.43_GH0.tar.gz) = 9328916267811a95dbbff94b51066dfc481f8d49ae0cf4d58e8384c58afbea50
-SIZE (veg-hyphy-2.5.43_GH0.tar.gz) = 5634198
+TIMESTAMP = 1673313088
+SHA256 (veg-hyphy-2.5.46hf1_GH0.tar.gz) = ec2f9e737741ce6811b7607b613b3c4be71e4ac57d0b516f0cb5174d8727be27
+SIZE (veg-hyphy-2.5.46hf1_GH0.tar.gz) = 5645952

cad/ngspice_rework/pkg-plist-shlib

@@ -1,7 +1,7 @@
 libdata/pkgconfig/ngspice.pc
 lib/libngspice.so
 lib/libngspice.so.0
-lib/libngspice.so.0.0.4
+lib/libngspice.so.0.0.5
 lib/ngspice/analog.cm
 lib/ngspice/digital.cm
 lib/ngspice/spice2poly.cm