Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 3 Dec 2019 01:29:51 +0000 (UTC)
From:      Stephen Montgomery-Smith <stephen@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r518897 - head/math/vtk6
Message-ID:  <201912030129.xB31Tp0k040795@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <pkubaj@FreeBSD.org>

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 <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if defined(PPC_ABI) && ${PPC_ABI} == ELFv1
+CXXFLAGS+=	-mminimal-toc
+.endif
+
+.include <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912030129.xB31Tp0k040795>