Index: head/graphics/opennurbs/Makefile =================================================================== --- head/graphics/opennurbs/Makefile (revision 436748) +++ head/graphics/opennurbs/Makefile (revision 436749) @@ -1,80 +1,60 @@ # Created by: Fernando Apesteguia # $FreeBSD$ PORTNAME= opennurbs PORTVERSION= 20130711 PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://files.na.mcneel.com/opennurbs/5.0/2013-07-11/ DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= fernando.apesteguia@gmail.com COMMENT= Tools to accurately transfer 3-D geometry between applications LICENSE_FILE= ${WRKSRC}/readme.txt USES= iconv:build dos2unix gmake zip MAKE_ARGS= CC="${CC}" CCC="${CXX}" MAKEFILE= makefile -BINEXAMPLESDIR= ${PREFIX}/libexec/openNURBS -MKFILE= ${EXAMPLESDIR}/bsd.openNURBS.mk +OPTIONS_DEFINE= EXAMPLES + .include -.if !exists(${SRC_BASE}/lib/libz) -IGNORE= needs SRC_BASE to compile. Install base system sources and try again +# In r311275 zlib.h was moved to contrib/zlib/zlib.h from lib/libz/zlib.h +LIBZ= ${SRC_BASE}/contrib/zlib +.if !exists(${LIBZ}/zlib.h) +LIBZ:= ${SRC_BASE}/lib/libz +. if !exists(${LIBZ}/zlib.h) +IGNORE= needs SRC_BASE to compile. Install base system sources and try again +. endif .endif .if ${ARCH} != i386 MAKE_ARGS+= ON_GNU_OPTIMIZER_FLAGS="-g -fPIC" .endif pre-build: - ${ICONV_CMD} -c -f utf-8 -t ascii ${WRKSRC}/opennurbs_version.h \ - > ${WRKSRC}/opennurbs_version.h.tmp || ${TRUE} - ${MV} ${WRKSRC}/opennurbs_version.h.tmp ${WRKSRC}/opennurbs_version.h - ${MV} ${WRKSRC}/zlib ${WRKSRC}/zlib_ - ${CP} -R ${SRC_BASE}/lib/libz ${WRKSRC}/zlib + @${RM} -r ${WRKSRC}/zlib + ${CP} -R ${LIBZ} ${WRKSRC}/zlib do-install: - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} \ - ${STAGEDIR}${BINEXAMPLESDIR} \ - ${STAGEDIR}${PREFIX}/include/openNURBS/zlib + @${MKDIR} ${STAGEDIR}${PREFIX}/include/openNURBS/zlib ${INSTALL_DATA} ${WRKSRC}/libopenNURBS.a ${STAGEDIR}${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/*.h ${STAGEDIR}${PREFIX}/include/openNURBS + ${INSTALL_DATA} ${WRKSRC}/zlib/*.h \ + ${STAGEDIR}${PREFIX}/include/openNURBS/zlib + +do-install-EXAMPLES-on: + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples_linking_pragmas.h \ ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/opennurbs.h ${STAGEDIR}${EXAMPLESDIR} - ${PRINTF} "CFLAGS+=-I${PREFIX}/include/openNURBS -I$$\{.CURDIR\}\n" \ - > ${STAGEDIR}${MKFILE} - @echo "LDADD+=-L${PREFIX}/lib -lm -lopenNURBS" >> ${STAGEDIR}${MKFILE} - ${PRINTF} ".PATH: $$\{.CURDIR\}/../example_userdata\n" \ - >> ${STAGEDIR}${MKFILE} - echo "NO_MAN=YES" >> ${STAGEDIR}${MKFILE} - echo ".include " >> ${STAGEDIR}${MKFILE} - ${PRINTF} "SUBDIR =" > ${STAGEDIR}${EXAMPLESDIR}/Makefile .for i in brep read roundtrip userdata write - ${PRINTF} " example_${i}" >> ${STAGEDIR}${EXAMPLESDIR}/Makefile @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/example_${i} - ${INSTALL_DATA} ${WRKSRC}/example_${i}/example_${i}.cpp \ - ${STAGEDIR}${EXAMPLESDIR}/example_${i}/example_${i}.cc - echo "PROG_CXX=example_${i}" \ - > ${STAGEDIR}${EXAMPLESDIR}/example_${i}/Makefile - echo "SRCS=example_${i}.cc example_ud.cc" \ - >> ${STAGEDIR}${EXAMPLESDIR}/example_${i}/Makefile - echo ".include \"../bsd.openNURBS.mk\"" \ - >> ${STAGEDIR}${EXAMPLESDIR}/example_${i}/Makefile - ${INSTALL_PROGRAM} ${WRKSRC}/example_${i}/example_${i} \ - ${STAGEDIR}${BINEXAMPLESDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/example_${i}/example_${i} ${STAGEDIR}${EXAMPLESDIR}/example_${i} + cd ${WRKSRC}/example_${i} && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/example_${i} "-name *\.cpp -or -name *\.h" .endfor - ${INSTALL_DATA} ${WRKSRC}/example_userdata/example_ud.cpp \ - ${STAGEDIR}${EXAMPLESDIR}/example_userdata/example_ud.cc - ${INSTALL_DATA} ${WRKSRC}/example_userdata/example_ud.h \ - ${STAGEDIR}${EXAMPLESDIR}/example_userdata/example_ud.h - ${PRINTF} "\n.include \n" \ - >> ${STAGEDIR}${EXAMPLESDIR}/Makefile - ${INSTALL_DATA} ${WRKSRC}/*.h ${STAGEDIR}${PREFIX}/include/openNURBS/ - ${INSTALL_DATA} ${WRKSRC}/zlib/*.h \ - ${STAGEDIR}${PREFIX}/include/openNURBS/zlib .include Index: head/graphics/opennurbs/files/patch-opennurbs__system.h =================================================================== --- head/graphics/opennurbs/files/patch-opennurbs__system.h (revision 436748) +++ head/graphics/opennurbs/files/patch-opennurbs__system.h (revision 436749) @@ -1,15 +1,15 @@ ---- opennurbs_system.h.orig 2015-08-14 13:19:05 UTC +--- opennurbs_system.h.orig 2017-02-11 10:13:51 UTC +++ opennurbs_system.h @@ -219,11 +219,7 @@ #include #include -#if defined(ON_COMPILER_XCODE) -#include -#else -#include -#endif +#include #include #include #include Index: head/graphics/opennurbs/pkg-plist =================================================================== --- head/graphics/opennurbs/pkg-plist (revision 436748) +++ head/graphics/opennurbs/pkg-plist (revision 436749) @@ -1,139 +1,132 @@ include/openNURBS/examples_linking_pragmas.h include/openNURBS/opennurbs.h include/openNURBS/opennurbs_3dm.h include/openNURBS/opennurbs_3dm_attributes.h include/openNURBS/opennurbs_3dm_properties.h include/openNURBS/opennurbs_3dm_settings.h include/openNURBS/opennurbs_annotation.h include/openNURBS/opennurbs_annotation2.h include/openNURBS/opennurbs_arc.h include/openNURBS/opennurbs_arccurve.h include/openNURBS/opennurbs_archive.h include/openNURBS/opennurbs_array.h include/openNURBS/opennurbs_array_defs.h include/openNURBS/opennurbs_base32.h include/openNURBS/opennurbs_base64.h include/openNURBS/opennurbs_beam.h include/openNURBS/opennurbs_bezier.h include/openNURBS/opennurbs_bitmap.h include/openNURBS/opennurbs_bounding_box.h include/openNURBS/opennurbs_box.h include/openNURBS/opennurbs_brep.h include/openNURBS/opennurbs_circle.h include/openNURBS/opennurbs_color.h include/openNURBS/opennurbs_compress.h include/openNURBS/opennurbs_cone.h include/openNURBS/opennurbs_crc.h include/openNURBS/opennurbs_curve.h include/openNURBS/opennurbs_curveonsurface.h include/openNURBS/opennurbs_curveproxy.h include/openNURBS/opennurbs_cylinder.h include/openNURBS/opennurbs_defines.h include/openNURBS/opennurbs_detail.h include/openNURBS/opennurbs_dimstyle.h include/openNURBS/opennurbs_dll_resource.h include/openNURBS/opennurbs_ellipse.h include/openNURBS/opennurbs_error.h include/openNURBS/opennurbs_evaluate_nurbs.h include/openNURBS/opennurbs_extensions.h include/openNURBS/opennurbs_font.h include/openNURBS/opennurbs_fpoint.h include/openNURBS/opennurbs_fsp.h include/openNURBS/opennurbs_fsp_defs.h include/openNURBS/opennurbs_geometry.h include/openNURBS/opennurbs_gl.h include/openNURBS/opennurbs_group.h include/openNURBS/opennurbs_hatch.h include/openNURBS/opennurbs_hsort_template.h include/openNURBS/opennurbs_instance.h include/openNURBS/opennurbs_intersect.h include/openNURBS/opennurbs_knot.h include/openNURBS/opennurbs_layer.h include/openNURBS/opennurbs_light.h include/openNURBS/opennurbs_line.h include/openNURBS/opennurbs_linecurve.h include/openNURBS/opennurbs_linestyle.h include/openNURBS/opennurbs_linetype.h include/openNURBS/opennurbs_lookup.h include/openNURBS/opennurbs_mapchan.h include/openNURBS/opennurbs_material.h include/openNURBS/opennurbs_math.h include/openNURBS/opennurbs_matrix.h include/openNURBS/opennurbs_memory.h include/openNURBS/opennurbs_mesh.h include/openNURBS/opennurbs_nurbscurve.h include/openNURBS/opennurbs_nurbssurface.h include/openNURBS/opennurbs_object.h include/openNURBS/opennurbs_object_history.h include/openNURBS/opennurbs_objref.h include/openNURBS/opennurbs_offsetsurface.h include/openNURBS/opennurbs_optimize.h include/openNURBS/opennurbs_photogrammetry.h include/openNURBS/opennurbs_plane.h include/openNURBS/opennurbs_planesurface.h include/openNURBS/opennurbs_pluginlist.h include/openNURBS/opennurbs_point.h include/openNURBS/opennurbs_pointcloud.h include/openNURBS/opennurbs_pointgeometry.h include/openNURBS/opennurbs_pointgrid.h include/openNURBS/opennurbs_polycurve.h include/openNURBS/opennurbs_polyedgecurve.h include/openNURBS/opennurbs_polyline.h include/openNURBS/opennurbs_polylinecurve.h include/openNURBS/opennurbs_qsort_template.h include/openNURBS/opennurbs_quaternion.h include/openNURBS/opennurbs_rand.h include/openNURBS/opennurbs_rendering.h include/openNURBS/opennurbs_revsurface.h include/openNURBS/opennurbs_rtree.h include/openNURBS/opennurbs_sphere.h include/openNURBS/opennurbs_string.h include/openNURBS/opennurbs_sumsurface.h include/openNURBS/opennurbs_surface.h include/openNURBS/opennurbs_surfaceproxy.h include/openNURBS/opennurbs_system.h include/openNURBS/opennurbs_textlog.h include/openNURBS/opennurbs_texture.h include/openNURBS/opennurbs_texture_mapping.h include/openNURBS/opennurbs_torus.h include/openNURBS/opennurbs_unicode.h include/openNURBS/opennurbs_userdata.h include/openNURBS/opennurbs_uuid.h include/openNURBS/opennurbs_version.h include/openNURBS/opennurbs_viewport.h include/openNURBS/opennurbs_workspace.h include/openNURBS/opennurbs_xform.h include/openNURBS/opennurbs_zlib.h include/openNURBS/zlib/crc32.h include/openNURBS/zlib/deflate.h include/openNURBS/zlib/gzguts.h include/openNURBS/zlib/inffast.h include/openNURBS/zlib/inffixed.h include/openNURBS/zlib/inflate.h include/openNURBS/zlib/inftrees.h include/openNURBS/zlib/trees.h include/openNURBS/zlib/zconf.h include/openNURBS/zlib/zlib.h include/openNURBS/zlib/zutil.h lib/libopenNURBS.a -libexec/openNURBS/example_brep -libexec/openNURBS/example_read -libexec/openNURBS/example_roundtrip -libexec/openNURBS/example_userdata -libexec/openNURBS/example_write -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bsd.openNURBS.mk -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_brep/Makefile -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_brep/example_brep.cc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_read/Makefile -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_read/example_read.cc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_roundtrip/Makefile -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_roundtrip/example_roundtrip.cc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_userdata/Makefile -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_userdata/example_ud.cc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_brep/example_brep +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_brep/example_brep.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_read/example_read +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_read/example_read.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_roundtrip/example_roundtrip +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_roundtrip/example_roundtrip.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_userdata/example_ud.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_userdata/example_ud.h -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_userdata/example_userdata.cc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_write/Makefile -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_write/example_write.cc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_userdata/example_userdata +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_userdata/example_userdata.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_write/example_write +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_write/example_write.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples_linking_pragmas.h %%PORTEXAMPLES%%%%EXAMPLESDIR%%/opennurbs.h