- Update to 1.4.2

- Prepare for upcoming boost 1.37.0 [1]

PR:		132833 [1]
Submitted by:	Dmitry Marakasov <amdmi3@amdmi3.ru>

6 files changed, 71 insertions, 27 deletions

diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile
index fc0465c438b..c7f667eaf00 100644
--- a/graphics/aqsis/Makefile
+++ b/graphics/aqsis/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	aqsis
-PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTVERSION=	1.4.2
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -20,36 +19,48 @@ BUILD_DEPENDS=	bjam:${PORTSDIR}/devel/boost \
 		xsltproc:${PORTSDIR}/textproc/libxslt \
 		fltk-threads>=0:${PORTSDIR}/x11-toolkits/fltk-threads
 LIB_DEPENDS=	IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
-		tiff.4:${PORTSDIR}/graphics/tiff
+		tiff.4:${PORTSDIR}/graphics/tiff \
+		aprutil-1.3:${PORTSDIR}/devel/apr \
+		db-4.2.2:${PORTSDIR}/databases/db42
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 CMAKE_ARGS=	-DAQSIS_BOOST_FILESYSTEM_LIBRARY:FILEPATH=${LOCALBASE}/lib/libboost_filesystem.so \
 		-DAQSIS_BOOST_REGEX_LIBRARY:FILEPATH=${LOCALBASE}/lib/libboost_regex.so \
 		-DAQSIS_BOOST_THREAD_LIBRARY:FILEPATH=${LOCALBASE}/lib/libboost_thread.so \
 		-DAQSIS_BOOST_WAVE_LIBRARY:FILEPATH=${LOCALBASE}/lib/libboost_wave.so \
-		-DAQSIS_BOOST_FILESYSTEM_LIBRARY_NAME:STRING=boost_filesystem \
-		-DAQSIS_BOOST_REGEX_LIBRARY_NAME:STRING=boost_regex \
-		-DAQSIS_BOOST_THREAD_LIBRARY_NAME:STRING=boost_thread \
-		-DAQSIS_BOOST_WAVE_LIBRARY_NAME:STRING=boost_wave \
-		-DAQSIS_FLTK_INCLUDE_DIR:PATH=${LOCALBASE}/include \
-		-DAQSIS_FLTK_LIBRARIES:FILEPATH=${LOCALBASE}/lib/libfltk.so \
-		-DAQSIS_FLTK_LIBRARIES_DIR:PATH=${LOCALBSAE}/lib
+		-DAQSIS_FLTK_LIBRARIES:FILEPATH=${LOCALBASE}/lib/libfltk.so
+#		-DAQSIS_BOOST_FILESYSTEM_LIBRARY_NAME:STRING=boost_filesystem \
+#		-DAQSIS_BOOST_REGEX_LIBRARY_NAME:STRING=boost_regex \
+#		-DAQSIS_BOOST_THREAD_LIBRARY_NAME:STRING=boost_thread \
+#		-DAQSIS_BOOST_WAVE_LIBRARY_NAME:STRING=boost_wave \
+#		-DAQSIS_FLTK_INCLUDE_DIR:PATH=${LOCALBASE}/include \
+#		-DAQSIS_FLTK_LIBRARIES_DIR:PATH=${LOCALBSAE}/lib
+CMAKE_USE_PTHREAD=	yes
 
 USE_LDCONFIG=	yes
 USE_CMAKE=	yes
 
+# Required for off-source building
+CMAKE_BUILD_PATH=	${WRKSRC}/build
+CMAKE_SOURCE_PATH=	${WRKSRC}/
+CONFIGURE_WRKSRC=	${CMAKE_BUILD_PATH}
+
+post-extract:
+	${MKDIR} ${CMAKE_BUILD_PATH}
+
 post-patch:
-	${REINPLACE_CMD} -e '54s/$$/ || defined(__sparc64__)/' \
+	${REINPLACE_CMD} -e '47s/$$/ || defined(__sparc64__)/' \
 	    ${WRKSRC}/renderer/ddmanager/ndspy.h
 
 post-configure:
-	${FIND} ${WRKSRC} -name "build.make" -o -name "link.txt" -o -name "relink.txt" \
-	    | ${XARGS} ${REINPLACE_CMD} -i "" -e 's|-ldl||g'
-	${REINPLACE_CMD} -e 's|-lz|-lz ${PTHREAD_LIBS}|' \
-	    ${WRKSRC}/renderer/aqsis/CMakeFiles/aqsis.dir/link.txt \
-	    ${WRKSRC}/texturing/teqser/CMakeFiles/teqser.dir/link.txt
-	${REINPLACE_CMD} -e 's|-O2|-O2 ${PTHREAD_LIBS}|' \
-	    ${WRKSRC}/shadercompiler/aqsltell/CMakeFiles/aqsltell.dir/link.txt
+	${FIND} ${WRKSRC} -name "relink.txt" -o -name "link.txt" \
+	    | ${XARGS} ${REINPLACE_CMD} -i "" -e 's|\-ldl||g'
+
+do-build:
+	cd ${CMAKE_BUILD_PATH} && ${MAKE}
+
+do-install:
+	cd ${CMAKE_BUILD_PATH} && ${MAKE} install
 
 .include <bsd.port.pre.mk>
 
diff --git a/graphics/aqsis/distinfo b/graphics/aqsis/distinfo
index 471a69ce721..803e721c4c5 100644
--- a/graphics/aqsis/distinfo
+++ b/graphics/aqsis/distinfo
@@ -1,3 +1,3 @@
-MD5 (aqsis-1.4.1.tar.gz) = 524f1392d2c07fbd0c6accc1ffe9cffe
-SHA256 (aqsis-1.4.1.tar.gz) = 3326e93a83aa99f1577fe52aff81ca781da9c8b60e36e239100504172049123f
-SIZE (aqsis-1.4.1.tar.gz) = 2474901
+MD5 (aqsis-1.4.2.tar.gz) = 6194c3af3ddc80999351565f2b2e2f55
+SHA256 (aqsis-1.4.2.tar.gz) = 40a3672ef749b1c3e179c6acbdd7398704c190ecc912e5607c792de1ca70c2de
+SIZE (aqsis-1.4.2.tar.gz) = 2483901
diff --git a/graphics/aqsis/files/patch-CMakeLists.txt b/graphics/aqsis/files/patch-CMakeLists.txt
index b0495b6189d..ad3da46036b 100644
--- a/graphics/aqsis/files/patch-CMakeLists.txt
+++ b/graphics/aqsis/files/patch-CMakeLists.txt
@@ -1,12 +1,33 @@
---- CMakeLists.txt.orig	2008-08-21 01:09:19.000000000 +0200
-+++ CMakeLists.txt	2008-08-21 01:09:27.000000000 +0200
-@@ -17,9 +17,6 @@
+--- CMakeLists.txt.orig	2009-01-21 22:12:32.000000000 +0100
++++ CMakeLists.txt	2009-04-01 23:23:39.000000000 +0200
+@@ -2,6 +2,12 @@
+ 
+ CMAKE_MINIMUM_REQUIRED(VERSION 2.4.6)
+ 
++if(COMMAND cmake_policy)
++    cmake_policy(SET CMP0003 NEW)
++    cmake_policy(SET CMP0005 OLD)
++endif(COMMAND cmake_policy)
++SET(CMAKE_DL_LIBS "")
++
+ # Set some variables used within various resources, including installer scripts.
+ SET(AQSIS_PROJECT_NAME "Aqsis Renderer")
+ SET(AQSIS_PROJECT_NAME_SHORT "Aqsis")
+@@ -17,7 +23,6 @@
  
  INCLUDE(macros)
  
 -INCLUDE(FirstCMakeRun)
--INCLUDE(OutOfSourceBuild)
--
+ INCLUDE(OutOfSourceBuild)
+ 
  # Find path to precompiled libs on windows.
- INCLUDE(FindWin32Libs)
+@@ -270,9 +275,6 @@
+ SET(PROCEDURALPATH "${PROCEDURALPATH}" CACHE STRING "Aqsis procedural searchpath")
+ SET(RESOURCEPATH "${RESOURCEPATH}" CACHE STRING "Aqsis resource searchpath")
+ CONFIGURE_FILE(aqsisrc.in.cmake ${PROJECT_BINARY_DIR}/aqsisrc)
+-ADD_CUSTOM_TARGET(aqsisrc ALL echo
+-	DEPENDS  ${PROJECT_BINARY_DIR}/aqsisrc
+-	)
+ INSTALL(FILES ${PROJECT_BINARY_DIR}/aqsisrc DESTINATION ${SYSCONFDIR})
+ 
  
diff --git a/graphics/aqsis/files/patch-aqsistypes::plugins.cpp b/graphics/aqsis/files/patch-aqsistypes_plugins.cpp
index a7b440f15a8..a7b440f15a8 100644
--- a/graphics/aqsis/files/patch-aqsistypes::plugins.cpp
+++ b/graphics/aqsis/files/patch-aqsistypes_plugins.cpp
diff --git a/graphics/aqsis/files/patch-displays-piqsl_piqsl.cpp b/graphics/aqsis/files/patch-displays-piqsl_piqsl.cpp
new file mode 100644
index 00000000000..2a5d55bee58
--- /dev/null
+++ b/graphics/aqsis/files/patch-displays-piqsl_piqsl.cpp
@@ -0,0 +1,10 @@
+--- displays/piqsl/piqsl.cpp.orig	2009-04-01 00:14:24.000000000 +0200
++++ displays/piqsl/piqsl.cpp	2009-04-01 00:13:48.000000000 +0200
+@@ -29,6 +29,7 @@
+ #define WIN32_LEAN_AND_MEAN
+ #endif
+ 
++#include	<iostream.h>
+ #include	<tiffio.h>
+ #include	<string>
+ #include	<list>
diff --git a/graphics/aqsis/pkg-plist b/graphics/aqsis/pkg-plist
index e2f13cd8381..d4af3736a81 100644
--- a/graphics/aqsis/pkg-plist
+++ b/graphics/aqsis/pkg-plist
@@ -8,6 +8,7 @@ bin/teqser
 etc/aqsis/aqsisrc
 include/aqsis/aqsis.h
 include/aqsis/aqsis_compiler.h
+include/aqsis/aqsis_config.h
 include/aqsis/aqsis_types.h
 include/aqsis/aqsismath.h
 include/aqsis/bitvector.h
@@ -37,6 +38,7 @@ include/aqsis/ri.inl
 include/aqsis/ri_types.h
 include/aqsis/riparamlist.h
 include/aqsis/shadeop.h
+include/aqsis/slo.h
 include/aqsis/slx.h
 include/aqsis/smartptr.h
 include/aqsis/socket.h