From owner-svn-ports-head@FreeBSD.ORG Tue Apr 15 13:21:23 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9FE6E751; Tue, 15 Apr 2014 13:21:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 80D271928; Tue, 15 Apr 2014 13:21:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3FDLNJQ039925; Tue, 15 Apr 2014 13:21:23 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3FDLNMH039922; Tue, 15 Apr 2014 13:21:23 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201404151321.s3FDLNMH039922@svn.freebsd.org> From: Pietro Cerutti Date: Tue, 15 Apr 2014 13:21:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351330 - head/math/vtk5 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Apr 2014 13:21:23 -0000 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