From owner-svn-ports-head@freebsd.org  Tue Nov 22 21:03:52 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C7C99C50B05;
 Tue, 22 Nov 2016 21:03:52 +0000 (UTC)
 (envelope-from thierry@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 mx1.freebsd.org (Postfix) with ESMTPS id 7FDB6C70;
 Tue, 22 Nov 2016 21:03:52 +0000 (UTC)
 (envelope-from thierry@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAML3pAC048254;
 Tue, 22 Nov 2016 21:03:51 GMT (envelope-from thierry@FreeBSD.org)
Received: (from thierry@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAML3p3F048253;
 Tue, 22 Nov 2016 21:03:51 GMT (envelope-from thierry@FreeBSD.org)
Message-Id: <201611222103.uAML3p3F048253@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: thierry set sender to
 thierry@FreeBSD.org using -f
From: Thierry Thomas <thierry@FreeBSD.org>
Date: Tue, 22 Nov 2016 21:03:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r426863 - head/cad/freecad
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Nov 2016 21:03:52 -0000

Author: thierry
Date: Tue Nov 22 21:03:51 2016
New Revision: 426863
URL: https://svnweb.freebsd.org/changeset/ports/426863

Log:
  Chase french/med upgrade (switch to hdf5-18).
  
  Reported by:	rakuco

Modified:
  head/cad/freecad/Makefile

Modified: head/cad/freecad/Makefile
==============================================================================
--- head/cad/freecad/Makefile	Tue Nov 22 20:56:58 2016	(r426862)
+++ head/cad/freecad/Makefile	Tue Nov 22 21:03:51 2016	(r426863)
@@ -2,6 +2,7 @@
 
 PORTNAME=	FreeCAD
 DISTVERSION=	0.17.g20161104
+PORTREVISION=	1
 CATEGORIES=	cad
 
 MAINTAINER=	ports@FreeBSD.org
@@ -39,9 +40,19 @@ USE_XORG=	ice sm x11 xext xt
 USE_GL=		gl glu
 USE_QT4=	qmake_build corelib gui moc_build network opengl rcc_build \
 		uic_build svg xml webkit
+USE_LDCONFIG=	yes
 CMAKE_ARGS=	-DOCC_INCLUDE_DIR="${LOCALBASE}/include/OpenCASCADE" \
 		-DFREECAD_USE_EXTERNAL_PIVY=1
 
+# To be removed when french/med will be built against science/hdf5
+LIB_DEPENDS+=	libhdf5-18.so:science/hdf5-18
+CMAKE_ARGS+=	-DHDF5_FOUND="TRUE" -DHDF5_VERSION="1.8.17"		\
+		-DHDF5_INCLUDE_DIRS="${LOCALBASE}/include/hdf5-18"	\
+		-DCMAKE_CXX_FLAGS="-I${LOCALBASE}/include/hdf5-18"	\
+		-DCMAKE_C_FLAGS="-I${LOCALBASE}/include/hdf5-18"	\
+		-DHDF5_LIBRARIES="-lhdf5-18"
+CFLAGS+=	-I${LOCALBASE}/include/hdf5-18
+
 CMAKE_INSTALL_PREFIX=	${PREFIX}/${PORTNAME}
 
 DESKTOP_ENTRIES=${PORTNAME} "" "${PREFIX}/FreeCAD/data/freecad.svg" \
@@ -51,6 +62,13 @@ post-patch:
 	@${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' \
 		${WRKSRC}/src/Gui/CMakeLists.txt
 
+pre-configure:
+	# To be removed when french/med will be built against science/hdf5
+	${REINPLACE_CMD} -e 's|find_package(HDF5 REQUIRED)|#find_package(HDF5 REQUIRED)|' \
+		${WRKSRC}/CMakeLists.txt
+	${REINPLACE_CMD} -e 's|<hdf5.h>|<hdf5-18/hdf5.h>|'	\
+		${WRKSRC}/src/3rdParty/salomesmesh/inc/MED_Common.hxx
+
 post-install:
 	${LN} -s ../${PORTNAME}/bin/FreeCAD ${STAGEDIR}${LOCALBASE}/bin/FreeCAD
 	${LN} -s ../${PORTNAME}/bin/FreeCADCmd ${STAGEDIR}${LOCALBASE}/bin/FreeCADCmd