From owner-svn-ports-all@freebsd.org Tue Dec 3 01:29:51 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 77B7C1C09C6; Tue, 3 Dec 2019 01:29:51 +0000 (UTC) (envelope-from stephen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47RktR2dt2z4fgP; Tue, 3 Dec 2019 01:29:51 +0000 (UTC) (envelope-from stephen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3F2C380D0; Tue, 3 Dec 2019 01:29:51 +0000 (UTC) (envelope-from stephen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xB31Tp6T040796; Tue, 3 Dec 2019 01:29:51 GMT (envelope-from stephen@FreeBSD.org) Received: (from stephen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xB31Tp0k040795; Tue, 3 Dec 2019 01:29:51 GMT (envelope-from stephen@FreeBSD.org) Message-Id: <201912030129.xB31Tp0k040795@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: stephen set sender to stephen@FreeBSD.org using -f From: Stephen Montgomery-Smith Date: Tue, 3 Dec 2019 01:29:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518897 - head/math/vtk6 X-SVN-Group: ports-head X-SVN-Commit-Author: stephen X-SVN-Commit-Paths: head/math/vtk6 X-SVN-Commit-Revision: 518897 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Dec 2019 01:29:51 -0000 Author: stephen Date: Tue Dec 3 01:29:50 2019 New Revision: 518897 URL: https://svnweb.freebsd.org/changeset/ports/518897 Log: - Fix build on powerpc64 elfv2. - Remove vtk5 from conflicts. - Bump portrevision. PR: 242361 Submitted by: Piotr Kubaj Modified: head/math/vtk6/Makefile Modified: head/math/vtk6/Makefile ============================================================================== --- head/math/vtk6/Makefile Tue Dec 3 01:27:12 2019 (r518896) +++ head/math/vtk6/Makefile Tue Dec 3 01:29:50 2019 (r518897) @@ -3,7 +3,7 @@ PORTNAME= vtk PORTVERSION= 6.2.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= math graphics MASTER_SITES= http://www.vtk.org/files/release/${VTK_SHORT_VER}/ PKGNAMESUFFIX= 6 @@ -23,12 +23,10 @@ LIB_DEPENDS= libtiff.so:graphics/tiff \ # TODO # * VTK Groups -CONFLICTS= vtk5 vtk8 +CONFLICTS= vtk8 USES= alias cmake jpeg localbase xorg USE_LDCONFIG= ${PREFIX}/lib/vtk-${VTK_SHORT_VER} USE_XORG= xt sm ice x11 xext -CXXFLAGS_powerpc64= -mminimal-toc - VTK_SHORT_VER= ${PORTVERSION:R} PLIST_SUB+= VER2=${VTK_SHORT_VER} @@ -210,4 +208,10 @@ USE_PERL5+= build CMAKE_ARGS+= -DBUILD_DOCUMENTATION:BOOL=OFF .endif -.include +.include + +.if defined(PPC_ABI) && ${PPC_ABI} == ELFv1 +CXXFLAGS+= -mminimal-toc +.endif + +.include