From owner-svn-ports-all@freebsd.org Mon May 30 12:01:19 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8103EB54F82; Mon, 30 May 2016 12:01:19 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5BFEA10D2; Mon, 30 May 2016 12:01:19 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4UC1Iep062221; Mon, 30 May 2016 12:01:18 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4UC1Ivo062218; Mon, 30 May 2016 12:01:18 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201605301201.u4UC1Ivo062218@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 30 May 2016 12:01:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416148 - 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-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 May 2016 12:01:19 -0000 Author: jbeich Date: Mon May 30 12:01:18 2016 New Revision: 416148 URL: https://svnweb.freebsd.org/changeset/ports/416148 Log: games/burrtools: minor improvements - Unbundle lua 5.1 - Adjust category and fix icon path in .desktop file - Avoid overlinking FLTK dependencies - Integrate DragonFly fix - Drop unnecessary patch - Drop unused xmlwrapp dependency - Convert to USES=localbase - Pacify stage-qa (shared libs) - Pacify portlint (regen patches) Deleted: head/games/burrtools/files/patch-src-help-data2c.cpp Modified: head/games/burrtools/Makefile (contents, props changed) head/games/burrtools/files/patch-src-halfedge-polyhedron.cpp (contents, props changed) head/games/burrtools/files/patch-src-lib-stl.cpp (contents, props changed) Modified: head/games/burrtools/Makefile ============================================================================== --- head/games/burrtools/Makefile Mon May 30 12:00:30 2016 (r416147) +++ head/games/burrtools/Makefile Mon May 30 12:01:18 2016 (r416148) @@ -3,7 +3,7 @@ PORTNAME= burrtools PORTVERSION= 0.6.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= SF @@ -15,31 +15,33 @@ LICENSE= GPLv3 BUILD_DEPENDS= netpbm>0:graphics/netpbm LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libpng.so:graphics/png \ - libxmlwrapp.so:textproc/xmlwrapp \ libfltk.so:x11-toolkits/fltk -USES= gmake -USE_XORG= x11 xt xext xmu xi -USE_GL= glu +USES= gmake localbase lua:51 +USE_GL= gl glu GNU_CONFIGURE= yes +CONFIGURE_ENV= ac_cv_lib_ICE_IceConnectionNumber="no" \ + ac_cv_search_glutInit="none required" CONFIGURE_ARGS= --disable-silent-rules +MAKE_ARGS= am_lua_liblua_a_OBJECTS='lua/luaclass.$$(OBJEXT)' -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lboost_system +LDFLAGS+= -Wl,--as-needed # fltk deps +LIBS+= -llua-${LUA_VER} -lboost_system # _ZN5boost6system15system_categoryEv PORTDOCS= * PORTEXAMPLES= * PLIST_FILES= bin/burrTxt bin/burrTxt2 bin/burrGui \ share/pixmaps/burricons.png -DESKTOP_ENTRIES="BurrGui" "" "${PREFIX}/pixmaps/burricons.png" "burrGui" "" "" +DESKTOP_ENTRIES="BurrGui" "" "burricons" "burrGui" "Game;LogicGame;" "" OPTIONS_DEFINE= DOCS EXAMPLES post-patch: + @${REINPLACE_CMD} -e '/GL_X_LIBS/d' ${WRKSRC}/configure @${REINPLACE_CMD} -e \ 's|g++ |$$(CXX) | ; \ - s|-O2 |$$(CXXFLAGS) |' ${WRKSRC}/src/Makefile.in + s|-O2 |$$(CXXFLAGS) $$(LDFLAGS) |' ${WRKSRC}/src/Makefile.in post-build: (cd ${WRKSRC} && ${CAT} burricons.ico | winicontoppm -bestqual | \ Modified: head/games/burrtools/files/patch-src-halfedge-polyhedron.cpp ============================================================================== --- head/games/burrtools/files/patch-src-halfedge-polyhedron.cpp Mon May 30 12:00:30 2016 (r416147) +++ head/games/burrtools/files/patch-src-halfedge-polyhedron.cpp Mon May 30 12:01:18 2016 (r416148) @@ -1,6 +1,6 @@ ---- 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 @@ +--- src/halfedge/polyhedron.cpp.orig 2013-05-08 19:02:06 UTC ++++ src/halfedge/polyhedron.cpp +@@ -206,12 +206,12 @@ void Polyhedron::finalize(void) // add the edge, to make sure we don't process it again handeled.insert(idx); Modified: head/games/burrtools/files/patch-src-lib-stl.cpp ============================================================================== --- head/games/burrtools/files/patch-src-lib-stl.cpp Mon May 30 12:00:30 2016 (r416147) +++ head/games/burrtools/files/patch-src-lib-stl.cpp Mon May 30 12:01:18 2016 (r416148) @@ -1,23 +1,14 @@ ---- ./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 - */ +--- src/lib/stl.cpp.orig 2013-05-08 19:02:06 UTC ++++ src/lib/stl.cpp +@@ -54,6 +54,8 @@ const char * basename(const char * name) -+#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; } ++#else ++#include #endif -+#endif - void stlExporter_c::write(const char * fname, const voxel_c & v, const faceList_c & holes) @@ -62,7 +64,7 @@ void stlExporter_c::write(const char * f FILE * f; unsigned long triangleCount = 0;