diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2014-02-19 05:44:13 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2014-02-19 05:44:13 +0000 |
| commit | 81f0ed54c53e78002440c1bba0b5ca08fdbd5a33 (patch) | |
| tree | d4bfbddf6d9b9d5f6d4f1fbe9072092d3821e609 /games/burrtools | |
| parent | 83d731b5e8d38f0d8f44ba30eafdd234b14f112f (diff) | |
| download | ports-81f0ed54c53e78002440c1bba0b5ca08fdbd5a33.tar.gz ports-81f0ed54c53e78002440c1bba0b5ca08fdbd5a33.zip | |
- Fix build on 10.x
- Remove USE_GCC
- Use canonical patch filenames
Notes
Notes:
svn path=/head/; revision=345004
Diffstat (limited to 'games/burrtools')
| -rw-r--r-- | games/burrtools/Makefile | 11 | ||||
| -rw-r--r-- | games/burrtools/files/patch-src-halfedge-polyhedron.cpp | 17 | ||||
| -rw-r--r-- | games/burrtools/files/patch-src-help-data2c.cpp (renamed from games/burrtools/files/patch-src__help__data2c.cpp) | 0 | ||||
| -rw-r--r-- | games/burrtools/files/patch-src-lib-stl.cpp (renamed from games/burrtools/files/patch-src__lib__stl.cpp) | 0 |
4 files changed, 25 insertions, 3 deletions
diff --git a/games/burrtools/Makefile b/games/burrtools/Makefile index 9bffabdcc85b..97448aecee68 100644 --- a/games/burrtools/Makefile +++ b/games/burrtools/Makefile @@ -18,12 +18,9 @@ LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \ 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 diff --git a/games/burrtools/files/patch-src-halfedge-polyhedron.cpp b/games/burrtools/files/patch-src-halfedge-polyhedron.cpp new file mode 100644 index 000000000000..66837ea34385 --- /dev/null +++ b/games/burrtools/files/patch-src-halfedge-polyhedron.cpp @@ -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++; diff --git a/games/burrtools/files/patch-src__help__data2c.cpp b/games/burrtools/files/patch-src-help-data2c.cpp index fd5bd68d23f2..fd5bd68d23f2 100644 --- a/games/burrtools/files/patch-src__help__data2c.cpp +++ b/games/burrtools/files/patch-src-help-data2c.cpp diff --git a/games/burrtools/files/patch-src__lib__stl.cpp b/games/burrtools/files/patch-src-lib-stl.cpp index c2ea074a7d88..c2ea074a7d88 100644 --- a/games/burrtools/files/patch-src__lib__stl.cpp +++ b/games/burrtools/files/patch-src-lib-stl.cpp |