5 files changed, 79 insertions, 79 deletions

diff --git a/graphics/ilmbase/Makefile b/graphics/ilmbase/Makefile
index 64a62d4c0a16..2953ce3a959a 100644
--- a/graphics/ilmbase/Makefile
+++ b/graphics/ilmbase/Makefile
@@ -12,51 +12,36 @@ COMMENT=	ILM Base libraries a.k.a. Half, IlmThread, Imath, and Iex
 
 LICENSE=	BSD3CLAUSE
 
-USES=		pathfix pkgconfig
-GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool
+USES=		cmake pkgconfig
 USE_LDCONFIG=	yes
 
 PORTDOCS=	AUTHORS ChangeLog README
-
-BIN=	eLut toFloat
-
-OPTIONS_DEFINE=		DOCS THREAD
-OPTIONS_DEFAULT=	THREAD
-THREAD_DESC=		Enable multithreaded file I/O support
+OPTIONS_DEFINE=		DOCS
 
 OPTIONS_SUB=	yes
 
 THREAD_CONFIGURE_ENABLE=	threading
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MTHREAD}
-CONFIGURE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
-.endif
-
 MAJORVER=	2_1
 VER=	11
 
 PLIST_SUB=	MAJORVER=${MAJORVER}
 PLIST_SUB+=	VER=${VER}
 
+HALF_BIN=	eLut toFloat
+
 regression-test regression test check:	build
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|Iex/libIex.la|Iex/libIex.la $(PTHREAD_LIBS)|' \
-		${WRKSRC}/IlmThread/Makefile.am
-	@${REINPLACE_CMD} -e 's|== x|= x|g' ${WRKSRC}/configure
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libHalf.so.${VER}
+	${RM} -f ${STAGEDIR}${PREFIX}/lib/*.la
 .for l in libIex libIexMath libImath libIlmThread
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${l}-${MAJORVER}.so.${VER}
+	${LN} -s ${l}-${MAJORVER}.so.${VER} ${STAGEDIR}${PREFIX}/lib/${l}.so
 .endfor
 
-.for e in ${BIN}
+.for e in ${HALF_BIN}
 	${INSTALL_PROGRAM} ${WRKSRC}/Half/${e} ${STAGEDIR}${PREFIX}/bin/${e}
 .endfor
 
diff --git a/graphics/ilmbase/files/patch-CMakeLists.txt b/graphics/ilmbase/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..dc6d2592137a
--- /dev/null
+++ b/graphics/ilmbase/files/patch-CMakeLists.txt
@@ -0,0 +1,53 @@
+--- CMakeLists.txt.orig	2013-11-12 03:09:51.000000000 +0400
++++ CMakeLists.txt	2014-03-27 00:26:23.467722879 +0400
+@@ -130,30 +130,30 @@
+ 
+ SET_TARGET_PROPERTIES ( Half
+   PROPERTIES
+-  VERSION 11.0.0
++  VERSION 11
+   SOVERSION 11
+   )
+ SET_TARGET_PROPERTIES ( Iex
+   PROPERTIES
+-  VERSION 11.0.0
++  VERSION 11
+   SOVERSION 11
+   OUTPUT_NAME "Iex-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}"
+   )
+ SET_TARGET_PROPERTIES ( Imath
+   PROPERTIES
+-  VERSION 11.0.0
++  VERSION 11
+   SOVERSION 11
+   OUTPUT_NAME "Imath-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}"
+   )
+ SET_TARGET_PROPERTIES ( IlmThread
+   PROPERTIES
+-  VERSION 11.0.0
++  VERSION 11
+   SOVERSION 11
+   OUTPUT_NAME "IlmThread-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}"
+   )
+ SET_TARGET_PROPERTIES ( IexMath
+   PROPERTIES
+-  VERSION 11.0.0
++  VERSION 11
+   SOVERSION 11
+   OUTPUT_NAME "IexMath-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}"
+   )
+@@ -190,11 +190,12 @@
+ Name: IlmBase
+ Description: Base math and exception libraries
+ Version: ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}
+-Libs: -L\${libdir} -lImath-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR} -lIexMath-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR} -lHalf -lIex-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR} -lIlmThread-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR} -pthreadCflags: -pthread -I\${OpenEXR_includedir}
++Libs: -L\${libdir} -lImath-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR} -lIexMath-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR} -lHalf -lIex-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR} -lIlmThread-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR} -pthread
++Cflags: -pthread -I\${OpenEXR_includedir}
+ ")
+ 
+ INSTALL ( FILES
+   ${CMAKE_BINARY_DIR}/IlmBase.pc
+   DESTINATION
+-  lib/pkgconfig
++  libdata/pkgconfig
+ )
diff --git a/graphics/ilmbase/files/patch-IlmThread__CMakeLists.txt b/graphics/ilmbase/files/patch-IlmThread__CMakeLists.txt
new file mode 100644
index 000000000000..f2154559660e
--- /dev/null
+++ b/graphics/ilmbase/files/patch-IlmThread__CMakeLists.txt
@@ -0,0 +1,19 @@
+--- IlmThread/CMakeLists.txt.orig	2013-11-12 01:10:49.000000000 +0400
++++ IlmThread/CMakeLists.txt	2014-03-27 00:38:30.616700075 +0400
+@@ -18,6 +18,7 @@
+ 	)
+ ENDIF()
+ 
++FIND_PACKAGE(Threads)
+ 
+ IF(BUILD_SHARED_LIBS)
+   ADD_DEFINITIONS(-DILMTHREAD_EXPORTS)
+@@ -26,7 +27,7 @@
+ ADD_LIBRARY ( IlmThread ${LIB_TYPE}
+   ${ILMTHREAD_LIBRARY_SOURCES}
+   )
+-TARGET_LINK_LIBRARIES(IlmThread Iex)
++TARGET_LINK_LIBRARIES(IlmThread Iex ${CMAKE_THREAD_LIBS_INIT})
+ 
+ INSTALL ( TARGETS
+   IlmThread
diff --git a/graphics/ilmbase/files/patch-configure b/graphics/ilmbase/files/patch-configure
deleted file mode 100644
index 61834be3eebd..000000000000
--- a/graphics/ilmbase/files/patch-configure
+++ /dev/null
@@ -1,47 +0,0 @@
---- configure.orig	2013-10-04 18:58:30.000000000 +0200
-+++ configure	2013-10-04 19:09:40.000000000 +0200
-@@ -17373,25 +17373,25 @@
- 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
--          { { $as_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
--$as_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
-+#          { { $as_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
-+#$as_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 was given.
- if test "${enable_osx_sdk+set}" = set; then
diff --git a/graphics/ilmbase/pkg-plist b/graphics/ilmbase/pkg-plist
index 4b6ef584cdaf..bd36676f85f7 100644
--- a/graphics/ilmbase/pkg-plist
+++ b/graphics/ilmbase/pkg-plist
@@ -57,29 +57,19 @@ include/OpenEXR/half.h
 include/OpenEXR/halfExport.h
 include/OpenEXR/halfFunction.h
 include/OpenEXR/halfLimits.h
-lib/libHalf.a
-lib/libHalf.la
 lib/libHalf.so
 lib/libHalf.so.%%VER%%
 lib/libIex-%%MAJORVER%%.so
 lib/libIex-%%MAJORVER%%.so.%%VER%%
-lib/libIex.a
-lib/libIex.la
 lib/libIex.so
 lib/libIexMath-%%MAJORVER%%.so
 lib/libIexMath-%%MAJORVER%%.so.%%VER%%
-lib/libIexMath.a
-lib/libIexMath.la
 lib/libIexMath.so
 lib/libIlmThread-%%MAJORVER%%.so
 lib/libIlmThread-%%MAJORVER%%.so.%%VER%%
-lib/libIlmThread.a
-lib/libIlmThread.la
 lib/libIlmThread.so
 lib/libImath-%%MAJORVER%%.so
 lib/libImath-%%MAJORVER%%.so.%%VER%%
-lib/libImath.a
-lib/libImath.la
 lib/libImath.so
 libdata/pkgconfig/IlmBase.pc
 @dirrmtry include/OpenEXR