diff --git a/audio/gogglesmm/Makefile b/audio/gogglesmm/Makefile index 4dee686701ef..23767cc09b84 100644 --- a/audio/gogglesmm/Makefile +++ b/audio/gogglesmm/Makefile @@ -2,7 +2,7 @@ PORTNAME= gogglesmm PORTVERSION= 1.2.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio MAINTAINER= jhale@FreeBSD.org diff --git a/x11-toolkits/fox17/Makefile b/x11-toolkits/fox17/Makefile index a2a75851d55d..6256d53612ab 100644 --- a/x11-toolkits/fox17/Makefile +++ b/x11-toolkits/fox17/Makefile @@ -1,8 +1,7 @@ # Created by: gahr PORTNAME= fox -PORTVERSION= 1.7.77 -PORTREVISION= 2 +PORTVERSION= 1.7.78 CATEGORIES= x11-toolkits MASTER_SITES= http://fox-toolkit.org/ftp/ \ ftp://ftp.fox-toolkit.org/pub/ diff --git a/x11-toolkits/fox17/distinfo b/x11-toolkits/fox17/distinfo index ab307996098d..141c035c8f7b 100644 --- a/x11-toolkits/fox17/distinfo +++ b/x11-toolkits/fox17/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1619009150 -SHA256 (fox-1.7.77.tar.gz) = 0505ffcc7e7e5167faa432a45a0f68f4f716b51a48732f386b3e21372ef26443 -SIZE (fox-1.7.77.tar.gz) = 5710846 +TIMESTAMP = 1645699908 +SHA256 (fox-1.7.78.tar.gz) = bbaf18fe753ef46ff1b9ccf6f64c5204394af8abdc574195030f07271adece24 +SIZE (fox-1.7.78.tar.gz) = 5716289 diff --git a/x11-toolkits/fox17/files/patch-lib_FXThread.cpp b/x11-toolkits/fox17/files/patch-lib_FXThread.cpp deleted file mode 100644 index 77f59d87ab1f..000000000000 --- a/x11-toolkits/fox17/files/patch-lib_FXThread.cpp +++ /dev/null @@ -1,33 +0,0 @@ -pthread_setname_np() and pthread_getname_np() are only implemented on FreeBSD -12.x >= 1201518 and 13.x >= 1300098. Port to pthread_set_name_np() and -pthread_get_name_np(), respectively, for older versions. - ---- lib/FXThread.cpp.orig 2020-12-24 17:03:54 UTC -+++ lib/FXThread.cpp -@@ -911,7 +911,10 @@ FXbool FXThread::description(const FXString& desc){ - return 0<=fxSetThreadDescription((HANDLE)tid,udesc); - #elif defined(__APPLE__) - return pthread_setname_np(desc.text())==0; --#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) -+#elif defined(__FreeBSD__) && !defined(HAVE_PTHREAD_SETNAME_NP) -+ pthread_set_name_np((pthread_t)tid,desc.text()); -+ return true; -+#elif defined(__NetBSD__) || defined(__OpenBSD__) - pthread_setname_np((pthread_t)tid,desc.text()); - return true; - #elif defined(HAVE_PTHREAD_SETNAME_NP) -@@ -938,7 +941,13 @@ FXString FXThread::description() const { - if(pthread_getname_np(*((pthread_t*)&tid),desc,ARRAYNUMBER(desc))==0){ - return desc; - } --#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) -+#elif defined(__FreeBSD__) && !defined(HAVE_PTHREAD_GETNAME_NP) -+ FXchar desc[256]; -+ pthread_get_name_np((pthread_t)tid,desc,ARRAYNUMBER(desc)); -+ if(desc[0]!='\0'){ -+ return desc; -+ } -+#elif defined(__NetBSD__) || defined(__OpenBSD__) - FXchar desc[256]; - if(pthread_getname_np((pthread_t)tid,desc,ARRAYNUMBER(desc))==0){ - return desc; diff --git a/x11-toolkits/fox17/pkg-plist b/x11-toolkits/fox17/pkg-plist index 28d5e5ceed78..533ea3bcd61a 100644 --- a/x11-toolkits/fox17/pkg-plist +++ b/x11-toolkits/fox17/pkg-plist @@ -368,11 +368,11 @@ include/fox-%%MAJORVER%%/xincs.h lib/libCHART-%%MAJORVER%%.a lib/libCHART-%%MAJORVER%%.so lib/libCHART-%%MAJORVER%%.so.0 -lib/libCHART-%%MAJORVER%%.so.0.0.77 +lib/libCHART-%%MAJORVER%%.so.0.0.78 lib/libFOX-%%MAJORVER%%.a lib/libFOX-%%MAJORVER%%.so lib/libFOX-%%MAJORVER%%.so.0 -lib/libFOX-%%MAJORVER%%.so.0.0.77 +lib/libFOX-%%MAJORVER%%.so.0.0.78 libdata/pkgconfig/fox17.pc man/man1/ControlPanel-17.1.gz %%PORTEXAMPLES%%man/man1/PathFinder-17.1.gz