svn commit: r304581 - in head/graphics/ilmbase: . files

[Steve Wills]

Author: swills
Date: Thu Sep 20 14:37:41 2012
New Revision: 304581
URL: http://svn.freebsd.org/changeset/ports/304581

Log:
  - Update to 1.0.2
  - Convert to OptionsNG

Added:
  head/graphics/ilmbase/files/patch-configure   (contents, props changed)
Deleted:
  head/graphics/ilmbase/files/patch-IlmThread-IlmThreadPool.cpp
Modified:
  head/graphics/ilmbase/Makefile
  head/graphics/ilmbase/distinfo   (contents, props changed)

Modified: head/graphics/ilmbase/Makefile
==============================================================================
--- head/graphics/ilmbase/Makefile	Thu Sep 20 14:22:09 2012	(r304580)
+++ head/graphics/ilmbase/Makefile	Thu Sep 20 14:37:41 2012	(r304581)
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ilmbase
-PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTVERSION=	1.0.2
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	openexr
@@ -17,19 +16,21 @@ COMMENT=	ILM Base libraries a.k.a. Half,
 
 CONFLICTS=	OpenEXR-1.[0-4].*
 
-OPTIONS=	THREAD	"Enable multithreaded file I/O support"	on
+OPTIONS_DEFINE=		THREAD
+OPTIONS_DEFAULT=	THREAD
+THREAD_DESC=		Enable multithreaded file I/O support
 
 USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool
 
-regression test check:	build
+regression-test regression test check:	build
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_THREAD)
+.if ${PORT_OPTIONS:MTHREAD}
 CONFIGURE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 .else

Modified: head/graphics/ilmbase/distinfo
==============================================================================
--- head/graphics/ilmbase/distinfo	Thu Sep 20 14:22:09 2012	(r304580)
+++ head/graphics/ilmbase/distinfo	Thu Sep 20 14:37:41 2012	(r304581)
@@ -1,2 +1,2 @@
-SHA256 (ilmbase-1.0.1.tar.gz) = 4f14fc7b26a37a391ec5f979697148e6774bc36bc052de26e40ffabe401e397d
-SIZE (ilmbase-1.0.1.tar.gz) = 463275
+SHA256 (ilmbase-1.0.2.tar.gz) = 2e5cda799ffdfca9b1a16bb120d49c74a39af1457ef22f968918c6200ba62e44
+SIZE (ilmbase-1.0.2.tar.gz) = 496540

Added: head/graphics/ilmbase/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/ilmbase/files/patch-configure	Thu Sep 20 14:37:41 2012	(r304581)
@@ -0,0 +1,47 @@
+--- configure.orig	2012-09-19 00:48:14.000000000 +0000
++++ configure	2012-09-19 00:51:54.000000000 +0000
+@@ -20384,25 +20384,25 @@
+   osx_arch=default
+ fi;
+ 
+-  if test "${osx_arch}" != default ; then
+-          osx_arch_flags="-arch ${osx_arch// / -arch }"
+-     CXXFLAGS="$CXXFLAGS $osx_arch_flags"
+-
+-          if test "$enable_dependency_tracking" != no ; then
+-        osx_arch_array=( ${osx_arch} )
+-        if test ${#osx_arch_array[@]} -gt 1 ; then
+-          { { echo "$as_me:$LINENO: error: building multiple OS X architectures requires --disable-dependency-tracking.
+-Please re-run configure with these options:
+-  --enable-osx-arch=\"${osx_arch}\" --disable-dependency-tracking
+-  		  " >&5
+-echo "$as_me: error: building multiple OS X architectures requires --disable-dependency-tracking.
+-Please re-run configure with these options:
+-  --enable-osx-arch=\"${osx_arch}\" --disable-dependency-tracking
+-  		  " >&2;}
+-   { (exit 1); exit 1; }; }
+-        fi
+-     fi
+-  fi
++#  if test "${osx_arch}" != default ; then
++#          osx_arch_flags="-arch ${osx_arch// / -arch }"
++#     CXXFLAGS="$CXXFLAGS $osx_arch_flags"
++#
++#          if test "$enable_dependency_tracking" != no ; then
++#        osx_arch_array=( ${osx_arch} )
++#        if test ${#osx_arch_array[@]} -gt 1 ; then
++#          { { echo "$as_me:$LINENO: error: building multiple OS X architectures requires --disable-dependency-tracking.
++#Please re-run configure with these options:
++#  --enable-osx-arch=\"${osx_arch}\" --disable-dependency-tracking
++#  		  " >&5
++#echo "$as_me: error: building multiple OS X architectures requires --disable-dependency-tracking.
++#Please re-run configure with these options:
++#  --enable-osx-arch=\"${osx_arch}\" --disable-dependency-tracking
++#  		  " >&2;}
++#   { (exit 1); exit 1; }; }
++#        fi
++#     fi
++#  fi
+ 
+     # Check whether --enable-osx-sdk or --disable-osx-sdk was given.
+ if test "${enable_osx_sdk+set}" = set; then