Upgrade to 6.7.1.

This commit is contained in:
Thierry Thomas 2014-05-06 19:38:13 +00:00
parent f6cdb79b62
commit cbcf86835c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=353124
19 changed files with 29116 additions and 865 deletions

View file

@ -1,146 +1,86 @@
# Created by: Thierry Thomas <thierry@pompo.net>
# $FreeBSD$
PORTNAME= OpenCASCADE
PORTVERSION= 6.6.0
PORTREVISION= 2
PORTNAME= opencascade
PORTVERSION= 6.7.1
CATEGORIES= cad science
MASTER_SITES= http://files.opencascade.com/OCCT/OCC_${PORTVERSION}_release/
DISTNAME= ${PORTNAME}${PORTVERSION:C/\.//g}
EXTRACT_SUFX= .tgz
MAINTAINER= thierry@FreeBSD.org
COMMENT= Open CASCADE Technology, 3D modeling & numerical simulation
LICENSE= OCTPL
LICENSE_NAME= Open CASCADE Technology Public License
LICENSE_FILE= ${WRKSRC}/LICENSE
LICENSE_NAME= LGPL21 with exception
LICENSE_FILE= ${WRKSRC}/OCCT_LGPL_EXCEPTION.txt
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
USES= bison shebangfix
# Check ${WRKSRC}/dox/overview/Overview.md
# and ${WRKSRC}/dox/dev_guides/building
USES= bison cmake compiler dos2unix gmake shebangfix tk
USE_XORG= xmu
SHEBANG_FILES= adm/cmake/draw.sh env_amk.sh draw.sh xcode.sh env.sh draw_amk.sh \
codeblocks.sh custom.sh custom_amk.sh.in
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
OPTIONS_DEFINE= TBB VIS OCAF DE DRAW FI QT JAVA DATA DOCS EXAMPLES
OPTIONS_DEFINE= TBB VIS
TBB_DESC= "Build with TBB"
VIS_DESC= "Build Visualizazion module (requires OpenGL, freetype, ftgl and gl2ps)"
OCAF_DESC= "Build Application Framework (requires VIS)"
DE_DESC= "Build DataExchange module (requires OCAF)"
DRAW_DESC= "Build Test Harness (requires DE and TCL)"
FI_DESC= "Enable freeimage support"
QT_DESC= "Enable QT support"
JAVA_DESC= "Enable Java support"
OPTIONS_DEFAULT=TBB VIS OCAF DE DRAW FI DATA DOCS EXAMPLES
OPTIONS_DEFAULT=TBB VIS
OPTIONS_SUB= yes
WRKSRC= ${WRKDIR}/ros
REINPLACE_ARGS= -i ""
USE_AUTOTOOLS= aclocal libtoolize autoheader automake
LIBTOOLIZE_ARGS=--force --copy --automake
AUTOMAKE_ARGS= --add-missing --copy --gnu
ACLOCAL_ARGS=
CPPFLAGS+= -I${LOCALBASE}/include
MAKE_ENV= LOCCROOT=${LOCCROOT}
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}/
USE_LDCONFIG= yes
LOCCROOT= OpenCAS
OCCROOT= ${PREFIX}/${LOCCROOT}
PLIST_SUB= OCCROOT="${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_USE= GL=glu
VIS_LIB_DEPENDS= libftgl.so:${PORTSDIR}/graphics/ftgl \
libfreetype.so:${PORTSDIR}/print/freetype2 \
libgl2ps.so:${PORTSDIR}/print/gl2ps \
libfreeimageplus.so:${PORTSDIR}/graphics/freeimage
NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MTBB}
LIB_DEPENDS+= libtbb.so:${PORTSDIR}/devel/tbb
CONFIGURE_ARGS+=--with-tbb-include=${LOCALBASE}/include \
--with-tbb-library=${LOCALBASE}/lib
.endif
.if ${PORT_OPTIONS:MVIS}
CONFIGURE_ARGS+=--enable-vis \
--with-ftgl=${LOCALBASE} \
--with-freetype=${LOCALBASE} \
--with-gl2ps=${LOCALBASE}
USE_GL= glu
LIB_DEPENDS+= libftgl.so:${PORTSDIR}/graphics/ftgl \
libfreetype.so:${PORTSDIR}/print/freetype2 \
libgl2ps.so:${PORTSDIR}/print/gl2ps
PLIST_SUB+= VIS=""
. if ${PORT_OPTIONS:MOCAF}
CONFIGURE_ARGS+=--enable-caf
PLIST_SUB+= OCAF=""
. if ${PORT_OPTIONS:MDE}
CONFIGURE_ARGS+=--enable-dxe
PLIST_SUB+= DE=""
. if ${PORT_OPTIONS:MDRAW}
CONFIGURE_ARGS+=--enable-draw \
--with-tcl=${TCL_LIBDIR} \
--with-tk=${TK_LIBDIR}
USES+= tk
LIB_DEPENDS+= libitcl.so.${ITCL_VER}:${PORTSDIR}/lang/itcl \
libTix${TIX_VER}.so:${PORTSDIR}/x11-toolkits/tix
ITCL_VER= 3
TIX_VER= 8.4.3
TIX_MM= 8.4.3
PLIST_SUB+= DRAW=""
. else
CONFIGURE_ARGS+=--without-tcl --disable-draw
PLIST_SUB+= DRAW="@comment "
. endif
. else
CONFIGURE_ARGS+=--disable-dxe --without-tcl --disable-draw
PLIST_SUB+= DRAW="@comment " DE="@comment "
. endif
. else
CONFIGURE_ARGS+=--disable-caf --without-tcl --disable-draw --disable-dxe
PLIST_SUB+= DE="@comment " DRAW="@comment " OCAF="@comment "
. endif
.else
CONFIGURE_ARGS+=--disable-vis --without-tcl --disable-draw --disable-dxe --disable-caf
PLIST_SUB+= VIS="@comment " DRAW="@comment " DE="@comment " OCAF="@comment "
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
.endif
.if ${PORT_OPTIONS:MFI}
LIB_DEPENDS+= libfreeimageplus.so:${PORTSDIR}/graphics/freeimage
CONFIGURE_ARGS+=--with-freeimage=${LOCALBASE}
.else
PLIST_SUB+= FI="@comment "
.endif
.if ${PORT_OPTIONS:MQT}
USE_QT4= corelib gui
CONFIGURE_ARGS+=--with-qt=${LOCALBASE}
LDFLAGS+= -L${QT_LIBDIR}
.else
PLIST_SUB+= QT="@comment "
.endif
.if ${PORT_OPTIONS:MJAVA}
USE_JAVA= yes
JAVA_VERSION= 1.6+
CONFIGURE_ARGS+=--with-java-include=${JAVA_HOME}/include
.else
CONFIGURE_ARGS+=--without-java-include
PLIST_SUB+= JAVA="@comment "
.endif
.if ${PORT_OPTIONS:MDATA}
PORTDATA= *
.endif
.if ${PORT_OPTIONS:MDOCS}
PORTDOCS= *
.endif
.if ${PORT_OPTIONS:MEXAMPLES}
PORTEXAMPLES= *
BUILD_DEPENDS+= bash:${PORTSDIR}/shells/bash \
doxygen:${PORTSDIR}/devel/doxygen \
dot:${PORTSDIR}/graphics/graphviz \
pdflatex:${PORTSDIR}/print/teTeX-base \
inkscape:${PORTSDIR}/graphics/inkscape
RUN_DEPENDS+= ${LOCALBASE}/www/MathJax/MathJax.js:${PORTSDIR}/www/mathjax
.endif
F_MALLOC= OSD/OSD_signal_WNT.cxx OSD/OSD_Csharedmemory.c OSD/OSD_MemInfo.cxx \
OSD/OSD_Thread.cxx OSD/OSD.cxx OSD/OSD_SharedLibrary.cxx \
OSD/OSD_MemInfo.cxx MMgt/MMgt_StackManager.cxx Image/Image_PixMap.cxx \
Standard/Standard_MMgrOpt.cxx Standard/Standard.cxx StepFile/step.yacc \
StepFile/recfile.pc ExprIntrp/ExprIntrp.tab.c
.if ${ARCH} == "i386"
BITS= 32
.else
BITS= 64
.endif
pre-everything::
@${ECHO_MSG}
@ -149,38 +89,55 @@ pre-everything::
@${ECHO_MSG}
pre-configure:
.if ${PORT_OPTIONS:MQT}
${REINPLACE_CMD} -e 's|$$qt/include|${QT_INCDIR}|g' ${WRKSRC}/configure.ac
${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 es in env.sh adm/templates/env.sh.in
${REINPLACE_CMD} -e 's|lin|bsd|' ${WRKSRC}/${es}
.endfor
post-build:
.if ${PORT_OPTIONS:MDOCS}
(cd ${WRKSRC} && ./gendoc -overview)
.endif
${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' ${F_MALLOC:C|^|${WRKSRC}/src/|}
post-install:
${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/include/OpenCASCADE
${RM} -f ${OCCROOT}/src/OS/*.orig ${OCCROOT}/src/DrawResources/*.orig \
${PREFIX}/include/OpenCASCADE/Standard_CLocaleSentry.hxx.orig
cd ${WRKSRC}/src && ${COPYTREE_SHARE} UnitsAPI ${OCCROOT}/src
.if ${PORT_OPTIONS:MDATA}
${MKDIR} ${DATADIR}
. for dir in data tests
cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${DATADIR}
. endfor
.endif
${MV} ${STAGEDIR}${OCCROOT}/bsd${BITS}/${COMPILER_TYPE}/bin/DRAWEXE \
${STAGEDIR}${PREFIX}/bin/
(cd ${STAGEDIR}${PREFIX}/bin && \
${LN} -sf DRAWEXE ${STAGEDIR}${OCCROOT}/bsd${BITS}/${COMPILER_TYPE}/bin/DRAWEXE)
${MV} ${STAGEDIR}${OCCROOT}/bsd${BITS}/${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}/${COMPILER_TYPE}/lib/$${l}; \
done)
${MKDIR} ${STAGEDIR}${PREFIX}/include/OpenCASCADE
(cd ${STAGEDIR}${OCCROOT}/inc && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/OpenCASCADE)
${RM} -rf ${STAGEDIR}${OCCROOT}/inc
${MKDIR} ${STAGEDIR}${OCCROOT}/inc
(cd ${STAGEDIR}${PREFIX}/include/OpenCASCADE \
&& for i in *; do \
${LN} -sf $${i} ${STAGEDIR}${OCCROOT}/inc/$${i}; \
done)
(cd ${WRKSRC} && ${COPYTREE_SHARE} tests ${STAGEDIR}${OCCROOT})
.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR}
.endif
.if ${PORT_OPTIONS:MEXAMPLES}
${MKDIR} ${EXAMPLESDIR}
cd ${WRKSRC}/samples && ${COPYTREE_SHARE} . ${EXAMPLESDIR}
${MKDIR} ${STAGEDIR}${DOCSDIR}
(cd ${WRKSRC}/doc/overview && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
${RMDIR} ${STAGEDIR}${DOCSDIR}/latex
.endif
.if defined(MAINTAINER_MODE)
regression-test: install
${MKDIR} /tmp/testOCC
bash -c "\
cd ${OCCROOT} && . ${OCCROOT}/env_amk.sh && \
CSF_TestScriptsPath=${DATADIR}/tests \
CSF_TestDataPath=${DATADIR}/data \
cd ${OCCROOT} && . ${OCCROOT}/env.sh && \
CSF_TestScriptsPath=${OCCROOT}/tests \
CSF_TestDataPath=${OCCROOT}/data \
DRAWEXE -f ${FILESDIR}/regtest "
.endif

View file

@ -1,2 +1,2 @@
SHA256 (OpenCASCADE660.tgz) = e39fa4b2255b9bd9bf97aa122043f4608d97b6b79d922375da53275e42b25d60
SIZE (OpenCASCADE660.tgz) = 119153607
SHA256 (opencascade-6.7.1.tgz) = bda3080a2cce8fb4feea77e9aa4eebb6dab1de7d661af0437d3dbfab6286ac73
SIZE (opencascade-6.7.1.tgz) = 194533180

View file

@ -0,0 +1,11 @@
--- 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)

View file

@ -1,30 +0,0 @@
--- Makefile.am.orig 2013-03-26 10:31:48.000000000 +0100
+++ Makefile.am 2013-05-11 17:25:23.000000000 +0200
@@ -91,18 +91,15 @@
fi
buildd=`pwd`; cd $(top_srcdir); sourced=`pwd`; cd $(prefix); installd=`pwd`; cd $$buildd; \
if [ "$$installd" != "$$sourced" ]; then \
- $(INSTALL) -d $(prefix)/inc; \
- cp -frL $(top_srcdir)/inc $(prefix); \
- cp -frL $$buildd/config.h $(prefix); \
+ mv $(top_srcdir)/inc $(top_srcdir)/OpenCASCADE; \
+ cp -frL $(top_srcdir)/OpenCASCADE $(prefix)/include/; \
+ mv $(top_srcdir)/OpenCASCADE $(top_srcdir)/inc; \
for d in $(FoundationClasses_DIRS) $(ModelingData_DIRS) $(ModelingAlgorithms_DIRS) $(Visualization_DIRS) $(ApplicationFramework_DIRS) $(DataExchange_DIRS) $(Draw_DIRS); do \
- $(INSTALL) -d $(prefix)/src/$$d; \
- cp -frL $(top_srcdir)/src/$$d $(prefix)/src; \
+ $(INSTALL) -d $(prefix)/$(LOCCROOT)/src/$$d; \
+ cp -frL $(top_srcdir)/src/$$d $(prefix)/$(LOCCROOT)/src; \
done; \
fi
- if [ -e $(prefix)/inc/config.h ]; then \
- rm -f $(prefix)/inc/config.h; \
- fi
- cd $(prefix)/inc && ln -s ../config.h config.h
- cd $(top_srcdir) && cp *amk.sh $(prefix)
+ cp $(top_srcdir)/config.h $(prefix)/include/OpenCASCADE/
+ cd $(top_srcdir) && cp *amk.sh $(prefix)/$(LOCCROOT)/
-.PHONY: FoundationClasses ModelingData ModelingAlgorithms Visualization ApplicationFramework DataExchange Draw
\ No newline at end of file
+.PHONY: FoundationClasses ModelingData ModelingAlgorithms Visualization ApplicationFramework DataExchange Draw

View file

@ -1,11 +1,11 @@
--- inc/Standard_CLocaleSentry.hxx.orig 2013-05-15 15:38:02.000000000 +0700
+++ inc/Standard_CLocaleSentry.hxx 2013-05-15 15:57:18.000000000 +0700
@@ -29,7 +29,7 @@
--- ./inc/Standard_CLocaleSentry.hxx.orig 2014-04-29 11:40:41.000000000 +0200
+++ ./inc/Standard_CLocaleSentry.hxx 2014-05-04 14:42:56.000000000 +0200
@@ -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__)) || defined(HAVE_XLOCALE_H) || (defined(__FreeBSD__) && (__FreeBSD_version>=900506))
+#if defined(__APPLE__) || defined(_GNU_SOURCE) || defined(__FreeBSD__) || defined(HAVE_XLOCALE_H)
#include <xlocale.h>
#ifndef HAVE_XLOCALE_H
#define HAVE_XLOCALE_H

View file

@ -1,11 +0,0 @@
--- src/DrawResources/InitEnvironment.tcl.orig Fri Sep 21 09:50:26 2001
+++ src/DrawResources/InitEnvironment.tcl Thu Aug 10 22:58:39 2006
@@ -7,6 +7,8 @@
set LINE_FROM_UNAME [ exec uname -a ] ;
if { [ regexp SunOS $LINE_FROM_UNAME ] } {
return "sun"
+ } elseif { [ regexp FreeBSD $LINE_FROM_UNAME ] } {
+ return "bsd"
} elseif { [ regexp IRIX $LINE_FROM_UNAME ] } {
return "sil"
} elseif { [ regexp OSF $LINE_FROM_UNAME ] } {

View file

@ -0,0 +1,11 @@
--- 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>

View file

@ -0,0 +1,11 @@
--- 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__

View file

@ -1,27 +0,0 @@
--- src/OS/ApplicationFramework.tcl.orig Thu Sep 22 19:55:08 2005
+++ src/OS/ApplicationFramework.tcl Thu Aug 10 22:46:41 2006
@@ -68,6 +68,12 @@
lappend l "[lindex [wokparam -v %CSF_TCL_HOME] 0]/include"
lappend l "[lindex [lindex [wokparam -v %STLPortInclude] 0] 0]"
}
+ FreeBSD {
+ lappend l "-I[lindex [wokparam -v %CSF_JavaHome] 0]/include"
+ lappend l "-I[lindex [wokparam -v %CSF_JavaHome] 0]/include/freebsd"
+ lappend l "[lindex [wokparam -v %CSF_TCL_HOME] 0]/include"
+ lappend l "[lindex [lindex [wokparam -v %STLPortInclude] 0] 0]"
+ }
SunOS {
lappend l "/usr/openwin/include"
lappend l "/usr/dt/include"
@@ -98,6 +104,11 @@
}
Linux {
lappend l /usr/X11R6/lib
+ }
+ FreeBSD {
+ lappend l /usr/X11R6/lib
+ lappend l "-L[wokparam -v %CSF_TCL_HOME]/lib -R[wokparam -v %CSF_TCL_HOME]/lib -ltcl"
+ lappend l "-L[wokparam -v %CSF_TCL_HOME]/lib -R[wokparam -v %CSF_TCL_HOME]/lib -ltk"
}
SunOS {
lappend l "-L[wokparam -v %CSF_TCL_HOME]/lib -R[wokparam -v %CSF_TCL_HOME]/lib -ltcl"

View file

@ -1,24 +0,0 @@
--- src/OS/DataExchange.tcl.orig Mon Jul 25 08:47:10 2005
+++ src/OS/DataExchange.tcl Tue Aug 1 21:03:42 2006
@@ -59,6 +59,12 @@
lappend l "[lindex [wokparam -v %CSF_TCL_HOME] 0]/include"
lappend l "[lindex [lindex [wokparam -v %STLPortInclude] 0] 0]"
}
+ FreeBSD {
+ lappend l "-I[lindex [wokparam -v %CSF_JavaHome] 0]/include"
+ lappend l "-I[lindex [wokparam -v %CSF_JavaHome] 0]/include/freebsd"
+ lappend l "[lindex [wokparam -v %CSF_TCL_HOME] 0]/include"
+ lappend l "[lindex [lindex [wokparam -v %STLPortInclude] 0] 0]"
+ }
SunOS {
lappend l "/usr/openwin/include"
lappend l "/usr/dt/include"
@@ -86,6 +92,8 @@
HP-UX {
}
Linux {
+ }
+ FreeBSD {
}
SunOS {
lappend l "-L[wokparam -v %CSF_TCL_HOME]/lib -R[wokparam -v %CSF_TCL_HOME]/lib -ltcl"

View file

@ -1,29 +0,0 @@
--- src/OS/Draw.tcl.orig Wed Nov 26 09:30:49 2003
+++ src/OS/Draw.tcl Thu Aug 10 22:08:37 2006
@@ -50,6 +50,13 @@
lappend l "[lindex [wokparam -v %CSF_TCL_HOME] 0]/include"
lappend l "[lindex [lindex [wokparam -v %STLPortInclude] 0] 0]"
}
+ FreeBSD {
+ lappend l "-I/usr/local/include"
+ lappend l "-I[lindex [wokparam -v %CSF_JavaHome] 0]/include"
+ lappend l "-I[lindex [wokparam -v %CSF_JavaHome] 0]/include/freebsd"
+ lappend l "[lindex [wokparam -v %CSF_TCL_HOME] 0]/include"
+ lappend l "[lindex [lindex [wokparam -v %STLPortInclude] 0] 0]"
+ }
SunOS {
lappend l "/usr/openwin/include"
lappend l "/usr/dt/include"
@@ -79,6 +86,12 @@
HP-UX {
}
Linux {
+ lappend l -L/usr/X11R6/lib
+ lappend l "-L[wokparam -v %CSF_TCL_HOME]/lib"
+ lappend l "-L[wokparam -v %STLPortHome]/lib"
+ }
+ FreeBSD {
+ lappend l -L/usr/local/lib
lappend l -L/usr/X11R6/lib
lappend l "-L[wokparam -v %CSF_TCL_HOME]/lib"
lappend l "-L[wokparam -v %STLPortHome]/lib"

View file

@ -1,35 +0,0 @@
--- src/OS/FoundationClasses.tcl.orig Thu Jun 30 11:18:06 2005
+++ src/OS/FoundationClasses.tcl Thu Aug 10 22:14:31 2006
@@ -44,7 +44,13 @@
}
Linux {
lappend l "-I[lindex [wokparam -v %CSF_JavaHome] 0]/include"
- lappend l "-I[lindex [wokparam -v %CSF_JavaHome] 0]/inclide/linux"
+ lappend l "-I[lindex [wokparam -v %CSF_JavaHome] 0]/include/linux"
+ lappend l "[lindex [wokparam -v %CSF_TCL_HOME] 0]/include"
+ lappend l "[lindex [lindex [wokparam -v %STLPortInclude] 0] 0]"
+ }
+ FreeBSD {
+ lappend l "-I[lindex [wokparam -v %CSF_JavaHome] 0]/include"
+ lappend l "-I[lindex [wokparam -v %CSF_JavaHome] 0]/include/FreeBSD"
lappend l "[lindex [wokparam -v %CSF_TCL_HOME] 0]/include"
lappend l "[lindex [lindex [wokparam -v %STLPortInclude] 0] 0]"
}
@@ -53,7 +59,7 @@
lappend l "/usr/dt/include"
lappend l "[lindex [wokparam -v %CSF_CXX_INCLUDE] 0]"
lappend l "-I[lindex [wokparam -v %CSF_JavaHome] 0]/include"
- lappend l "-I[lindex [wokparam -v %CSF_JavaHome] 0]/inclide/solaris"
+ lappend l "-I[lindex [wokparam -v %CSF_JavaHome] 0]/include/solaris"
lappend l "[lindex [wokparam -v %CSF_TCL_HOME] 0]/include"
}
IRIX {
@@ -75,6 +81,8 @@
HP-UX {
}
Linux {
+ }
+ FreeBSD {
}
SunOS {
}

View file

@ -1,32 +0,0 @@
--- src/OS/ModelingAlgorithms.tcl.orig Thu Jun 30 11:18:06 2005
+++ src/OS/ModelingAlgorithms.tcl Thu Aug 10 22:18:25 2006
@@ -45,10 +45,16 @@
HP-UX {
}
Linux {
- lappend l "-I[lindex [wokparam -v %CSF_JavaHome] 0]/include"
- lappend l "-I[lindex [wokparam -v %CSF_JavaHome] 0]/include/solaris"
- lappend l "[lindex [wokparam -v %CSF_TCL_HOME] 0]/include"
- lappend l "[lindex [lindex [wokparam -v %STLPortInclude] 0] 0]"
+ lappend l "-I[lindex [wokparam -v %CSF_JavaHome] 0]/include"
+ lappend l "-I[lindex [wokparam -v %CSF_JavaHome] 0]/include/linux"
+ lappend l "[lindex [wokparam -v %CSF_TCL_HOME] 0]/include"
+ lappend l "[lindex [lindex [wokparam -v %STLPortInclude] 0] 0]"
+ }
+ FreeBSD {
+ lappend l "-I[lindex [wokparam -v %CSF_JavaHome] 0]/include"
+ lappend l "-I[lindex [wokparam -v %CSF_JavaHome] 0]/include/freebsd"
+ lappend l "[lindex [wokparam -v %CSF_TCL_HOME] 0]/include"
+ lappend l "[lindex [lindex [wokparam -v %STLPortInclude] 0] 0]"
}
SunOS {
lappend l "/usr/openwin/include"
@@ -77,6 +83,8 @@
HP-UX {
}
Linux {
+ }
+ FreeBSD {
}
SunOS {
lappend l "-L[wokparam -v %CSF_TCL_HOME]/lib -R[wokparam -v %CSF_TCL_HOME]/lib -ltcl"

View file

@ -1,24 +0,0 @@
--- src/OS/ModelingData.tcl.orig Wed Nov 26 09:36:01 2003
+++ src/OS/ModelingData.tcl Thu Aug 10 22:21:03 2006
@@ -43,6 +43,12 @@
lappend l "[lindex [wokparam -v %CSF_TCL_HOME] 0]/include"
lappend l "[lindex [lindex [wokparam -v %STLPortInclude] 0] 0]"
}
+ FreeBSD {
+ lappend l "-I[lindex [wokparam -v %CSF_JavaHome] 0]/include"
+ lappend l "-I[lindex [wokparam -v %CSF_JavaHome] 0]/include/freebsd"
+ lappend l "[lindex [wokparam -v %CSF_TCL_HOME] 0]/include"
+ lappend l "[lindex [lindex [wokparam -v %STLPortInclude] 0] 0]"
+ }
SunOS {
lappend l "/usr/openwin/include"
lappend l "/usr/dt/include"
@@ -70,6 +76,8 @@
HP-UX {
}
Linux {
+ }
+ FreeBSD {
}
SunOS {
lappend l "-L[wokparam -v %CSF_TCL_HOME]/lib -R[wokparam -v %CSF_TCL_HOME]/lib -ltcl"

View file

@ -1,27 +0,0 @@
--- src/OS/Visualization.tcl.orig Fri Jun 25 19:07:24 2004
+++ src/OS/Visualization.tcl Thu Aug 10 22:42:55 2006
@@ -47,6 +47,12 @@
lappend l "[lindex [wokparam -v %CSF_TCL_HOME] 0]/include"
lappend l "[lindex [lindex [wokparam -v %STLPortInclude] 0] 0]"
}
+ FreeBSD {
+ lappend l "-I[lindex [wokparam -v %CSF_JavaHome] 0]/include"
+ lappend l "-I[lindex [wokparam -v %CSF_JavaHome] 0]/include/freebsd"
+ lappend l "[lindex [wokparam -v %CSF_TCL_HOME] 0]/include"
+ lappend l "[lindex [lindex [wokparam -v %STLPortInclude] 0] 0]"
+ }
SunOS {
lappend l "\$OPENWINHOME/include"
lappend l "/usr/openwin/include/X11"
@@ -76,6 +82,11 @@
}
Linux {
lappend l /usr/X11R6/lib
+ }
+ FreeBSD {
+ lappend l /usr/X11R6/lib
+ lappend l "-L[wokparam -v %CSF_TCL_HOME]/lib -R[wokparam -v %CSF_TCL_HOME]/lib -ltcl"
+ lappend l "-L[wokparam -v %CSF_TCL_HOME]/lib -R[wokparam -v %CSF_TCL_HOME]/lib -ltk"
}
SunOS {
lappend l "-L[wokparam -v %CSF_TCL_HOME]/lib -R[wokparam -v %CSF_TCL_HOME]/lib -ltcl"

View file

@ -1,14 +0,0 @@
--- src/Standard/Standard_CLocaleSentry.hxx.orig 2013-04-18 17:20:16.000000000 +0200
+++ src/Standard/Standard_CLocaleSentry.hxx 2013-05-13 18:57:58.000000000 +0200
@@ -29,7 +29,10 @@
//! 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)
+#ifdef __FreeBSD__
+ #include <sys/param.h>
+#endif
+#if defined(__APPLE__) || defined(_GNU_SOURCE) || defined(HAVE_XLOCALE_H) || (__FreeBSD_version >= 900506)
#include <xlocale.h>
#ifndef HAVE_XLOCALE_H
#define HAVE_XLOCALE_H

View file

@ -1,11 +0,0 @@
--- src/Standard/Standard_CString.cxx.orig 2013-05-15 15:59:21.000000000 +0700
+++ src/Standard/Standard_CString.cxx 2013-05-15 15:59:52.000000000 +0700
@@ -274,7 +274,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.
#define strtod_l(thePtr, theNextPtr, theLocale) strtod(thePtr, theNextPtr)
#endif
#define vprintf_l(theLocale, theFormat, theArgPtr) vprintf(theFormat, theArgPtr)

View file

@ -0,0 +1,11 @@
--- 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>

File diff suppressed because it is too large Load diff