5 files changed, 5 insertions, 59 deletions

diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile
index d8f6b739ba6d..5679c5d78611 100644
--- a/graphics/osg/Makefile
+++ b/graphics/osg/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	osg
-PORTVERSION=	3.6.4
+PORTVERSION=	3.6.5
 DISTVERSIONPREFIX=	OpenSceneGraph-
-PORTREVISION=	4
 CATEGORIES=	graphics
 
 MAINTAINER=	amdmi3@FreeBSD.org
@@ -30,7 +29,7 @@ USE_XORG=	x11
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	OSG_VERSION=${PORTVERSION} \
-		OSG_SHLIBVER=160 \
+		OSG_SHLIBVER=161 \
 		OPENTHREADS_VERSION=3.3.1 \
 		OPENTHREADS_SHLIBVER=21
 
diff --git a/graphics/osg/distinfo b/graphics/osg/distinfo
index b36ddb3ff2b1..5125318380c2 100644
--- a/graphics/osg/distinfo
+++ b/graphics/osg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1575910338
-SHA256 (openscenegraph-OpenSceneGraph-OpenSceneGraph-3.6.4_GH0.tar.gz) = 81394d1b484c631028b85d21c5535280c21bbd911cb058e8746c87e93e7b9d33
-SIZE (openscenegraph-OpenSceneGraph-OpenSceneGraph-3.6.4_GH0.tar.gz) = 5771539
+TIMESTAMP = 1581433181
+SHA256 (openscenegraph-OpenSceneGraph-OpenSceneGraph-3.6.5_GH0.tar.gz) = aea196550f02974d6d09291c5d83b51ca6a03b3767e234a8c0e21322927d1e12
+SIZE (openscenegraph-OpenSceneGraph-OpenSceneGraph-3.6.5_GH0.tar.gz) = 5780762
diff --git a/graphics/osg/files/patch-src_OpenThreads_pthreads_CMakeLists.txt b/graphics/osg/files/patch-src_OpenThreads_pthreads_CMakeLists.txt
deleted file mode 100644
index 73290c44d28c..000000000000
--- a/graphics/osg/files/patch-src_OpenThreads_pthreads_CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/OpenThreads/pthreads/CMakeLists.txt.orig	2019-07-26 11:54:16 UTC
-+++ src/OpenThreads/pthreads/CMakeLists.txt
-@@ -80,8 +80,15 @@ ELSE()
-           # double check that pthread_setaffinity_np is available as FreeBSD header doesn't contain required function
-           CHECK_CXX_SOURCE_COMPILES("
-             #include <pthread.h>
-+            #ifdef __FreeBSD__
-+            #include <pthread_np.h>
-+            #endif
-             int main() {
-+            #ifdef __FreeBSD__
-+            cpuset_t cpumask;
-+            #else
-             cpu_set_t cpumask;
-+            #endif
-             CPU_ZERO( &cpumask );
-             CPU_SET( 0, &cpumask );
-             pthread_setaffinity_np( pthread_self(), sizeof(cpumask), &cpumask);
diff --git a/graphics/osg/files/patch-src_OpenThreads_pthreads_PThread.cpp b/graphics/osg/files/patch-src_OpenThreads_pthreads_PThread.cpp
deleted file mode 100644
index 24a63b76fff9..000000000000
--- a/graphics/osg/files/patch-src_OpenThreads_pthreads_PThread.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/OpenThreads/pthreads/PThread.cpp.orig	2019-07-26 11:54:16 UTC
-+++ src/OpenThreads/pthreads/PThread.cpp
-@@ -21,6 +21,9 @@
- #include <sys/types.h>
- #include <unistd.h>
- #include <pthread.h>
-+#if defined(HAVE_PTHREAD_SETAFFINITY_NP) && defined(__FreeBSD__)
-+    #include <pthread_np.h>
-+#endif
- #include <limits.h>
- 
- #if defined __linux__ || defined __sun || defined __APPLE__ || ANDROID
-@@ -113,7 +116,11 @@ namespace OpenThreads
- static void setAffinity(const Affinity& affinity)
- {
-     //std::cout<<"setProcessAffinity : "<< affinity.activeCPUs.size() <<std::endl;
-+#if defined(__FreeBSD__)
-+    cpuset_t cpumask;
-+#else
-     cpu_set_t cpumask;
-+#endif
-     CPU_ZERO( &cpumask );
-     unsigned int numprocessors = OpenThreads::GetNumberOfProcessors();
-     if (affinity)
diff --git a/graphics/osg/files/patch-src_osgViewer_CMakeLists.txt b/graphics/osg/files/patch-src_osgViewer_CMakeLists.txt
deleted file mode 100644
index 5004572efabe..000000000000
--- a/graphics/osg/files/patch-src_osgViewer_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/osgViewer/CMakeLists.txt.orig	2019-07-26 11:54:16 UTC
-+++ src/osgViewer/CMakeLists.txt
-@@ -210,7 +210,7 @@ ELSEIF(${OSG_WINDOWING_SYSTEM} STREQUAL "X11")
-     IF(OSGVIEWER_USE_XINERAMA)
-         ADD_DEFINITIONS(-DOSGVIEWER_USE_XINERAMA)
-         SET(LIB_PRIVATE_HEADERS ${LIB_PRIVATE_HEADERS} ${XINERAMA_INCLUDE_DIRS} )
--        SET(LIB_EXTRA_LIBS -lXinerama ${LIB_EXTRA_LIBS})
-+        SET(LIB_EXTRA_LIBS ${X11_Xinerama_LIB} ${LIB_EXTRA_LIBS})
-     ENDIF()
- 
-     # X11 on Apple requires X11 library plus OpenGL linking hack on Leopard