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

archivers/9e/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2020/12/03 13:08:49 zafer Exp $
+# $NetBSD: Makefile,v 1.14 2021/11/06 09:46:31 nia Exp $
 
 DISTNAME= 9e
 PKGNAME= 9e-1.0
-CATEGORIES= plan9 archivers
+CATEGORIES= archivers plan9
 MASTER_SITES= https://www.aydogan.net/distfiles/archivers/
 
 MAINTAINER= [email protected]

archivers/9e/distinfo

@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 09:57:04 nia Exp $
+$NetBSD: distinfo,v 1.7 2021/11/06 09:46:31 nia Exp $
 
 BLAKE2s (9e.tar.gz) = 51703ebf41ca22ebadf137ed9f1b744a28c6f00614eaf8867bd12c9f5f2929cb
 SHA512 (9e.tar.gz) = 742f7fd4e8801a63c000d1fccaa9ae851e74ceaa2cdf2c41cbfc7e647a52f6c0ac2843b87320fb7d821f7bf0112323e1b67ca4d998fcc703711dc1868d8d0516
 Size (9e.tar.gz) = 2019 bytes
-SHA1 (patch-aa) = 5d5982bfc544910f3d36eb40a9de9c5caa8432fd
-SHA1 (patch-ab) = 7c81596f86905d6b9a42cab77fbfad6b15c911c3
+SHA1 (patch-Makefile) = bfcd5c3580449e2a36398233fb757b5d426f7a48
+SHA1 (patch-ab) = 3f46fec41407f00232c44447360e911b09cde8bb

archivers/9e/patches/patch-Makefile

@@ -0,0 +1,37 @@
+$NetBSD: patch-Makefile,v 1.1 2021/11/06 09:46:31 nia Exp $
+
+Honor CC, CFLAGS, LDFLAGS.
+
+--- Makefile.orig 2000-06-15 13:40:52.000000000 +0000
++++ Makefile
+@@ -1,14 +1,7 @@
+ # Makefile for 9e
+
+-CC = gcc 
+-
+-CFLAGS = -g3 -ggdb
+-
+ .PHONY: all clean distclean
+
+-LIBS = -lefence
+-
+-HDRS = 9a.h
+ SRCS = 9e.c
+ OBJS = 9e.o
+
+@@ -17,7 +10,7 @@ BINARIES = 9e
+ all: $(BINARIES)
+
+ 9e: $(OBJS)
+- $(CC) -o 9e 9e.o $(LIBS)
++ $(CC) $(LDFLAGS) -o 9e 9e.o
+
+ clean:
+ rm -f *.o *~ a.out
+@@ -26,4 +19,4 @@ clean:
+ distclean: clean
+ rm -f ${BINARIES}
+
+-# EOF
+\ No newline at end of file
++# EOF

archivers/9e/patches/patch-ab

@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2003/02/06 15:06:18 yyamano Exp $
+$NetBSD: patch-ab,v 1.3 2021/11/06 09:46:31 nia Exp $
 
---- 9e.c.orig Thu Jun 15 22:40:52 2000
+--- 9e.c.orig 2000-06-15 13:40:52.000000000 +0000
 +++ 9e.c
-@@ -1,6 +1,9 @@
+@@ -1,9 +1,13 @@
  /* 9e.c */
 
  #include <assert.h>
@@ -12,7 +12,11 @@ $NetBSD: patch-ab,v 1.2 2003/02/06 15:06:18 yyamano Exp $
  #include <dirent.h>
  #include <errno.h>
  #include <stdio.h>
-@@ -139,17 +142,16 @@
++#include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
+@@ -139,17 +143,16 @@ void do_file(char *file, FILE *fin) {
  }
 
  if(Hdrs) {

archivers/arc/distinfo

@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2021/10/26 09:57:04 nia Exp $
+$NetBSD: distinfo,v 1.15 2021/11/06 09:49:20 nia Exp $
 
 BLAKE2s (arc-5.21p.tar.gz) = fe9c447c2c1ac5fcc9e03ed5311cf2e2ae37fad1813a9890ecc02ba2e1109b16
 SHA512 (arc-5.21p.tar.gz) = c70c01ec407cc27f6507e2715d8b553277609cb49369a1e65a83d007362a24b69bb09ef2bf168ee36ca6797bd4524644a89e9114d866351ae53fece193c2967c
 Size (arc-5.21p.tar.gz) = 84791 bytes
-SHA1 (patch-aa) = efbb7e0a3a715d871dc98ad4fad58d0ae49f5b02
+SHA1 (patch-aa) = 10a314ddbe3c44d8f74a591740973892e3906713
 SHA1 (patch-ab) = e85c2698747106a7319db07185bfe0b6e2480974
 SHA1 (patch-ac) = 3332d9db5c41fb205ab9f5123b0de0704ae634b3
 SHA1 (patch-ad) = b8c7b8a9a0733fb8f4a8963765d3dcd318988afc

archivers/arc/patches/patch-aa

@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.5 2015/01/04 10:43:44 wiz Exp $
+$NetBSD: patch-aa,v 1.6 2021/11/06 09:49:20 nia Exp $
+
+Honor CC, CFLAGS. Use LDFLAGS when linking.
 
 --- Makefile.orig 2010-08-07 13:06:42.000000000 +0000
 +++ Makefile
@@ -20,3 +22,23 @@ $NetBSD: patch-aa,v 1.5 2015/01/04 10:43:44 wiz Exp $
 
  # Integer-only stdio routines for Atari ST.
  #LIBS=-liio16
+@@ -69,10 +69,10 @@ MOBJ = marc.o arcdata.o arcdos.o arcio.o
+ all: arc$(PROG) marc$(PROG)
+
+ arc$(PROG): $(OBJS) $(TMCLOCK)
+- $(CC) $(OPT) -o arc$(PROG) $(OBJS) $(TMCLOCK) $(LIBS)
++ $(CC) $(OPT) $(LDFLAGS) -o arc$(PROG) $(OBJS) $(TMCLOCK) $(LIBS)
+
+ marc$(PROG): $(MOBJ) $(TMCLOCK)
+- $(CC) $(OPT) -o marc$(PROG) $(MOBJ) $(TMCLOCK) $(LIBS)
++ $(CC) $(OPT) $(LDFLAGS) -o marc$(PROG) $(MOBJ) $(TMCLOCK) $(LIBS)
+
+ clean:
+ rm -f *.o arc$(PROG) marc$(PROG)
+@@ -137,4 +137,4 @@ install: all
+ install -s -m 0755 -D marc $(DESTDIR)$(PREFIX)/bin/marc
+ install -m 0644 -D arc.1 $(DESTDIR)$(PREFIX)/share/man/man1/arc.1
+ install -m 0644 -D marc.1 $(DESTDIR)$(PREFIX)/share/man/man1/marc.1
+- 
+\ No newline at end of file
++ 

archivers/ark/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.71 2021/09/29 19:00:16 adam Exp $
+# $NetBSD: Makefile,v 1.72 2021/11/15 22:54:02 wiz Exp $
 
 DISTNAME= ark-${KAPPSVER}
-PKGREVISION= 4
+PKGREVISION= 5
 CATEGORIES= x11
 
 HOMEPAGE= https://kde.org/applications/utilities/ark/

archivers/gnome-autoar/Makefile

@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2021/09/29 09:10:30 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2021/11/13 09:18:47 cirnatdan Exp $
 
-DISTNAME= gnome-autoar-0.3.2
-PKGREVISION= 1
+DISTNAME= gnome-autoar-0.4.1
 CATEGORIES= archivers gnome
 MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX= .tar.xz
@@ -13,14 +12,13 @@ LICENSE= gnu-lgpl-v2.1
 
 USE_TOOLS+= pkg-config gmake
 USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
 
-CONFIGURE_ARGS+= --disable-schemas-compile
-CONFIGURE_ARGS+= --enable-introspection
+MESON_ARGS+= -Dintrospection=enabled
 
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../lang/vala/buildlink3.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../archivers/libarchive/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
+.include "../../devel/meson/build.mk"
 .include "../../mk/bsd.pkg.mk"

archivers/gnome-autoar/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2020/11/04 12:27:58 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2021/11/13 09:18:47 cirnatdan Exp $
 include/gnome-autoar-0/gnome-autoar/autoar-compressor.h
 include/gnome-autoar-0/gnome-autoar/autoar-enum-types.h
 include/gnome-autoar-0/gnome-autoar/autoar-extractor.h
@@ -10,32 +10,13 @@ include/gnome-autoar-0/gnome-autoar/autoar-misc.h
 include/gnome-autoar-0/gnome-autoar/gnome-autoar.h
 lib/girepository-1.0/GnomeAutoar-0.1.typelib
 lib/girepository-1.0/GnomeAutoarGtk-0.1.typelib
-lib/libgnome-autoar-0.la
-lib/libgnome-autoar-gtk-0.la
+lib/libgnome-autoar-0.so
+lib/libgnome-autoar-0.so.0
+lib/libgnome-autoar-0.so.0.1.1
+lib/libgnome-autoar-gtk-0.so
+lib/libgnome-autoar-gtk-0.so.0
+lib/libgnome-autoar-gtk-0.so.0.1.1
 lib/pkgconfig/gnome-autoar-0.pc
 lib/pkgconfig/gnome-autoar-gtk-0.pc
 share/gir-1.0/GnomeAutoar-0.1.gir
 share/gir-1.0/GnomeAutoarGtk-0.1.gir
-share/gtk-doc/html/gnome-autoar/AutoarCompressor.html
-share/gtk-doc/html/gnome-autoar/AutoarExtractor.html
-share/gtk-doc/html/gnome-autoar/annotation-glossary.html
-share/gtk-doc/html/gnome-autoar/api-index-full.html
-share/gtk-doc/html/gnome-autoar/ch01.html
-share/gtk-doc/html/gnome-autoar/ch02.html
-share/gtk-doc/html/gnome-autoar/ch03.html
-share/gtk-doc/html/gnome-autoar/gnome-autoar-autoar-format-filter.html
-share/gtk-doc/html/gnome-autoar/gnome-autoar-autoar-gtk-chooser.html
-share/gtk-doc/html/gnome-autoar/gnome-autoar-autoar-misc.html
-share/gtk-doc/html/gnome-autoar/gnome-autoar.devhelp2
-share/gtk-doc/html/gnome-autoar/home.png
-share/gtk-doc/html/gnome-autoar/index.html
-share/gtk-doc/html/gnome-autoar/left-insensitive.png
-share/gtk-doc/html/gnome-autoar/left.png
-share/gtk-doc/html/gnome-autoar/object-tree.html
-share/gtk-doc/html/gnome-autoar/right-insensitive.png
-share/gtk-doc/html/gnome-autoar/right.png
-share/gtk-doc/html/gnome-autoar/style.css
-share/gtk-doc/html/gnome-autoar/up-insensitive.png
-share/gtk-doc/html/gnome-autoar/up.png
-share/vala/vapi/gnome-autoar-0.vapi
-share/vala/vapi/gnome-autoar-gtk-0.vapi

archivers/gnome-autoar/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 09:57:06 nia Exp $
+$NetBSD: distinfo,v 1.6 2021/11/13 09:18:47 cirnatdan Exp $
 
-BLAKE2s (gnome-autoar-0.3.2.tar.xz) = a3d054d16e9de65fd4532f07ae7cfe1a2874f9dbce069cab0134b78a9e033a47
-SHA512 (gnome-autoar-0.3.2.tar.xz) = 6685e44ed61388759ff820b7cd403304f32d47fab4e2f66f5571a5cc6d01c1287bda851f230b3782bb1beff6ef784c25434930f15ef6ed32d788db4b89435968
-Size (gnome-autoar-0.3.2.tar.xz) = 298656 bytes
+BLAKE2s (gnome-autoar-0.4.1.tar.xz) = 26d431611bf4698fdefc6755054bf2366f81deef7f2378364f94106adb2479b4
+SHA512 (gnome-autoar-0.4.1.tar.xz) = 5c082c42342256c3af9dfa49435c1ab884c051a9c47a0313a343a747c2f30de2662505f4d77db20dffbdd39a5d0447d2dfb4ccf3da96a198ea987bc5c0c0dddf
+Size (gnome-autoar-0.4.1.tar.xz) = 50152 bytes

audio/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.640 2021/09/11 23:44:48 nia Exp $
+# $NetBSD: Makefile,v 1.643 2021/11/15 22:05:46 wiz Exp $
 #
 
 COMMENT= Audio tools, players, and libraries
@@ -176,15 +176,21 @@ SUBDIR+= gst-plugins1-dts
 SUBDIR+= gst-plugins1-faac
 SUBDIR+= gst-plugins1-faad
 SUBDIR+= gst-plugins1-flac
+SUBDIR+= gst-plugins1-fluidsynth
 SUBDIR+= gst-plugins1-gme
 SUBDIR+= gst-plugins1-jack
+SUBDIR+= gst-plugins1-ladspa
 SUBDIR+= gst-plugins1-lame
 SUBDIR+= gst-plugins1-libvisual
+SUBDIR+= gst-plugins1-lv2
+SUBDIR+= gst-plugins1-modplug
 SUBDIR+= gst-plugins1-mpg123
+SUBDIR+= gst-plugins1-musepack
 SUBDIR+= gst-plugins1-opus
 SUBDIR+= gst-plugins1-oss
 SUBDIR+= gst-plugins1-pulse
 SUBDIR+= gst-plugins1-sid
+SUBDIR+= gst-plugins1-sndfile
 SUBDIR+= gst-plugins1-soundtouch
 SUBDIR+= gst-plugins1-speex
 SUBDIR+= gst-plugins1-twolame
@@ -208,7 +214,9 @@ SUBDIR+= id3ren
 SUBDIR+= id3v2
 SUBDIR+= ifp-line
 SUBDIR+= jack
+SUBDIR+= jack-keyboard
 SUBDIR+= jack-rack
+SUBDIR+= jack_umidi
 SUBDIR+= juke
 SUBDIR+= kid3
 SUBDIR+= ladspa

audio/abcde/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2021/05/24 19:49:03 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2021/11/11 17:01:51 ryoon Exp $
 
 DISTNAME= abcde-2.9.3
 PKGREVISION= 3
@@ -20,7 +20,6 @@ DEPENDS+= p5-WebService-MusicBrainz>=1.0.4:../../net/p5-WebService-MusicBrainz
 DEPENDS+= mkcue>=2.1:../../misc/mkcue
 
 NO_BUILD= yes
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
 
 USE_TOOLS+= bash:run ftp:run gsed:run perl:run
 REPLACE_BASH= abcde cddb-tool

audio/amsynth/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2021/09/08 21:04:53 nia Exp $
+# $NetBSD: Makefile,v 1.11 2021/11/13 10:48:03 nia Exp $
 
 DISTNAME= amsynth-1.12.2
-PKGREVISION= 2
+PKGREVISION= 3
 CATEGORIES= audio
 MASTER_SITES= ${MASTER_SITE_GITHUB:=amsynth/}
 GITHUB_PROJECT= amsynth

audio/amsynth/options.mk

@@ -1,9 +1,15 @@
-# $NetBSD: options.mk,v 1.1 2020/04/11 10:56:54 nia Exp $
+# $NetBSD: options.mk,v 1.2 2021/11/13 10:48:03 nia Exp $
 
 PKG_OPTIONS_VAR= PKG_OPTIONS.amsynth
-PKG_SUPPORTED_OPTIONS= alsa jack
+PKG_SUPPORTED_OPTIONS= alsa
 PKG_SUGGESTED_OPTIONS.Linux= alsa
 
+.include "../../audio/jack/platform.mk"
+.if ${PLATFORM_SUPPORTS_JACK:tl} == "yes"
+PKG_SUPPORTED_OPTIONS+= jack
+PKG_SUGGESTED_OPTIONS+= jack
+.endif
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Malsa)

audio/audacity/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.143 2021/10/09 15:35:02 nia Exp $
+# $NetBSD: Makefile,v 1.144 2021/11/08 23:30:39 nia Exp $
 
 # NOTES ON UPDATING
 # - Upstream is insisting that packages use their internal modified
@@ -8,7 +8,7 @@
 # This should be disabled by default, Audacity is offline software.
 # - Please test usage on NetBSD.
 DISTNAME= audacity-2.4.1
-PKGREVISION= 5
+PKGREVISION= 6
 CATEGORIES= audio
 MASTER_SITES= ${MASTER_SITE_GITHUB:=audacity/}
 GITHUB_PROJECT= Audacity
@@ -74,6 +74,7 @@ CONFIG_SUB_OVERRIDE= \
 PTHREAD_AUTO_VARS= yes
 
 INSTALLATION_DIRS+= lib
+INSTALLATION_DIRS+= share/audacity/plug-ins
 
 # regen Makefile.in to avoid being built as shared libraries
 pre-configure:
@@ -83,6 +84,11 @@ pre-configure:
 post-install:
  ${INSTALL_LIB} ${WRKSRC}/lib-src/FileDialog/.libs/libFileDialog.so.0.0.0 \
  ${DESTDIR}${PREFIX}/lib/libFileDialog.so.0
+ # Install missing plugins.
+ ${INSTALL_DATA} ${WRKSRC}/plug-ins/*.ny \
+ ${DESTDIR}${PREFIX}/share/audacity/plug-ins
+ ${INSTALL_DATA} ${WRKSRC}/nyquist/*.lsp \
+ ${DESTDIR}${PREFIX}/share/audacity/nyquist
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"