<semaphore.h> is a system header nowadays, so don't overlap locally

8 files changed, 89 insertions, 2 deletions

diff --git a/audio/libtunepimp/Makefile b/audio/libtunepimp/Makefile
index 5fef674d14a..e1396b1a84d 100644
--- a/audio/libtunepimp/Makefile
+++ b/audio/libtunepimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2020/05/06 14:04:05 adam Exp $
+# $NetBSD: Makefile,v 1.48 2020/05/14 19:03:12 joerg Exp $
 
 DISTNAME=		libtunepimp-0.5.3
 PKGREVISION=		31
@@ -23,6 +23,9 @@ CXXFLAGS.SunOS+=	-fpermissive
 
 .include "../../mk/bsd.prefs.mk"
 
+post-extract:
+	${MV} ${WRKSRC}/lib/threads/posix/semaphore.h ${WRKSRC}/lib/threads/posix/semaphore_.h
+
 .if ${OPSYS} == "SunOS"
 pre-configure:
 	${ECHO} "#define HAVE_STATVFS 1" >> ${WRKSRC}/config.h.in
diff --git a/audio/libtunepimp/distinfo b/audio/libtunepimp/distinfo
index eca909d1027..765c593d05f 100644
--- a/audio/libtunepimp/distinfo
+++ b/audio/libtunepimp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2015/11/03 01:12:39 agc Exp $
+$NetBSD: distinfo,v 1.16 2020/05/14 19:03:12 joerg Exp $
 
 SHA1 (libtunepimp-0.5.3.tar.gz) = 1b904cd97ce009588fe57336f40e79b6edf9947e
 RMD160 (libtunepimp-0.5.3.tar.gz) = 6bc312591b98a5b74824fc3103137cbf60d4b012
@@ -21,5 +21,11 @@ SHA1 (patch-an) = cbd5466e85dbfd38974759033b59a6147a2e62ba
 SHA1 (patch-ao) = 589faf81480e89c310fe1ae199e15657723923dc
 SHA1 (patch-ap) = cbbdc7d28ca083ec51720370bf4cbe81ec475609
 SHA1 (patch-configure) = c7dad50002b3bf8460e5c5bf5c708dc32f3dd38d
+SHA1 (patch-lib_analyzer.h) = 76929fb01d4c5981146e9021bcfbfbde158d94f2
+SHA1 (patch-lib_readmeta.h) = 1a8a68a946876f26ea5d19b41e00dc3c35b8e9fc
+SHA1 (patch-lib_threads_posix_semaphore.cpp) = e97681c25ef4008f9ed03595b9a01a45da71e9f5
+SHA1 (patch-lib_threads_posix_thread.h) = 3cbb27a0e1e7e0a65913113bf864d299ea7738ac
+SHA1 (patch-lib_watchdog.h) = fcb342adce73e01b01d378d9e67434ef3d75df09
 SHA1 (patch-lib_write.cpp) = a5bddad371c85055dd40be0cb9a0e385b0065d9c
+SHA1 (patch-lib_write.h) = 4bbbfac189203bf49772d95755ac43a056ec5d70
 SHA1 (patch-plugins_vorbis_vorbis__meta.cpp) = 3dd73ce8802177f5e2862335f8e09093091333ec
diff --git a/audio/libtunepimp/patches/patch-lib_analyzer.h b/audio/libtunepimp/patches/patch-lib_analyzer.h
new file mode 100644
index 00000000000..c243994f429
--- /dev/null
+++ b/audio/libtunepimp/patches/patch-lib_analyzer.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_analyzer.h,v 1.1 2020/05/14 19:03:12 joerg Exp $
+
+--- lib/analyzer.h.orig	2020-05-13 19:40:40.918058734 +0000
++++ lib/analyzer.h
+@@ -28,7 +28,7 @@
+ #define __ANALYZER_H__
+ 
+ #include "thread.h"
+-#include "semaphore.h"
++#include "semaphore_.h"
+ #include "track.h"
+ #include "plugin.h"
+ 
diff --git a/audio/libtunepimp/patches/patch-lib_readmeta.h b/audio/libtunepimp/patches/patch-lib_readmeta.h
new file mode 100644
index 00000000000..a682cd477cb
--- /dev/null
+++ b/audio/libtunepimp/patches/patch-lib_readmeta.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_readmeta.h,v 1.1 2020/05/14 19:03:12 joerg Exp $
+
+--- lib/readmeta.h.orig	2020-05-13 19:40:43.479981206 +0000
++++ lib/readmeta.h
+@@ -30,7 +30,7 @@
+ #include <string>
+ using namespace std;
+ #include "thread.h"
+-#include "semaphore.h"
++#include "semaphore_.h"
+ #include "track.h"
+ #include "plugin.h"
+ 
diff --git a/audio/libtunepimp/patches/patch-lib_threads_posix_semaphore.cpp b/audio/libtunepimp/patches/patch-lib_threads_posix_semaphore.cpp
new file mode 100644
index 00000000000..cd79f4aa759
--- /dev/null
+++ b/audio/libtunepimp/patches/patch-lib_threads_posix_semaphore.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_threads_posix_semaphore.cpp,v 1.1 2020/05/14 19:03:12 joerg Exp $
+
+--- lib/threads/posix/semaphore.cpp.orig	2020-05-13 19:40:46.833581962 +0000
++++ lib/threads/posix/semaphore.cpp
+@@ -29,7 +29,7 @@
+ #include <sys/time.h>
+ #include <stdlib.h>
+ #include <errno.h>
+-#include "semaphore.h"
++#include "semaphore_.h"
+ 
+ 
+ Semaphore::Semaphore(const char *name)
diff --git a/audio/libtunepimp/patches/patch-lib_threads_posix_thread.h b/audio/libtunepimp/patches/patch-lib_threads_posix_thread.h
new file mode 100644
index 00000000000..a30f63d78b4
--- /dev/null
+++ b/audio/libtunepimp/patches/patch-lib_threads_posix_thread.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_threads_posix_thread.h,v 1.1 2020/05/14 19:03:12 joerg Exp $
+
+--- lib/threads/posix/thread.h.orig	2020-05-13 19:40:49.579909635 +0000
++++ lib/threads/posix/thread.h
+@@ -29,7 +29,7 @@
+ 
+ #include <pthread.h>
+ #include <signal.h>
+-#include "semaphore.h"
++#include "semaphore_.h"
+ 
+ #include "defs.h"
+ 
diff --git a/audio/libtunepimp/patches/patch-lib_watchdog.h b/audio/libtunepimp/patches/patch-lib_watchdog.h
new file mode 100644
index 00000000000..bf56b8b03b3
--- /dev/null
+++ b/audio/libtunepimp/patches/patch-lib_watchdog.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_watchdog.h,v 1.1 2020/05/14 19:03:12 joerg Exp $
+
+--- lib/watchdog.h.orig	2020-05-13 19:40:52.260133750 +0000
++++ lib/watchdog.h
+@@ -28,7 +28,7 @@
+ #define __WATCHDOG_H__
+ 
+ #include "thread.h"
+-#include "semaphore.h"
++#include "semaphore_.h"
+ #include "mutex.h"
+ 
+ class TunePimp;
diff --git a/audio/libtunepimp/patches/patch-lib_write.h b/audio/libtunepimp/patches/patch-lib_write.h
new file mode 100644
index 00000000000..29b3a2f7d5b
--- /dev/null
+++ b/audio/libtunepimp/patches/patch-lib_write.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_write.h,v 1.1 2020/05/14 19:03:12 joerg Exp $
+
+--- lib/write.h.orig	2020-05-13 19:40:54.215206075 +0000
++++ lib/write.h
+@@ -28,7 +28,7 @@
+ #define WRITE_H
+ 
+ #include "thread.h"
+-#include "semaphore.h"
++#include "semaphore_.h"
+ #include "track.h"
+ #include "context.h"
+ #include "plugins.h"