audio/pianod2: update to version 306

7 files changed, 22 insertions, 23 deletions

diff --git a/audio/pianod2/Makefile b/audio/pianod2/Makefile
index eb76fc5f9857..2c6804af4f2e 100644
--- a/audio/pianod2/Makefile
+++ b/audio/pianod2/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pianod2
-PORTVERSION=	301
-PORTREVISION=	2
+PORTVERSION=	306
 CATEGORIES=	audio
 MASTER_SITES=	http://deviousfish.com/Downloads/pianod2/Devel/
 
diff --git a/audio/pianod2/distinfo b/audio/pianod2/distinfo
index 6d8eb6cd240f..efd53b13dd13 100644
--- a/audio/pianod2/distinfo
+++ b/audio/pianod2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1548905797
-SHA256 (pianod2-301.tar.gz) = d6fa01d786af65fe3b4e6f4f97fa048db6619b9443e23f655d3ea8ab4766caee
-SIZE (pianod2-301.tar.gz) = 796928
+TIMESTAMP = 1584744963
+SHA256 (pianod2-306.tar.gz) = f954f8e70cacfd712e682387213b1dd3e0926b7f90bed4bff860bac0008094a7
+SIZE (pianod2-306.tar.gz) = 789401
diff --git a/audio/pianod2/files/patch-configure.ac b/audio/pianod2/files/patch-configure.ac
index 54784555a444..4753100cb575 100644
--- a/audio/pianod2/files/patch-configure.ac
+++ b/audio/pianod2/files/patch-configure.ac
@@ -1,11 +1,11 @@
---- configure.ac.orig	2018-12-07 06:39:29 UTC
+--- configure.ac.orig	2020-03-17 17:41:27 UTC
 +++ configure.ac
 @@ -19,7 +19,7 @@
  AC_PREREQ([2.68])
  AC_CONFIG_MACRO_DIRS([m4])
  AC_INIT([pianod2],
 -	m4_esyscmd([svn info svn://svn.deviousfish.com/pianod2 | grep Revision: | awk '{print $2}' | tr -d '\n']),
-+	[301],
++	[306],
  	[pianod@lists.deviousfish.com],
  	,[http://deviousfish.com/pianod2])
  AM_INIT_AUTOMAKE([foreign -Wall -Werror])
diff --git a/audio/pianod2/files/patch-src-Makefile.am b/audio/pianod2/files/patch-src-Makefile.am
index f265d4a91cbe..a4ba803cc6ec 100644
--- a/audio/pianod2/files/patch-src-Makefile.am
+++ b/audio/pianod2/files/patch-src-Makefile.am
@@ -1,4 +1,4 @@
---- src/Makefile.am.orig	2018-03-16 18:13:50 UTC
+--- src/Makefile.am.orig	2020-03-17 17:41:27 UTC
 +++ src/Makefile.am
 @@ -44,7 +44,7 @@ libao_ldadd		= -lao
  endif
diff --git a/audio/pianod2/files/patch-src-common-fileio.cpp b/audio/pianod2/files/patch-src-common-fileio.cpp
new file mode 100644
index 000000000000..a8543d9f7b37
--- /dev/null
+++ b/audio/pianod2/files/patch-src-common-fileio.cpp
@@ -0,0 +1,14 @@
+--- src/common/fileio.cpp.orig	2020-03-17 17:41:27 UTC
++++ src/common/fileio.cpp
+@@ -125,11 +125,7 @@ static char *select_nobody_user (const char *nobody_na
+             // Other varieties get this right.
+         } while (getgrouplist (nobody_name,
+                                nobody.pw_gid,
+-#if !defined(__FreeBSD__) && !defined(__APPLE__)
+                                nobody_groups,
+-#else
+-                               (int *) nobody_groups,
+-#endif
+                                &nobody_groups_count)
+                  < 0);
+     }
diff --git a/audio/pianod2/files/patch-src-common-xmlio.cpp b/audio/pianod2/files/patch-src-common-xmlio.cpp
deleted file mode 100644
index ea61e55456ce..000000000000
--- a/audio/pianod2/files/patch-src-common-xmlio.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/common/xmlio.cpp.orig	2018-03-16 18:13:50 UTC
-+++ src/common/xmlio.cpp
-@@ -212,11 +212,7 @@ static char *select_nobody_user (const char *nobody_na
-             // Stupid apple/BSDism: nobody.pw_gid should be gid_t but is int.
-             // Other varieties get this right.
-         } while (getgrouplist (nobody_name, nobody.pw_gid,
--#if !defined(__FreeBSD__) && !defined(__APPLE__)
-                                nobody_groups,
--#else
--                               (int *) nobody_groups,
--#endif
-                                &nobody_groups_count) < 0);
-     }
-     return home;
diff --git a/audio/pianod2/files/patch-src-mediaunits-pandora-pandorasource.cpp b/audio/pianod2/files/patch-src-mediaunits-pandora-pandorasource.cpp
index f82d3ac5ea17..2db5a9f8bc71 100644
--- a/audio/pianod2/files/patch-src-mediaunits-pandora-pandorasource.cpp
+++ b/audio/pianod2/files/patch-src-mediaunits-pandora-pandorasource.cpp
@@ -1,4 +1,4 @@
---- src/mediaunits/pandora/pandorasource.cpp.orig	2018-03-16 18:13:50 UTC
+--- src/mediaunits/pandora/pandorasource.cpp.orig	2020-03-17 17:41:28 UTC
 +++ src/mediaunits/pandora/pandorasource.cpp
 @@ -15,6 +15,7 @@