Date: Thu, 13 Feb 2014 16:57:34 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344131 - in head/math/carve: . files Message-ID: <201402131657.s1DGvYRn059015@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Thu Feb 13 16:57:34 2014 New Revision: 344131 URL: http://svnweb.freebsd.org/changeset/ports/344131 QAT: https://qat.redports.org/buildarchive/r344131/ Log: - STAGE-clean - Fix build Modified: head/math/carve/Makefile head/math/carve/files/patch-common_scene.cpp head/math/carve/pkg-plist Modified: head/math/carve/Makefile ============================================================================== --- head/math/carve/Makefile Thu Feb 13 16:43:29 2014 (r344130) +++ head/math/carve/Makefile Thu Feb 13 16:57:34 2014 (r344131) @@ -11,20 +11,22 @@ EXTRACT_SUFX= .tgz MAINTAINER= gahr@FreeBSD.org COMMENT= A fast, robust constructive solid geometry library +LICENSE= GPLv2 + LIB_DEPENDS= libboost_filesystem.so:${PORTSDIR}/devel/boost-libs -OPTIONS_DEFINE= GUI +OPTIONS_DEFINE= DOCS GUI -USES= cmake:outsource +USES= cmake:outsource compiler:c++11-lib USE_GL= glut USE_LDCONFIG= yes -LICENSE= GPLv2 +PORTDOCS= * CFLAGS+= -I${LOCALBASE}/include +CXXFLAGS+= -std=c++11 LDFLAGS+= -L${LOCALBASE}/lib -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MGUI} @@ -37,11 +39,15 @@ PLIST_SUB+= GUI="@comment " CMAKE_ARGS+= -DCARVE_WITH_GUI:BOOL=false .endif +post-patch: + ${FIND} ${WRKSRC} -name "*.cpp" -o -name "*.h" -o -name "*.hpp" | ${XARGS} \ + ${REINPLACE_CMD} -e 's|::tr1||g' + ${REINPLACE_CMD} -e '/gtest/s|^|#|; /tests/s|^|#|' ${WRKSRC}/CMakeLists.txt + ${REINPLACE_CMD} -e 's|__is_heap|is_heap|' ${WRKSRC}/lib/triangulator.cpp + post-install: - ${LN} -sf libcarve.so.${PORTVERSION} ${PREFIX}/lib/libcarve.so.${PORTVERSION:R:R} -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/carve.pdf ${DOCSDIR} -.endif + ${LN} -sf libcarve.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libcarve.so.${PORTVERSION:R:R} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/carve.pdf ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: head/math/carve/files/patch-common_scene.cpp ============================================================================== --- head/math/carve/files/patch-common_scene.cpp Thu Feb 13 16:43:29 2014 (r344130) +++ head/math/carve/files/patch-common_scene.cpp Thu Feb 13 16:57:34 2014 (r344131) @@ -1,5 +1,14 @@ ---- common/scene.cpp.orig 2011-12-01 12:05:53.000000000 +0100 -+++ common/scene.cpp 2011-12-01 12:05:22.000000000 +0100 +--- common/scene.cpp.orig 2011-08-26 22:17:26.000000000 +0200 ++++ common/scene.cpp 2014-02-13 15:16:11.000000000 +0100 +@@ -31,7 +31,7 @@ + static int lastbutton = 0; + + static Scene *g_scene = NULL; +-static int g_mainWindow = NULL; ++static int g_mainWindow = 0; + static GLUI *g_rightPanel = NULL; + static double near_plane = 0.2; + static double far_plane = 200; @@ -412,7 +412,7 @@ GLUI_Master.set_glutKeyboardFunc(s_key); GLUI_Master.set_glutSpecialFunc(NULL); Modified: head/math/carve/pkg-plist ============================================================================== --- head/math/carve/pkg-plist Thu Feb 13 16:43:29 2014 (r344130) +++ head/math/carve/pkg-plist Thu Feb 13 16:57:34 2014 (r344131) @@ -74,8 +74,6 @@ include/carve/vertex_decl.hpp include/carve/vertex_impl.hpp include/carve/win32.h include/carve/xcode_config.h -%%PORTDOCS%%%%DOCSDIR%%/carve.pdf -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm include/carve/external @dirrm include/carve/collection/unordered @dirrm include/carve/collection
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402131657.s1DGvYRn059015>