3 files changed, 14 insertions, 103 deletions

diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile
index f2979052695d..73620aa87363 100644
--- a/cad/opencascade/Makefile
+++ b/cad/opencascade/Makefile
@@ -25,8 +25,6 @@ LIB_DEPENDS=	itcl.${ITCL_VER}:${PORTSDIR}/lang/itcl		\
 		fltk.1:${PORTSDIR}/x11-toolkits/fltk		\
 		dps.0:${PORTSDIR}/x11/dgs
 
-BROKEN=		does not build
-
 USE_BZIP2=	yes
 USE_BISON=	build
 USE_TK=		84
@@ -52,8 +50,7 @@ LIB_TCLX=	${LOCALBASE}/lib/tclx${TCL_VER}/libtclx${TCL_VER}.so
 PATCH_WRKSRC=	${WRKDIR}/OpenCASCADE${PORTVERSION}.0
 WRKSRC=		${PATCH_WRKSRC}/ros
 REINPLACE_ARGS=	-i ""
-USE_AUTOTOOLS=	libtool:22
-LIBTOOLFILES=	ros/configure
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR}				\
 		--with-tk=${TK_LIBDIR}					\
 		--with-java-include=${JAVA_HOME}/include		\
@@ -68,10 +65,10 @@ CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR}				\
 		--with-stlport-library=${LOCALBASE}/lib			\
 		--enable-production=yes
 CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} ${GCC4WA} -I${LOCALBASE}/include	\
-		-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}" ARCH=${ARCH}
+		-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}" ARCH=${ARCH} LD=${CXX}
 # We strip the libs
 MAKE_ENV=	INSTALL_STRIP_FLAG=-s OCC_BUILDDIR="${PATCH_WRKSRC}"	\
-		OCC_INSTALLDIR="${OCCROOT}" PTHREAD_LIBS="${PTHREAD_LIBS}"
+		OCC_INSTALLDIR="${OCCROOT}" PTHREAD_LIBS="${PTHREAD_LIBS}" LD=${CXX}
 USE_LDCONFIG=	yes
 USE_FORTRAN=	yes
 
diff --git a/cad/opencascade/files/patch-ros_configure b/cad/opencascade/files/patch-ros_configure
index f1306f83e355..99df62382ac0 100644
--- a/cad/opencascade/files/patch-ros_configure
+++ b/cad/opencascade/files/patch-ros_configure
@@ -1,5 +1,14 @@
---- ./ros/configure.orig	2008-09-09 18:18:13.000000000 +0200
-+++ ./ros/configure	2008-09-30 22:47:12.000000000 +0200
+--- ros/configure.orig	2008-09-09 18:18:13.000000000 +0200
++++ ros/configure	2010-04-05 15:58:11.000000000 +0200
+@@ -6556,7 +6556,7 @@
+   ;;
+ 
+ freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  objformat=elf
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
 @@ -12826,6 +12826,8 @@
  	Linux*) CXXFLAGS="$CXXFLAGS -DLIN -DLININTEL -D_GNU_SOURCE=1"
  		CFLAGS="$CFLAGS -DLIN -DLININTEL -fexceptions"
diff --git a/cad/opencascade/pkg-plist b/cad/opencascade/pkg-plist
index 1895488ab21d..3d45c5b78be6 100644
--- a/cad/opencascade/pkg-plist
+++ b/cad/opencascade/pkg-plist
@@ -3,383 +3,288 @@ FreeBSD/lib
 bin/DRAWEXE
 bin/wokprocess
 bin/woksh
-lib/libBinLPlugin.a
 lib/libBinLPlugin.la
 lib/libBinLPlugin.so
 lib/libBinLPlugin.so.0
-lib/libBinPlugin.a
 lib/libBinPlugin.la
 lib/libBinPlugin.so
 lib/libBinPlugin.so.0
-lib/libBinTObjPlugin.a
 lib/libBinTObjPlugin.la
 lib/libBinTObjPlugin.so
 lib/libBinTObjPlugin.so.0
-lib/libBinXCAFPlugin.a
 lib/libBinXCAFPlugin.la
 lib/libBinXCAFPlugin.so
 lib/libBinXCAFPlugin.so.0
-lib/libFWOSPlugin.a
 lib/libFWOSPlugin.la
 lib/libFWOSPlugin.so
 lib/libFWOSPlugin.so.0
-lib/libPTKernel.a
 lib/libPTKernel.la
 lib/libPTKernel.so
 lib/libPTKernel.so.0
-lib/libStdLPlugin.a
 lib/libStdLPlugin.la
 lib/libStdLPlugin.so
 lib/libStdLPlugin.so.0
-lib/libStdPlugin.a
 lib/libStdPlugin.la
 lib/libStdPlugin.so
 lib/libStdPlugin.so.0
-lib/libTKAdvTools.a
 lib/libTKAdvTools.la
 lib/libTKAdvTools.so
 lib/libTKAdvTools.so.0
-lib/libTKBO.a
 lib/libTKBO.la
 lib/libTKBO.so
 lib/libTKBO.so.0
-lib/libTKBRep.a
 lib/libTKBRep.la
 lib/libTKBRep.so
 lib/libTKBRep.so.0
-lib/libTKBin.a
 lib/libTKBin.la
 lib/libTKBin.so
 lib/libTKBin.so.0
-lib/libTKBinL.a
 lib/libTKBinL.la
 lib/libTKBinL.so
 lib/libTKBinL.so.0
-lib/libTKBinTObj.a
 lib/libTKBinTObj.la
 lib/libTKBinTObj.so
 lib/libTKBinTObj.so.0
-lib/libTKBinXCAF.a
 lib/libTKBinXCAF.la
 lib/libTKBinXCAF.so
 lib/libTKBinXCAF.so.0
-lib/libTKBool.a
 lib/libTKBool.la
 lib/libTKBool.so
 lib/libTKBool.so.0
-lib/libTKCAF.a
 lib/libTKCAF.la
 lib/libTKCAF.so
 lib/libTKCAF.so.0
-lib/libTKCDF.a
 lib/libTKCDF.la
 lib/libTKCDF.so
 lib/libTKCDF.so.0
-lib/libTKCDLFront.a
 lib/libTKCDLFront.la
 lib/libTKCDLFront.so
 lib/libTKCDLFront.so.0
-lib/libTKCPPClient.a
 lib/libTKCPPClient.la
 lib/libTKCPPClient.so
 lib/libTKCPPClient.so.0
-lib/libTKCPPExt.a
 lib/libTKCPPExt.la
 lib/libTKCPPExt.so
 lib/libTKCPPExt.so.0
-lib/libTKCPPIntExt.a
 lib/libTKCPPIntExt.la
 lib/libTKCPPIntExt.so
 lib/libTKCPPIntExt.so.0
-lib/libTKCPPJini.a
 lib/libTKCPPJini.la
 lib/libTKCPPJini.so
 lib/libTKCPPJini.so.0
-lib/libTKCSFDBSchema.a
 lib/libTKCSFDBSchema.la
 lib/libTKCSFDBSchema.so
 lib/libTKCSFDBSchema.so.0
-lib/libTKDCAF.a
 lib/libTKDCAF.la
 lib/libTKDCAF.so
 lib/libTKDCAF.so.0
-lib/libTKDraw.a
 lib/libTKDraw.la
 lib/libTKDraw.so
 lib/libTKDraw.so.0
-lib/libTKFeat.a
 lib/libTKFeat.la
 lib/libTKFeat.so
 lib/libTKFeat.so.0
-lib/libTKFillet.a
 lib/libTKFillet.la
 lib/libTKFillet.so
 lib/libTKFillet.so.0
-lib/libTKG2d.a
 lib/libTKG2d.la
 lib/libTKG2d.so
 lib/libTKG2d.so.0
-lib/libTKG3d.a
 lib/libTKG3d.la
 lib/libTKG3d.so
 lib/libTKG3d.so.0
-lib/libTKGeomAlgo.a
 lib/libTKGeomAlgo.la
 lib/libTKGeomAlgo.so
 lib/libTKGeomAlgo.so.0
-lib/libTKGeomBase.a
 lib/libTKGeomBase.la
 lib/libTKGeomBase.so
 lib/libTKGeomBase.so.0
-lib/libTKHLR.a
 lib/libTKHLR.la
 lib/libTKHLR.so
 lib/libTKHLR.so.0
-lib/libTKIDLFront.a
 lib/libTKIDLFront.la
 lib/libTKIDLFront.so
 lib/libTKIDLFront.so.0
-lib/libTKIGES.a
 lib/libTKIGES.la
 lib/libTKIGES.so
 lib/libTKIGES.so.0
-lib/libTKLCAF.a
 lib/libTKLCAF.la
 lib/libTKLCAF.so
 lib/libTKLCAF.so.0
-lib/libTKMath.a
 lib/libTKMath.la
 lib/libTKMath.so
 lib/libTKMath.so.0
-lib/libTKMesh.a
 lib/libTKMesh.la
 lib/libTKMesh.so
 lib/libTKMesh.so.0
-lib/libTKMeshVS.a
 lib/libTKMeshVS.la
 lib/libTKMeshVS.so
 lib/libTKMeshVS.so.0
-lib/libTKNIS.a
 lib/libTKNIS.la
 lib/libTKNIS.so
 lib/libTKNIS.so.0
-lib/libTKOffset.a
 lib/libTKOffset.la
 lib/libTKOffset.so
 lib/libTKOffset.so.0
-lib/libTKOpenGl.a
 lib/libTKOpenGl.la
 lib/libTKOpenGl.so
 lib/libTKOpenGl.so.0
-lib/libTKPCAF.a
 lib/libTKPCAF.la
 lib/libTKPCAF.so
 lib/libTKPCAF.so.0
-lib/libTKPLCAF.a
 lib/libTKPLCAF.la
 lib/libTKPLCAF.so
 lib/libTKPLCAF.so.0
-lib/libTKPShape.a
 lib/libTKPShape.la
 lib/libTKPShape.so
 lib/libTKPShape.so.0
-lib/libTKPrim.a
 lib/libTKPrim.la
 lib/libTKPrim.so
 lib/libTKPrim.so.0
-lib/libTKSTEP.a
 lib/libTKSTEP.la
 lib/libTKSTEP.so
 lib/libTKSTEP.so.0
-lib/libTKSTEP209.a
 lib/libTKSTEP209.la
 lib/libTKSTEP209.so
 lib/libTKSTEP209.so.0
-lib/libTKSTEPAttr.a
 lib/libTKSTEPAttr.la
 lib/libTKSTEPAttr.so
 lib/libTKSTEPAttr.so.0
-lib/libTKSTEPBase.a
 lib/libTKSTEPBase.la
 lib/libTKSTEPBase.so
 lib/libTKSTEPBase.so.0
-lib/libTKSTL.a
 lib/libTKSTL.la
 lib/libTKSTL.so
 lib/libTKSTL.so.0
-lib/libTKService.a
 lib/libTKService.la
 lib/libTKService.so
 lib/libTKService.so.0
-lib/libTKShHealing.a
 lib/libTKShHealing.la
 lib/libTKShHealing.so
 lib/libTKShHealing.so.0
-lib/libTKShapeSchema.a
 lib/libTKShapeSchema.la
 lib/libTKShapeSchema.so
 lib/libTKShapeSchema.so.0
-lib/libTKStdLSchema.a
 lib/libTKStdLSchema.la
 lib/libTKStdLSchema.so
 lib/libTKStdLSchema.so.0
-lib/libTKStdSchema.a
 lib/libTKStdSchema.la
 lib/libTKStdSchema.so
 lib/libTKStdSchema.so.0
-lib/libTKTCPPExt.a
 lib/libTKTCPPExt.la
 lib/libTKTCPPExt.so
 lib/libTKTCPPExt.so.0
-lib/libTKTObj.a
 lib/libTKTObj.la
 lib/libTKTObj.so
 lib/libTKTObj.so.0
-lib/libTKTObjDRAW.a
 lib/libTKTObjDRAW.la
 lib/libTKTObjDRAW.so
 lib/libTKTObjDRAW.so.0
-lib/libTKTopAlgo.a
 lib/libTKTopAlgo.la
 lib/libTKTopAlgo.so
 lib/libTKTopAlgo.so.0
-lib/libTKTopTest.a
 lib/libTKTopTest.la
 lib/libTKTopTest.so
 lib/libTKTopTest.so.0
-lib/libTKV2d.a
 lib/libTKV2d.la
 lib/libTKV2d.so
 lib/libTKV2d.so.0
-lib/libTKV3d.a
 lib/libTKV3d.la
 lib/libTKV3d.so
 lib/libTKV3d.so.0
-lib/libTKVRML.a
 lib/libTKVRML.la
 lib/libTKVRML.so
 lib/libTKVRML.so.0
-lib/libTKViewerTest.a
 lib/libTKViewerTest.la
 lib/libTKViewerTest.so
 lib/libTKViewerTest.so.0
-lib/libTKWOK.a
 lib/libTKWOK.la
 lib/libTKWOK.so
 lib/libTKWOK.so.0
-lib/libTKWOKTcl.a
 lib/libTKWOKTcl.la
 lib/libTKWOKTcl.so
 lib/libTKWOKTcl.so.0
-lib/libTKXCAF.a
 lib/libTKXCAF.la
 lib/libTKXCAF.so
 lib/libTKXCAF.so.0
-lib/libTKXCAFSchema.a
 lib/libTKXCAFSchema.la
 lib/libTKXCAFSchema.so
 lib/libTKXCAFSchema.so.0
-lib/libTKXDEDRAW.a
 lib/libTKXDEDRAW.la
 lib/libTKXDEDRAW.so
 lib/libTKXDEDRAW.so.0
-lib/libTKXDEIGES.a
 lib/libTKXDEIGES.la
 lib/libTKXDEIGES.so
 lib/libTKXDEIGES.so.0
-lib/libTKXDESTEP.a
 lib/libTKXDESTEP.la
 lib/libTKXDESTEP.so
 lib/libTKXDESTEP.so.0
-lib/libTKXMesh.a
 lib/libTKXMesh.la
 lib/libTKXMesh.so
 lib/libTKXMesh.so.0
-lib/libTKXSBase.a
 lib/libTKXSBase.la
 lib/libTKXSBase.so
 lib/libTKXSBase.so.0
-lib/libTKXSDRAW.a
 lib/libTKXSDRAW.la
 lib/libTKXSDRAW.so
 lib/libTKXSDRAW.so.0
-lib/libTKXml.a
 lib/libTKXml.la
 lib/libTKXml.so
 lib/libTKXml.so.0
-lib/libTKXmlL.a
 lib/libTKXmlL.la
 lib/libTKXmlL.so
 lib/libTKXmlL.so.0
-lib/libTKXmlTObj.a
 lib/libTKXmlTObj.la
 lib/libTKXmlTObj.so
 lib/libTKXmlTObj.so.0
-lib/libTKXmlXCAF.a
 lib/libTKXmlXCAF.la
 lib/libTKXmlXCAF.so
 lib/libTKXmlXCAF.so.0
-lib/libTKernel.a
 lib/libTKernel.la
 lib/libTKernel.so
 lib/libTKernel.so.0
-lib/libTKjcas.a
 lib/libTKjcas.la
 lib/libTKjcas.so
 lib/libTKjcas.so.0
-lib/libXCAFPlugin.a
 lib/libXCAFPlugin.la
 lib/libXCAFPlugin.so
 lib/libXCAFPlugin.so.0
-lib/libXmlLPlugin.a
 lib/libXmlLPlugin.la
 lib/libXmlLPlugin.so
 lib/libXmlLPlugin.so.0
-lib/libXmlPlugin.a
 lib/libXmlPlugin.la
 lib/libXmlPlugin.so
 lib/libXmlPlugin.so.0
-lib/libXmlTObjPlugin.a
 lib/libXmlTObjPlugin.la
 lib/libXmlTObjPlugin.so
 lib/libXmlTObjPlugin.so.0
-lib/libXmlXCAFPlugin.a
 lib/libXmlXCAFPlugin.la
 lib/libXmlXCAFPlugin.so
 lib/libXmlXCAFPlugin.so.0
-lib/libmscmd.a
 lib/libmscmd.la
 lib/libmscmd.so
 lib/libmscmd.so.0
-lib/libwokcmd.a
 lib/libwokcmd.la
 lib/libwokcmd.so
 lib/libwokcmd.so.0
-lib/libwokdeliverysteps.a
 lib/libwokdeliverysteps.la
 lib/libwokdeliverysteps.so
 lib/libwokdeliverysteps.so.0
-lib/libwokdfltsteps.a
 lib/libwokdfltsteps.la
 lib/libwokdfltsteps.so
 lib/libwokdfltsteps.so.0
-lib/libwokobjssteps.a
 lib/libwokobjssteps.la
 lib/libwokobjssteps.so
 lib/libwokobjssteps.so.0
-lib/libwokorbixsteps.a
 lib/libwokorbixsteps.la
 lib/libwokorbixsteps.so
 lib/libwokorbixsteps.so.0
-lib/libwoksteps.a
 lib/libwoksteps.la
 lib/libwoksteps.so
 lib/libwoksteps.so.0
-lib/libwoktoolscmd.a
 lib/libwoktoolscmd.la
 lib/libwoktoolscmd.so
 lib/libwoktoolscmd.so.0
-lib/libwokutilscmd.a
 lib/libwokutilscmd.la
 lib/libwokutilscmd.so
 lib/libwokutilscmd.so.0