Update to upstream netbsd/pkgsrc

archivers/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.189 2022/01/17 17:49:05 rhialto Exp $
+# $NetBSD: Makefile,v 1.190 2022/05/25 09:22:05 adam Exp $
 #
 
 COMMENT=	Archivers and compression tools
@@ -108,7 +108,6 @@ SUBDIR+=	py-libarchive-c
 SUBDIR+=	py-lz4
 SUBDIR+=	py-rarfile
 SUBDIR+=	py-unrardll
-SUBDIR+=	py-yuicompressor
 SUBDIR+=	py-zipp
 SUBDIR+=	py-zipp1
 SUBDIR+=	py-zipstream

archivers/mousetar/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2021/04/21 22:23:53 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2022/05/24 13:02:34 nia Exp $
 
 DISTNAME=	mousetar-20021217
 PKGREVISION=	1
@@ -21,9 +21,7 @@ CPPFLAGS.SunOS+=	-DTAR_INODE_NONE -DLINUX_NAMLEN
 CPPFLAGS.SunOS+=	-DL_SET=SEEK_SET -DL_INCR=SEEK_CUR -DL_XTND=SEEK_END
 CPPFLAGS.Linux+=	-DLINUX_NAMLEN
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-[2-9].*-*)
-CPPFLAGS+=	-DTAR_INODE_INTERNAL
-.endif
+CPPFLAGS.NetBSD+=	-DTAR_INODE_INTERNAL
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 

archivers/ocaml-bz2/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2022/05/03 18:29:18 jaapb Exp $
+# $NetBSD: Makefile,v 1.22 2022/05/24 18:59:20 jaapb Exp $
 
 PKGNAME=	ocaml-bz2-${VERSION}
 DISTNAME=	camlbz2-${VERSION}
@@ -19,7 +19,7 @@ OCAML_USE_FINDLIB=	yes
 pre-configure:
 	cd ${WRKSRC} && autoconf
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.prefs.mk"
 
 .include "../../archivers/bzip2/buildlink3.mk"

archivers/ocaml-decompress/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/05/03 19:45:12 jaapb Exp $
+# $NetBSD: Makefile,v 1.4 2022/05/24 18:59:20 jaapb Exp $
 
 DISTNAME=	${GITHUB_PROJECT}-1.4.3
 PKGNAME=	ocaml-${DISTNAME}
@@ -15,7 +15,7 @@ LICENSE=	mit
 USE_LANGUAGES=	# none
 OCAML_USE_DUNE=	yes
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../devel/ocaml-checkseum/buildlink3.mk"
 .include "../../devel/ocaml-cmdliner/buildlink3.mk"
 .include "../../devel/ocaml-optint/buildlink3.mk"

archivers/ocaml-decompress/buildlink3.mk

@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.3 2022/05/03 19:45:12 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2022/05/24 17:37:50 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-decompress
 
 .if !defined(OCAML_DECOMPRESS_BUILDLINK3_MK)
 OCAML_DECOMPRESS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-decompress+=	ocaml-decompress>=1.4.1
-BUILDLINK_API_DEPENDS.ocaml-decompress+=	ocaml-decompress>=1.4.3
+BUILDLINK_ABI_DEPENDS.ocaml-decompress+=	ocaml-decompress>=1.4.3
 BUILDLINK_PKGSRCDIR.ocaml-decompress?=		../../archivers/ocaml-decompress
 
 .endif	# OCAML_DECOMPRESS_BUILDLINK3_MK

archivers/ocaml-zip/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2022/05/03 09:27:09 jaapb Exp $
+# $NetBSD: Makefile,v 1.28 2022/05/24 18:59:20 jaapb Exp $
 #
 
 VERSION=	1.11
@@ -19,7 +19,7 @@ INSTALL_TARGET=		install-findlib
 USE_TOOLS+=		gmake
 OCAML_USE_FINDLIB=	yes
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 
 .if ${OCAML_USE_OPT_COMPILER} == "yes"
 BUILD_TARGET+=	allopt

archivers/php-pecl-zip/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2021/12/12 14:24:55 taca Exp $
+# $NetBSD: Makefile,v 1.11 2022/05/24 14:51:48 taca Exp $
 #
 
 MODNAME=	zip
-PECL_VERSION=	1.20.0
+PECL_VERSION=	1.20.1
 PKGNAME=	${PHP_PKG_PREFIX}-pecl-${MODNAME}-${PECL_VERSION}
 CATEGORIES=	archivers
 

archivers/php-pecl-zip/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2021/12/12 14:24:55 taca Exp $
+$NetBSD: distinfo,v 1.9 2022/05/24 14:51:48 taca Exp $
 
-BLAKE2s (php-zip/zip-1.20.0.tgz) = 11600e308b3fa91862ad8df8aa626cbd75aa6b297d2025ddbd5d150521f54ba9
-SHA512 (php-zip/zip-1.20.0.tgz) = 0a23952a8df2f75cf7e1919a289ba7d34be58fea416cdd02010aed81336aeda559ef48838063916f16632dfdf4a0f69519ad58bc4412b5395801c5f72ff57af7
-Size (php-zip/zip-1.20.0.tgz) = 350996 bytes
+BLAKE2s (php-zip/zip-1.20.1.tgz) = 17084a091834f73638b9bef0a897a62a7a47cb39a1c0e95cfae348be07588694
+SHA512 (php-zip/zip-1.20.1.tgz) = 7912443c2dbc47dfa2d88eb16d290a5ff215cc7115b035dce92b4bbaec92498179c2b62302bc7e0f159a01675219a673b12befab171691d2bcb1f85907509216
+Size (php-zip/zip-1.20.1.tgz) = 351117 bytes

archivers/unrar/Makefile.common

@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.43 2022/03/15 05:38:09 adam Exp $
+# $NetBSD: Makefile.common,v 1.44 2022/05/14 05:43:03 adam Exp $
 #
 # used by archivers/libunrar/Makefile
 # used by archivers/unrar/Makefile
 
-DISTNAME=	unrarsrc-6.1.6
+DISTNAME=	unrarsrc-6.1.7
 PKGNAME=	${DISTNAME:S/src//}
 CATEGORIES=	archivers
 MASTER_SITES=	https://www.rarlab.com/rar/

archivers/unrar/distinfo

@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.93 2022/03/15 05:38:09 adam Exp $
+$NetBSD: distinfo,v 1.94 2022/05/14 05:43:03 adam Exp $
 
-BLAKE2s (unrarsrc-6.1.6.tar.gz) = 3ffd1de50a3c6b2951970b5485c563ac8f646ab86e0bcd29bafd7e73ae157b5f
-SHA512 (unrarsrc-6.1.6.tar.gz) = b13db40d34036fb57233216344ecf2d76543ae65c3bd4cccbd3d39e2d30c877c67a4d125cfd1febaab6a5abe7fd6cdfe270f7a48ff149530a0b9ee7340533bf2
-Size (unrarsrc-6.1.6.tar.gz) = 236651 bytes
+BLAKE2s (unrarsrc-6.1.7.tar.gz) = 660269473f1897d8f8b3f7acc1ceeca32332608c2ac8a4e9608d62a9f814a092
+SHA512 (unrarsrc-6.1.7.tar.gz) = b1a95358ff66b0e049597bbc4e1786d0bc909a8aff4aca94ee793d0d5a3c8b052eb347d88f44b6bc2e6231e777f1b711c198711118ae9ffbe8db2f72e7fbe846
+Size (unrarsrc-6.1.7.tar.gz) = 236798 bytes
 SHA1 (patch-makefile) = b467d681dacd3230c6b8761400e6c5566663eae4

audio/adplay/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2022/03/28 10:43:29 tnn Exp $
+# $NetBSD: Makefile,v 1.10 2022/05/13 13:22:58 fcambus Exp $
 
 DISTNAME=	adplay-1.8.1
 PKGREVISION=	4
@@ -8,7 +8,7 @@ GITHUB_PROJECT=	adplay-unix
 GITHUB_RELEASE=	v${PKGVERSION_NOREV}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	fcambus@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/adplug/adplay-unix
 COMMENT=	Console-based OPL2 audio player
 LICENSE=	gnu-gpl-v2

audio/adplug/Makefile

@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.12 2020/06/10 11:09:23 fcambus Exp $
+# $NetBSD: Makefile,v 1.13 2022/05/13 13:26:51 fcambus Exp $
 
 DISTNAME=	adplug-2.3.3
 CATEGORIES=	audio devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=adplug/}
 GITHUB_RELEASE=	${PKGNAME_NOREV}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	fcambus@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/adplug/adplug/
 COMMENT=	AdLib emulator library supporting many formats
 LICENSE=	gnu-lgpl-v2.1

audio/audacious-plugins/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.130 2022/04/18 19:10:18 adam Exp $
+# $NetBSD: Makefile,v 1.131 2022/05/18 15:09:55 nia Exp $
 
 DISTNAME=	audacious-plugins-4.1
 PKGREVISION=	11
@@ -43,16 +43,31 @@ SUBST_SED.oss+=		-e "s,/dev/dsp,${DEVOSSAUDIO},g"
 CONFIGURE_ARGS+=	--disable-oss4
 .endif
 
-PLIST_VARS+=	dbus
-
-.include "options.mk"
 .include "../../audio/audacious/buildlink3.mk"
+
+PLIST_VARS+=		gtk2
+.if ${PKG_BUILD_OPTIONS.audacious:Mgtk2}
+PLIST.gtk2+=		yes
+.else
+CONFIGURE_ARGS+=	--disable-gtk
+.endif
+
+PLIST_VARS+=		qt5
+.if ${PKG_BUILD_OPTIONS.audacious:Mqt5}
+PLIST.qt5=		yes
+.else
+CONFIGURE_ARGS+=	--disable-qt
+.endif
+
+PLIST_VARS+=	dbus
 .if ${PKG_BUILD_OPTIONS.audacious:Mdbus}
 USE_TOOLS+=		gdbus-codegen
 PLIST.dbus=		yes
 .else
 CONFIGURE_ARGS+=	--disable-mpris2
 .endif
+
+.include "options.mk"
 .include "../../audio/faad2/buildlink3.mk"
 .include "../../audio/lame/buildlink3.mk"
 .include "../../audio/libcddb/buildlink3.mk"

audio/audacious-plugins/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2021/05/14 06:42:48 nia Exp $
+@comment $NetBSD: PLIST,v 1.25 2022/05/18 15:09:55 nia Exp $
 lib/audacious/Container/asx.so
 lib/audacious/Container/asx3.so
 lib/audacious/Container/audpl.so
@@ -9,36 +9,36 @@ lib/audacious/Effect/compressor.so
 lib/audacious/Effect/crossfade.so
 lib/audacious/Effect/crystalizer.so
 lib/audacious/Effect/echo.so
-lib/audacious/Effect/ladspa.so
+${PLIST.gtk2}lib/audacious/Effect/ladspa.so
 lib/audacious/Effect/mixer.so
 lib/audacious/Effect/resample.so
 lib/audacious/Effect/silence-removal.so
 lib/audacious/Effect/speed-pitch.so
 lib/audacious/Effect/stereo.so
 lib/audacious/Effect/voice_removal.so
-lib/audacious/General/alarm.so
-lib/audacious/General/albumart-qt.so
-lib/audacious/General/albumart.so
-lib/audacious/General/aosd.so
+${PLIST.gtk2}lib/audacious/General/alarm.so
+${PLIST.qt5}lib/audacious/General/albumart-qt.so
+${PLIST.gtk2}lib/audacious/General/albumart.so
+${PLIST.gtk2}lib/audacious/General/aosd.so
 lib/audacious/General/cd-menu-items.so
 lib/audacious/General/delete-files.so
-lib/audacious/General/gtkui.so
-lib/audacious/General/hotkey.so
+${PLIST.gtk2}lib/audacious/General/gtkui.so
+${PLIST.gtk2}lib/audacious/General/hotkey.so
 ${PLIST.lirc}lib/audacious/General/lirc.so
-lib/audacious/General/lyricwiki-qt.so
+${PLIST.qt5}lib/audacious/General/lyricwiki-qt.so
 ${PLIST.dbus}lib/audacious/General/mpris2.so
-lib/audacious/General/playlist-manager-qt.so
-lib/audacious/General/playlist-manager.so
-lib/audacious/General/qtui.so
+${PLIST.qt5}lib/audacious/General/playlist-manager-qt.so
+${PLIST.gtk2}lib/audacious/General/playlist-manager.so
+${PLIST.qt5}lib/audacious/General/qtui.so
 lib/audacious/General/scrobbler.so
-lib/audacious/General/search-tool-qt.so
-lib/audacious/General/search-tool.so
-lib/audacious/General/skins-qt.so
-lib/audacious/General/skins.so
-lib/audacious/General/song-info-qt.so
+${PLIST.qt5}lib/audacious/General/search-tool-qt.so
+${PLIST.gtk2}lib/audacious/General/search-tool.so
+${PLIST.qt5}lib/audacious/General/skins-qt.so
+${PLIST.gtk2}lib/audacious/General/skins.so
+${PLIST.qt5}lib/audacious/General/song-info-qt.so
 lib/audacious/General/song_change.so
-lib/audacious/General/statusicon-qt.so
-lib/audacious/General/statusicon.so
+${PLIST.qt5}lib/audacious/General/statusicon-qt.so
+${PLIST.gtk2}lib/audacious/General/statusicon.so
 lib/audacious/Input/aac-raw.so
 ${PLIST.adplug}lib/audacious/Input/adplug.so
 ${PLIST.fluidsynth}lib/audacious/Input/amidi-plug.so
@@ -65,13 +65,13 @@ lib/audacious/Output/sdlout.so
 lib/audacious/Transport/gio.so
 lib/audacious/Transport/mms.so
 lib/audacious/Transport/neon.so
-lib/audacious/Visualization/blur_scope-qt.so
-lib/audacious/Visualization/blur_scope.so
-lib/audacious/Visualization/cairo-spectrum.so
-lib/audacious/Visualization/gl-spectrum-qt.so
-lib/audacious/Visualization/gl-spectrum.so
-lib/audacious/Visualization/qt-spectrum.so
-lib/audacious/Visualization/vumeter-qt.so
+${PLIST.qt5}lib/audacious/Visualization/blur_scope-qt.so
+${PLIST.gtk2}lib/audacious/Visualization/blur_scope.so
+${PLIST.gtk2}lib/audacious/Visualization/cairo-spectrum.so
+${PLIST.qt5}lib/audacious/Visualization/gl-spectrum-qt.so
+${PLIST.gtk2}lib/audacious/Visualization/gl-spectrum.so
+${PLIST.qt5}lib/audacious/Visualization/qt-spectrum.so
+${PLIST.qt5}lib/audacious/Visualization/vumeter-qt.so
 share/audacious/Skins/Classic/balance.png
 share/audacious/Skins/Classic/cbuttons.png
 share/audacious/Skins/Classic/eq_ex.png

audio/audacious/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2022/04/18 19:09:40 adam Exp $
+# $NetBSD: Makefile,v 1.74 2022/05/18 15:09:55 nia Exp $
 
 DISTNAME=	audacious-4.1
 PKGREVISION=	3
@@ -25,6 +25,4 @@ LDFLAGS.Darwin+=	-flat_namespace -undefined suppress
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"