mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-18 08:02:48 +00:00
Code Issues Releases Activity

Upgrade to 7.1.0.

Browse Source 
Release notes at
https://www.opencascade.com/sites/default/files/documents/release_notes_7.1.0.pdf

PR:		220110
Submitted by:	tj+freebsd_portsxi (at) a13.fr
With bits from:	ml (at) netfence.it
This commit is contained in:
Thierry Thomas 2017-07-15 17:23:50 +00:00
parent 4cb506c1f3
commit 82f832df60
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=445905
13 changed files with 2738 additions and 6311 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
cad/opencascade/Makefile
View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= opencascade
PORTVERSION= 6.9.1
PORTREVISION= 9
PORTVERSION= 7.1.0
CATEGORIES= cad science
MASTER_SITES= LOCAL/thierry
@ -15,20 +14,23 @@ LICENSE_NAME= LGPL21 with exception
LICENSE_FILE= ${WRKSRC}/OCCT_LGPL_EXCEPTION.txt
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
LIB_DEPENDS= libtbb.so:devel/tbb \
LIB_DEPENDS= libfreetype.so:print/freetype2 \
libtbb.so:devel/tbb \
libvtksys-${VTKVER}.so:math/vtk6
RUN_DEPENDS= bash:shells/bash
# Check ${WRKSRC}/dox/overview/Overview.md
# Check ${WRKSRC}/dox/overview/overview.md
# and ${WRKSRC}/dox/dev_guides/building
USES= alias:10 bison cmake compiler:c++11-lib dos2unix \
USES= alias:10 cmake:outsource compiler:c++11-lib dos2unix \
shebangfix tk tar:tgz
USE_XORG= xmu
USE_XORG= ice sm x11 xext xi xmu xt
USE_GL= gl glu
DOS2UNIX_FILES= adm/templates/*
SHEBANG_FILES= adm/templates/env.sh.in adm/templates/draw.sh \
adm/templates/custom.sh.in adm/templates/custom.sh.main \
adm/start.tcl draw.sh xcode.sh env.sh custom.sh.in \
gendoc codeblocks.sh
SHEBANG_FILES= adm/templates/*.sh \
adm/templates/*.sh.in \
adm/templates/*.sh.main \
gendoc
ENVSH= env.sh adm/templates/env.sh.in adm/templates/env.sh
VTKVER= 6.2
OPTIONS_DEFINE= VIS DOXYGEN
@ -37,19 +39,18 @@ OPTIONS_DEFAULT=VIS
OPTIONS_SUB= yes
REINPLACE_ARGS= -i ""
CFLAGS+= -I${LOCALBASE}/include -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}
LDFLAGS+= -L${LOCALBASE}/lib -L${TCL_LIBDIR} -L${TK_LIBDIR}
CMAKE_ARGS+= -D3RDPARTY_TCL_INCLUDE_DIR=${TCL_INCLUDEDIR} \
-D3RDPARTY_TCL_LIBRARY=${TCL_LIBDIR} \
-D3RDPARTY_TBB_DIR=${LOCALBASE} \
-D3RDPARTY_TBB_LIBRARY_DIR=${LOCALBASE}/lib \
-DINSTALL_DIR=${OCCROOT}/ -DUSE_TBB:BOOL=ON \
-D3RDPARTY_TBBMALLOC_LIBRARY=${LOCALBASE}/lib/libtbbmalloc.so \
-D3RDPARTY_TBB_LIBRARY=${LOCALBASE}/lib/libtbb.so \
-D3RDPARTY_TBBMALLOC_LIBRARY_DIR=${LOCALBASE}/lib \
-DUSE_VTK:BOOL=ON -D3RDPARTY_VTK_DIR=${LOCALBASE} \
-D3RDPARTY_VTK_INCLUDE_DIR=${LOCALBASE}/include/vtk-${VTKVER} \
-D3RDPARTY_VTK_LIBRARY_DIR=${LOCALBASE}/lib/vtk-${VTKVER}
CFLAGS+= -I${LOCALBASE}/include
CMAKE_ARGS+= -DINSTALL_DIR=${OCCROOT} \
-DINSTALL_DIR_INCLUDE=${PREFIX}/include/OpenCASCADE \
-DINSTALL_DIR_LIB=${PREFIX}/lib \
-DINSTALL_DIR_CMAKE=${OCCROOT}/lib/cmake \
-DINSTALL_DIR_DATA=${OCCROOT}/data \
-DINSTALL_DIR_RESOURCE=${OCCROOT}/resources \
-DINSTALL_DIR_SAMPLES=${OCCROOT}/samples \
-DINSTALL_DIR_TESTS=${OCCROOT}/tests \
-DINSTALL_TEST_CASES:BOOL=ON \
-DUSE_TBB:BOOL=ON \
-DUSE_VTK:BOOL=ON
USE_LDCONFIG= yes
@ -61,15 +62,11 @@ VIS_CMAKE_ON= -DUSE_FREEIMAGE:BOOL=ON -DUSE_GL2PS:BOOL=ON \
-DUSE_FREETYPE:BOOL=ON
VIS_CMAKE_OFF= -DUSE_FREEIMAGE:BOOL=OFF -DUSE_GL2PS:BOOL=OFF \
-DUSE_FREETYPE:BOOL=OFF
VIS_USE= GL=glu
VIS_LIB_DEPENDS= libftgl.so:graphics/ftgl \
libfreetype.so:print/freetype2 \
libgl2ps.so:print/gl2ps \
libfreeimageplus.so:graphics/freeimage
VIS_CMAKE_ON= -D3RDPARTY_FREETYPE_DIR=${LOCALBASE} \
-D3RDPARTY_FREEIMAGE_DIR=${LOCALBASE} \
-D3RDPARTY_GL2PS_DIR=${LOCALBASE}
VIS_CMAKE_ON= -D3RDPARTY_FREETYPE_DIR=${LOCALBASE}
DOXYGEN_USE= TEX=latex:build
DOXYGEN_BUILD_DEPENDS= bash:shells/bash \
@ -80,12 +77,6 @@ DOXYGEN_RUN_DEPENDS= ${LOCALBASE}/www/MathJax/MathJax.js:www/mathjax
.include <bsd.port.options.mk>
.if ${ARCH} == "i386"
BITS= 32
.else
BITS= 64
.endif
pre-everything::
@${ECHO_MSG}
@${ECHO_MSG} "Warning: to build OpenCascade, you should have at least"
@ -94,39 +85,23 @@ pre-everything::
pre-configure:
${REINPLACE_CMD} -e 's|tclsh|${TCLSH}|' ${WRKSRC}/gendoc
.for mod in TKDraw TKViewerTest
${REINPLACE_CMD} -e 's|tcl8.6|tcl${TCL_VER:C|\.||}|;s|tk8.6|tk${TK_VER:C|\.||}|' \
${WRKSRC}/adm/cmake/${mod}/CMakeLists.txt
.endfor
.for mod in TKIVtk TKIVtkDraw
${REINPLACE_CMD} -E 's/(vtk[[:alnum:]]+)\-6.1/\1\-${VTKVER}/' \
${WRKSRC}/adm/cmake/${mod}/CMakeLists.txt
.endfor
.for es in env.sh adm/templates/env.sh.in
${REINPLACE_CMD} -e 's|lin|bsd|' ${WRKSRC}/${es}
.for es in ${ENVSH}
${REINPLACE_CMD} -e 's|lin|bsd|;s|x86_64|amd64|' ${WRKSRC}/${es}
.endfor
pre-patch:
@${REINPLACE_CMD} 's|<malloc.h>|<stdlib.h>|' \
${WRKSRC}/src/OSD/OSD_MemInfo.cxx \
${WRKSRC}/src/StepFile/step.tab.c \
${WRKSRC}/src/StepFile/step.yacc
post-build-DOXYGEN-on:
(cd ${WRKSRC} && ./gendoc -overview)
post-install:
${MV} ${STAGEDIR}${OCCROOT}/bsd${BITS}/${CHOSEN_COMPILER_TYPE}/bin/DRAWEXE \
${STAGEDIR}${PREFIX}/bin/
${MV} ${STAGEDIR}${OCCROOT}/bin/DRAWEXE-${PORTVERSION} ${STAGEDIR}${PREFIX}/bin/DRAWEXE
(cd ${STAGEDIR}${PREFIX}/bin && \
${LN} -sf DRAWEXE ${STAGEDIR}${OCCROOT}/bsd${BITS}/${CHOSEN_COMPILER_TYPE}/bin/DRAWEXE)
${MV} ${STAGEDIR}${OCCROOT}/bsd${BITS}/${CHOSEN_COMPILER_TYPE}/lib/lib*.so \
${STAGEDIR}${PREFIX}/lib/
(cd ${STAGEDIR}${PREFIX}/lib \
&& for l in lib*.so; do \
${MV} $${l} $${l}.0; \
${LN} -sf $${l}.0 $${l}; \
${LN} -sf $${l}.0 ${STAGEDIR}${OCCROOT}/bsd${BITS}/${CHOSEN_COMPILER_TYPE}/lib/$${l}; \
done)
${MKDIR} ${STAGEDIR}${PREFIX}/include/OpenCASCADE
(cd ${STAGEDIR}${OCCROOT}/inc && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/OpenCASCADE)
${RM} -r ${STAGEDIR}${OCCROOT}/inc
${LN} -sf ${PREFIX}/include/OpenCASCADE ${STAGEDIR}${OCCROOT}/inc
(cd ${WRKSRC} && ${COPYTREE_SHARE} tests ${STAGEDIR}${OCCROOT})
${LN} -sf DRAWEXE ${STAGEDIR}${OCCROOT}/bin/DRAWEXE)
post-install-DOXYGEN-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
(cd ${WRKSRC}/doc/overview && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
@ -136,9 +111,9 @@ post-install-DOXYGEN-on:
regression-test: install
${MKDIR} /tmp/testOCC
bash -c "\
cd ${OCCROOT} && . ${OCCROOT}/env.sh && \
CSF_TestScriptsPath=${OCCROOT}/tests \
CSF_TestDataPath=${OCCROOT}/data \
cd ${OCCROOT} && . ${OCCROOT}/bin/env.sh && \
CSF_TestScriptsPath=${OCCROOT}/tests \
CSF_TestDataPath=${OCCROOT}/data \
DRAWEXE -f ${FILESDIR}/regtest "
.endif

5
cad/opencascade/distinfo
View File

@ -1,2 +1,3 @@
SHA256 (opencascade-6.9.1.tgz) = f92659ae3fb09c28233fb9178bc24fd2aab6776f6d9ea2479c3bdfe6296b873f
SIZE (opencascade-6.9.1.tgz) = 209589289
TIMESTAMP = 1498857001
SHA256 (opencascade-7.1.0.tgz) = 0e23f038f4d12ed68d402dd8093923ac506db34abcf1c09bd2bffba1587f68d5
SIZE (opencascade-7.1.0.tgz) = 221861542

26
cad/opencascade/files/patch-CMakeLists.txt Normal file
View File

@ -0,0 +1,26 @@
--- CMakeLists.txt.orig 2016-11-25 09:52:00 UTC
+++ CMakeLists.txt
@@ -739,7 +739,7 @@ if (${DRAWEXE_INDEX} GREATER -1)
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
else()
install (FILES "${CMAKE_SOURCE_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}"
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
endif()
# copy draw script to CMake binary folder
@@ -906,7 +906,13 @@ foreach (OCCT_CONFIGURATION ${CMAKE_CONF
endforeach()
# install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration
install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")
-install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
+install(CODE "
+ configure_file(
+ \"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\"
+ \"\$ENV{DESTDIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\"
+ COPYONLY)
+")
+
foreach (OCCT_MODULE ${OCCT_MODULES})
if (BUILD_MODULE_${OCCT_MODULE})

17
cad/opencascade/files/patch-adm_cmake_occt__csf.cmake Normal file
View File

@ -0,0 +1,17 @@
--- adm/cmake/occt_csf.cmake.orig 2016-11-25 09:52:00 UTC
+++ adm/cmake/occt_csf.cmake
@@ -100,7 +100,6 @@ else()
set (CSF_ThreadLibs "pthread rt stdc++")
set (CSF_OpenGlLibs "GL")
set (CSF_XwLibs "X11 Xext Xmu Xi")
- set (CSF_dl "dl")
if (USE_TCL)
set (CSF_TclLibs "tcl${3RDPARTY_TCL_LIBRARY_VERSION}")
@@ -127,4 +126,4 @@ else()
set (CSF_GL2PS)
endif()
endif()
-endif()
\ No newline at end of file
+endif()

6
cad/opencascade/files/patch-adm_templates_occt_macros.cmake → cad/opencascade/files/patch-adm_cmake_occt__macros.cmake
View File

@ -1,6 +1,6 @@
--- adm/templates/occt_macros.cmake.orig 2014-11-16 14:21:14.000000000 +0100
+++ adm/templates/occt_macros.cmake 2014-11-16 14:35:55.000000000 +0100
@@ -44,7 +44,7 @@
--- adm/cmake/occt_macros.cmake.orig 2016-11-25 09:52:00 UTC
+++ adm/cmake/occt_macros.cmake
@@ -53,7 +53,7 @@ macro (OCCT_MAKE_OS_WITH_BITNESS)
elseif(APPLE)
set (OS_WITH_BIT "mac${COMPILER_BITNESS}")
else()

24
cad/opencascade/files/patch-adm_templates_custom.install.sh.in Normal file
View File

@ -0,0 +1,24 @@
--- adm/templates/custom.install.sh.in.orig 2017-07-15 14:03:43 UTC
+++ adm/templates/custom.install.sh.in
@@ -14,14 +14,14 @@ if [ "$1" == "@BIN_LETTER@" ]; then
export TK_VERSION_WITH_DOT="@3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT@"
export CSF_OCCTBinPath="@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_BIN@"
- export CSF_OCCTLibPath="@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_LIB@"
- export CSF_OCCTIncludePath="@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_INCLUDE@"
- export CSF_OCCTResourcePath="@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_RESOURCE@"
- export CSF_OCCTDataPath="@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_DATA@"
- export CSF_OCCTSamplesPath="@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_SAMPLES@"
- export CSF_OCCTTestsPath="@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_TESTS@"
+ export CSF_OCCTLibPath="@INSTALL_DIR_LIB@"
+ export CSF_OCCTIncludePath="@INSTALL_DIR_INCLUDE@"
+ export CSF_OCCTResourcePath="@INSTALL_DIR_RESOURCE@"
+ export CSF_OCCTDataPath="@INSTALL_DIR_DATA@"
+ export CSF_OCCTSamplesPath="@INSTALL_DIR_SAMPLES@"
+ export CSF_OCCTTestsPath="@INSTALL_DIR_TESTS@"
export CSF_OCCTDocPath="@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_DOC@"
-
+
# for compatability with external application using CASROOT
export CASROOT="@INSTALL_DIR_ABSOLUTE@"
fi

12
cad/opencascade/files/patch-configure.ac
View File

@ -1,12 +0,0 @@
--- configure.ac.orig 2013-04-19 08:49:57.000000000 +0200
+++ configure.ac 2013-05-08 23:20:45.000000000 +0200
@@ -67,8 +67,7 @@
#-----------------------------------------------------------------------------
# dl library is required
#-----------------------------------------------------------------------------
-AC_CHECK_LIB([dl],[dlopen],[],[AC_MSG_ERROR([dl library is required])])
-CSF_SOCKETLibs_LIB=-ldl
+CSF_SOCKETLibs_LIB=
#---------------------------------------------------------------------
#

18
cad/opencascade/files/patch-inc_Standard_Time.hxx
View File

@ -1,18 +0,0 @@
--- inc/Standard_Time.hxx.orig 2013-04-18 17:20:16.000000000 +0200
+++ inc/Standard_Time.hxx 2013-05-09 14:46:25.000000000 +0200
@@ -34,10 +34,10 @@
// ------------------------------------------------------------------
// IsEqual : Returns Standard_True if two time values are equal
// ------------------------------------------------------------------
-inline Standard_Boolean IsEqual (const Standard_Time theOne,
- const Standard_Time theTwo)
-{
- return theOne == theTwo;
-}
+//inline Standard_Boolean IsEqual (const Standard_Time theOne,
+// const Standard_Time theTwo)
+//{
+// return theOne == theTwo;
+//}
#endif

11
cad/opencascade/files/patch-src_OSD_OSD_MemInfo.cxx
View File

@ -1,11 +0,0 @@
--- src/OSD/OSD_MemInfo.cxx.orig 2014-04-29 11:40:36.000000000 +0200
+++ src/OSD/OSD_MemInfo.cxx 2014-05-04 14:18:16.000000000 +0200
@@ -28,7 +28,7 @@
#include <malloc/malloc.h>
#else
#include <unistd.h>
- #include <malloc.h>
+ #include <stdlib.h>
#endif
#include <string>

6
cad/opencascade/files/patch-src_STEPConstruct_STEPConstruct__AP203Context.cxx
View File

@ -1,6 +1,6 @@
--- src/STEPConstruct/STEPConstruct_AP203Context.cxx.orig 2015-09-25 16:19:10.000000000 +0200
+++ src/STEPConstruct/STEPConstruct_AP203Context.cxx 2015-10-25 20:37:31.000000000 +0100
@@ -105,7 +105,7 @@
--- src/STEPConstruct/STEPConstruct_AP203Context.cxx.orig 2016-11-25 09:52:26 UTC
+++ src/STEPConstruct/STEPConstruct_AP203Context.cxx
@@ -123,7 +123,7 @@ Handle(StepBasic_DateAndTime) STEPConstr
long shift = 0;
_get_timezone (&shift);
#else

4
cad/opencascade/files/patch-inc_Standard_CLocaleSentry.hxx → cad/opencascade/files/patch-src_Standard_Standard__CLocaleSentry.hxx
View File

@ -1,5 +1,5 @@
--- inc/Standard_CLocaleSentry.hxx.orig 2014-11-07 16:16:43.000000000 +0100
+++ inc/Standard_CLocaleSentry.hxx 2014-11-16 14:42:51.000000000 +0100
--- src/Standard/Standard_CLocaleSentry.hxx.orig 2016-11-25 09:52:27 UTC
+++ src/Standard/Standard_CLocaleSentry.hxx
@@ -25,7 +25,7 @@
//! and become part of POSIX since '2008.
//! Notice that this is impossible to test (_POSIX_C_SOURCE >= 200809L)

8
cad/opencascade/files/patch-src_Standard_Standard_CString.cxx → cad/opencascade/files/patch-src_Standard_Standard__CString.cxx
View File

@ -1,9 +1,9 @@
--- src/Standard/Standard_CString.cxx.orig 2014-11-07 16:16:43.000000000 +0100
+++ src/Standard/Standard_CString.cxx 2014-11-16 14:57:27.000000000 +0100
@@ -81,7 +81,7 @@
--- src/Standard/Standard_CString.cxx.orig 2016-11-25 09:52:27 UTC
+++ src/Standard/Standard_CString.cxx
@@ -81,7 +81,7 @@ Standard_Integer HashCodes (const Standa
// strtod, strtol, strtoll functions. For other system with locale-depended
// implementations problems may appear if "C" locale is not set explicitly.
#ifndef __ANDROID__
#if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__MINGW32__)
- #error System does not support xlocale. Import/export could be broken if C locale did not specified by application.
+ #warning System does not support xlocale. Import/export could be broken if C locale did not specified by application.
#endif

8811
cad/opencascade/pkg-plist
View File

File diff suppressed because it is too large Load Diff