svn commit: r345004 - in head/games/burrtools: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Wed Feb 19 05:44:15 UTC 2014
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<pair<int,int>, HalfEdge*>::iterator cit = connections.find(idx);
++ multimap<pair<int,int>, 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<pair<int,int>, HalfEdge*>::iterator cit2 = cit;
++ multimap<pair<int,int>, 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 <libgen.h>
++#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 <libgen.h>
++#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)
More information about the svn-ports-head
mailing list