Date: Tue, 15 Apr 2014 13:21:23 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351330 - head/math/vtk5 Message-ID: <201404151321.s3FDLNMH039922@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Tue Apr 15 13:21:22 2014 New Revision: 351330 URL: http://svnweb.freebsd.org/changeset/ports/351330 QAT: https://qat.redports.org/buildarchive/r351330/ Log: - Unbreak by temporarily removing support for PYTHON wrapping - Bump PORTREVISION (default options changed) Modified: head/math/vtk5/Makefile head/math/vtk5/pkg-plist Modified: head/math/vtk5/Makefile ============================================================================== --- head/math/vtk5/Makefile Tue Apr 15 13:14:55 2014 (r351329) +++ head/math/vtk5/Makefile Tue Apr 15 13:21:22 2014 (r351330) @@ -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}/tex 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." Modified: head/math/vtk5/pkg-plist ============================================================================== --- head/math/vtk5/pkg-plist Tue Apr 15 13:14:55 2014 (r351329) +++ head/math/vtk5/pkg-plist Tue Apr 15 13:21:22 2014 (r351330) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404151321.s3FDLNMH039922>