- Update from 1.2.3 to 1.3.9

PR:		ports/184609
Submitted by:	Shane Ambler <FreeBSD@Shaneware.biz> (maintainer)

8 files changed, 11 insertions, 32 deletions

diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 7ea7dd7..f915a1d 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	blender
 PORTVERSION=	2.69
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics games
 MASTER_SITES=	http://download.blender.org/source/ \
 		http://mirror.cs.umn.edu/blender.org/source/ \
diff --git a/graphics/opencolorio/Makefile b/graphics/opencolorio/Makefile
index 3d5187c..15fbd48 100644
--- a/graphics/opencolorio/Makefile
+++ b/graphics/opencolorio/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	opencolorio
 PORTVERSION=	1.0.8
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	graphics multimedia
 
 MAINTAINER?=	FreeBSD@Shaneware.biz
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index acc8750..67d3f5e 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	openimageio
-PORTVERSION=	1.2.3
-PORTREVISION?=	2
+PORTVERSION=	1.3.9
+PORTREVISION?=	0
 CATEGORIES?=	graphics multimedia
 
 MAINTAINER?=	FreeBSD@Shaneware.biz
@@ -15,8 +15,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	OpenImageIO
 GH_PROJECT=	oiio
 GH_TAGNAME=	Release-${PORTVERSION}
-GH_COMMIT=	bcdad81
-WRKSRC=		${WRKDIR}/OpenImageIO-oiio-${GH_COMMIT}/src
+GH_COMMIT=	1a57f2f
 
 # fbm also installs bin/idiff
 CONFLICTS=	fbm-[0-9]*
@@ -78,7 +77,7 @@ CMAKE_ARGS+=	-DUSE_OCIO:BOOL=OFF
 
 post-install:
 .if ${SLAVE_PORT} == no
-	${LN} -sf libOpenImageIO.so.1.2 ${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.1
+	${LN} -sf libOpenImageIO.so.1.3 ${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.1
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/openimageio/distinfo b/graphics/openimageio/distinfo
index 4b1c39f..3c63d9b 100644
--- a/graphics/openimageio/distinfo
+++ b/graphics/openimageio/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openimageio-1.2.3.tar.gz) = 9d1dd8b332cc2a191f3d60acc68636a0736d1caa535c326554476bef7a88726d
-SIZE (openimageio-1.2.3.tar.gz) = 12380067
+SHA256 (openimageio-1.3.9.tar.gz) = 4f68be9bcb50ebb1e645f8f9204247c90d443e050c26dda2cb7ebdead08cde88
+SIZE (openimageio-1.3.9.tar.gz) = 14832206
diff --git a/graphics/openimageio/files/patch-include_sysutil.h b/graphics/openimageio/files/patch-include_sysutil.h
deleted file mode 100644
index 13e52b9..0000000
--- a/graphics/openimageio/files/patch-include_sysutil.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/sysutil.h.orig	2013-09-24 15:26:10.604215091 +0930
-+++ include/sysutil.h	2013-09-24 15:26:16.727214989 +0930
-@@ -41,6 +41,7 @@
- #define OPENIMAGEIO_SYSUTIL_H
- 
- #include <string>
-+#include <time.h>
- 
- #ifdef __MINGW32__
- #include <malloc.h> // for alloca
diff --git a/graphics/openimageio/files/patch-ptex.imageio_ptex_PtexWriter.cpp b/graphics/openimageio/files/patch-ptex.imageio_ptex_PtexWriter.cpp
deleted file mode 100644
index 341136e..0000000
--- a/graphics/openimageio/files/patch-ptex.imageio_ptex_PtexWriter.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./ptex.imageio/ptex/PtexWriter.cpp.orig	2013-06-04 19:49:43.476382085 +0930
-+++ ./ptex.imageio/ptex/PtexWriter.cpp	2013-06-04 19:49:48.134381870 +0930
-@@ -66,6 +66,7 @@
- #include <algorithm>
- #include <iostream>
- #include <sstream>
-+#include <unistd.h>
- 
- #include "filesystem.h"
- 
diff --git a/graphics/openimageio/pkg-plist b/graphics/openimageio/pkg-plist
index 0d5a61c..fc05e4c 100644
--- a/graphics/openimageio/pkg-plist
+++ b/graphics/openimageio/pkg-plist
@@ -39,8 +39,8 @@ include/OpenImageIO/pugiconfig.hpp
 include/OpenImageIO/version.h
 lib/libOpenImageIO.so
 lib/libOpenImageIO.so.1
-lib/libOpenImageIO.so.1.2
-lib/libOpenImageIO.so.1.2.3
+lib/libOpenImageIO.so.1.3
+lib/libOpenImageIO.so.1.3.9
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/openimageio.pdf
diff --git a/graphics/py-openimageio/Makefile b/graphics/py-openimageio/Makefile
index 7d4e127..d072791 100644
--- a/graphics/py-openimageio/Makefile
+++ b/graphics/py-openimageio/Makefile
@@ -11,6 +11,6 @@ OPTIONS_EXCLUDE=DOCS IMAGEVIEWER OCIO
 
 do-install:
 	@${MKDIR} -p ${STAGEDIR}${PYTHON_SITELIBDIR}
-	${INSTALL_LIB} ${BUILD_WRKSRC}/python/OpenImageIO.so ${STAGEDIR}${PYTHON_SITELIBDIR}
+	${INSTALL_LIB} ${BUILD_WRKSRC}/src/python/OpenImageIO.so ${STAGEDIR}${PYTHON_SITELIBDIR}
 
 .include "${MASTERDIR}/Makefile"