From owner-svn-ports-head@FreeBSD.ORG Wed Feb 19 05:44:14 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EFA8188A; Wed, 19 Feb 2014 05:44:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CCA101B20; Wed, 19 Feb 2014 05:44:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1J5iE64056414; Wed, 19 Feb 2014 05:44:14 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1J5iEBU056410; Wed, 19 Feb 2014 05:44:14 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201402190544.s1J5iEBU056410@svn.freebsd.org> From: Dmitry Marakasov Date: Wed, 19 Feb 2014 05:44:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345004 - in head/games/burrtools: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Feb 2014 05:44:15 -0000 Author: amdmi3 Date: Wed Feb 19 05:44:13 2014 New Revision: 345004 URL: http://svnweb.freebsd.org/changeset/ports/345004 QAT: https://qat.redports.org/buildarchive/r345004/ Log: - Fix build on 10.x - Remove USE_GCC - Use canonical patch filenames Added: head/games/burrtools/files/patch-src-halfedge-polyhedron.cpp (contents, props changed) head/games/burrtools/files/patch-src-help-data2c.cpp - copied unchanged from r344883, head/games/burrtools/files/patch-src__help__data2c.cpp head/games/burrtools/files/patch-src-lib-stl.cpp - copied unchanged from r344883, head/games/burrtools/files/patch-src__lib__stl.cpp Deleted: head/games/burrtools/files/patch-src__help__data2c.cpp head/games/burrtools/files/patch-src__lib__stl.cpp Modified: head/games/burrtools/Makefile Modified: head/games/burrtools/Makefile ============================================================================== --- head/games/burrtools/Makefile Wed Feb 19 05:31:15 2014 (r345003) +++ head/games/burrtools/Makefile Wed Feb 19 05:44:13 2014 (r345004) @@ -18,12 +18,9 @@ LIB_DEPENDS= libpng15.so:${PORTSDIR}/gra libfltk.so:${PORTSDIR}/x11-toolkits/fltk \ libboost_thread.so:${PORTSDIR}/devel/boost-libs -OPTIONS_DEFINE= DOCS EXAMPLES - USE_XORG= x11 xt xext xmu xi USE_GL= glu USES= gmake -USE_GCC= 4.2+ GNU_CONFIGURE= yes CPPFLAGS+= `fltk-config --cxxflags` LDFLAGS+= `fltk-config --ldflags` @@ -32,6 +29,14 @@ PORTDOCS= * PORTEXAMPLES= * PLIST_FILES= bin/burrTxt bin/burrTxt2 bin/burrGui +OPTIONS_DEFINE= DOCS EXAMPLES + +post-patch: + @${REINPLACE_CMD} -e 's|g++|$$(CXX)|; \ + /burrTxt2_LDADD =/ s|$$| -lboost_system|; \ + /burrGui_LDADD =/ s|$$| -lboost_system|' \ + ${WRKSRC}/src/Makefile.am ${WRKSRC}/src/Makefile.in + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/burrTxt ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/src/burrTxt2 ${STAGEDIR}${PREFIX}/bin Added: head/games/burrtools/files/patch-src-halfedge-polyhedron.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/burrtools/files/patch-src-halfedge-polyhedron.cpp Wed Feb 19 05:44:13 2014 (r345004) @@ -0,0 +1,17 @@ +--- src/halfedge/polyhedron.cpp.orig 2011-07-23 21:04:15.000000000 +0400 ++++ src/halfedge/polyhedron.cpp 2014-02-19 09:19:56.242568734 +0400 +@@ -206,12 +206,12 @@ + // add the edge, to make sure we don't process it again + handeled.insert(idx); + +- map, HalfEdge*>::iterator cit = connections.find(idx); ++ multimap, HalfEdge*>::iterator cit = connections.find(idx); + // now we have the very first halfedge conection our 2 vertices, first let's count how many there are + + int n = 0; + { +- map, HalfEdge*>::iterator cit2 = cit; ++ multimap, HalfEdge*>::iterator cit2 = cit; + while (cit2->first == idx) + { + n++; Copied: head/games/burrtools/files/patch-src-help-data2c.cpp (from r344883, head/games/burrtools/files/patch-src__help__data2c.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/burrtools/files/patch-src-help-data2c.cpp Wed Feb 19 05:44:13 2014 (r345004, copy of r344883, head/games/burrtools/files/patch-src__help__data2c.cpp) @@ -0,0 +1,20 @@ +--- ./src/help/data2c.cpp.orig 2010-10-09 07:48:30.000000000 -0400 ++++ ./src/help/data2c.cpp 2010-11-11 20:19:35.000000000 -0500 +@@ -48,6 +48,9 @@ + fprintf(out, "\\x%02x", c); + } + ++#if defined(__FreeBSD__) ++#include ++#else + #if defined(WIN32) || defined(__APPLE__) + const char * basename(const char * n) { + +@@ -62,6 +65,7 @@ + return n; + } + #endif ++#endif + + + /* first param: output file name Copied: head/games/burrtools/files/patch-src-lib-stl.cpp (from r344883, head/games/burrtools/files/patch-src__lib__stl.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/burrtools/files/patch-src-lib-stl.cpp Wed Feb 19 05:44:13 2014 (r345004, copy of r344883, head/games/burrtools/files/patch-src__lib__stl.cpp) @@ -0,0 +1,20 @@ +--- ./src/lib/stl.cpp.orig 2010-10-09 07:48:31.000000000 -0400 ++++ ./src/lib/stl.cpp 2010-11-11 20:19:35.000000000 -0500 +@@ -40,6 +40,9 @@ + * The concrete classes do the grid dependend stuff and add lots of triangles to the file + */ + ++#if defined(__FreeBSD__) ++#include ++#else + #if defined(WIN32) || defined(__APPLE__) + const char * basename(const char * name) { + const char * res1 = strchr(name, '/'); +@@ -55,6 +58,7 @@ + return res; + } + #endif ++#endif + + + void stlExporter_c::write(const char * fname, const voxel_c & v, const faceList_c & holes)