freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switch from GCC to Clang

Browse Source 
bump PORTREVISION
This commit is contained in:
Oliver Lehmann
2014-03-23 09:45:39 +00:00
parent 02e7987e4c
commit 4619451ba9
15 changed files with 343 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
devel/atlas-devel/Makefile
View File

@@ -3,7 +3,7 @@
PORTNAME= Atlas
PORTVERSION= 0.6.3
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= SF/worldforge/${PORTNAME}-C%2B%2B%20%28protocol%20lib%29/${PORTVERSION}
DISTNAME= ${PORTNAME}-C++-${PORTVERSION:S/.r/rc/}
@@ -15,11 +15,9 @@ OPTIONS_DEFINE= DOCS
PKGNAMESUFFIX= -devel
GNU_CONFIGURE= yes
USES= pathfix compiler:c++11-lang
USE_AUTOTOOLS= libtool
USES= pathfix compiler:c++11-lib
USE_LDCONFIG= YES
USE_BZIP2= YES
USE_GCC= yes
MAKE_ARGS= docdir=${DOCSDIR}
CONFIGURE_ARGS+=--program-transform-name=

7
devel/atlas-devel/pkg-plist
View File

@@ -36,31 +36,24 @@ include/Atlas-C++-0.6/Atlas/Objects/loadDefaults.h
include/Atlas-C++-0.6/Atlas/Objects/objectFactory.h
include/Atlas-C++-0.6/Atlas/Task.h
include/Atlas-C++-0.6/Atlas/Version.h
lib/libAtlas-0.6.a
lib/libAtlas-0.6.la
lib/libAtlas-0.6.so
lib/libAtlas-0.6.so.2
lib/libAtlasCodecs-0.6.a
lib/libAtlasCodecs-0.6.la
lib/libAtlasCodecs-0.6.so
lib/libAtlasCodecs-0.6.so.2
lib/libAtlasFilters-0.6.a
lib/libAtlasFilters-0.6.la
lib/libAtlasFilters-0.6.so
lib/libAtlasFilters-0.6.so.2
lib/libAtlasFunky-0.6.a
lib/libAtlasFunky-0.6.la
lib/libAtlasFunky-0.6.so
lib/libAtlasFunky-0.6.so.2
lib/libAtlasMessage-0.6.a
lib/libAtlasMessage-0.6.la
lib/libAtlasMessage-0.6.so
lib/libAtlasMessage-0.6.so.2
lib/libAtlasNet-0.6.a
lib/libAtlasNet-0.6.la
lib/libAtlasNet-0.6.so
lib/libAtlasNet-0.6.so.2
lib/libAtlasObjects-0.6.a
lib/libAtlasObjects-0.6.la
lib/libAtlasObjects-0.6.so
lib/libAtlasObjects-0.6.so.2

8
devel/eris/Makefile
View File

@@ -3,7 +3,7 @@
PORTNAME= eris
PORTVERSION= 1.3.23
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= SF/worldforge/Eris%201.4%20%28client%20lib%29/${PORTVERSION}/
@@ -19,10 +19,6 @@ LIB_DEPENDS= libAtlas-0.6.so:${PORTSDIR}/devel/atlas-devel \
CONFIGURE_ARGS= --disable-silent-rules
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USES= pathfix pkgconfig
USE_GCC= yes
USES= pathfix pkgconfig compiler:c++11-lib
CXXFLAGS+= -include wchar.h
NO_STAGE= yes
.include <bsd.port.mk>

11
devel/eris/files/patch-Eris-Metaserver.h Normal file
View File

@@ -0,0 +1,11 @@
--- Eris/Metaserver.h.orig 2014-03-10 19:49:32.000000000 +0100
+++ Eris/Metaserver.h 2014-03-10 19:49:47.000000000 +0100
@@ -12,6 +12,8 @@
#include <sigc++/signal.h>
#include <memory>
+#include <ios>
+
#include <stdint.h>
// Forward decls

11
devel/eris/files/patch-Eris-PollDefault.cpp Normal file
View File

@@ -0,0 +1,11 @@
--- Eris/PollDefault.cpp.orig 2014-03-10 19:29:37.000000000 +0100
+++ Eris/PollDefault.cpp 2014-03-10 19:29:49.000000000 +0100
@@ -77,7 +77,7 @@
if (!got_data) return;
- struct timeval timeout = {msec_timeout / 1000, (msec_timeout % 1000) * 1000};
+ struct timeval timeout = {(long)msec_timeout / 1000, ((long)msec_timeout % 1000) * 1000};
int retval = select(maxfd+1, &reading, &writing, &exceptions, &timeout);
if (retval < 0) {
warning() << "select() returned error: " << retval;

10
devel/eris/files/patch-Eris-View.h Normal file
View File

@@ -0,0 +1,10 @@
--- ./Eris/View.h.orig 2014-03-10 19:30:34.000000000 +0100
+++ ./Eris/View.h 2014-03-10 19:30:56.000000000 +0100
@@ -13,6 +13,7 @@
#include <sigc++/connection.h>
// std
+#include <string>
#include <deque>
#include <map>
#include <set>

2
devel/libwfut/Makefile
View File

@@ -14,7 +14,7 @@ LIB_DEPENDS= libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
CONFIGURE_ARGS+=--without-python
GNU_CONFIGURE= yes
USES= pathfix pkgconfig
USES= pathfix pkgconfig compiler:c++11-lang
USE_LDCONFIG= yes
post-patch:

6
devel/mercator/Makefile
View File

@@ -3,8 +3,7 @@
PORTNAME= mercator
PORTVERSION= 0.3.3
#PORTREVISION= 1
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= SF/worldforge/Mercator%20%28terrain%20lib%29/${PORTVERSION}
@@ -14,10 +13,9 @@ COMMENT= A procedural terrain library
LIB_DEPENDS= libwfmath-1.0.so:${PORTSDIR}/math/wfmath
CONFIGURE_ARGS= --disable-silent-rules
USES= pathfix pkgconfig
USES= pathfix pkgconfig compiler:c++11-lib
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GCC= yes
CXXFLAGS+= -include wchar.h

5
devel/varconf/Makefile
View File

@@ -3,7 +3,7 @@
PORTNAME= varconf
PORTVERSION= 1.0.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= SF/worldforge/${PORTNAME}%20%28config%20lib%29/${PORTVERSION}
@@ -16,10 +16,9 @@ OPTIONS_DEFINE= DOCS
GNU_CONFIGURE= yes
USE_BZIP2= yes
USES= libtool pathfix pkgconfig
USES= libtool pathfix pkgconfig compiler:c++11-lib
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
USE_GCC= yes
post-install:
@${MKDIR} ${STAGEDIR}${DOCSDIR}

5
math/wfmath/Makefile
View File

@@ -3,16 +3,15 @@
PORTNAME= wfmath
PORTVERSION= 1.0.2
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= math
MASTER_SITES= SF/worldforge/${PORTNAME}%20%28math%20lib%29/${PORTVERSION}
MAINTAINER= oliver@FreeBSD.org
COMMENT= Worldforge math library
USES= gmake pathfix pkgconfig
USES= pathfix pkgconfig compiler:c++11-lib
USE_LDCONFIG= yes
USE_GCC= yes
GNU_CONFIGURE= yes
.include <bsd.port.mk>

244
math/wfmath/files/patch-wfmath-intersect.cpp Normal file
View File

@@ -0,0 +1,244 @@
--- wfmath/intersect.cpp.orig 2014-03-10 19:17:04.000000000 +0100
+++ wfmath/intersect.cpp 2014-03-10 19:18:00.000000000 +0100
@@ -31,121 +31,6 @@
namespace WFMath {
-// force a bunch of instantiations
-
-template bool Intersect<2>(const Point<2>&, const Point<2>&, bool);
-template bool Intersect<3>(const Point<3>&, const Point<3>&, bool);
-template bool Contains<2>(const Point<2>&, const Point<2>&, bool);
-template bool Contains<3>(const Point<3>&, const Point<3>&, bool);
-
-template bool Intersect<Point<2>,AxisBox<2> >(const Point<2>&, const AxisBox<2>&, bool);
-template bool Intersect<Point<3>,AxisBox<3> >(const Point<3>&, const AxisBox<3>&, bool);
-template bool Contains<2>(const Point<2>&, const AxisBox<2>&, bool);
-template bool Contains<3>(const Point<3>&, const AxisBox<3>&, bool);
-template bool Intersect<2>(const AxisBox<2>&, const Point<2>&, bool);
-template bool Intersect<3>(const AxisBox<3>&, const Point<3>&, bool);
-template bool Contains<2>(const AxisBox<2>&, const Point<2>&, bool);
-template bool Contains<3>(const AxisBox<3>&, const Point<3>&, bool);
-
-template bool Intersect<2>(const AxisBox<2>&, const AxisBox<2>&, bool);
-template bool Intersect<3>(const AxisBox<3>&, const AxisBox<3>&, bool);
-template bool Contains<2>(const AxisBox<2>&, const AxisBox<2>&, bool);
-template bool Contains<3>(const AxisBox<3>&, const AxisBox<3>&, bool);
-
-template bool Intersect<Point<2>,Ball<2> >(const Point<2>&, const Ball<2>&, bool);
-template bool Intersect<Point<3>,Ball<3> >(const Point<3>&, const Ball<3>&, bool);
-template bool Contains<2>(const Point<2>&, const Ball<2>&, bool);
-template bool Contains<3>(const Point<3>&, const Ball<3>&, bool);
-template bool Intersect<2>(const Ball<2>&, const Point<2>&, bool);
-template bool Intersect<3>(const Ball<3>&, const Point<3>&, bool);
-template bool Contains<2>(const Ball<2>&, const Point<2>&, bool);
-template bool Contains<3>(const Ball<3>&, const Point<3>&, bool);
-
-template bool Intersect<AxisBox<2>,Ball<2> >(const AxisBox<2>&, const Ball<2>&, bool);
-template bool Intersect<AxisBox<3>,Ball<3> >(const AxisBox<3>&, const Ball<3>&, bool);
-template bool Contains<2>(const AxisBox<2>&, const Ball<2>&, bool);
-template bool Contains<3>(const AxisBox<3>&, const Ball<3>&, bool);
-template bool Intersect<2>(const Ball<2>&, const AxisBox<2>&, bool);
-template bool Intersect<3>(const Ball<3>&, const AxisBox<3>&, bool);
-template bool Contains<2>(const Ball<2>&, const AxisBox<2>&, bool);
-template bool Contains<3>(const Ball<3>&, const AxisBox<3>&, bool);
-
-template bool Intersect<2>(const Ball<2>&, const Ball<2>&, bool);
-template bool Intersect<3>(const Ball<3>&, const Ball<3>&, bool);
-template bool Contains<2>(const Ball<2>&, const Ball<2>&, bool);
-template bool Contains<3>(const Ball<3>&, const Ball<3>&, bool);
-
-template bool Intersect<Point<2>,Segment<2> >(const Point<2>&, const Segment<2>&, bool);
-template bool Intersect<Point<3>,Segment<3> >(const Point<3>&, const Segment<3>&, bool);
-template bool Contains<2>(const Point<2>&, const Segment<2>&, bool);
-template bool Contains<3>(const Point<3>&, const Segment<3>&, bool);
-template bool Intersect<2>(const Segment<2>&, const Point<2>&, bool);
-template bool Intersect<3>(const Segment<3>&, const Point<3>&, bool);
-template bool Contains<2>(const Segment<2>&, const Point<2>&, bool);
-template bool Contains<3>(const Segment<3>&, const Point<3>&, bool);
-
-template bool Intersect<AxisBox<2>,Segment<2> >(const AxisBox<2>&, const Segment<2>&, bool);
-template bool Intersect<AxisBox<3>,Segment<3> >(const AxisBox<3>&, const Segment<3>&, bool);
-template bool Contains<2>(const AxisBox<2>&, const Segment<2>&, bool);
-template bool Contains<3>(const AxisBox<3>&, const Segment<3>&, bool);
-template bool Intersect<2>(const Segment<2>&, const AxisBox<2>&, bool);
-template bool Intersect<3>(const Segment<3>&, const AxisBox<3>&, bool);
-template bool Contains<2>(const Segment<2>&, const AxisBox<2>&, bool);
-template bool Contains<3>(const Segment<3>&, const AxisBox<3>&, bool);
-
-template bool Intersect<Ball<2>,Segment<2> >(const Ball<2>&, const Segment<2>&, bool);
-template bool Intersect<Ball<3>,Segment<3> >(const Ball<3>&, const Segment<3>&, bool);
-template bool Contains<2>(const Ball<2>&, const Segment<2>&, bool);
-template bool Contains<3>(const Ball<3>&, const Segment<3>&, bool);
-template bool Intersect<2>(const Segment<2>&, const Ball<2>&, bool);
-template bool Intersect<3>(const Segment<3>&, const Ball<3>&, bool);
-template bool Contains<2>(const Segment<2>&, const Ball<2>&, bool);
-template bool Contains<3>(const Segment<3>&, const Ball<3>&, bool);
-
-template bool Intersect<2>(const Segment<2>&, const Segment<2>&, bool);
-template bool Intersect<3>(const Segment<3>&, const Segment<3>&, bool);
-template bool Contains<2>(const Segment<2>&, const Segment<2>&, bool);
-template bool Contains<3>(const Segment<3>&, const Segment<3>&, bool);
-
-template bool Intersect<Point<2>,RotBox<2> >(const Point<2>&, const RotBox<2>&, bool);
-template bool Intersect<Point<3>,RotBox<3> >(const Point<3>&, const RotBox<3>&, bool);
-template bool Contains<2>(const Point<2>&, const RotBox<2>&, bool);
-template bool Contains<3>(const Point<3>&, const RotBox<3>&, bool);
-template bool Intersect<2>(const RotBox<2>&, const Point<2>&, bool);
-template bool Intersect<3>(const RotBox<3>&, const Point<3>&, bool);
-template bool Contains<2>(const RotBox<2>&, const Point<2>&, bool);
-template bool Contains<3>(const RotBox<3>&, const Point<3>&, bool);
-
-template bool Intersect<AxisBox<2>,RotBox<2> >(const AxisBox<2>&, const RotBox<2>&, bool);
-template bool Intersect<AxisBox<3>,RotBox<3> >(const AxisBox<3>&, const RotBox<3>&, bool);
-template bool Contains<2>(const AxisBox<2>&, const RotBox<2>&, bool);
-template bool Contains<3>(const AxisBox<3>&, const RotBox<3>&, bool);
-template bool Contains<2>(const RotBox<2>&, const AxisBox<2>&, bool);
-template bool Contains<3>(const RotBox<3>&, const AxisBox<3>&, bool);
-
-template bool Intersect<Ball<2>,RotBox<2> >(const Ball<2>&, const RotBox<2>&, bool);
-template bool Intersect<Ball<3>,RotBox<3> >(const Ball<3>&, const RotBox<3>&, bool);
-template bool Contains<2>(const Ball<2>&, const RotBox<2>&, bool);
-template bool Contains<3>(const Ball<3>&, const RotBox<3>&, bool);
-template bool Intersect<2>(const RotBox<2>&, const Ball<2>&, bool);
-template bool Intersect<3>(const RotBox<3>&, const Ball<3>&, bool);
-template bool Contains<2>(const RotBox<2>&, const Ball<2>&, bool);
-template bool Contains<3>(const RotBox<3>&, const Ball<3>&, bool);
-
-template bool Intersect<Segment<2>,RotBox<2> >(const Segment<2>&, const RotBox<2>&, bool);
-template bool Intersect<Segment<3>,RotBox<3> >(const Segment<3>&, const RotBox<3>&, bool);
-template bool Contains<2>(const Segment<2>&, const RotBox<2>&, bool);
-template bool Contains<3>(const Segment<3>&, const RotBox<3>&, bool);
-template bool Intersect<2>(const RotBox<2>&, const Segment<2>&, bool);
-template bool Intersect<3>(const RotBox<3>&, const Segment<3>&, bool);
-template bool Contains<2>(const RotBox<2>&, const Segment<2>&, bool);
-template bool Contains<3>(const RotBox<3>&, const Segment<3>&, bool);
-
-template bool Intersect<2>(const RotBox<2>&, const RotBox<2>&, bool);
-template bool Intersect<3>(const RotBox<3>&, const RotBox<3>&, bool);
-template bool Contains<2>(const RotBox<2>&, const RotBox<2>&, bool);
-template bool Contains<3>(const RotBox<3>&, const RotBox<3>&, bool);
-
// The 2d implementation was inspired as a simplification of the 3d.
// It used the fact that two not-similarly-oriented rectangles a and b
// intersect each other if and only if a's bounding box in b's coordinate
@@ -359,4 +244,119 @@
return true;
}
+// force a bunch of instantiations
+
+template bool Intersect<2>(const Point<2>&, const Point<2>&, bool);
+template bool Intersect<3>(const Point<3>&, const Point<3>&, bool);
+template bool Contains<2>(const Point<2>&, const Point<2>&, bool);
+template bool Contains<3>(const Point<3>&, const Point<3>&, bool);
+
+template bool Intersect<Point<2>,AxisBox<2> >(const Point<2>&, const AxisBox<2>&, bool);
+template bool Intersect<Point<3>,AxisBox<3> >(const Point<3>&, const AxisBox<3>&, bool);
+template bool Contains<2>(const Point<2>&, const AxisBox<2>&, bool);
+template bool Contains<3>(const Point<3>&, const AxisBox<3>&, bool);
+template bool Intersect<2>(const AxisBox<2>&, const Point<2>&, bool);
+template bool Intersect<3>(const AxisBox<3>&, const Point<3>&, bool);
+template bool Contains<2>(const AxisBox<2>&, const Point<2>&, bool);
+template bool Contains<3>(const AxisBox<3>&, const Point<3>&, bool);
+
+template bool Intersect<2>(const AxisBox<2>&, const AxisBox<2>&, bool);
+template bool Intersect<3>(const AxisBox<3>&, const AxisBox<3>&, bool);
+template bool Contains<2>(const AxisBox<2>&, const AxisBox<2>&, bool);
+template bool Contains<3>(const AxisBox<3>&, const AxisBox<3>&, bool);
+
+template bool Intersect<Point<2>,Ball<2> >(const Point<2>&, const Ball<2>&, bool);
+template bool Intersect<Point<3>,Ball<3> >(const Point<3>&, const Ball<3>&, bool);
+template bool Contains<2>(const Point<2>&, const Ball<2>&, bool);
+template bool Contains<3>(const Point<3>&, const Ball<3>&, bool);
+template bool Intersect<2>(const Ball<2>&, const Point<2>&, bool);
+template bool Intersect<3>(const Ball<3>&, const Point<3>&, bool);
+template bool Contains<2>(const Ball<2>&, const Point<2>&, bool);
+template bool Contains<3>(const Ball<3>&, const Point<3>&, bool);
+
+template bool Intersect<AxisBox<2>,Ball<2> >(const AxisBox<2>&, const Ball<2>&, bool);
+template bool Intersect<AxisBox<3>,Ball<3> >(const AxisBox<3>&, const Ball<3>&, bool);
+template bool Contains<2>(const AxisBox<2>&, const Ball<2>&, bool);
+template bool Contains<3>(const AxisBox<3>&, const Ball<3>&, bool);
+template bool Intersect<2>(const Ball<2>&, const AxisBox<2>&, bool);
+template bool Intersect<3>(const Ball<3>&, const AxisBox<3>&, bool);
+template bool Contains<2>(const Ball<2>&, const AxisBox<2>&, bool);
+template bool Contains<3>(const Ball<3>&, const AxisBox<3>&, bool);
+
+template bool Intersect<2>(const Ball<2>&, const Ball<2>&, bool);
+template bool Intersect<3>(const Ball<3>&, const Ball<3>&, bool);
+template bool Contains<2>(const Ball<2>&, const Ball<2>&, bool);
+template bool Contains<3>(const Ball<3>&, const Ball<3>&, bool);
+
+template bool Intersect<Point<2>,Segment<2> >(const Point<2>&, const Segment<2>&, bool);
+template bool Intersect<Point<3>,Segment<3> >(const Point<3>&, const Segment<3>&, bool);
+template bool Contains<2>(const Point<2>&, const Segment<2>&, bool);
+template bool Contains<3>(const Point<3>&, const Segment<3>&, bool);
+template bool Intersect<2>(const Segment<2>&, const Point<2>&, bool);
+template bool Intersect<3>(const Segment<3>&, const Point<3>&, bool);
+template bool Contains<2>(const Segment<2>&, const Point<2>&, bool);
+template bool Contains<3>(const Segment<3>&, const Point<3>&, bool);
+
+template bool Intersect<AxisBox<2>,Segment<2> >(const AxisBox<2>&, const Segment<2>&, bool);
+template bool Intersect<AxisBox<3>,Segment<3> >(const AxisBox<3>&, const Segment<3>&, bool);
+template bool Contains<2>(const AxisBox<2>&, const Segment<2>&, bool);
+template bool Contains<3>(const AxisBox<3>&, const Segment<3>&, bool);
+template bool Intersect<2>(const Segment<2>&, const AxisBox<2>&, bool);
+template bool Intersect<3>(const Segment<3>&, const AxisBox<3>&, bool);
+template bool Contains<2>(const Segment<2>&, const AxisBox<2>&, bool);
+template bool Contains<3>(const Segment<3>&, const AxisBox<3>&, bool);
+
+template bool Intersect<Ball<2>,Segment<2> >(const Ball<2>&, const Segment<2>&, bool);
+template bool Intersect<Ball<3>,Segment<3> >(const Ball<3>&, const Segment<3>&, bool);
+template bool Contains<2>(const Ball<2>&, const Segment<2>&, bool);
+template bool Contains<3>(const Ball<3>&, const Segment<3>&, bool);
+template bool Intersect<2>(const Segment<2>&, const Ball<2>&, bool);
+template bool Intersect<3>(const Segment<3>&, const Ball<3>&, bool);
+template bool Contains<2>(const Segment<2>&, const Ball<2>&, bool);
+template bool Contains<3>(const Segment<3>&, const Ball<3>&, bool);
+
+template bool Intersect<2>(const Segment<2>&, const Segment<2>&, bool);
+template bool Intersect<3>(const Segment<3>&, const Segment<3>&, bool);
+template bool Contains<2>(const Segment<2>&, const Segment<2>&, bool);
+template bool Contains<3>(const Segment<3>&, const Segment<3>&, bool);
+
+template bool Intersect<Point<2>,RotBox<2> >(const Point<2>&, const RotBox<2>&, bool);
+template bool Intersect<Point<3>,RotBox<3> >(const Point<3>&, const RotBox<3>&, bool);
+template bool Contains<2>(const Point<2>&, const RotBox<2>&, bool);
+template bool Contains<3>(const Point<3>&, const RotBox<3>&, bool);
+template bool Intersect<2>(const RotBox<2>&, const Point<2>&, bool);
+template bool Intersect<3>(const RotBox<3>&, const Point<3>&, bool);
+template bool Contains<2>(const RotBox<2>&, const Point<2>&, bool);
+template bool Contains<3>(const RotBox<3>&, const Point<3>&, bool);
+
+template bool Intersect<AxisBox<2>,RotBox<2> >(const AxisBox<2>&, const RotBox<2>&, bool);
+template bool Intersect<AxisBox<3>,RotBox<3> >(const AxisBox<3>&, const RotBox<3>&, bool);
+template bool Contains<2>(const AxisBox<2>&, const RotBox<2>&, bool);
+template bool Contains<3>(const AxisBox<3>&, const RotBox<3>&, bool);
+template bool Contains<2>(const RotBox<2>&, const AxisBox<2>&, bool);
+template bool Contains<3>(const RotBox<3>&, const AxisBox<3>&, bool);
+
+template bool Intersect<Ball<2>,RotBox<2> >(const Ball<2>&, const RotBox<2>&, bool);
+template bool Intersect<Ball<3>,RotBox<3> >(const Ball<3>&, const RotBox<3>&, bool);
+template bool Contains<2>(const Ball<2>&, const RotBox<2>&, bool);
+template bool Contains<3>(const Ball<3>&, const RotBox<3>&, bool);
+template bool Intersect<2>(const RotBox<2>&, const Ball<2>&, bool);
+template bool Intersect<3>(const RotBox<3>&, const Ball<3>&, bool);
+template bool Contains<2>(const RotBox<2>&, const Ball<2>&, bool);
+template bool Contains<3>(const RotBox<3>&, const Ball<3>&, bool);
+
+template bool Intersect<Segment<2>,RotBox<2> >(const Segment<2>&, const RotBox<2>&, bool);
+template bool Intersect<Segment<3>,RotBox<3> >(const Segment<3>&, const RotBox<3>&, bool);
+template bool Contains<2>(const Segment<2>&, const RotBox<2>&, bool);
+template bool Contains<3>(const Segment<3>&, const RotBox<3>&, bool);
+template bool Intersect<2>(const RotBox<2>&, const Segment<2>&, bool);
+template bool Intersect<3>(const RotBox<3>&, const Segment<3>&, bool);
+template bool Contains<2>(const RotBox<2>&, const Segment<2>&, bool);
+template bool Contains<3>(const RotBox<3>&, const Segment<3>&, bool);
+
+template bool Intersect<2>(const RotBox<2>&, const RotBox<2>&, bool);
+template bool Intersect<3>(const RotBox<3>&, const RotBox<3>&, bool);
+template bool Contains<2>(const RotBox<2>&, const RotBox<2>&, bool);
+template bool Contains<3>(const RotBox<3>&, const RotBox<3>&, bool);
+
}

21
math/wfmath/patch-wfmath-axisbox.h Normal file
View File

@@ -0,0 +1,21 @@
--- wfmath/axisbox.h.orig 2014-03-10 19:19:47.000000000 +0100
+++ wfmath/axisbox.h 2014-03-10 19:20:00.000000000 +0100
@@ -153,6 +153,9 @@
/// Get the minimal box that contains a1 and a2
friend AxisBox Union<dim>(const AxisBox& a1, const AxisBox& a2);
+ friend bool Intersect<2>(const RotBox<2>& r, const AxisBox<2>& b, bool proper);
+ friend bool Intersect<3>(const RotBox<3>& r, const AxisBox<3>& b, bool proper);
+
friend bool Intersect<dim>(const AxisBox& b, const Point<dim>& p, bool proper);
friend bool Contains<dim>(const Point<dim>& p, const AxisBox& b, bool proper);
@@ -174,8 +177,6 @@
friend bool Contains<dim>(const Polygon<dim>& p, const AxisBox& b, bool proper);
friend bool Contains<dim>(const AxisBox& b, const Polygon<dim>& p, bool proper);
- private:
-
Point<dim> m_low, m_high;
};

21
math/wfmath/patch-wfmath-rotbox.h Normal file
View File

@@ -0,0 +1,21 @@
--- wfmath/rotbox.h.orig 2014-03-10 19:19:38.000000000 +0100
+++ wfmath/rotbox.h 2014-03-10 19:19:56.000000000 +0100
@@ -159,6 +159,9 @@
RotBox toParentCoords(const Point<dim>& origin, const Quaternion& rotation) const;
RotBox toLocalCoords(const Point<dim>& origin, const Quaternion& rotation) const;
+ friend bool Intersect<2>(const RotBox<2>& r, const AxisBox<2>& b, bool proper);
+ friend bool Intersect<3>(const RotBox<3>& r, const AxisBox<3>& b, bool proper);
+
friend bool Intersect<dim>(const RotBox& r, const Point<dim>& p, bool proper);
friend bool Contains<dim>(const Point<dim>& p, const RotBox& r, bool proper);
@@ -181,8 +184,6 @@
friend bool Contains<dim>(const Polygon<dim>& p, const RotBox& r, bool proper);
friend bool Contains<dim>(const RotBox& r, const Polygon<dim>& p, bool proper);
- private:
-
Point<dim> m_corner0;
Vector<dim> m_size;
RotMatrix<dim> m_orient;

19
net/cyphesis/Makefile
View File

@@ -3,7 +3,7 @@
PORTNAME= cyphesis
PORTVERSION= 0.6.2
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= SF/worldforge/${PORTNAME}%20%28server%29/${PORTVERSION}
@@ -22,19 +22,16 @@ CONFIGURE_ARGS= --with-python=${LOCALBASE}
GNU_CONFIGURE= yes
USE_BZIP2= yes
USES= gmake pathfix pkgconfig
USES= gmake pathfix pkgconfig compiler:c++11-lib
USE_LDCONFIG= yes
USE_PGSQL= yes
USE_PYTHON= 2
USE_GCC= yes
CFLAGS+= -I${LOCALBASE}/include
MAN1= cyclient.1 cycmd.1 cyphesis.1 cyphesis-tools.1 cyaddrules.1 \
cyconvertrules.1 cydumprules.1 cyloadrules.1 cypasswd.1
NO_STAGE= yes
OPTIONS_DEFINE= DOCS
.include <bsd.port.options.mk>
@@ -59,13 +56,13 @@ post-patch:
post-install:
.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
@${MKDIR} ${DOCSDIR}/conf
.for docfile in README COPYING AUTHORS THANKS NEWS ChangeLog TODO FIXME
@${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
@${MKDIR} ${STAGEDIR}${DOCSDIR}/conf
.for file in README COPYING AUTHORS THANKS NEWS ChangeLog TODO FIXME
@${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
.endfor
.for docfile in acorn.xml basic.xml cyphesis.vconf mason.xml werewolf.xml
@${INSTALL_DATA} ${WRKSRC}/data/${docfile} ${DOCSDIR}/conf
.for file in acorn.xml basic.xml cyphesis.vconf mason.xml werewolf.xml
@${INSTALL_DATA} ${WRKSRC}/data/${file} ${STAGEDIR}${DOCSDIR}/conf
.endfor
.endif

10
net/skstream/Makefile
View File

@@ -3,6 +3,7 @@
PORTNAME= skstream
PORTVERSION= 0.3.9
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= SF/worldforge/${PORTNAME}%20%28network%20lib%29/${PORTVERSION}
@@ -10,10 +11,9 @@ MAINTAINER= oliver@FreeBSD.org
COMMENT= An iostream based C++ socket library
USE_GMAKE= yes
USES= pathfix pkgconfig
USES= pathfix pkgconfig compiler:c++11-lib
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GCC= yes
OPTIONS_DEFINE= DOCS
@@ -23,9 +23,11 @@ post-patch:
@${REINPLACE_CMD} -e 's| install-docdataDATA | |g' ${WRKSRC}/Makefile.in
post-install:
.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
.for docfile in README COPYING AUTHORS NEWS README.FreeSockets
@${INSTALL_DATA} ${WRKSRC}/${docfile} ${STAGEDIR}${DOCSDIR}
.for file in README COPYING AUTHORS NEWS README.FreeSockets
@${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
.endfor
.endif
.include <bsd.port.mk>