diff options
| author | Pietro Cerutti <gahr@FreeBSD.org> | 2011-01-05 17:05:00 +0000 |
|---|---|---|
| committer | Pietro Cerutti <gahr@FreeBSD.org> | 2011-01-05 17:05:00 +0000 |
| commit | 3a36041c63391192c3520c19ce2396ee18197ab9 (patch) | |
| tree | f5de1c1cff29f56c98f3d1d70805b3fb3aa1f32a /math | |
| parent | - register UID/GID 587 for assp user (port mail/assp) (diff) | |
- Fix build and plist when building static libraries
Notes
Notes:
svn path=/head/; revision=267421
Diffstat (limited to 'math')
| -rw-r--r-- | math/vtk5/Makefile | 22 | ||||
| -rw-r--r-- | math/vtk5/pkg-plist | 6 |
2 files changed, 21 insertions, 7 deletions
diff --git a/math/vtk5/Makefile b/math/vtk5/Makefile index 56c4f706b08f..ba5f18c8931f 100644 --- a/math/vtk5/Makefile +++ b/math/vtk5/Makefile @@ -8,6 +8,7 @@ PORTNAME= vtk PORTVERSION= 5.6.1 +PORTREVISION= 1 CATEGORIES= math graphics MASTER_SITES= http://www.vtk.org/files/release/${PORTVERSION:R}/ \ http://www.neuro.mcw.edu/Ports/distfiles/VTK5/ @@ -60,11 +61,6 @@ CMAKE_ARGS+= -DBUILD_DOCUMENTATION:BOOL=ON \ -DBUILD_TESTING:BOOL=OFF \ -DKWSYS_LFS_DISABLE:BOOL=ON \ -DVTK_USE_PARALLEL:BOOL=ON \ - -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \ - -DVTK_USE_SYSTEM_JPEG:BOOL=ON \ - -DVTK_USE_SYSTEM_PNG:BOOL=ON \ - -DVTK_USE_SYSTEM_TIFF:BOOL=ON \ - -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \ -DVTK_USE_GUISUPPORT:BOOL=ON \ -DVTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T:BOOL=ON \ -DVTK_DATA_ROOT:PATH=${EXAMPLESDIR}/VTKData \ @@ -75,11 +71,21 @@ CMAKE_ARGS+= -DBUILD_DOCUMENTATION:BOOL=ON \ .include <bsd.port.options.mk> .if defined(WITH_SHARED) -CMAKE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON +CMAKE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON \ + -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \ + -DVTK_USE_SYSTEM_JPEG:BOOL=ON \ + -DVTK_USE_SYSTEM_PNG:BOOL=ON \ + -DVTK_USE_SYSTEM_TIFF:BOOL=ON \ + -DVTK_USE_SYSTEM_ZLIB:BOOL=ON PLIST_SUB+= SHARED="" \ STATIC="@comment " .else -CMAKE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=OFF +CMAKE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=OFF \ + -DVTK_USE_SYSTEM_EXPAT:BOOL=OFF \ + -DVTK_USE_SYSTEM_JPEG:BOOL=OFF \ + -DVTK_USE_SYSTEM_PNG:BOOL=OFF \ + -DVTK_USE_SYSTEM_TIFF:BOOL=OFF \ + -DVTK_USE_SYSTEM_ZLIB:BOOL=OFF PLIST_SUB+= SHARED="@comment " \ STATIC="" .endif @@ -199,8 +205,10 @@ post-patch: ${REINPLACE_CMD} -e '222s|)|) \&\& !defined(__FreeBSD__)|' \ ${WRKSRC}/Utilities/kwsys/SharedForward.h.in ${REINPLACE_CMD} -e '25,30d' ${WRKSRC}/Wrapping/Python/setup.py.in +.if !defined(WITH_SHARED) ${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|g' \ ${WRKSRC}/IO/vtkPNGReader.cxx +.endif post-configure: .if defined(WITH_WRAP_JAVA) diff --git a/math/vtk5/pkg-plist b/math/vtk5/pkg-plist index 02cb615bc818..e4ac7d4dab26 100644 --- a/math/vtk5/pkg-plist +++ b/math/vtk5/pkg-plist @@ -116,6 +116,7 @@ %%STATIC%%lib/vtk-%%VER2%%/libvtkImaging.a %%STATIC%%lib/vtk-%%VER2%%/libvtkInfovis.a %%STATIC%%lib/vtk-%%VER2%%/libvtkNetCDF.a +%%STATIC%%lib/vtk-%%VER2%%/libvtkNetCDF_cxx.a %%STATIC%%lib/vtk-%%VER2%%/libvtkParallel.a %%STATIC%%lib/vtk-%%VER2%%/libvtkRendering.a %%STATIC%%lib/vtk-%%VER2%%/libvtkViews.a @@ -123,14 +124,19 @@ %%STATIC%%lib/vtk-%%VER2%%/libvtkWidgets.a %%STATIC%%lib/vtk-%%VER2%%/libvtkalglib.a %%STATIC%%lib/vtk-%%VER2%%/libvtkexoIIc.a +%%STATIC%%lib/vtk-%%VER2%%/libvtkexpat.a %%STATIC%%lib/vtk-%%VER2%%/libvtkfreetype.a %%STATIC%%lib/vtk-%%VER2%%/libvtkftgl.a +%%STATIC%%lib/vtk-%%VER2%%/libvtkjpeg.a %%STATIC%%lib/vtk-%%VER2%%/libvtklibxml2.a %%STATIC%%lib/vtk-%%VER2%%/libvtkmetaio.a +%%STATIC%%lib/vtk-%%VER2%%/libvtkpng.a %%STATIC%%lib/vtk-%%VER2%%/libvtkproj4.a %%STATIC%%lib/vtk-%%VER2%%/libvtksqlite.a %%STATIC%%lib/vtk-%%VER2%%/libvtksys.a +%%STATIC%%lib/vtk-%%VER2%%/libvtktiff.a %%STATIC%%lib/vtk-%%VER2%%/libvtkverdict.a +%%STATIC%%lib/vtk-%%VER2%%/libvtkzlib.a %%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkCommonPythonD.so.%%VER1%% %%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkCommonPythonD.so.%%VER2%% %%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkCommonPythonD.so.%%VER3%% |