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

archivers/zstd/Makefile

@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2020/06/16 14:58:08 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2020/10/01 07:25:06 mcf Exp $
 
 DISTNAME=	zstd-1.4.5
+PKGREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_GITHUB:=facebook/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}

archivers/zstd/distinfo

@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.24 2020/06/14 13:51:55 adam Exp $
+$NetBSD: distinfo,v 1.25 2020/10/01 07:25:06 mcf 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) = 5005ffd50388520f69bd95012f696274e29fd3a9
+SHA1 (patch-lib_Makefile) = 07196103e013532ac60e1ce6dfc9f61de3367287
 SHA1 (patch-programs_Makefile) = 2500df468c2994f1b33165c5d2774817bdc8addc
 SHA1 (patch-zlibWrapper_examples_minigzip.c) = 4ed0cb648bdd6efa61b3f66ba6eb1ea74b7767ec

archivers/zstd/patches/patch-lib_Makefile

@@ -1,4 +1,4 @@
-$NetBSD: patch-lib_Makefile,v 1.9 2020/06/14 13:51:55 adam Exp $
+$NetBSD: patch-lib_Makefile,v 1.10 2020/10/01 07:25:06 mcf Exp $
 
 Detect and use third-party libraries (taken from programs/Makefile).
 -fvisibility=hidden makes error when linking.
@@ -7,14 +7,17 @@ Fix pkgconfig installation path.
 
 --- lib/Makefile.orig	2020-05-22 05:04:00.000000000 +0000
 +++ lib/Makefile
-@@ -165,6 +165,40 @@ CPPFLAGS  += -DZSTD_LEGACY_SUPPORT=$(ZST
+@@ -165,6 +165,43 @@ CPPFLAGS  += -DZSTD_LEGACY_SUPPORT=$(ZST
 
  ZSTD_OBJ   := $(patsubst %.c,%.o,$(ZSTD_FILES))
 
 +VOID = /dev/null
 +
++# Make 4.3 doesn't support '\#' anymore (https://lwn.net/Articles/810071/)
++NUM_SYMBOL := \#
++
 +# thread detection
-+HAVE_PTHREAD := $(shell printf '\#include <pthread.h>\nint main(void) { return 0; }' | $(CC) $(FLAGS) -o have_pthread$(EXT) -x c - -pthread 2> $(VOID) && rm have_pthread$(EXT) && echo 1 || echo 0)
++HAVE_PTHREAD := $(shell printf '$(NUM_SYMBOL)include <pthread.h>\nint main(void) { return 0; }' | $(CC) $(FLAGS) -o have_pthread$(EXT) -x c - -pthread 2> $(VOID) && rm have_pthread$(EXT) && echo 1 || echo 0)
 +HAVE_THREAD := $(shell [ "$(HAVE_PTHREAD)" -eq "1" -o -n "$(filter Windows%,$(OS))" ] && echo 1 || echo 0)
 +ifeq ($(HAVE_THREAD), 1)
 +THREAD_MSG := ==> building with threading support
@@ -23,22 +26,22 @@ Fix pkgconfig installation path.
 +endif
 +
 +# zlib detection
-+HAVE_ZLIB := $(shell printf '\#include <zlib.h>\nint main(void) { return 0; }' | $(CC) $(FLAGS) -o have_zlib$(EXT) -x c - -lz 2> $(VOID) && rm have_zlib$(EXT) && echo 1 || echo 0)
++HAVE_ZLIB := $(shell printf '$(NUM_SYMBOL)include <zlib.h>\nint main(void) { return 0; }' | $(CC) $(FLAGS) -o have_zlib$(EXT) -x c - -lz 2> $(VOID) && rm have_zlib$(EXT) && echo 1 || echo 0)
 +ifeq ($(HAVE_ZLIB), 1)
 +ZLIB_MSG := ==> building zstd with .gz compression support
 +ZLIBCPP = -DZSTD_GZCOMPRESS -DZSTD_GZDECOMPRESS
 +ZLIBLD = -lz
 +endif
 +
 +# lzma detection
-+HAVE_LZMA := $(shell printf '\#include <lzma.h>\nint main(void) { return 0; }' | $(CC) $(FLAGS) -o have_lzma$(EXT) -x c - -llzma 2> $(VOID) && rm have_lzma$(EXT) && echo 1 || echo 0)
++HAVE_LZMA := $(shell printf '$(NUM_SYMBOL)include <lzma.h>\nint main(void) { return 0; }' | $(CC) $(FLAGS) -o have_lzma$(EXT) -x c - -llzma 2> $(VOID) && rm have_lzma$(EXT) && echo 1 || echo 0)
 +ifeq ($(HAVE_LZMA), 1)
 +LZMACPP = -DZSTD_LZMACOMPRESS -DZSTD_LZMADECOMPRESS
 +LZMALD = -llzma
 +endif
 +
 +# lz4 detection
-+HAVE_LZ4 := $(shell printf '\#include <lz4frame.h>\n\#include <lz4.h>\nint main(void) { return 0; }' | $(CC) $(FLAGS) -o have_lz4$(EXT) -x c - -llz4 2> $(VOID) && rm have_lz4$(EXT) && echo 1 || echo 0)
++HAVE_LZ4 := $(shell printf '$(NUM_SYMBOL)include <lz4frame.h>\n$(NUM_SYMBOL)include <lz4.h>\nint main(void) { return 0; }' | $(CC) $(FLAGS) -o have_lz4$(EXT) -x c - -llz4 2> $(VOID) && rm have_lz4$(EXT) && echo 1 || echo 0)
 +ifeq ($(HAVE_LZ4), 1)
 +LZ4CPP = -DZSTD_LZ4COMPRESS -DZSTD_LZ4DECOMPRESS
 +LZ4LD = -llz4
@@ -48,7 +51,7 @@ 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 +238,8 @@ $(LIBZSTD): $(ZSTD_FILES)
+@@ -204,7 +241,8 @@ $(LIBZSTD): $(ZSTD_FILES)
  else
 
  LIBZSTD = libzstd.$(SHARED_EXT_VER)
@@ -58,15 +61,15 @@ Fix pkgconfig installation path.
  $(LIBZSTD): $(ZSTD_FILES)
  	@echo compiling dynamic library $(LIBVER)
  	$(Q)$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
-@@ -251,7 +286,6 @@ clean:
+@@ -251,7 +289,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))
 
  all: libzstd.pc
 
-@@ -287,11 +321,7 @@ $(error configured includedir ($(INCLUDE
+@@ -287,11 +324,7 @@ $(error configured includedir ($(INCLUDE
  endif
  endif
 
@@ -78,7 +81,7 @@ Fix pkgconfig installation path.
 
  ifneq (,$(filter $(shell uname),SunOS))
  INSTALL ?= ginstall
-@@ -351,4 +381,3 @@ uninstall:
+@@ -351,4 +384,3 @@ uninstall:
  	$(Q)$(RM) $(DESTDIR)$(INCLUDEDIR)/zdict.h
  	@echo zstd libraries successfully uninstalled
 

audio/musicpd/Makefile

@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.225 2020/08/18 17:57:38 leot Exp $
+# $NetBSD: Makefile,v 1.226 2020/10/02 09:47:09 wiz Exp $
 
-DISTNAME=	mpd-0.21.25
+DISTNAME=	mpd-0.22
 PKGNAME=	${DISTNAME:S/mpd/musicpd/}
-PKGREVISION=	2
 CATEGORIES=	audio
-MASTER_SITES=	https://www.musicpd.org/download/mpd/0.21/
+MASTER_SITES=	https://www.musicpd.org/download/mpd/0.22/
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -17,10 +16,10 @@ CONFLICTS=	mpd-[0-9]*
 USE_TOOLS+=	pkg-config
 USE_LANGUAGES=	c c++
 
-# c++14
-GCC_REQD+=	6
+# c++17
+GCC_REQD+=	8
 
-MESON_ARGS+=	-Ddocumentation=true
+MESON_ARGS+=	-Ddocumentation=enabled
 
 # worrying libraries with limited maintainance:
 # - audiofile, many CVEs, no activity since 2016
@@ -112,7 +111,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/mpdconf.example ${DESTDIR}${EGDIR}
 
 .include "../../devel/meson/build.mk"
-BUILDLINK_ABI_DEPENDS.flac+=	flac>=1.2
+BUILDLINK_API_DEPENDS.flac+=	flac>=1.2
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/libid3tag/buildlink3.mk"
 .include "../../audio/libopus/buildlink3.mk"

audio/musicpd/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2020/01/04 20:46:27 nia Exp $
+@comment $NetBSD: PLIST,v 1.15 2020/10/02 09:47:09 wiz Exp $
 bin/mpd
 man/man1/mpd.1
 man/man5/mpd.conf.5
@@ -9,6 +9,8 @@ share/doc/mpd/README.md
 share/doc/mpd/html/.buildinfo
 share/doc/mpd/html/_sources/developer.rst.txt
 share/doc/mpd/html/_sources/index.rst.txt
+share/doc/mpd/html/_sources/mpd.1.rst.txt
+share/doc/mpd/html/_sources/mpd.conf.5.rst.txt
 share/doc/mpd/html/_sources/plugins.rst.txt
 share/doc/mpd/html/_sources/protocol.rst.txt
 share/doc/mpd/html/_sources/user.rst.txt
@@ -30,6 +32,8 @@ share/doc/mpd/html/_static/underscore.js
 share/doc/mpd/html/developer.html
 share/doc/mpd/html/genindex.html
 share/doc/mpd/html/index.html
+share/doc/mpd/html/mpd.1.html
+share/doc/mpd/html/mpd.conf.5.html
 share/doc/mpd/html/objects.inv
 share/doc/mpd/html/plugins.html
 share/doc/mpd/html/protocol.html

audio/musicpd/distinfo

@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.117 2020/07/07 12:52:19 nia Exp $
+$NetBSD: distinfo,v 1.118 2020/10/02 09:47:09 wiz Exp $
 
-SHA1 (mpd-0.21.25.tar.xz) = 7e733fc9bf98c9c25f6b780e0df2347d0f1717b2
-RMD160 (mpd-0.21.25.tar.xz) = 9951bf096e8d6d6fe3a07a82d660caf1d2bd91af
-SHA512 (mpd-0.21.25.tar.xz) = 67e0cbf176d18cd63effab0d12b22bea846458cbaa383ead9078c4b5f2a472dbb1d7308af4d6898691e8864a911c808af5ca2c553d8233323b8aaedfdc7189fc
-Size (mpd-0.21.25.tar.xz) = 683768 bytes
-SHA1 (patch-src_net_IPv6Address.hxx) = c9e9a5676451e6834fcef359266d37fc15f079e6
-SHA1 (patch-src_output_plugins_SolarisOutputPlugin.cxx) = 16f366dfc41b712753ed8da32389848a2cd84f4d
+SHA1 (mpd-0.22.tar.xz) = 5dd348085f39e6c6259a771e49d992370d55872e
+RMD160 (mpd-0.22.tar.xz) = b1b54c521796b26e20c60f1ab1b3600fed0ae397
+SHA512 (mpd-0.22.tar.xz) = 2a6671dc2392dbac65d8339b8cfe86626fc46727bedab80266b24c6d63b0a26a832fc233576866ab5115627efdaa61bbe6876f4d33cb48c21e16fb5b74d3cfe4
+Size (mpd-0.22.tar.xz) = 722940 bytes
+SHA1 (patch-src_net_IPv6Address.hxx) = 3e0ad6e63a970a17d0d8b2403acc538d8b08342e

audio/musicpd/patches/patch-src_net_IPv6Address.hxx

@@ -1,4 +1,4 @@
-$NetBSD: patch-src_net_IPv6Address.hxx,v 1.1 2018/12/11 10:37:20 wiz Exp $
+$NetBSD: patch-src_net_IPv6Address.hxx,v 1.2 2020/10/02 09:47:09 wiz Exp $
 
 Fixes
 In file included from /usr/include/netinet/in.h:372:0,
@@ -13,7 +13,7 @@ https://mail-index.netbsd.org/source-changes/2018/12/10/msg101328.html
 
 https://github.com/MusicPlayerDaemon/MPD/issues/438
 
---- src/net/IPv6Address.hxx.orig	2018-11-16 12:27:58.000000000 +0000
+--- src/net/IPv6Address.hxx.orig	2020-09-23 13:26:51.000000000 +0000
 +++ src/net/IPv6Address.hxx
 @@ -41,6 +41,7 @@
  #include <ws2tcpip.h>
@@ -22,4 +22,4 @@ https://github.com/MusicPlayerDaemon/MPD/issues/438
 +#include <arpa/inet.h>
  #endif
 
- /**
+ class IPv4Address;

audio/ncspot/Makefile

@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2020/09/04 11:49:46 pin Exp $
+# $NetBSD: Makefile,v 1.4 2020/10/01 08:38:02 pin Exp $
 
 DISTNAME=	ncspot-0.2.2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GITHUB:=hrkfdn/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
+MAINTAINER=	pin@NetBSD.org
 HOMEPAGE=	https://github.com/hrkfdn/ncspot/
 COMMENT=	Cross-platform ncurses Spotify client written in Rust
 LICENSE=	2-clause-bsd

cross/mingw-w64-i686-crt/Makefile

@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.7 2020/08/31 18:06:53 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2020/10/02 16:49:36 ryoon Exp $
 
-PKGREVISION= 1
 .include "../../cross/mingw-w64-x86_64-crt/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/mingw-w64-v/mingw-w64-i686-crt-/}