Date: Fri, 19 Nov 2010 08:19:03 GMT From: Stas Timokhin <devel@stasyan.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/152394: fix in port cad/netgen for build with salome Message-ID: <201011190819.oAJ8J3Gl044878@www.freebsd.org> Resent-Message-ID: <201011190820.oAJ8KEbY037848@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 152394
>Category: ports
>Synopsis: fix in port cad/netgen for build with salome
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Nov 19 08:20:14 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Stas Timokhin
>Release: 8.0-release
>Organization:
None
>Environment:
>Description:
Some changes (copying additional headers) for use cad/netgen with cad/salome-netgenplugin.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN cad/netgen/Makefile /usr/local/tinderbox/portstrees/FreeBSD/ports/cad/netgen/Makefile
--- cad/netgen/Makefile 2010-07-24 23:38:10.000000000 +0700
+++ /usr/local/tinderbox/portstrees/FreeBSD/ports/cad/netgen/Makefile 2010-11-11 16:13:02.000000000 +0600
@@ -2,12 +2,12 @@
# Date created: 29 April 2004
# Whom: Thierry Thomas <thierry@FreeBSD.org>
#
-# $FreeBSD: ports/cad/netgen/Makefile,v 1.24 2010/07/24 16:38:10 mm Exp $
+# $FreeBSD$
#
PORTNAME= netgen
PORTVERSION= 4.9.13
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= cad
MASTER_SITES= SF/netgen-mesher/netgen-mesher/${PORTVERSION}/
@@ -67,6 +67,10 @@
${WRKSRC}/ng/ngappinit.cpp
post-install:
+# copy some additional headers for build cad/salome-netgenplugin
+ ${MKDIR} ${DATADIR}/include
+ ${SH} ${FILESDIR}/netgen_copy_include_for_salome ${WRKSRC} ${PREFIX}
+ ${LN} ${PREFIX}/lib/libnglib.so ${PREFIX}/lib/libnglib.so.1
${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>
diff -ruN cad/netgen/files/netgen_copy_include_for_salome /usr/local/tinderbox/portstrees/FreeBSD/ports/cad/netgen/files/netgen_copy_include_for_salome
--- cad/netgen/files/netgen_copy_include_for_salome 1970-01-01 07:00:00.000000000 +0700
+++ /usr/local/tinderbox/portstrees/FreeBSD/ports/cad/netgen/files/netgen_copy_include_for_salome 2010-11-10 09:49:29.000000000 +0600
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+src_dir=$1
+install_dir=$2
+
+if ! test -d $src_dir/libsrc ; then
+ echo "No dir $src_dir/libsrc ... Bye"
+ exit 1
+fi
+if ! test -d $install_dir/share/netgen ; then
+ echo "No dir $install_dir/share/netgen ... Bye"
+ exit 1
+fi
+
+dest_dir=$install_dir/share/netgen/include
+mkdir -p $dest_dir > /dev/null 2>&1
+cp -af $src_dir/libsrc/csg/*.hpp $dest_dir
+cp -af $src_dir/libsrc/general/*.hpp $dest_dir
+cp -af $src_dir/libsrc/geom2d/*.hpp $dest_dir
+cp -af $src_dir/libsrc/gprim/*.hpp $dest_dir
+cp -af $src_dir/libsrc/interface/*.hpp $dest_dir
+cp -af $src_dir/libsrc/linalg/*.hpp $dest_dir
+cp -af $src_dir/libsrc/meshing/*.hpp $dest_dir
+cp -af $src_dir/libsrc/stlgeom/*.hpp $dest_dir
+cp -af $src_dir/libsrc/visualization/*.hpp $dest_dir
+
+cp -af $src_dir/libsrc/occ/*.hpp $dest_dir
+cp -af $src_dir/libsrc/occ/*.hxx $dest_dir
+cp -af $src_dir/libsrc/occ/*.ixx $dest_dir
+cp -af $src_dir/libsrc/occ/*.jxx $dest_dir
+cp -af $src_dir/libsrc/occ/*.h $dest_dir
+
+cp -af $src_dir/libsrc/include/mystdlib.h $dest_dir
+cp -af $src_dir/libsrc/include/mydefs.hpp $dest_dir
+# cp -af $src_dir/libsrc/include/parallel.hpp $dest_dir
+
+rm -f $dest_dir/ngexception.hpp
+rm -f $dest_dir/paralleltop.hpp
+rm -f $dest_dir/soldata.hpp
diff -ruN cad/netgen/files/patch-libsrc_occ_Makefile.am /usr/local/tinderbox/portstrees/FreeBSD/ports/cad/netgen/files/patch-libsrc_occ_Makefile.am
--- cad/netgen/files/patch-libsrc_occ_Makefile.am 1970-01-01 07:00:00.000000000 +0700
+++ /usr/local/tinderbox/portstrees/FreeBSD/ports/cad/netgen/files/patch-libsrc_occ_Makefile.am 2010-11-08 10:11:27.000000000 +0600
@@ -0,0 +1,9 @@
+--- libsrc/occ/Makefile.am.orig 2010-11-08 10:10:46.000000000 +0600
++++ libsrc/occ/Makefile.am 2010-11-08 10:10:57.000000000 +0600
+@@ -1,5 +1,4 @@
+-noinst_HEADERS = occgeom.hpp occmeshsurf.hpp \
+-Partition_Inter2d.hxx Partition_Loop2d.hxx Partition_Loop.hxx \
++noinst_HEADERS = Partition_Inter2d.hxx Partition_Loop2d.hxx Partition_Loop.hxx \
+ Partition_Inter3d.hxx Partition_Loop3d.hxx Partition_Spliter.hxx \
+ Partition_Inter2d.ixx Partition_Loop2d.ixx Partition_Loop.ixx \
+ Partition_Inter3d.ixx Partition_Loop3d.ixx Partition_Spliter.ixx \
diff -ruN cad/netgen/pkg-plist /usr/local/tinderbox/portstrees/FreeBSD/ports/cad/netgen/pkg-plist
--- cad/netgen/pkg-plist 2010-07-02 19:03:30.000000000 +0700
+++ /usr/local/tinderbox/portstrees/FreeBSD/ports/cad/netgen/pkg-plist 2010-11-10 10:03:06.000000000 +0600
@@ -22,6 +22,7 @@
include/soldata.hpp
lib/libnglib.la
lib/libnglib.so
+lib/libnglib.so.1
%%DOCSDIR%%/ng4.pdf
%%DATADIR%%/boxcyl.geo
%%DATADIR%%/circle_on_cube.geo
@@ -62,5 +63,141 @@
%%DATADIR%%/twobricks.geo
%%DATADIR%%/twocubes.geo
%%DATADIR%%/twocyl.geo
+%%DATADIR%%/include/Partition_Inter2d.hxx
+%%DATADIR%%/include/Partition_Inter2d.ixx
+%%DATADIR%%/include/Partition_Inter2d.jxx
+%%DATADIR%%/include/Partition_Inter3d.hxx
+%%DATADIR%%/include/Partition_Inter3d.ixx
+%%DATADIR%%/include/Partition_Inter3d.jxx
+%%DATADIR%%/include/Partition_Loop.hxx
+%%DATADIR%%/include/Partition_Loop.ixx
+%%DATADIR%%/include/Partition_Loop.jxx
+%%DATADIR%%/include/Partition_Loop2d.hxx
+%%DATADIR%%/include/Partition_Loop2d.ixx
+%%DATADIR%%/include/Partition_Loop2d.jxx
+%%DATADIR%%/include/Partition_Loop3d.hxx
+%%DATADIR%%/include/Partition_Loop3d.ixx
+%%DATADIR%%/include/Partition_Loop3d.jxx
+%%DATADIR%%/include/Partition_Spliter.hxx
+%%DATADIR%%/include/Partition_Spliter.ixx
+%%DATADIR%%/include/Partition_Spliter.jxx
+%%DATADIR%%/include/adfront2.hpp
+%%DATADIR%%/include/adfront3.hpp
+%%DATADIR%%/include/adtree.hpp
+%%DATADIR%%/include/algprim.hpp
+%%DATADIR%%/include/array.hpp
+%%DATADIR%%/include/autodiff.hpp
+%%DATADIR%%/include/autoptr.hpp
+%%DATADIR%%/include/basegeom.hpp
+%%DATADIR%%/include/bcfunctions.hpp
+%%DATADIR%%/include/bisect.hpp
+%%DATADIR%%/include/bitarray.hpp
+%%DATADIR%%/include/boundarylayer.hpp
+%%DATADIR%%/include/brick.hpp
+%%DATADIR%%/include/classifyhpel.hpp
+%%DATADIR%%/include/clusters.hpp
+%%DATADIR%%/include/csg.hpp
+%%DATADIR%%/include/csgeom.hpp
+%%DATADIR%%/include/csgparser.hpp
+%%DATADIR%%/include/curve2d.hpp
+%%DATADIR%%/include/curvedelems.hpp
+%%DATADIR%%/include/densemat.hpp
+%%DATADIR%%/include/dynamicmem.hpp
+%%DATADIR%%/include/edgeflw.hpp
+%%DATADIR%%/include/explicitcurve2d.hpp
+%%DATADIR%%/include/extrusion.hpp
+%%DATADIR%%/include/findip.hpp
+%%DATADIR%%/include/findip2.hpp
+%%DATADIR%%/include/flags.hpp
+%%DATADIR%%/include/gencyl.hpp
+%%DATADIR%%/include/geom2d.hpp
+%%DATADIR%%/include/geom2dmesh.hpp
+%%DATADIR%%/include/geom3d.hpp
+%%DATADIR%%/include/geometry2d.hpp
+%%DATADIR%%/include/geomfuncs.hpp
+%%DATADIR%%/include/geoml.hpp
+%%DATADIR%%/include/geomobjects.hpp
+%%DATADIR%%/include/geomobjects2.hpp
+%%DATADIR%%/include/geomops.hpp
+%%DATADIR%%/include/geomops2.hpp
+%%DATADIR%%/include/geomsearch.hpp
+%%DATADIR%%/include/geomtest3d.hpp
+%%DATADIR%%/include/global.hpp
+%%DATADIR%%/include/gprim.hpp
+%%DATADIR%%/include/hashtabl.hpp
+%%DATADIR%%/include/hpref_hex.hpp
+%%DATADIR%%/include/hpref_prism.hpp
+%%DATADIR%%/include/hpref_pyramid.hpp
+%%DATADIR%%/include/hpref_quad.hpp
+%%DATADIR%%/include/hpref_segm.hpp
+%%DATADIR%%/include/hpref_tet.hpp
+%%DATADIR%%/include/hpref_trig.hpp
+%%DATADIR%%/include/hprefinement.hpp
+%%DATADIR%%/include/identify.hpp
+%%DATADIR%%/include/improve2.hpp
+%%DATADIR%%/include/improve3.hpp
+%%DATADIR%%/include/linalg.hpp
+%%DATADIR%%/include/localh.hpp
+%%DATADIR%%/include/manifold.hpp
+%%DATADIR%%/include/meshclass.hpp
+%%DATADIR%%/include/meshdoc.hpp
+%%DATADIR%%/include/meshfunc.hpp
+%%DATADIR%%/include/meshing.hpp
+%%DATADIR%%/include/meshing2.hpp
+%%DATADIR%%/include/meshing3.hpp
+%%DATADIR%%/include/meshstlsurface.hpp
+%%DATADIR%%/include/meshsurf.hpp
+%%DATADIR%%/include/meshtool.hpp
+%%DATADIR%%/include/meshtype.hpp
+%%DATADIR%%/include/mpi_interface.hpp
+%%DATADIR%%/include/msghandler.hpp
+%%DATADIR%%/include/mvdraw.hpp
+%%DATADIR%%/include/myadt.hpp
+%%DATADIR%%/include/mydefs.hpp
+%%DATADIR%%/include/mystdlib.h
+%%DATADIR%%/include/mystring.hpp
+%%DATADIR%%/include/netgenout.hpp
+%%DATADIR%%/include/occgeom.hpp
+%%DATADIR%%/include/occmeshsurf.hpp
+%%DATADIR%%/include/opti.hpp
+%%DATADIR%%/include/optmem.hpp
+%%DATADIR%%/include/parthreads.hpp
+%%DATADIR%%/include/polyhedra.hpp
+%%DATADIR%%/include/polynomial.hpp
+%%DATADIR%%/include/profiler.hpp
+%%DATADIR%%/include/revolution.hpp
+%%DATADIR%%/include/ruler2.hpp
+%%DATADIR%%/include/ruler3.hpp
+%%DATADIR%%/include/seti.hpp
+%%DATADIR%%/include/singularref.hpp
+%%DATADIR%%/include/solid.hpp
+%%DATADIR%%/include/sort.hpp
+%%DATADIR%%/include/spbita2d.hpp
+%%DATADIR%%/include/specials.hpp
+%%DATADIR%%/include/specpoin.hpp
+%%DATADIR%%/include/spline.hpp
+%%DATADIR%%/include/spline2d.hpp
+%%DATADIR%%/include/spline3d.hpp
+%%DATADIR%%/include/splinegeometry.hpp
+%%DATADIR%%/include/stack.hpp
+%%DATADIR%%/include/stlgeom.hpp
+%%DATADIR%%/include/stlline.hpp
+%%DATADIR%%/include/stltool.hpp
+%%DATADIR%%/include/stltopology.hpp
+%%DATADIR%%/include/surface.hpp
+%%DATADIR%%/include/symbolta.hpp
+%%DATADIR%%/include/table.hpp
+%%DATADIR%%/include/template.hpp
+%%DATADIR%%/include/topology.hpp
+%%DATADIR%%/include/transform3d.hpp
+%%DATADIR%%/include/triapprox.hpp
+%%DATADIR%%/include/utilities.h
+%%DATADIR%%/include/validate.hpp
+%%DATADIR%%/include/vector.hpp
+%%DATADIR%%/include/vispar.hpp
+%%DATADIR%%/include/visual.hpp
+%%DATADIR%%/include/vssolution.hpp
+%%DATADIR%%/include/writeuser.hpp
+@dirrm %%DATADIR%%/include
@dirrm %%DATADIR%%
@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011190819.oAJ8J3Gl044878>