diff --git a/net/poco/Makefile b/net/poco/Makefile index 39bb9b24484..4d1d227a9ea 100644 --- a/net/poco/Makefile +++ b/net/poco/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.2 2010/09/26 15:10:53 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.3 2010/11/09 16:59:31 jasper Exp $ COMMENT = POCO C++ libraries for network based applications VERSION = 1.3.6p2 DISTNAME = poco-${VERSION}-all PKGNAME = poco-${VERSION:S/p/./g} -REVISION = 0 +REVISION = 1 CATEGORIES = net devel SHLIB_VERSION = 0.0 .for _lib in PocoMySQL PocoNetSSL PocoODBC PocoSQLite PocoZip \ diff --git a/net/poco/patches/patch-Foundation_src_Thread_POSIX_cpp b/net/poco/patches/patch-Foundation_src_Thread_POSIX_cpp deleted file mode 100644 index 01efc2fbd4e..00000000000 --- a/net/poco/patches/patch-Foundation_src_Thread_POSIX_cpp +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-Foundation_src_Thread_POSIX_cpp,v 1.1.1.1 2010/07/28 18:13:01 sebastia Exp $ ---- Foundation/src/Thread_POSIX.cpp.orig Fri Jan 15 13:13:34 2010 -+++ Foundation/src/Thread_POSIX.cpp Mon Jul 19 12:09:13 2010 -@@ -129,7 +129,7 @@ void ThreadImpl::setOSPriorityImpl(int prio) - - int ThreadImpl::getMinOSPriorityImpl() - { --#if defined(__VMS) || defined(__digital__) -+#if defined(__VMS) || defined(__digital__) || defined(__OpenBSD__) - return PRI_OTHER_MIN; - #else - return sched_get_priority_min(SCHED_OTHER); -@@ -139,7 +139,7 @@ int ThreadImpl::getMinOSPriorityImpl() - - int ThreadImpl::getMaxOSPriorityImpl() - { --#if defined(__VMS) || defined(__digital__) -+#if defined(__VMS) || defined(__digital__) || defined(__OpenBSD__) - return PRI_OTHER_MAX; - #else - return sched_get_priority_max(SCHED_OTHER); diff --git a/telephony/iaxclient/Makefile b/telephony/iaxclient/Makefile index 478f4eec5fc..19d37d58e92 100644 --- a/telephony/iaxclient/Makefile +++ b/telephony/iaxclient/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2010/10/11 08:18:20 jasper Exp $ +# $OpenBSD: Makefile,v 1.8 2010/11/09 16:58:55 jasper Exp $ COMMENT-main= IAX client library COMMENT-tcl= IAX client library, tcl bindings @@ -6,7 +6,7 @@ COMMENT-iaxcomm=IAX softphone DISTNAME= iaxclient-2.1beta3 PKGNAME-main= ${DISTNAME} -REVISION-main= 1 +REVISION-main= 2 PKGNAME-tcl= ${DISTNAME:S/iaxclient/iaxclient-tcl/} REVISION-tcl= 2 PKGNAME-iaxcomm= iaxcomm-1.1.0 diff --git a/telephony/iaxclient/patches/patch-lib_unixfuncs_c b/telephony/iaxclient/patches/patch-lib_unixfuncs_c deleted file mode 100644 index b2f849d9e3c..00000000000 --- a/telephony/iaxclient/patches/patch-lib_unixfuncs_c +++ /dev/null @@ -1,27 +0,0 @@ -$OpenBSD: patch-lib_unixfuncs_c,v 1.2 2010/09/26 15:09:29 ajacoutot Exp $ -we do not have sched_get_priority_{min/max}, fix was inspired by patch to pjsua -to fix the same problem. ---- lib/unixfuncs.c.orig Mon Apr 7 18:05:42 2008 -+++ lib/unixfuncs.c Fri Sep 24 15:32:42 2010 -@@ -217,7 +217,8 @@ static int WatchDogProc( prioboost *b ) - /* Run at a priority level above main thread so we can still run if it hangs. */ - /* Rise more than 1 because of rumored off-by-one scheduler bugs. */ - schp.sched_priority = b->priority + 4; -- maxPri = sched_get_priority_max(SCHEDULER_POLICY); -+// maxPri = sched_get_priority_max(SCHEDULER_POLICY); -+ maxPri=31; - if( schp.sched_priority > maxPri ) schp.sched_priority = maxPri; - - if (pthread_setschedparam(pthread_self(), SCHEDULER_POLICY, &schp) != 0) -@@ -368,8 +369,9 @@ int iaxci_prioboostbegin() - - int result = 0; - -- b->priority = (sched_get_priority_max(SCHEDULER_POLICY) - -- sched_get_priority_min(SCHEDULER_POLICY)) / 2; -+// b->priority = (sched_get_priority_max(SCHEDULER_POLICY) - -+// sched_get_priority_min(SCHEDULER_POLICY)) / 2; -+ b->priority = 15; - schp.sched_priority = b->priority; - - b->ThreadID = pthread_self();