Merge remote-tracking branch 'netbsd/trunk' into joyent/release/trunk

TritonDataCenter · Jan 3, 2021 · 0da6c55 · 0da6c55
2 parents e5ec76b + 278f20a
commit 0da6c55
Show file tree

Hide file tree

Showing 237 changed files with 2,124 additions and 2,973 deletions.
diff --git a/archivers/php-pecl-zip/Makefile b/archivers/php-pecl-zip/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2020/10/04 06:17:10 taca Exp $
+# $NetBSD: Makefile,v 1.5 2021/01/03 07:26:53 taca Exp $
 #
 
 MODNAME=	zip
-PECL_VERSION=	1.19.1
+PECL_VERSION=	1.19.2
 PKGNAME=	${PHP_PKG_PREFIX}-pecl-${MODNAME}-${PECL_VERSION}
 CATEGORIES=	archivers
 
@@ -11,7 +11,7 @@ HOMEPAGE=	https://pecl.php.net/package/zip
 COMMENT=	Zip management extension with libzip
 LICENSE=	php
 
-PHP_VERSIONS_ACCEPTED=	72 73 74
+PHP_VERSIONS_INCOMPATIBLE=	56
 
 CONFIGURE_ARGS+=	--enable-zip
 CONFIGURE_ARGS+=	--with-libzip=${PREFIX}

diff --git a/archivers/php-pecl-zip/distinfo b/archivers/php-pecl-zip/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2020/10/04 06:17:10 taca Exp $
+$NetBSD: distinfo,v 1.4 2021/01/03 07:26:53 taca Exp $
 
-SHA1 (php-zip/zip-1.19.1.tgz) = 1edcc5ee7cb547e28943ad989fb97d72152ccbae
-RMD160 (php-zip/zip-1.19.1.tgz) = 80830e61036b17c059782c2efedd08fec9b4213f
-SHA512 (php-zip/zip-1.19.1.tgz) = 3bcc581385a46e389907acc194728621b307d1240d771ec8124dc3c19392eb4a43a8674ad6a320559c86d030672b29fb2e5ae129a2c32a0b7707a00a5e6fb4ca
-Size (php-zip/zip-1.19.1.tgz) = 325579 bytes
+SHA1 (php-zip/zip-1.19.2.tgz) = c912f7eae400d5f23f20b28cdc9c4337140219e0
+RMD160 (php-zip/zip-1.19.2.tgz) = 66c22bc0a645f382ebdc733d554f5d615eeb585f
+SHA512 (php-zip/zip-1.19.2.tgz) = ef0971da57cd1b92a2b458e978d539e82851a65c811c4dd3ead7827db84a3c995d065bb6390ecd617273b92e47236e22c9696a4f98bc263617a2637fa30dd0bd
+Size (php-zip/zip-1.19.2.tgz) = 325915 bytes
diff --git a/archivers/py-zstandard/Makefile b/archivers/py-zstandard/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2020/12/06 10:55:42 adam Exp $
+# $NetBSD: Makefile,v 1.18 2021/01/03 14:57:53 adam Exp $
 
-DISTNAME=	zstandard-0.14.1
+DISTNAME=	zstandard-0.15.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	archivers python
 MASTER_SITES=	${MASTER_SITE_PYPI:=z/zstandard/}
@@ -11,13 +11,13 @@ COMMENT=	Zstandard bindings for Python
 LICENSE=	modified-bsd
 
 DEPENDS+=	${PYPKGPREFIX}-cffi>=1.11:../../devel/py-cffi
-
-PYTHON_VERSIONED_DEPENDENCIES=	hypothesis:test
+TEST_DEPENDS+=	${PYPKGPREFIX}-hypothesis-[0-9]*:../../devel/py-hypothesis
 
 PYSETUPBUILDARGS+=	--system-zstd
 
-BUILDLINK_API_DEPENDS.zstd+=	zstd>=1.4.5
+PYTHON_VERSIONS_INCOMPATIBLE=	27
+
+BUILDLINK_API_DEPENDS.zstd+=	zstd>=1.4.8
 .include "../../archivers/zstd/buildlink3.mk"
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/py-zstandard/PLIST b/archivers/py-zstandard/PLIST
@@ -1,14 +1,16 @@
-@comment $NetBSD: PLIST,v 1.5 2019/02/26 06:42:27 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2021/01/03 14:57:53 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
 ${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
-${PYSITELIB}/_zstd_cffi.so
 ${PYSITELIB}/zstandard/__init__.py
 ${PYSITELIB}/zstandard/__init__.pyc
+${PYSITELIB}/zstandard/__init__.pyi
 ${PYSITELIB}/zstandard/__init__.pyo
-${PYSITELIB}/zstandard/cffi.py
-${PYSITELIB}/zstandard/cffi.pyc
-${PYSITELIB}/zstandard/cffi.pyo
-${PYSITELIB}/zstd.so
+${PYSITELIB}/zstandard/_cffi.so
+${PYSITELIB}/zstandard/backend_c.so
+${PYSITELIB}/zstandard/backend_cffi.py
+${PYSITELIB}/zstandard/backend_cffi.pyc
+${PYSITELIB}/zstandard/backend_cffi.pyo
+${PYSITELIB}/zstandard/py.typed
diff --git a/archivers/py-zstandard/distinfo b/archivers/py-zstandard/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.15 2020/12/06 10:55:42 adam Exp $
+$NetBSD: distinfo,v 1.16 2021/01/03 14:57:53 adam Exp $
 
-SHA1 (zstandard-0.14.1.tar.gz) = 93090c79a331d4ceffad7fa762b7297aee62a9db
-RMD160 (zstandard-0.14.1.tar.gz) = 70aabbd898e364ed52927126e5220c3bb2b3fa67
-SHA512 (zstandard-0.14.1.tar.gz) = e49f294816f0c7da35914363dbbdfcc4d432f7fa8367192e07a5d0c093ec8af76966fd0a95b4e8316091f056a8027c383ca73cc9ed506b29e2f9a31bc9ad3379
-Size (zstandard-0.14.1.tar.gz) = 676849 bytes
-SHA1 (patch-zstd.c) = d6566abae99231175401ce130cb2260b040d72e8
+SHA1 (zstandard-0.15.1.tar.gz) = 59be1c44cd73f8513b8f2b37ed9fe69af1a0c1e8
+RMD160 (zstandard-0.15.1.tar.gz) = 5024d775b7c377a90ce70f9330e2a610e8de5928
+SHA512 (zstandard-0.15.1.tar.gz) = 7aabe647fa8c9a696084da6544c27287fe7d57e3a0ce2594c061fd20136e147ded4ea3da3648f6ef93c49636edc1d04ca4f29561514fb13f1a5d0340cd51996b
+Size (zstandard-0.15.1.tar.gz) = 992126 bytes
diff --git a/archivers/py-zstandard/patches/patch-zstd.c b/archivers/py-zstandard/patches/patch-zstd.c
diff --git a/archivers/zstd/Makefile b/archivers/zstd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2020/10/01 07:25:06 mcf Exp $
+# $NetBSD: Makefile,v 1.32 2021/01/03 14:55:50 adam Exp $
 
-DISTNAME=	zstd-1.4.5
-PKGREVISION=	1
+DISTNAME=	zstd-1.4.8
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_GITHUB:=facebook/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -14,7 +13,7 @@ LICENSE=	modified-bsd OR gnu-gpl-v2
 CHECK_PORTABILITY_SKIP+=	tests/playTests.sh
 
 # 1.4.5: ../lib/libzstd.so: file not recognized: file format not recognized
-MAKE_JOBS_SAFE=		no
+#MAKE_JOBS_SAFE=		no
 
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		ggrep gmake pkg-config

diff --git a/archivers/zstd/PLIST b/archivers/zstd/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.5 2018/10/22 15:28:02 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2021/01/03 14:55:50 adam Exp $
 bin/unzstd
 bin/zstd
 bin/zstdcat
 bin/zstdgrep
 bin/zstdless
 bin/zstdmt
-include/zbuff.h
 include/zdict.h
 include/zstd.h
 include/zstd_errors.h

diff --git a/archivers/zstd/distinfo b/archivers/zstd/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.25 2020/10/01 07:25:06 mcf Exp $
+$NetBSD: distinfo,v 1.26 2021/01/03 14:55:50 adam Exp $
 
-SHA1 (zstd-1.4.5.tar.gz) = 9c344c2660c990b6d6a9cced73db3a0dfe2b0092
-RMD160 (zstd-1.4.5.tar.gz) = b7b9df3d4293eab050f84d2fc7f0a29c89905e87
-SHA512 (zstd-1.4.5.tar.gz) = b03c497c3e0590c3d384cb856e3024f144b2bfac0d805d80e68deafa612c68237f12a2d657416d476a28059e80936c79f099fc42331464b417593895ea214387
-Size (zstd-1.4.5.tar.gz) = 1987927 bytes
-SHA1 (patch-Makefile) = daf9d1946513ee24a4c4c187ec80878e9a578744
-SHA1 (patch-lib_Makefile) = 07196103e013532ac60e1ce6dfc9f61de3367287
-SHA1 (patch-programs_Makefile) = 2500df468c2994f1b33165c5d2774817bdc8addc
+SHA1 (zstd-1.4.8.tar.gz) = e3027d788b964429c773fab05e000061dc6eb3f6
+RMD160 (zstd-1.4.8.tar.gz) = 94aa90fff2a52a5c0314a19d2a59903ac760eada
+SHA512 (zstd-1.4.8.tar.gz) = 61ce5d61e24770e70c32680f32d58542d6a1b5cc65737256561d8e34c77a82c1d36c769c179da5ea8ed5ecb035b4a4af292b9717c65976172e282859a332137a
+Size (zstd-1.4.8.tar.gz) = 1816546 bytes
+SHA1 (patch-Makefile) = e1e702cd3b461d432e25909fdcf01cc51c769a8a
+SHA1 (patch-lib_Makefile) = 8d31689c4bf9dd97b82f01396ef6b58cb29fd80e
+SHA1 (patch-programs_Makefile) = 9d57ba124fc2b243d6fcb8bfb744c2d39ac89e0e
 SHA1 (patch-zlibWrapper_examples_minigzip.c) = 4ed0cb648bdd6efa61b3f66ba6eb1ea74b7767ec
diff --git a/archivers/zstd/patches/patch-Makefile b/archivers/zstd/patches/patch-Makefile
@@ -1,18 +1,18 @@
-$NetBSD: patch-Makefile,v 1.8 2018/10/07 06:25:30 adam Exp $
+$NetBSD: patch-Makefile,v 1.9 2021/01/03 14:55:50 adam Exp $
 
 Enable the "install" target on all OS.
 
---- Makefile.orig	2018-10-05 16:34:52.000000000 +0000
+--- Makefile.orig	2020-12-19 00:39:42.000000000 +0000
 +++ Makefile
-@@ -113,7 +113,6 @@ clean:
+@@ -149,7 +149,6 @@ clean:
  #------------------------------------------------------------------------------
  # make install is validated only for Linux, macOS, Hurd and some BSD targets
  #------------------------------------------------------------------------------
 -ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD DragonFly NetBSD MSYS_NT Haiku))
 
  HOST_OS = POSIX
  CMAKE_PARAMS = -DZSTD_BUILD_CONTRIB:BOOL=ON -DZSTD_BUILD_STATIC:BOOL=ON -DZSTD_BUILD_TESTS:BOOL=ON -DZSTD_ZLIB_SUPPORT:BOOL=ON -DZSTD_LZMA_SUPPORT:BOOL=ON -DCMAKE_BUILD_TYPE=Release
-@@ -319,7 +318,6 @@ clang38install:
+@@ -356,7 +355,6 @@ clang38install:
  lz4install:
  	[ -e lz4 ] || git clone https://github.com/lz4/lz4 && sudo $(MAKE) -C lz4 install
 

diff --git a/archivers/zstd/patches/patch-lib_Makefile b/archivers/zstd/patches/patch-lib_Makefile
@@ -1,15 +1,15 @@
-$NetBSD: patch-lib_Makefile,v 1.10 2020/10/01 07:25:06 mcf Exp $
+$NetBSD: patch-lib_Makefile,v 1.11 2021/01/03 14:55:50 adam Exp $
 
 Detect and use third-party libraries (taken from programs/Makefile).
 -fvisibility=hidden makes error when linking.
 Enable the "install" target on all OS.
 Fix pkgconfig installation path.
 
---- lib/Makefile.orig	2020-05-22 05:04:00.000000000 +0000
+--- lib/Makefile.orig	2020-12-19 00:39:42.000000000 +0000
 +++ lib/Makefile
-@@ -165,6 +165,43 @@ CPPFLAGS  += -DZSTD_LEGACY_SUPPORT=$(ZST
+@@ -193,6 +193,43 @@ endif
+ endif # BUILD_DIR
 
- ZSTD_OBJ   := $(patsubst %.c,%.o,$(ZSTD_FILES))
 
 +VOID = /dev/null
 +
@@ -50,39 +50,39 @@ Fix pkgconfig installation path.
 +
  # macOS linker doesn't support -soname, and use different extension
  # see : https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/DynamicLibraries/100-Articles/DynamicLibraryDesignGuidelines.html
- ifeq ($(shell uname), Darwin)
-@@ -204,7 +241,8 @@ $(LIBZSTD): $(ZSTD_FILES)
- else
-
+ ifeq ($(UNAME), Darwin)
+@@ -259,7 +296,8 @@ else  # not Windows
  LIBZSTD = libzstd.$(SHARED_EXT_VER)
--$(LIBZSTD): LDFLAGS += -shared -fPIC -fvisibility=hidden
+ .PHONY: $(LIBZSTD)  # must be run every time
+ $(LIBZSTD): CFLAGS += -fPIC
+-$(LIBZSTD): LDFLAGS += -shared -fvisibility=hidden
 +$(LIBZSTD): CPPFLAGS += $(THREAD_CPP) $(ZLIBCPP) $(LZMACPP) $(LZ4CPP)
-+$(LIBZSTD): LDFLAGS += -shared -fPIC $(THREAD_LD) $(ZLIBLD) $(LZMALD) $(LZ4LD)
- $(LIBZSTD): $(ZSTD_FILES)
- 	@echo compiling dynamic library $(LIBVER)
- 	$(Q)$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
-@@ -251,7 +289,6 @@ clean:
++$(LIBZSTD): LDFLAGS += -shared $(THREAD_LD) $(ZLIBLD) $(LZMALD) $(LZ4LD)
+
+ ifndef BUILD_DIR
+ # determine BUILD_DIR from compilation flags
+@@ -349,7 +387,6 @@ clean:
  #-----------------------------------------------------------------------------
  # make install is validated only for below listed environments
  #-----------------------------------------------------------------------------
--ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku))
+-ifneq (,$(filter $(UNAME),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku))
 
  all: libzstd.pc
 
-@@ -287,11 +324,7 @@ $(error configured includedir ($(INCLUDE
- endif
- endif
+@@ -380,11 +417,7 @@ PCLIBPREFIX := $(if $(findstring $(LIBDI
+ # to PREFIX, rather than as a resolved value.
+ PCEXEC_PREFIX := $(if $(HAS_EXPLICIT_EXEC_PREFIX),$(EXEC_PREFIX),$${prefix})
 
--ifneq (,$(filter $(shell uname),FreeBSD NetBSD DragonFly))
--PKGCONFIGDIR ?= $(PREFIX)/libdata/pkgconfig
+-ifneq (,$(filter $(UNAME),FreeBSD NetBSD DragonFly))
+-  PKGCONFIGDIR ?= $(PREFIX)/libdata/pkgconfig
 -else
- PKGCONFIGDIR ?= $(LIBDIR)/pkgconfig
+   PKGCONFIGDIR ?= $(LIBDIR)/pkgconfig
 -endif
 
- ifneq (,$(filter $(shell uname),SunOS))
- INSTALL ?= ginstall
-@@ -351,4 +384,3 @@ uninstall:
- 	$(Q)$(RM) $(DESTDIR)$(INCLUDEDIR)/zdict.h
+ ifneq (,$(filter $(UNAME),SunOS))
+   INSTALL ?= ginstall
+@@ -448,4 +481,3 @@ uninstall:
+ 	$(RM) $(DESTDIR)$(INCLUDEDIR)/zdict.h
  	@echo zstd libraries successfully uninstalled
 
 -endif
diff --git a/archivers/zstd/patches/patch-programs_Makefile b/archivers/zstd/patches/patch-programs_Makefile
@@ -1,21 +1,23 @@
-$NetBSD: patch-programs_Makefile,v 1.7 2020/06/14 13:51:55 adam Exp $
+$NetBSD: patch-programs_Makefile,v 1.8 2021/01/03 14:55:50 adam Exp $
 
 Use zstd shared library.
 
---- programs/Makefile.orig	2020-05-22 05:04:00.000000000 +0000
+--- programs/Makefile.orig	2020-12-19 00:39:42.000000000 +0000
 +++ programs/Makefile
-@@ -172,12 +172,12 @@ zstd : CPPFLAGS += -DZSTD_LEGACY_SUPPORT
- ifneq (,$(filter Windows%,$(OS)))
- zstd : $(RES_FILE)
- endif
--zstd : $(ZSTDLIB_FILES) $(ZSTD_CLI_OBJ)
-+zstd : $(ZSTD_CLI_OBJ)
+@@ -222,14 +222,14 @@ zstd:
+ else
+ # BUILD_DIR is defined
+
+-ZSTD_OBJ := $(addprefix $(BUILD_DIR)/, $(ZSTD_ALL_OBJ))
++ZSTD_OBJ := $(addprefix $(BUILD_DIR)/, $(ZSTD_CLI_OBJ))
+ $(BUILD_DIR)/zstd : $(ZSTD_OBJ)
  	@echo "$(THREAD_MSG)"
  	@echo "$(ZLIB_MSG)"
  	@echo "$(LZMA_MSG)"
  	@echo "$(LZ4_MSG)"
+ 	@echo LINK $@
 -	$(CC) $(FLAGS) $^ -o $@$(EXT) $(LDFLAGS)
 +	$(CC) $(FLAGS) $^ -o $@$(EXT) $(LDFLAGS) -L$(ZSTDDIR) -lzstd
 
- .PHONY: zstd-release
- zstd-release: DEBUGFLAGS := -DBACKTRACE_ENABLE=0
+ ifeq ($(HAVE_HASH),1)
+ SRCBIN_HASH = $(shell cat $(BUILD_DIR)/zstd 2> $(VOID) | $(HASH) | cut -f 1 -d " ")
diff --git a/audio/cddb-bundle/Makefile b/audio/cddb-bundle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2020/11/05 09:07:23 ryoon Exp $
+# $NetBSD: Makefile,v 1.37 2021/01/02 12:41:22 nia Exp $
 #
 
 DISTNAME=	cddb.bundle-0.2
@@ -18,12 +18,11 @@ USE_LANGUAGES=	objc
 MAKE_ENV+=	ADDITIONAL_CPPFLAGS="-Wno-import"
 MAKE_FILE=	GNUmakefile
 
+MAKE_FLAGS+=	BUNDLE_INSTALL_DIR=${DESTDIR}${PREFIX}/lib/GNUstep/Bundles
+
 INSTALL_MAKE_FLAGS=	INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} \
 			INSTALL_DATA=${INSTALL_DATA:Q}
 
-FIX_GNUSTEP_INSTALLATION_DIR=		yes
-SUBST_FILES.gnustep_installation_dir+=	Cddb/GNUmakefile
-
 .include "../../devel/gnustep-base/buildlink3.mk"
 .include "../../x11/gnustep-gui/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mpg123-pulse/Makefile b/audio/mpg123-pulse/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2021/01/01 09:52:17 ryoon Exp $
+# $NetBSD: Makefile,v 1.29 2021/01/03 15:06:00 adam Exp $
 
 MPG123_MODULE=	pulse
 
-PKGREVISION= 3
 .include "../../audio/mpg123/Makefile.common"
 
 .include "../../audio/mpg123/buildlink3.mk"

diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.59 2020/08/01 23:44:06 tsutsui Exp $
+# $NetBSD: Makefile,v 1.60 2021/01/03 15:06:00 adam Exp $
 
 PKGNAME=	${DISTNAME:C/[^[:alnum:]]*//}
-PKGREVISION=	1
 COMMENT=	MPEG layer 1, 2, and 3 audio player
 
 PKGCONFIG_OVERRIDE+=	libmpg123.pc.in

diff --git a/audio/mpg123/Makefile.common b/audio/mpg123/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.55 2020/07/27 14:46:14 adam Exp $
+# $NetBSD: Makefile.common,v 1.56 2021/01/03 15:06:00 adam Exp $
 #
 # used by audio/mpg123-nas/Makefile
 # used by audio/mpg123-oss/Makefile
 # used by audio/mpg123-pulse/Makefile
 # used by audio/mpg123-sun/Makefile
 
-DISTNAME=	mpg123-1.26.3
+DISTNAME=	mpg123-1.26.4
 PKGNAME?=	${DISTNAME:C/[[:alnum:]]*/&-${MPG123_MODULE}/}
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mpg123/}

diff --git a/audio/mpg123/distinfo b/audio/mpg123/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.54 2020/07/27 14:46:14 adam Exp $
+$NetBSD: distinfo,v 1.55 2021/01/03 15:06:00 adam Exp $
 
-SHA1 (mpg123-1.26.3.tar.bz2) = e48e6d65d4b016a6999654288bdbd9075e2565ab
-RMD160 (mpg123-1.26.3.tar.bz2) = 6a2a86daf4e31bb916c75987bde4b49746075544
-SHA512 (mpg123-1.26.3.tar.bz2) = 7574331afaecf3f867455df4b7012e90686ad6ac8c5b5e820244204ea7088bf2b02c3e75f53fe71c205f9eca81fef93f1d969c8d0d1ee9775dc05482290f7b2d
-Size (mpg123-1.26.3.tar.bz2) = 1046915 bytes
+SHA1 (mpg123-1.26.4.tar.bz2) = d6f68d8defbb0622c677d29251a7e81df62cd32f
+RMD160 (mpg123-1.26.4.tar.bz2) = ad42a3d4376b993aafc641596233bbc1b8876d1f
+SHA512 (mpg123-1.26.4.tar.bz2) = 425162227aafb99b8723428fe9bd403739a2dd68828b86a2cff7f9928a9f0ab3f67420e56c0abe7c9deeb94bce6c6acd59acaa0606ce24c01716465640564785
+Size (mpg123-1.26.4.tar.bz2) = 1050563 bytes
 SHA1 (patch-Makefile.in) = e1b529e9468994e25c2567df7e64a2905b0cf529
 SHA1 (patch-aa) = 4b2761219dd8fb92079d7f96872e56beb702696a
 SHA1 (patch-ad) = f07b637c3fc1d3ea0426013fc25bca8e3aecba56

diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.151 2021/01/01 09:50:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.152 2021/01/03 14:58:37 wiz Exp $
 
 DISTNAME=	pulseaudio-14.0
 CATEGORIES=	audio
@@ -38,6 +38,9 @@ TOOL_DEPENDS+=	p5-XML-Parser>=2.31nb1:../../textproc/p5-XML-Parser
 REPLACE_BASH=	shell-completion/bash/pulseaudio git-version-gen
 REPLACE_BASH=	src/utils/pa-info
 
+# backup file has "=="
+CHECK_PORTABILITY_SKIP+=	configure~
+
 .include "../../mk/bsd.prefs.mk"
 
 # Some tests are incompatible for NetBSD at least

diff --git a/audio/spotify-qt/Makefile b/audio/spotify-qt/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2020/11/28 21:17:28 pin Exp $
+# $NetBSD: Makefile,v 1.6 2021/01/02 14:13:56 pin Exp $
 
-DISTNAME=	spotify-qt-3.2
+DISTNAME=	spotify-qt-3.3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GITHUB:=kraxarn/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}