ports/101533: science/paraview: upgrade to 2.4.4 and unbreak.
Thierry Thomas
thierry at pompo.net
Sun Aug 6 22:10:22 UTC 2006
>Number: 101533
>Category: ports
>Synopsis: science/paraview: upgrade to 2.4.4 and unbreak.
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Aug 06 22:10:19 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Thierry Thomas
>Release: FreeBSD 6.1-STABLE i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD graf.pompo.net 6.1-STABLE FreeBSD 6.1-STABLE #0: Tue Jun 27 06:04:37 CEST 2006 thierry at graf.pompo.net:/usr/obj/usr/src/sys/GRAF060511 i386
>Description:
- Upgrade to 2.4.4 and unbreak;
- Define -LAH & CMAKE_VERBOSE_MAKEFILE to ease investigation in
case of failure;
- Respect LOCALBASE & PTHREAD_LIBS.
>How-To-Repeat:
N/A.
>Fix:
Please apply the following patch.
--- paraview.diff begins here ---
diff -urN science/paraview.orig/Makefile science/paraview/Makefile
--- science/paraview.orig/Makefile Fri May 19 21:58:46 2006
+++ science/paraview/Makefile Sun Aug 6 23:53:43 2006
@@ -6,7 +6,7 @@
#
PORTNAME= paraview
-PORTVERSION= 2.4.3
+PORTVERSION= 2.4.4
CATEGORIES= science graphics
MASTER_SITES= http://www.paraview.org/files/v2.4/
@@ -22,6 +22,8 @@
expat.6:${PORTSDIR}/textproc/expat2
USE_GL= yes
+USE_GMAKE= yes
+
WRKSRC= ${WRKDIR}/${DISTNAME}-build
PATCH_WRKSRC= ${WRKDIR}/${DISTNAME}
PLIST_SUB+= VERMAJORMINOR=2.4
@@ -31,19 +33,20 @@
CXX="${CXX}"
LIB_INSTDIR= ${PREFIX}/lib/${PORTNAME}-${PORTVERSION:R}
-BROKEN= Does not build with new cmake
-
-pre-patch:
- ${REINPLACE_CMD} -e 's|vtkpng|png|g' \
- ${WRKDIR}/paraview-${PORTVERSION}/GUI/Widgets/CMakeLists.txt
+pre-configure:
+ ${FIND} ${PATCH_WRKSRC}/VTK/CMake -name "Find*.cmake" -exec \
+ ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g;s|/usr/X11R6|${X11BASE}|g' {} \;
do-configure:
${MKDIR} ${WRKSRC}
cd ${WRKSRC} && \
- ${LOCALBASE}/bin/cmake ../${DISTNAME} \
+ ${LOCALBASE}/bin/cmake ../${DISTNAME} -LAH \
+ -DCMAKE_VERBOSE_MAKEFILE:BOOL="TRUE" \
-DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} \
- -DCMAKE_C_FLAGS="${CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
- -DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
+ -DCMAKE_C_FLAGS:STRING="${CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
+ -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
+ -DCMAKE_EXE_LINKER_FLAGS:STRING="${LDFLAGS}" \
+ -DCMAKE_THREAD_LIBS:STRING="${PTHREAD_LIBS}" \
-DPARAVIEW_USE_SYSTEM_HDF5=1 \
-DBUILD_SHARED_LIBS="ON" \
-DVTK_USE_SYSTEM_PNG="ON" \
@@ -52,6 +55,7 @@
-DVTK_USE_SYSTEM_ZLIB="ON" \
-DVTK_USE_SYSTEM_FREETYPE="ON" \
-DVTK_USE_SYSTEM_EXPAT="ON" \
+ -DVTK_USE_X="ON" \
-DVTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T=1
post-install:
diff -urN science/paraview.orig/distinfo science/paraview/distinfo
--- science/paraview.orig/distinfo Sat Apr 29 17:28:08 2006
+++ science/paraview/distinfo Sat Aug 5 17:34:56 2006
@@ -1,3 +1,3 @@
-MD5 (paraview-2.4.3.tar.gz) = db4e6974d8bba12de8a50748161b3f42
-SHA256 (paraview-2.4.3.tar.gz) = e84e984a31cbfb332706c3038f22ab92ffaae18e1edd3024fdba6a9f242cffc7
-SIZE (paraview-2.4.3.tar.gz) = 45423483
+MD5 (paraview-2.4.4.tar.gz) = 7f8e926542268546563e8e8c1d4ad852
+SHA256 (paraview-2.4.4.tar.gz) = 2af388f046ceeff87fa6241ce91bfb55ac090c47f817486f130b7c8714aa8b1e
+SIZE (paraview-2.4.4.tar.gz) = 45431692
diff -urN science/paraview.orig/files/patch-CMakeLists.txt science/paraview/files/patch-CMakeLists.txt
--- science/paraview.orig/files/patch-CMakeLists.txt Thu Jan 1 01:00:00 1970
+++ science/paraview/files/patch-CMakeLists.txt Sun Aug 6 00:23:21 2006
@@ -0,0 +1,17 @@
+--- ./CMakeLists.txt.orig Thu Jun 29 15:01:13 2006
++++ ./CMakeLists.txt Sun Aug 6 00:22:36 2006
+@@ -318,9 +318,12 @@
+ SET(ICET_MPI_MAX_NUMPROCS "${VTK_MPI_MAX_NUMPROCS}" CACHE INTERNAL
+ "This is set from VTK_MPI_MAX_NUMPROCS.")
+
++IF(VTK_USE_X)
++ FIND_PACKAGE(X11)
++ SET(VTK_INCLUDE_DIR ${X11_INCLUDE_DIR})
++ENDIF(VTK_USE_X)
+
+-
+-SET(VTK_INCLUDE_DIR
++SET(VTK_INCLUDE_DIR ${VTK_INCLUDE_DIR}
+ ${ParaView_SOURCE_DIR}/VTK
+ ${ParaView_BINARY_DIR}/VTK
+ ${ParaView_SOURCE_DIR}/VTK/Utilities
diff -urN science/paraview.orig/files/patch-GUI_Widgets_CMakeLists.txt science/paraview/files/patch-GUI_Widgets_CMakeLists.txt
--- science/paraview.orig/files/patch-GUI_Widgets_CMakeLists.txt Thu Jan 1 01:00:00 1970
+++ science/paraview/files/patch-GUI_Widgets_CMakeLists.txt Sun Aug 6 10:39:05 2006
@@ -0,0 +1,21 @@
+--- ./GUI/Widgets/CMakeLists.txt.orig Thu Oct 20 16:32:11 2005
++++ ./GUI/Widgets/CMakeLists.txt Sun Aug 6 10:38:41 2006
+@@ -397,7 +397,17 @@
+ TARGET_LINK_LIBRARIES (KWWidgets vtkParallel)
+ ENDIF(VTK_USE_PARALLEL OR VTK_USE_PARALLEL_ISSET)
+ ENDIF(VTK_WRAP_TCL)
+-TARGET_LINK_LIBRARIES (KWWidgets vtkpng)
++
++IF(VTK_USE_SYSTEM_PNG)
++ TARGET_LINK_LIBRARIES (KWWidgets png)
++ INCLUDE_DIRECTORIES(
++ ${KWWidgets_INCLUDE_PATH}
++ ${VTK_INCLUDE_DIR}
++ ${PNG_INCLUDE_DIR}
++ )
++ELSE(VTK_USE_SYSTEM_PNG)
++ TARGET_LINK_LIBRARIES (KWWidgets vtkpng)
++ENDIF(VTK_USE_SYSTEM_PNG)
+
+ # We need KWSys
+
diff -urN science/paraview.orig/files/patch-VTK_CMake_CMakeLists.txt science/paraview/files/patch-VTK_CMake_CMakeLists.txt
--- science/paraview.orig/files/patch-VTK_CMake_CMakeLists.txt Thu Jan 1 01:00:00 1970
+++ science/paraview/files/patch-VTK_CMake_CMakeLists.txt Sun Aug 6 09:30:51 2006
@@ -0,0 +1,11 @@
+--- ./VTK/CMake/CMakeLists.txt.orig Mon Mar 15 16:01:43 2004
++++ ./VTK/CMake/CMakeLists.txt Sun Aug 6 09:30:22 2006
+@@ -33,8 +33,6 @@
+
+ # Remove any existing flag.
+ SET(CMAKE_ABI_VARS
+- CMAKE_C_FLAGS
+- CMAKE_CXX_FLAGS
+ CMAKE_EXE_LINKER_FLAGS
+ CMAKE_SHARED_LINKER_FLAGS
+ CMAKE_MODULE_LINKER_FLAGS
diff -urN science/paraview.orig/files/patch-VTK_CMake_FindPNG.cmake science/paraview/files/patch-VTK_CMake_FindPNG.cmake
--- science/paraview.orig/files/patch-VTK_CMake_FindPNG.cmake Thu Jan 1 01:00:00 1970
+++ science/paraview/files/patch-VTK_CMake_FindPNG.cmake Sun Aug 6 10:17:42 2006
@@ -0,0 +1,30 @@
+--- ./VTK/CMake/FindPNG.cmake.orig Thu Jan 1 00:00:00 1970
++++ ./VTK/CMake/FindPNG.cmake Sun Aug 6 10:16:48 2006
+@@ -0,0 +1,27 @@
++#
++# Find the native PNG includes and library
++#
++# This module defines
++# PNG_INCLUDE_DIR, where to find png.h, etc.
++# PNG_LIBRARIES, the libraries to link against to use PNG.
++# PNG_FOUND, If false, do not try to use PNG.
++
++# also defined, but not for general use are
++# PNG_LIBRARY, where to find the PNG library.
++
++FIND_PATH(PNG_INCLUDE_DIR png.h
++ /usr/local/include
++ /usr/include
++)
++
++FIND_LIBRARY(PNG_LIBRARY png
++ /usr/lib
++ /usr/local/lib
++)
++
++IF(PNG_INCLUDE_DIR)
++ IF(PNG_LIBRARY)
++ SET( PNG_FOUND "YES" )
++ SET( PNG_LIBRARIES ${PNG_LIBRARY} )
++ ENDIF(PNG_LIBRARY)
++ENDIF(PNG_INCLUDE_DIR)
--- paraview.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list