- Update to 3.2.1

5 files changed, 4 insertions, 92 deletions

diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile
index a94aa1ddda41..8cad5f7d1aaf 100644
--- a/graphics/osg/Makefile
+++ b/graphics/osg/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	osg
-PORTVERSION=	3.2.0
-PORTREVISION=	4
+PORTVERSION=	3.2.1
 CATEGORIES=	graphics
 MASTER_SITES=	http://trac.openscenegraph.org/downloads/developer_releases/ \
 		http://mirror.amdmi3.ru/distfiles/
@@ -31,7 +30,7 @@ USE_LDCONFIG=	yes
 PLIST_SUB=	OSG_VERSION=${PORTVERSION} \
 		OSG_SHLIBVER=100 \
 		OPENTHREADS_VERSION=${PORTVERSION} \
-		OPENTHREADS_SHLIBVER=13
+		OPENTHREADS_SHLIBVER=20
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/graphics/osg/distinfo b/graphics/osg/distinfo
index fbdaf6731fd8..d11e882792b1 100644
--- a/graphics/osg/distinfo
+++ b/graphics/osg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (OpenSceneGraph-3.2.0.zip) = ceca56e58e9ba245d5f9d0661352ddf405a7cb105341a122c5541b69c0ce032e
-SIZE (OpenSceneGraph-3.2.0.zip) = 7195748
+SHA256 (OpenSceneGraph-3.2.1.zip) = d9ae72263d0191855b0f804d93c586d489f119aca0499292acc09bb0fa0b3e6d
+SIZE (OpenSceneGraph-3.2.1.zip) = 7219212
diff --git a/graphics/osg/files/patch-CMakeModules_FindFreeType.cmake b/graphics/osg/files/patch-CMakeModules_FindFreeType.cmake
deleted file mode 100644
index 135d24e12ff3..000000000000
--- a/graphics/osg/files/patch-CMakeModules_FindFreeType.cmake
+++ /dev/null
@@ -1,44 +0,0 @@
---- CMakeModules/FindFreeType.cmake.orig	2013-12-24 19:18:24.000000000 +0100
-+++ CMakeModules/FindFreeType.cmake	2013-12-24 19:19:27.000000000 +0100
-@@ -24,18 +24,18 @@
- # wants explicit full paths and this trickery doesn't work too well.
- # I'm going to attempt to cut out the middleman and hope 
- # everything still works.
--FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h 
-+FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build freetype2/ft2build.h 
-   PATHS
-   $ENV{FREETYPE_DIR}
-   NO_DEFAULT_PATH
-   PATH_SUFFIXES include    
- )
--FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h 
-+FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build freetype2/ft2build.h 
-   PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-   NO_DEFAULT_PATH
-   PATH_SUFFIXES include
- )
--FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h 
-+FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build freetype2/ft2build.h 
-   PATHS
-   /usr/local
-   /usr
-@@ -51,16 +51,16 @@
-   PATH_SUFFIXES include
- )
- 
--FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h 
-+FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h 
-   $ENV{FREETYPE_DIR}/include/freetype2
-   NO_DEFAULT_PATH
- )
--FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h 
-+FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h 
-   PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-   NO_DEFAULT_PATH
-   PATH_SUFFIXES include/freetype2
- )
--FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h 
-+FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h 
-   /usr/local/include/freetype2
-   /usr/include/freetype2
-   /usr/local/X11R6/include/freetype2
diff --git a/graphics/osg/files/patch-src-osgPlugins-freetype-FreeTypeFont.cpp b/graphics/osg/files/patch-src-osgPlugins-freetype-FreeTypeFont.cpp
deleted file mode 100644
index eaae7ca841dc..000000000000
--- a/graphics/osg/files/patch-src-osgPlugins-freetype-FreeTypeFont.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/osgPlugins/freetype/FreeTypeFont.cpp.orig	2013-12-24 19:29:26.000000000 +0100
-+++ src/osgPlugins/freetype/FreeTypeFont.cpp	2013-12-24 19:30:24.000000000 +0100
-@@ -14,8 +14,9 @@
- #include "FreeTypeFont.h"
- #include "FreeTypeLibrary.h"
- 
--#include <freetype/ftoutln.h>
--#include <freetype/ftbbox.h>
-+#include <ft2build.h>
-+#include FT_OUTLINE_H
-+#include FT_BBOX_H
- 
- #include <osg/Notify>
- #include <osg/io_utils>
diff --git a/graphics/osg/files/patch-src-osgPlugins-osc-osc-OscHostEndianess.h b/graphics/osg/files/patch-src-osgPlugins-osc-osc-OscHostEndianess.h
deleted file mode 100644
index 54b5c92be57e..000000000000
--- a/graphics/osg/files/patch-src-osgPlugins-osc-osc-OscHostEndianess.h
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: src/osgPlugins/osc/osc/OscHostEndianness.h
-===================================================================
---- src/osgPlugins/osc/osc/OscHostEndianness.h	(revision 13802)
-+++ src/osgPlugins/osc/osc/OscHostEndianness.h	(working copy)
-@@ -60,6 +60,15 @@
-         #else
-             #error Unknown machine endianness detected.
-         #endif
-+    #elif defined(__FreeBSD__)
-+        #include <sys/endian.h>
-+        #if (_BYTE_ORDER == _LITTLE_ENDIAN)
-+            #define __LITTLE_ENDIAN__
-+        #elif (_BYTE_ORDER == _BIG_ENDIAN)
-+            #define __BIG_ENDIAN__
-+        #else
-+            #error Unknown machine endianness detected.
-+        #endif
-     #endif
- 
-     #if   defined(__LITTLE_ENDIAN__)
-@@ -74,7 +83,7 @@
- 
-     #else
- 
--        #error please edit OSCHostEndianness.h to configure endianness
-+        #error please edit OscHostEndianness.h to configure endianness
- 
-     #endif
-