jack: Install man pages on non-Linux. Fix Linux PLIST.

8 files changed, 65 insertions, 17 deletions

diff --git a/audio/jack/Makefile b/audio/jack/Makefile
index 1237094a627..888a3d8bea1 100644
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2021/09/08 21:04:55 nia Exp $
+# $NetBSD: Makefile,v 1.44 2021/09/10 11:14:05 nia Exp $
 
 DISTNAME=	jack2-1.9.19
 PKGNAME=	${DISTNAME:S/jack2/jack/1}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GITHUB:=jackaudio/}
 GITHUB_PROJECT=	jack2
diff --git a/audio/jack/PLIST b/audio/jack/PLIST
index c0431de46a3..fbec22031c5 100644
--- a/audio/jack/PLIST
+++ b/audio/jack/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.11 2021/09/08 19:19:19 nia Exp $
+@comment $NetBSD: PLIST,v 1.12 2021/09/10 11:14:05 nia Exp $
+${PLIST.alsa}bin/alsa_in
+${PLIST.alsa}bin/alsa_out
 bin/jack_alias
 bin/jack_bufsize
 bin/jack_connect
@@ -21,6 +23,7 @@ bin/jack_monitor_client
 bin/jack_multiple_metro
 bin/jack_net_master
 bin/jack_net_slave
+bin/jack_netsource
 bin/jack_property
 bin/jack_rec
 bin/jack_samplerate
@@ -78,3 +81,25 @@ lib/libjackserver.so
 lib/libjackserver.so.0
 lib/libjackserver.so.0.1.0
 lib/pkgconfig/jack.pc
+man/alsa_in.1
+man/alsa_out.1
+man/jack_bufsize.1
+man/jack_connect.1
+man/jack_disconnect.1
+man/jack_freewheel.1
+man/jack_impulse_grabber.1
+man/jack_iodelay.1
+man/jack_load.1
+man/jack_lsp.1
+man/jack_metro.1
+man/jack_monitor_client.1
+man/jack_netsource.1
+man/jack_property.1
+man/jack_samplerate.1
+man/jack_showtime.1
+man/jack_simple_client.1
+man/jack_transport.1
+man/jack_unload.1
+man/jack_wait.1
+man/jackd.1
+man/jackrec.1
diff --git a/audio/jack/distinfo b/audio/jack/distinfo
index e7ec61e8098..553cf6541a4 100644
--- a/audio/jack/distinfo
+++ b/audio/jack/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2021/09/09 22:41:43 nia Exp $
+$NetBSD: distinfo,v 1.26 2021/09/10 11:14:05 nia Exp $
 
 SHA1 (jack2-1.9.19.tar.gz) = 3182304c0a3ecd911775fb46088f0df79ee9015f
 RMD160 (jack2-1.9.19.tar.gz) = da6ed4db02dfc856c477d76a73fe22157b6f7df8
@@ -11,14 +11,14 @@ SHA1 (patch-example-clients_wscript) = 9db0899e797acbc416bfd9e6aba50c70bd5ff0ab
 SHA1 (patch-netbsd_JackAtomic__os.h) = cd9cc4bf9913b3dedfbb8a2ea34077277e17f85d
 SHA1 (patch-netbsd_JackNetBSDTime.c) = 7cc2504bbd452b703dd062ac5d35f68ffe7e3b0a
 SHA1 (patch-netbsd_JackPlatformPlug__os.h) = f17b0daf4d8a4ef1001b35e6ea1411cfb1b981c2
-SHA1 (patch-netbsd_sun_JackSunAdapter.cpp) = 03c8fc59afb5a1ecf090eb9e47b3b2d43720da91
+SHA1 (patch-netbsd_sun_JackSunAdapter.cpp) = e3d2972dd07919c5de266ae830f043aed2662a2c
 SHA1 (patch-netbsd_sun_JackSunAdapter.h) = 740b36c69d02742eceeb724ba18796664fb1bc2d
-SHA1 (patch-netbsd_sun_JackSunDriver.cpp) = 78d5bc56a0cbea4bb7f15f0d3c775c69a3ac2a3a
+SHA1 (patch-netbsd_sun_JackSunDriver.cpp) = b3f18de879f2d770547ac534bfd4f5bb64db3017
 SHA1 (patch-netbsd_sun_JackSunDriver.h) = 9da5fbec2216081876174057f831da4c54e3029e
 SHA1 (patch-posix_JackNetUnixSocket.cpp) = 562242daf7c0f296bfcd03f468518aaf18d995d9
 SHA1 (patch-posix_JackNetUnixSocket.h) = ce9a9255dc0dd423562b94b0fcc1012c8ba3a37e
 SHA1 (patch-posix_JackPosixSemaphore.cpp) = 59425ada11a5cab83159691ae10a23c0d36750ef
 SHA1 (patch-posix_JackSocket.cpp) = 88ae18c3d2cc31a43355ff9b0c78ab13b83bd314
 SHA1 (patch-tests_wscript) = e0bf616175a116df489808cda8cb8c70890d4da0
-SHA1 (patch-tools_wscript) = c990639f5c1a998dd02d12eb345e78b0a91a1c6f
-SHA1 (patch-wscript) = 6514e2e7d10f096deb99effa35974e9253599f74
+SHA1 (patch-tools_wscript) = 197fc67305c62ccfb35b06d194d1785bb8ef5ab3
+SHA1 (patch-wscript) = 71c9a1c583b864b6d89c081aa0e259ff898e293d
diff --git a/audio/jack/patches/patch-common_wscript b/audio/jack/patches/patch-common_wscript
index 8fd3001762a..2a386b888b5 100644
--- a/audio/jack/patches/patch-common_wscript
+++ b/audio/jack/patches/patch-common_wscript
@@ -1,4 +1,4 @@
-$NetBSD: patch-common_wscript,v 1.2 2021/09/09 21:10:18 nia Exp $
+$NetBSD: patch-common_wscript,v 1.3 2021/09/10 11:14:05 nia Exp $
 
 Add NetBSD support.
 
diff --git a/audio/jack/patches/patch-netbsd_sun_JackSunAdapter.cpp b/audio/jack/patches/patch-netbsd_sun_JackSunAdapter.cpp
index c159d9b538f..d5e917ef563 100644
--- a/audio/jack/patches/patch-netbsd_sun_JackSunAdapter.cpp
+++ b/audio/jack/patches/patch-netbsd_sun_JackSunAdapter.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-netbsd_sun_JackSunAdapter.cpp,v 1.2 2021/09/09 22:41:43 nia Exp $
+$NetBSD: patch-netbsd_sun_JackSunAdapter.cpp,v 1.3 2021/09/10 11:14:05 nia Exp $
 
 Add NetBSD support.
 
---- netbsd/sun/JackSunAdapter.cpp.orig	2021-09-09 21:08:54.598607823 +0000
+--- netbsd/sun/JackSunAdapter.cpp.orig	2021-09-10 11:08:26.064717543 +0000
 +++ netbsd/sun/JackSunAdapter.cpp
 @@ -0,0 +1,490 @@
 +/*
diff --git a/audio/jack/patches/patch-netbsd_sun_JackSunDriver.cpp b/audio/jack/patches/patch-netbsd_sun_JackSunDriver.cpp
index bebeb4f6ad8..647f00f531f 100644
--- a/audio/jack/patches/patch-netbsd_sun_JackSunDriver.cpp
+++ b/audio/jack/patches/patch-netbsd_sun_JackSunDriver.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-netbsd_sun_JackSunDriver.cpp,v 1.2 2021/09/09 22:41:43 nia Exp $
+$NetBSD: patch-netbsd_sun_JackSunDriver.cpp,v 1.3 2021/09/10 11:14:05 nia Exp $
 
 Add NetBSD support.
 
---- netbsd/sun/JackSunDriver.cpp.orig	2021-09-09 21:08:54.658178887 +0000
+--- netbsd/sun/JackSunDriver.cpp.orig	2021-09-10 11:08:26.142826553 +0000
 +++ netbsd/sun/JackSunDriver.cpp
 @@ -0,0 +1,569 @@
 +/*
diff --git a/audio/jack/patches/patch-tools_wscript b/audio/jack/patches/patch-tools_wscript
index 9a6a62170b6..e3ddd11e684 100644
--- a/audio/jack/patches/patch-tools_wscript
+++ b/audio/jack/patches/patch-tools_wscript
@@ -1,6 +1,7 @@
-$NetBSD: patch-tools_wscript,v 1.1 2021/09/08 19:19:20 nia Exp $
+$NetBSD: patch-tools_wscript,v 1.2 2021/09/10 11:14:05 nia Exp $
 
-Add NetBSD support.
+- Add NetBSD support.
+- Ensure jack_netsource is built on all Unixes.
 
 --- tools/wscript.orig	2021-07-15 06:18:26.000000000 +0000
 +++ tools/wscript
@@ -13,3 +14,12 @@ Add NetBSD support.
      if bld.env['IS_WINDOWS']:
          os_incdir = ['../windows']
      for example_tool, example_tool_source in list(example_tools.items()):
+@@ -66,7 +68,7 @@ def build(bld):
+                 prog.env['LIB_PTHREAD'] = [':libwinpthread.a']
+         prog.target = 'jack_transport'
+ 
+-    if bld.env['IS_LINUX'] or bld.env['IS_MACOSX']:
++    if not bld.env['IS_WINDOWS']:
+         prog = bld(features = 'c cprogram')
+         prog.includes = os_incdir + ['.', '..', '../common/jack', '../common']
+         prog.source = ['netsource.c', '../common/netjack_packet.c']
diff --git a/audio/jack/patches/patch-wscript b/audio/jack/patches/patch-wscript
index cf4a6838364..1a18d53a4d0 100644
--- a/audio/jack/patches/patch-wscript
+++ b/audio/jack/patches/patch-wscript
@@ -1,6 +1,7 @@
-$NetBSD: patch-wscript,v 1.1 2021/09/08 19:19:20 nia Exp $
+$NetBSD: patch-wscript,v 1.2 2021/09/10 11:14:05 nia Exp $
 
-Add NetBSD support.
+- Add NetBSD support.
+- Ensure man pages are installed on all Unixes.
 
 --- wscript.orig	2021-07-15 06:18:26.000000000 +0000
 +++ wscript
@@ -47,3 +48,15 @@ Add NetBSD support.
  def build(bld):
      if not bld.variant and bld.env['BUILD_WITH_32_64']:
          Options.commands.append(bld.cmd + '_' + lib32)
+@@ -821,9 +836,10 @@ def build(bld):
+     bld.recurse('tools')
+ 
+     if bld.env['IS_LINUX']:
+-        bld.recurse('man')
+         bld.recurse('systemd')
+     if not bld.env['IS_WINDOWS']:
++        bld.recurse('man')
++    if not bld.env['IS_WINDOWS']:
+         bld.recurse('tests')
+     if bld.env['BUILD_JACKDBUS']:
+         bld.recurse('dbus')