zoneminder: Drop patch to source file that no longer exists

[Greg Troxel <gdt%lexort.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Sun Jan 14 13:31:32 2024 -0500
Changeset:	904834c83bad9fe8ab95ef261dfd4d9211df419b

Modified Files:
	zoneminder/Makefile
	zoneminder/distinfo
Removed Files:
	zoneminder/patches/patch-src_zm_thread_cpp

Log Message:
zoneminder: Drop patch to source file that no longer exists

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=904834c83bad9fe8ab95ef261dfd4d9211df419b

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 zoneminder/Makefile                        |  5 ++-
 zoneminder/distinfo                        |  1 -
 zoneminder/patches/patch-src_zm_thread_cpp | 58 ------------------------------
 3 files changed, 2 insertions(+), 62 deletions(-)

diffs:
diff --git a/zoneminder/Makefile b/zoneminder/Makefile
index b48ef4027e..f028336791 100644
--- a/zoneminder/Makefile
+++ b/zoneminder/Makefile
@@ -38,7 +38,6 @@ PKG_SUGGESTED_OPTIONS=		apache
 
 ## MAIN BUILD
 
-# As of 1.32, ZoneMinder has removed autoconf support.
 USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake perl pkg-config
@@ -154,7 +153,7 @@ LIBS+=		-lexecinfo
 
 PERL5_REQD+=		5.6.0
 
-# \todo Thoroughly review and rototill this section. 
+# \todo Thoroughly review and rototill this section.
 #
 # Arrange for module.mk to perform its magic here on top of the non-Perl
 # build tasks.
@@ -214,7 +213,7 @@ ZM_REPLACE_PERL+=	scripts/zmupdate.pl.in
 ZM_REPLACE_PERL+=	scripts/zmvideo.pl.in
 ZM_REPLACE_PERL+=	scripts/zmwatch.pl.in
 ZM_REPLACE_PERL+=	scripts/zmx10.pl.in
-REPLACE_PERL+=	${ZM_REPLACE_PERL}
+REPLACE_PERL+=		${ZM_REPLACE_PERL}
 
 # The intention of zmsystemctl.pl is to use bin/pkexec to allow the
 # apache user to start and stop the ZoneMinder services on operating
diff --git a/zoneminder/distinfo b/zoneminder/distinfo
index d3f096da0b..ef375db018 100644
--- a/zoneminder/distinfo
+++ b/zoneminder/distinfo
@@ -29,6 +29,5 @@ SHA1 (patch-src_zm_comms_h) = e9e25dced4ad54aa118f153fbd3390d1eb525e65
 SHA1 (patch-src_zm_logger_cpp) = aed07139cd8adc11c7b43d4fefc24bc158b5617c
 SHA1 (patch-src_zm_remote_camera_h) = 87da3e6326df5f9ab3c98fed5c7c9bae20cd6dc5
 SHA1 (patch-src_zm_signal_cpp) = af9625702518648b8d62ed20d0d52c1a2a27841a
-SHA1 (patch-src_zm_thread_cpp) = 165a1e38eb76f5cfe72606b1071177e619d73fe6
 SHA1 (patch-src_zmc_cpp) = 1499eb3e2d92372a0dea036f22f429efeefe4d95
 SHA1 (patch-src_zmu.cpp) = c2097766ecd0707728d29353ffaf590b234d8902
diff --git a/zoneminder/patches/patch-src_zm_thread_cpp b/zoneminder/patches/patch-src_zm_thread_cpp
deleted file mode 100644
index bb432ddedf..0000000000
--- a/zoneminder/patches/patch-src_zm_thread_cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-src_zm_thread_cpp,v 1.2 2013/03/24 16:47:47 joerg Exp $
-
-pthread_mutex_timedlock() is not available on NetBSD 5.0, and not required
-in ZoneMinder.
-
-Work around varying notion of an undefined mpid on pthread/not.
-
---- src/zm_thread.cpp.orig	2018-12-08 14:22:36.000000000 +0000
-+++ src/zm_thread.cpp
-@@ -69,6 +69,7 @@ void Mutex::lock() {
-     throw ThreadException( stringtf( "Unable to lock pthread mutex: %s", strerror(errno) ) );
- }
- 
-+#if 0
- void Mutex::lock( int secs ) {
-   struct timespec timeout = getTimeout( secs );
-   if ( pthread_mutex_timedlock( &mMutex, &timeout ) < 0 )
-@@ -80,6 +81,7 @@ void Mutex::lock( double secs ) {
-   if ( pthread_mutex_timedlock( &mMutex, &timeout ) < 0 )
-     throw ThreadException( stringtf( "Unable to timedlock pthread mutex: %s", strerror(errno) ) );
- }
-+#endif
- 
- void Mutex::unlock() {
-   if ( pthread_mutex_unlock( &mMutex ) < 0 )
-@@ -218,9 +220,15 @@ template <class T> void ThreadData<T>::u
-   Debug(9, "Updated value, %p", this);
- }
- 
-+#ifndef USE_PTHREAD
-+#define MPID_UNDEFINED -1
-+#else /* USE_PTHREAD */
-+#define MPID_UNDEFINED NULL
-+#endif /* USE_PTHREAD */
-+
- Thread::Thread() :
-   mThreadCondition( mThreadMutex ),
--  mPid( -1 ),
-+  mPid( MPID_UNDEFINED ),
-   mStarted( false ),
-   mRunning( false )
- {
-@@ -283,7 +291,7 @@ void Thread::join() {
-   if ( isThread() )
-     throw ThreadException( "Can't self join thread" );
-   mThreadMutex.lock();
--  if ( mPid >= 0 ) {
-+  if ( mPid != MPID_UNDEFINED ) {
-     if ( mStarted ) {
-       void *threadStatus = 0;
-       if ( pthread_join( mThread, &threadStatus ) < 0 )
-@@ -305,4 +313,5 @@ void Thread::kill( int signal ) {
- }
- 
- // Some explicit template instantiations
--#include "zm_threaddata.cpp"
-+template class ThreadData<bool>;
-+template class ThreadData<int>;