Date: Mon, 8 Feb 2016 11:16:36 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408473 - in head/cad/openscad: . files Message-ID: <201602081116.u18BGa3K059695@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Mon Feb 8 11:16:36 2016 New Revision: 408473 URL: https://svnweb.freebsd.org/changeset/ports/408473 Log: - Fix build with boost 1.60 - Fix LICENSE PR: 199601 Approved by: portmgr blanket Added: head/cad/openscad/files/ head/cad/openscad/files/patch-src_colormap.h (contents, props changed) head/cad/openscad/files/patch-src_scintillaeditor.h (contents, props changed) Modified: head/cad/openscad/Makefile Modified: head/cad/openscad/Makefile ============================================================================== --- head/cad/openscad/Makefile Mon Feb 8 11:16:25 2016 (r408472) +++ head/cad/openscad/Makefile Mon Feb 8 11:16:36 2016 (r408473) @@ -11,7 +11,7 @@ DISTNAME= openscad-${PORTVERSION}.src MAINTAINER= mr@FreeBSD.org COMMENT= Programmer's solid 3D CAD modeller -LICENSE= GPLv2 +LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \ Added: head/cad/openscad/files/patch-src_colormap.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/openscad/files/patch-src_colormap.h Mon Feb 8 11:16:36 2016 (r408473) @@ -0,0 +1,14 @@ +--- src/colormap.h.orig 2015-03-05 16:25:10 UTC ++++ src/colormap.h +@@ -5,9 +5,11 @@ + #include <list> + #include "linalg.h" + ++#ifndef Q_MOC_RUN + #include <boost/shared_ptr.hpp> + #include <boost/filesystem.hpp> + #include <boost/property_tree/ptree.hpp> ++#endif + + namespace fs = boost::filesystem; + Added: head/cad/openscad/files/patch-src_scintillaeditor.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/openscad/files/patch-src_scintillaeditor.h Mon Feb 8 11:16:36 2016 (r408473) @@ -0,0 +1,14 @@ +--- src/scintillaeditor.h.orig 2015-03-05 20:25:13 UTC ++++ src/scintillaeditor.h +@@ -11,9 +11,11 @@ + #include "scadlexer.h" + #include "parsersettings.h" + ++#ifndef Q_MOC_RUN + #include <boost/shared_ptr.hpp> + #include <boost/property_tree/ptree.hpp> + #include <boost/property_tree/json_parser.hpp> ++#endif + + class EditorColorScheme + {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602081116.u18BGa3K059695>