diff options
| author | gahr <gahr@FreeBSD.org> | 2014-04-15 21:21:22 +0800 |
|---|---|---|
| committer | gahr <gahr@FreeBSD.org> | 2014-04-15 21:21:22 +0800 |
| commit | 2304deff0a4936ded3396af8578f9b1960fd9b19 (patch) | |
| tree | 066912ac67bf7cbfc66af8f69a32df0bd68afabf | |
| parent | d7cef66675e5070bc714602f8797b9fffd090d24 (diff) | |
| download | freebsd-ports-graphics-2304deff0a4936ded3396af8578f9b1960fd9b19.tar.gz freebsd-ports-graphics-2304deff0a4936ded3396af8578f9b1960fd9b19.tar.zst freebsd-ports-graphics-2304deff0a4936ded3396af8578f9b1960fd9b19.zip | |
- Unbreak by temporarily removing support for PYTHON wrapping
- Bump PORTREVISION (default options changed)
| -rw-r--r-- | math/vtk5/Makefile | 9 | ||||
| -rw-r--r-- | math/vtk5/pkg-plist | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/math/vtk5/Makefile b/math/vtk5/Makefile index 1b72fa5d7fe..881c144261a 100644 --- a/math/vtk5/Makefile +++ b/math/vtk5/Makefile @@ -3,7 +3,7 @@ PORTNAME= vtk PORTVERSION= 5.10.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math graphics MASTER_SITES= http://www.vtk.org/files/release/${PORTVERSION:R}/ PKGNAMESUFFIX= 5 @@ -19,7 +19,6 @@ LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \ libpng15.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff -BROKEN= Violates stage and fails to package WRKSRC= ${WRKDIR}/VTK${PORTVERSION} CONFLICTS= vtk-4* @@ -33,7 +32,7 @@ CXXFLAGS+= -DUSE_INTERP_ERRORLINE OPTIONS_DEFINE= SHARED THEORA VTKMPEG2 GL2PS OSMESA QT4 JAVA \ PYTHON TCLTK DBGLEAKS LEGACY -OPTIONS_DEFAULT=SHARED GL2PS QT4 PYTHON TCLTK LEGACY +OPTIONS_DEFAULT=SHARED GL2PS QT4 TCLTK LEGACY SHARED_DESC= Build shared libraries VTKMPEG2_DESC= Patented MPEG2 encoder module @@ -140,6 +139,7 @@ PLIST_SUB+= QT="@comment " .endif .if ${PORT_OPTIONS:MPYTHON} +IGNORE= python wrapping does not stage properly .if ${PORT_OPTIONS:MSHARED} == "" IGNORE= python wrapping requires shared libraries.\ Run make config again and enable the SHARED option @@ -148,7 +148,7 @@ USE_PYTHON= yes PYDISTUTILS_PKGNAME= VTK INSTALLS_EGGINFO= yes CMAKE_ARGS+= -DVTK_WRAP_PYTHON:BOOL=ON \ - -DVTK_PYTHON_SETUP_ARGS:STRING='--prefix="${PREFIX}"' + -DVTK_PYTHON_SETUP_ARGS:STRING='--prefix="${PREFIX}"' PLIST_SUB+= PYTHON="" .else CMAKE_ARGS+= -DVTK_WRAP_PYTHON:BOOL=OFF @@ -274,6 +274,7 @@ post-install: done .endif .endif + .if ${PORT_OPTIONS:MVTKMPEG2} @${ECHO_CMD} @${ECHO_CMD} "This port uses the patented MPEG2 encoder." diff --git a/math/vtk5/pkg-plist b/math/vtk5/pkg-plist index 68dd2a71aee..0f647ed9084 100644 --- a/math/vtk5/pkg-plist +++ b/math/vtk5/pkg-plist @@ -1,4 +1,5 @@ man/man3/vtk.3.gz +%%WRAPPING%%bin/vtkWrapHierarchy %%GL2PS%%include/vtk-%%VER2%%/vtkGL2PSExporter.h %%MPEG%%include/vtk-%%VER2%%/vtkMPEG2Writer.h %%THEORA%%include/vtk-%%VER2%%/vtkOggTheoraWriter.h @@ -121,7 +122,6 @@ man/man3/vtk.3.gz %%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/wx/wxVTKRenderWindow.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/wx/wxVTKRenderWindowInteractor.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/wx/wxVTKRenderWindowInteractor.pyc -%%PYTHON%%bin/vtkWrapHierarchy %%PYTHON%%bin/vtkWrapPython %%PYTHON%%bin/vtkWrapPythonInit %%PYTHON%%bin/vtkpython |