freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade cad/opencascade to 6.8.0.

Browse Source 
Changelog at http://www.opencascade.com/pub/doc/Release_Notes_6.8.0.pdf

PR:		ports/195172
Submitted by:	/me
This commit is contained in:
Thierry Thomas
2014-11-22 18:44:55 +00:00
parent 8e556b93ae
commit 5676e4c0b6
10 changed files with 918 additions and 1221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cad/opencascade/Makefile
+21 -15
View File
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= opencascade
PORTVERSION= 6.7.1
PORTREVISION= 4
PORTVERSION= 6.8.0
CATEGORIES= cad science
MASTER_SITES= http://files.opencascade.com/OCCT/OCC_${PORTVERSION}_release/
@@ -15,6 +14,8 @@ 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:${PORTSDIR}/devel/tbb \
libvtksys-${VTKVER}.so:${PORTSDIR}/math/vtk6
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
# Check ${WRKSRC}/dox/overview/Overview.md
@@ -26,11 +27,11 @@ 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
VTKVER= 6.1
OPTIONS_DEFINE= TBB VIS DOCS
TBB_DESC= Build with TBB
OPTIONS_DEFINE= VIS DOCS
VIS_DESC= Build Visualizazion module (requires OpenGL, freetype, ftgl and gl2ps)
OPTIONS_DEFAULT=TBB VIS
OPTIONS_DEFAULT=VIS
OPTIONS_SUB= yes
REINPLACE_ARGS= -i ""
@@ -38,18 +39,26 @@ 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_TCL_DLL=libtcl${TCL_VER:C|\.||} \
-DINSTALL_DIR=${OCCROOT}/
-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}
USE_LDCONFIG= yes
LOCCROOT= OpenCAS
OCCROOT= ${PREFIX}/${LOCCROOT}
PLIST_SUB= OCCROOT="${LOCCROOT}" BITS=${BITS} CC=${COMPILER_TYPE}
TBB_LIB_DEPENDS= libtbb.so:${PORTSDIR}/devel/tbb
TBB_CMAKE_ON= -DUSE_TBB:BOOL=ON
VIS_CMAKE_ON= -DUSE_FREEIMAGE:BOOL=ON -DUSE_GL2PS:BOOL=ON
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:${PORTSDIR}/graphics/ftgl \
libfreetype.so:${PORTSDIR}/print/freetype2 \
@@ -61,10 +70,7 @@ VIS_LIB_DEPENDS= libftgl.so:${PORTSDIR}/graphics/ftgl \
.if ${PORT_OPTIONS:MVIS}
CMAKE_ARGS+= -D3RDPARTY_FREETYPE_DIR=${LOCALBASE} \
-D3RDPARTY_FREEIMAGE_DIR=${LOCALBASE} \
-D3RDPARTY_GL2PS_DIR=${LOCALBASE} \
-D3RDPARTY_TBB_DIR=${LOCALBASE} \
-D3RDPARTY_TBB_DLL=${LOCALBASE}/lib \
-D3RDPARTY_TBB_MALLOC_DLL=${LOCALBASE}/lib
-D3RDPARTY_GL2PS_DIR=${LOCALBASE}
.endif
.if ${PORT_OPTIONS:MDOCS}
cad/opencascade/distinfo
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (opencascade-6.7.1.tgz) = c918cb554c0c22d322dc1d2f3a31069e1d5dcbae869db741339e1d4903e864b1
SIZE (opencascade-6.7.1.tgz) = 194568487
SHA256 (opencascade-6.8.0.tgz) = 6646c1af4b54228db15173862be6999ffb60b1d79d7b77dbc6d5e342498f0236
SIZE (opencascade-6.8.0.tgz) = 198312319
cad/opencascade/files/patch-CMakeLists.txt
-11
View File
@@ -1,11 +0,0 @@
--- CMakeLists.txt.orig 2014-04-30 11:16:14.000000000 +0200
+++ CMakeLists.txt 2014-05-04 18:30:57.000000000 +0200
@@ -100,7 +100,7 @@
elseif(APPLE)
SET(OS_WITH_BIT "mac${COMPILER_BITNESS}")
else()
- SET(OS_WITH_BIT "lin${COMPILER_BITNESS}")
+ SET(OS_WITH_BIT "bsd${COMPILER_BITNESS}")
endif()
if (${COMPILER_BITNESS} STREQUAL 64)
cad/opencascade/files/patch-adm_templates_occt_macros.cmake
+11
View File
@@ -0,0 +1,11 @@
--- 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 @@
elseif(APPLE)
set (OS_WITH_BIT "mac${COMPILER_BITNESS}")
else()
- set (OS_WITH_BIT "lin${COMPILER_BITNESS}")
+ set (OS_WITH_BIT "bsd${COMPILER_BITNESS}")
endif()
endmacro()
cad/opencascade/files/patch-inc_Standard_CLocaleSentry.hxx
+9 -9
View File
@@ -1,11 +1,11 @@
--- inc/Standard_CLocaleSentry.hxx.orig 2014-04-29 11:40:41.000000000 +0200
+++ inc/Standard_CLocaleSentry.hxx 2014-05-15 21:33:15.000000000 +0200
--- 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
@@ -25,7 +25,7 @@
//! Notice that this is impossible to test (_POSIX_C_SOURCE >= 200809L)
//! since POSIX didn't declared such identifier.
//! We check _GNU_SOURCE for glibc extensions here and it is always defined by g++ compiler.
-#if defined(__APPLE__) || defined(_GNU_SOURCE) || defined(HAVE_XLOCALE_H)
+#if defined(__APPLE__) || defined(_GNU_SOURCE) || (defined(__FreeBSD__) && (__FreeBSD_version > 910000)) || defined(HAVE_XLOCALE_H)
#include <xlocale.h>
#ifndef HAVE_XLOCALE_H
//! and become part of POSIX since '2008.
//! Notice that this is impossible to test (_POSIX_C_SOURCE >= 200809L)
//! since POSIX didn't declared such identifier.
- #if defined(__APPLE__)
+ #if defined(__APPLE__) || (defined(__FreeBSD__) && (__FreeBSD_version > 910000))
#define HAVE_XLOCALE_H
#endif
cad/opencascade/files/patch-src_OSD_OSD_SharedLibrary.cxx
-11
View File
@@ -1,11 +0,0 @@
--- src/OSD/OSD_SharedLibrary.cxx.orig 2014-04-29 11:40:36.000000000 +0200
+++ src/OSD/OSD_SharedLibrary.cxx 2014-05-04 14:21:09.000000000 +0200
@@ -25,7 +25,7 @@
#include <stdio.h>
#ifdef HAVE_MALLOC_H
-# include <malloc.h>
+# include <stdlib.h>
#endif
#ifdef __some_crappy_system__
cad/opencascade/files/patch-src_Standard_Standard_CString.cxx
+9 -9
View File
@@ -1,11 +1,11 @@
--- src/Standard/Standard_CString.cxx.orig 2014-04-29 11:40:41.000000000 +0200
+++ src/Standard/Standard_CString.cxx 2014-10-18 16:05:36.000000000 +0200
@@ -94,7 +94,7 @@
// So we switch to C locale temporarily
#define SAVE_TL() Standard_CLocaleSentry aLocaleSentry;
#ifndef HAVE_XLOCALE_H
- #error System does not support xlocale. Import/export could be broken if C locale did not specified by application.
+ // #error System does not support xlocale. Import/export could be broken if C locale did not specified by application.
--- 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 @@
// strtod, strtol, strtoll functions. For other system with locale-depended
// implementations problems may appear if "C" locale is not set explicitly.
#ifndef __ANDROID__
- #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
#define strtod_l(thePtr, theNextPtr, theLocale) strtod(thePtr, theNextPtr)
#endif
#define vprintf_l(theLocale, theFormat, theArgPtr) vprintf(theFormat, theArgPtr)
cad/opencascade/files/patch-src_Standard_Standard_MMgrOpt.cxx
-11
View File
@@ -1,11 +0,0 @@
--- src/Standard/Standard_MMgrOpt.cxx.orig 2014-04-29 11:40:41.000000000 +0200
+++ src/Standard/Standard_MMgrOpt.cxx 2014-05-04 14:44:24.000000000 +0200
@@ -42,7 +42,7 @@
# endif
#endif
#ifdef HAVE_MALLOC_H
-# include <malloc.h>
+# include <stdlib.h>
#endif
#include <stdlib.h>
#include <sys/types.h>
cad/opencascade/files/patch-src_StepFile_recfile.pc
+11
View File
@@ -0,0 +1,11 @@
--- src/StepFile/recfile.pc.orig 2014-11-07 16:16:45.000000000 +0100
+++ src/StepFile/recfile.pc 2014-11-16 21:26:42.000000000 +0100
@@ -16,7 +16,7 @@
#include "stdio.h"
#include "string.h"
#include "stdlib.h"
-#if (!defined(_WIN32) && !defined(__APPLE__))
+#if (!defined(_WIN32) && !defined(__APPLE__) && !defined(__FreeBSD__))
#include "malloc.h"
#endif
#include "recfile.ph"
cad/opencascade/pkg-plist
+855 -1153
View File
File diff suppressed because it is too large Load Diff