Attachment #69260 for bug #101533

View | Details | Raw Unified | Return to bug 101533
Collapse All | Expand All

Lines 6-12 Link Here

(-)science/paraview/Makefile (-9 / +13 lines)
6	#	6	#
7		7
8	PORTNAME= paraview	8	PORTNAME= paraview
9	PORTVERSION= 2.4.3	9	PORTVERSION= 2.4.4
10	CATEGORIES= science graphics	10	CATEGORIES= science graphics
11	MASTER_SITES= http://www.paraview.org/files/v2.4/	11	MASTER_SITES= http://www.paraview.org/files/v2.4/
12		12
Lines 22-27 Link Here
22	expat.6:${PORTSDIR}/textproc/expat2	22	expat.6:${PORTSDIR}/textproc/expat2
23		23
24	USE_GL= yes	24	USE_GL= yes
		25	USE_GMAKE= yes
		26
25	WRKSRC= ${WRKDIR}/${DISTNAME}-build	27	WRKSRC= ${WRKDIR}/${DISTNAME}-build
26	PATCH_WRKSRC= ${WRKDIR}/${DISTNAME}	28	PATCH_WRKSRC= ${WRKDIR}/${DISTNAME}
27	PLIST_SUB+= VERMAJORMINOR=2.4	29	PLIST_SUB+= VERMAJORMINOR=2.4
Lines 31-49 Link Here
31	CXX="${CXX}"	33	CXX="${CXX}"
32	LIB_INSTDIR= ${PREFIX}/lib/${PORTNAME}-${PORTVERSION:R}	34	LIB_INSTDIR= ${PREFIX}/lib/${PORTNAME}-${PORTVERSION:R}
33		35
34	BROKEN= Does not build with new cmake	36	pre-configure:
35		37	${FIND} ${PATCH_WRKSRC}/VTK/CMake -name "Find*.cmake" -exec \
36	pre-patch:	38	${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g;s\|/usr/X11R6\|${X11BASE}\|g' {} \;
37	${REINPLACE_CMD} -e 's\|vtkpng\|png\|g' \
38	${WRKDIR}/paraview-${PORTVERSION}/GUI/Widgets/CMakeLists.txt
39		39
40	do-configure:	40	do-configure:
41	${MKDIR} ${WRKSRC}	41	${MKDIR} ${WRKSRC}
42	cd ${WRKSRC} && \	42	cd ${WRKSRC} && \
43	${LOCALBASE}/bin/cmake ../${DISTNAME} \	43	${LOCALBASE}/bin/cmake ../${DISTNAME} -LAH \
		44	-DCMAKE_VERBOSE_MAKEFILE:BOOL="TRUE" \
44	-DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} \	45	-DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} \
45	-DCMAKE_C_FLAGS="${CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \	46	-DCMAKE_C_FLAGS:STRING="${CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
46	-DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \	47	-DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
		48	-DCMAKE_EXE_LINKER_FLAGS:STRING="${LDFLAGS}" \
		49	-DCMAKE_THREAD_LIBS:STRING="${PTHREAD_LIBS}" \
47	-DPARAVIEW_USE_SYSTEM_HDF5=1 \	50	-DPARAVIEW_USE_SYSTEM_HDF5=1 \
48	-DBUILD_SHARED_LIBS="ON" \	51	-DBUILD_SHARED_LIBS="ON" \
49	-DVTK_USE_SYSTEM_PNG="ON" \	52	-DVTK_USE_SYSTEM_PNG="ON" \
Lines 52-57 Link Here
52	-DVTK_USE_SYSTEM_ZLIB="ON" \	55	-DVTK_USE_SYSTEM_ZLIB="ON" \
53	-DVTK_USE_SYSTEM_FREETYPE="ON" \	56	-DVTK_USE_SYSTEM_FREETYPE="ON" \
54	-DVTK_USE_SYSTEM_EXPAT="ON" \	57	-DVTK_USE_SYSTEM_EXPAT="ON" \
		58	-DVTK_USE_X="ON" \
55	-DVTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T=1	59	-DVTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T=1
56		60
57	post-install:	61	post-install:

Lines 1-3 Link Here

(-)science/paraview/distinfo (-3 / +3 lines)
1	MD5 (paraview-2.4.3.tar.gz) = db4e6974d8bba12de8a50748161b3f42	1	MD5 (paraview-2.4.4.tar.gz) = 7f8e926542268546563e8e8c1d4ad852
2	SHA256 (paraview-2.4.3.tar.gz) = e84e984a31cbfb332706c3038f22ab92ffaae18e1edd3024fdba6a9f242cffc7	2	SHA256 (paraview-2.4.4.tar.gz) = 2af388f046ceeff87fa6241ce91bfb55ac090c47f817486f130b7c8714aa8b1e
3	SIZE (paraview-2.4.3.tar.gz) = 45423483	3	SIZE (paraview-2.4.4.tar.gz) = 45431692




--- ./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




--- ./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
 

Line 0 Link Here

(-)science/paraview/files/patch-VTK_CMake_CMakeLists.txt (+11 lines)
	1	--- ./VTK/CMake/CMakeLists.txt.orig Mon Mar 15 16:01:43 2004
	2	+++ ./VTK/CMake/CMakeLists.txt Sun Aug 6 09:30:22 2006
	3	@@ -33,8 +33,6 @@
	4
	5	# Remove any existing flag.
	6	SET(CMAKE_ABI_VARS
	7	- CMAKE_C_FLAGS
	8	- CMAKE_CXX_FLAGS
	9	CMAKE_EXE_LINKER_FLAGS
	10	CMAKE_SHARED_LINKER_FLAGS
	11	CMAKE_MODULE_LINKER_FLAGS




--- ./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)

Return to bug 101533

Line 0 Link Here

(-)science/paraview/files/patch-CMakeLists.txt (+17 lines)
	1	--- ./CMakeLists.txt.orig Thu Jun 29 15:01:13 2006
	2	+++ ./CMakeLists.txt Sun Aug 6 00:22:36 2006
	3	@@ -318,9 +318,12 @@
	4	SET(ICET_MPI_MAX_NUMPROCS "${VTK_MPI_MAX_NUMPROCS}" CACHE INTERNAL
	5	"This is set from VTK_MPI_MAX_NUMPROCS.")
	6
	7	+IF(VTK_USE_X)
	8	+ FIND_PACKAGE(X11)
	9	+ SET(VTK_INCLUDE_DIR ${X11_INCLUDE_DIR})
	10	+ENDIF(VTK_USE_X)
	11
	12	-
	13	-SET(VTK_INCLUDE_DIR
	14	+SET(VTK_INCLUDE_DIR ${VTK_INCLUDE_DIR}
	15	${ParaView_SOURCE_DIR}/VTK
	16	${ParaView_BINARY_DIR}/VTK
	17	${ParaView_SOURCE_DIR}/VTK/Utilities

Line 0 Link Here

(-)science/paraview/files/patch-GUI_Widgets_CMakeLists.txt (+21 lines)
	1	--- ./GUI/Widgets/CMakeLists.txt.orig Thu Oct 20 16:32:11 2005
	2	+++ ./GUI/Widgets/CMakeLists.txt Sun Aug 6 10:38:41 2006
	3	@@ -397,7 +397,17 @@
	4	TARGET_LINK_LIBRARIES (KWWidgets vtkParallel)
	5	ENDIF(VTK_USE_PARALLEL OR VTK_USE_PARALLEL_ISSET)
	6	ENDIF(VTK_WRAP_TCL)
	7	-TARGET_LINK_LIBRARIES (KWWidgets vtkpng)
	8	+
	9	+IF(VTK_USE_SYSTEM_PNG)
	10	+ TARGET_LINK_LIBRARIES (KWWidgets png)
	11	+ INCLUDE_DIRECTORIES(
	12	+ ${KWWidgets_INCLUDE_PATH}
	13	+ ${VTK_INCLUDE_DIR}
	14	+ ${PNG_INCLUDE_DIR}
	15	+ )
	16	+ELSE(VTK_USE_SYSTEM_PNG)
	17	+ TARGET_LINK_LIBRARIES (KWWidgets vtkpng)
	18	+ENDIF(VTK_USE_SYSTEM_PNG)
	19
	20	# We need KWSys
	21

Line 0 Link Here

(-)science/paraview/files/patch-VTK_CMake_FindPNG.cmake (+30 lines)
	1	--- ./VTK/CMake/FindPNG.cmake.orig Thu Jan 1 00:00:00 1970
	2	+++ ./VTK/CMake/FindPNG.cmake Sun Aug 6 10:16:48 2006
	3	@@ -0,0 +1,27 @@
	4	+#
	5	+# Find the native PNG includes and library
	6	+#
	7	+# This module defines
	8	+# PNG_INCLUDE_DIR, where to find png.h, etc.
	9	+# PNG_LIBRARIES, the libraries to link against to use PNG.
	10	+# PNG_FOUND, If false, do not try to use PNG.
	11	+
	12	+# also defined, but not for general use are
	13	+# PNG_LIBRARY, where to find the PNG library.
	14	+
	15	+FIND_PATH(PNG_INCLUDE_DIR png.h
	16	+ /usr/local/include
	17	+ /usr/include
	18	+)
	19	+
	20	+FIND_LIBRARY(PNG_LIBRARY png
	21	+ /usr/lib
	22	+ /usr/local/lib
	23	+)
	24	+
	25	+IF(PNG_INCLUDE_DIR)
	26	+ IF(PNG_LIBRARY)
	27	+ SET( PNG_FOUND "YES" )
	28	+ SET( PNG_LIBRARIES ${PNG_LIBRARY} )
	29	+ ENDIF(PNG_LIBRARY)
	30	+ENDIF(PNG_INCLUDE_DIR)