From nobody@FreeBSD.org  Sat Sep 15 13:35:27 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6D4D5106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 15 Sep 2012 13:35:27 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 3FA898FC12
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 15 Sep 2012 13:35:27 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id q8FDZQbr001582
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 15 Sep 2012 13:35:26 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id q8FDZQ3t001581;
	Sat, 15 Sep 2012 13:35:26 GMT
	(envelope-from nobody)
Message-Id: <201209151335.q8FDZQ3t001581@red.freebsd.org>
Date: Sat, 15 Sep 2012 13:35:26 GMT
From: Shane Ambler <FreeBSD@Shaneware.biz>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [maintainer update] update graphics/openimageio
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         171665
>Category:       ports
>Synopsis:       [maintainer update] update graphics/openimageio
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rm
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 15 13:40:10 UTC 2012
>Closed-Date:    Mon Sep 17 05:32:09 UTC 2012
>Last-Modified:  Mon Sep 17 05:32:09 UTC 2012
>Originator:     Shane Ambler
>Release:        9.0-RELEASE-p1
>Organization:
>Environment:
FreeBSD leader.local 9.0-RELEASE-p1 FreeBSD 9.0-RELEASE-p1 #1: Tue May 15 12:34:33 CST 2012     shane@leader.local:/usr/obj/usr/src/sys/GENERIC  amd64

>Description:
update graphics/openimageio to v1.0.9
includes addition of conflict with graphics/fbm
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -Nu openimageio.orig/Makefile openimageio/Makefile
--- openimageio.orig/Makefile	2012-09-15 22:55:20.295949610 +0930
+++ openimageio/Makefile	2012-09-15 22:54:18.945948633 +0930
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	openimageio
-PORTVERSION=	1.0.6
+PORTVERSION=	1.0.9
 CATEGORIES=	graphics multimedia
 MASTER_SITES=	https://github.com/OpenImageIO/oiio/tarball/
 DISTNAME=	Release-${PORTVERSION}
@@ -26,6 +26,9 @@
 		tbb:${PORTSDIR}/devel/tbb \
 		webp:${PORTSDIR}/graphics/webp
 
+# fbm also installs bin/idiff
+CONFLICTS=	fbm-[0-9]*
+
 FETCH_ARGS=	-pRr
 USE_CMAKE=	yes
 CMAKE_VERBOSE=	yes
@@ -36,17 +39,19 @@
 		-DUSE_TBB:BOOL=ON
 LDFLAGS+=	-ltbb
 USE_LDCONFIG=	yes
-WRKSRC=		${WRKDIR}/OpenImageIO-oiio-f0a566a/src
+WRKSRC=		${WRKDIR}/OpenImageIO-oiio-0d48631/src
 MAKE_JOBS_SAFE=	yes
 
-OPTIONS_DEFINE=	IMAGEVIEWER THREADS
+OPTIONS_DEFINE=	DOCS IMAGEVIEWER THREADS
 OPTIONS_DEFAULT=	DOCS IMAGEVIEWER THREADS
 
 IMAGEVIEWER_DESC=	Build image viewer
 
 .include <bsd.port.options.mk>
 
-.if empty(PORT_OPTIONS:MDOCS)
+.if ${PORT_OPTIONS:MDOCS}
+CMAKE_ARGS+=	-DINSTALL_DOCS:BOOL=ON
+.else
 CMAKE_ARGS+=	-DINSTALL_DOCS:BOOL=OFF
 .endif
 
@@ -61,7 +66,7 @@
 PLIST_SUB+=	IMAGEVIEWER="@comment "
 .endif
 
-.if empty(PORT_OPTIONS:MTHREADS)
+.if ${PORT_OPTIONS:MTHREADS}
 CMAKE_ARGS+=	-DNOTHREADS:BOOL=ON
 .else
 CMAKE_ARGS+=	-DNOTHREADS:BOOL=OFF
diff -Nu openimageio.orig/distinfo openimageio/distinfo
--- openimageio.orig/distinfo	2012-09-15 22:55:20.295949610 +0930
+++ openimageio/distinfo	2012-09-14 02:12:43.369947989 +0930
@@ -1,2 +1,2 @@
-SHA256 (openimageio/Release-1.0.6) = b6ca648f13973b517135edbc9bc34367cdc54a8ca87f6b8014f363803825aa1e
-SIZE (openimageio/Release-1.0.6) = 4196479
+SHA256 (openimageio/Release-1.0.9) = 59ebc09f3d3e5ac780adc4a3e0020d6986721f6be1c84dd01da7899a565b5204
+SIZE (openimageio/Release-1.0.9) = 4208590
diff -Nu openimageio.orig/pkg-plist openimageio/pkg-plist
--- openimageio.orig/pkg-plist	2012-09-15 22:55:20.295949610 +0930
+++ openimageio/pkg-plist	2012-09-14 02:11:10.875947983 +0930
@@ -60,7 +60,7 @@
 lib/libOpenImageIO.so
 lib/libOpenImageIO.so.1
 lib/libOpenImageIO.so.1.0
-lib/libOpenImageIO.so.1.0.6
+lib/libOpenImageIO.so.1.0.9
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/openimageio.pdf


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->rm 
Responsible-Changed-By: rm 
Responsible-Changed-When: Sun Sep 16 20:02:54 UTC 2012 
Responsible-Changed-Why:  
I will take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171665 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/171665: commit references a PR
Date: Mon, 17 Sep 2012 05:24:13 +0000 (UTC)

 Author: rm
 Date: Mon Sep 17 05:24:02 2012
 New Revision: 304386
 URL: http://svn.freebsd.org/changeset/ports/304386
 
 Log:
   - update openimageio to 1.0.9
   - add conflicts with fbm
   - convert DOCS to optionsng
   - chase update in graphics/blender (the only consumer)
   
   PR:		171665
   Submitted by:	Shane Ambler <FreeBSD at Shaneware dot biz> (maintainer)
   
   - update py-openimageio to 1.0.9
   
   PR:     171666
   Submitted by:   Shane Ambler <FreeBSD at Shaneware dot biz> (maintainer)
 
 Modified:
   head/graphics/blender/Makefile
   head/graphics/openimageio/Makefile
   head/graphics/openimageio/distinfo
   head/graphics/openimageio/pkg-plist
   head/graphics/py-openimageio/Makefile
   head/graphics/py-openimageio/distinfo
 
 Modified: head/graphics/blender/Makefile
 ==============================================================================
 --- head/graphics/blender/Makefile	Mon Sep 17 03:23:03 2012	(r304385)
 +++ head/graphics/blender/Makefile	Mon Sep 17 05:24:02 2012	(r304386)
 @@ -6,6 +6,7 @@
  
  PORTNAME=	blender
  PORTVERSION=	2.63a
 +PORTREVISION=	1
  CATEGORIES=	graphics games
  MASTER_SITES=	http://download.blender.org/source/ \
  		http://mirror.cs.umn.edu/blender.org/source/ \
 
 Modified: head/graphics/openimageio/Makefile
 ==============================================================================
 --- head/graphics/openimageio/Makefile	Mon Sep 17 03:23:03 2012	(r304385)
 +++ head/graphics/openimageio/Makefile	Mon Sep 17 05:24:02 2012	(r304386)
 @@ -6,7 +6,7 @@
  #
  
  PORTNAME=	openimageio
 -PORTVERSION=	1.0.6
 +PORTVERSION=	1.0.9
  CATEGORIES=	graphics multimedia
  MASTER_SITES=	https://github.com/OpenImageIO/oiio/tarball/
  DISTNAME=	Release-${PORTVERSION}
 @@ -26,6 +26,9 @@ LIB_DEPENDS=	IlmImf:${PORTSDIR}/graphics
  		tbb:${PORTSDIR}/devel/tbb \
  		webp:${PORTSDIR}/graphics/webp
  
 +# fbm also installs bin/idiff
 +CONFLICTS=	fbm-[0-9]*
 +
  FETCH_ARGS=	-pRr
  USE_CMAKE=	yes
  CMAKE_VERBOSE=	yes
 @@ -36,17 +39,19 @@ CMAKE_ARGS=	-DBUILDSTATIC:BOOL=OFF \
  		-DUSE_TBB:BOOL=ON
  LDFLAGS+=	-ltbb
  USE_LDCONFIG=	yes
 -WRKSRC=		${WRKDIR}/OpenImageIO-oiio-f0a566a/src
 +WRKSRC=		${WRKDIR}/OpenImageIO-oiio-0d48631/src
  MAKE_JOBS_SAFE=	yes
  
 -OPTIONS_DEFINE=	IMAGEVIEWER THREADS
 +OPTIONS_DEFINE=	DOCS IMAGEVIEWER THREADS
  OPTIONS_DEFAULT=	DOCS IMAGEVIEWER THREADS
  
  IMAGEVIEWER_DESC=	Build image viewer
  
  .include <bsd.port.options.mk>
  
 -.if empty(PORT_OPTIONS:MDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
 +CMAKE_ARGS+=	-DINSTALL_DOCS:BOOL=ON
 +.else
  CMAKE_ARGS+=	-DINSTALL_DOCS:BOOL=OFF
  .endif
  
 @@ -61,7 +66,7 @@ CMAKE_ARGS+=	-DUSE_OPENGL:BOOL=OFF -DUSE
  PLIST_SUB+=	IMAGEVIEWER="@comment "
  .endif
  
 -.if empty(PORT_OPTIONS:MTHREADS)
 +.if ${PORT_OPTIONS:MTHREADS}
  CMAKE_ARGS+=	-DNOTHREADS:BOOL=ON
  .else
  CMAKE_ARGS+=	-DNOTHREADS:BOOL=OFF
 
 Modified: head/graphics/openimageio/distinfo
 ==============================================================================
 --- head/graphics/openimageio/distinfo	Mon Sep 17 03:23:03 2012	(r304385)
 +++ head/graphics/openimageio/distinfo	Mon Sep 17 05:24:02 2012	(r304386)
 @@ -1,2 +1,2 @@
 -SHA256 (openimageio/Release-1.0.6) = b6ca648f13973b517135edbc9bc34367cdc54a8ca87f6b8014f363803825aa1e
 -SIZE (openimageio/Release-1.0.6) = 4196479
 +SHA256 (openimageio/Release-1.0.9) = 59ebc09f3d3e5ac780adc4a3e0020d6986721f6be1c84dd01da7899a565b5204
 +SIZE (openimageio/Release-1.0.9) = 4208590
 
 Modified: head/graphics/openimageio/pkg-plist
 ==============================================================================
 --- head/graphics/openimageio/pkg-plist	Mon Sep 17 03:23:03 2012	(r304385)
 +++ head/graphics/openimageio/pkg-plist	Mon Sep 17 05:24:02 2012	(r304386)
 @@ -60,7 +60,7 @@ include/OpenImageIO/version.h
  lib/libOpenImageIO.so
  lib/libOpenImageIO.so.1
  lib/libOpenImageIO.so.1.0
 -lib/libOpenImageIO.so.1.0.6
 +lib/libOpenImageIO.so.1.0.9
  %%PORTDOCS%%%%DOCSDIR%%/CHANGES
  %%PORTDOCS%%%%DOCSDIR%%/LICENSE
  %%PORTDOCS%%%%DOCSDIR%%/openimageio.pdf
 
 Modified: head/graphics/py-openimageio/Makefile
 ==============================================================================
 --- head/graphics/py-openimageio/Makefile	Mon Sep 17 03:23:03 2012	(r304385)
 +++ head/graphics/py-openimageio/Makefile	Mon Sep 17 05:24:02 2012	(r304386)
 @@ -6,7 +6,7 @@
  #
  
  PORTNAME=	openimageio
 -PORTVERSION=	1.0.6
 +PORTVERSION=	1.0.9
  CATEGORIES=	graphics multimedia python
  MASTER_SITES=	https://github.com/OpenImageIO/oiio/tarball/
  PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 @@ -36,7 +36,7 @@ LDFLAGS+=	-ltbb
  MAKE_JOBS_SAFE=	yes
  USE_LDCONFIG=	yes
  USE_PYTHON=	2.6+
 -WRKSRC=		${WRKDIR}/OpenImageIO-oiio-f0a566a/src
 +WRKSRC=		${WRKDIR}/OpenImageIO-oiio-0d48631/src
  
  PLIST_FILES=	%%PYTHON_SITELIBDIR%%/OpenImageIO.so
  
 
 Modified: head/graphics/py-openimageio/distinfo
 ==============================================================================
 --- head/graphics/py-openimageio/distinfo	Mon Sep 17 03:23:03 2012	(r304385)
 +++ head/graphics/py-openimageio/distinfo	Mon Sep 17 05:24:02 2012	(r304386)
 @@ -1,2 +1,2 @@
 -SHA256 (openimageio/Release-1.0.6) = b6ca648f13973b517135edbc9bc34367cdc54a8ca87f6b8014f363803825aa1e
 -SIZE (openimageio/Release-1.0.6) = 4196479
 +SHA256 (openimageio/Release-1.0.9) = 59ebc09f3d3e5ac780adc4a3e0020d6986721f6be1c84dd01da7899a565b5204
 +SIZE (openimageio/Release-1.0.9) = 4208590
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: rm 
State-Changed-When: Mon Sep 17 05:32:06 UTC 2012 
State-Changed-Why:  
Committed, thank you! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171665 
>Unformatted:
