Attachment #237735 for bug #230359




PORTNAME=	ode
DISTVERSION=	0.16.2
PORTREVISION=	4
PORTEPOCH=	1
CATEGORIES=	devel
MASTER_SITES=	https://bitbucket.org/odedevs/${PORTNAME}/downloads/

MAINTAINER=	acm@FreeBSD.org
COMMENT=	Articulated rigid body dynamics library

LICENSE=	LGPL21 BSD3CLAUSE
LICENSE_COMB=	dual

USES=		cmake:testing
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--enable-shared
TEST_TARGET=	check
USE_CXXSTD=	c++03

CMAKE_OFF=	ODE_WITH_TESTS
CMAKE_TESTING_ON=	ODE_WITH_TESTS

CXXFLAGS+=	-Wno-c++11-narrowing
DOUBLE_DESC=		Enable double precision (BROKEN with GIMPACT)
OU_DESC=		Enable Thread-local storage (Experimental)
DEMOS_DESC=		Build demos (not installed)

OPTIONS_DEFINE=		DEMOS GIMPACT LIBCCD OU TRIMESH # it looks like TRIMESH isn't defined but is needed because ODE_NO_TRIMESH is never defined otherwise
OPTIONS_DEFAULT=	LIBCCD TRIMESH

DEMOS_DESC=		Build demos (not installed)
DEMOS_CMAKE_BOOL=	ODE_WITH_DEMOS
DEMOS_CONFIGURE_ENABLE=	demos
DEMOS_USES=		gl localbase pkgconfig
DEMOS_USE=		GL=gl,glu

GIMPACT_DESC=		Enable gimpact instead of opcode support
GIMPACT_CMAKE_BOOL=	ODE_WITH_GIMPACT
GIMPACT_PREVENTS=	TRIMESH

LIBCCD_DESC=		Use libccd for handling some collision tests absent in ODE
LIBCCD_CMAKE_BOOL=	ODE_WITH_LIBCCD ODE_WITH_LIBCCD_SYSTEM
LIBCCD_CXXFLAGS=	-I${WRKSRC}/libccd/src/custom
LIBCCD_LIB_DEPENDS=	libccd.so:math/libccd

OU_DESC=		Enable Thread-local storage (Experimental)
OU_CMAKE_BOOL=		ODE_WITH_OU

TRIMESH_DESC=		Build with trimesh
TRIMESH_CMAKE_OFF=	-DODE_NO_TRIMESH=ON

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)b/devel/ode/distinfo (-2 / +3 lines)
1	SHA256 (ode-0.13.tar.bz2) = 34ce3e236e313bf109a0cb5546d2fca462aed99f29a42e62bc1463b803c31ef9	1	TIMESTAMP = 1667161105
2	SIZE (ode-0.13.tar.bz2) = 2008288	2	SHA256 (ode-0.16.2.tar.gz) = b26aebdcb015e2d89720ef48e0cb2e8a3ca77915f89d853893e7cc861f810f22
		3	SIZE (ode-0.16.2.tar.gz) = 2627992

Removed Link Here

(-)a/devel/ode/files/patch-ode_demo_demo__jointPR.cpp (-11 lines)
1	--- ode/demo/demo_jointPR.cpp.orig 2013-08-19 17:48:05 UTC
2	+++ ode/demo/demo_jointPR.cpp
3	@@ -329,7 +329,7 @@ int main (int argc, char **argv)
4	{
5	int j = i+1;
6	if ( j+1 > argc \|\| // Check if we have enough arguments
7	- argv[j] == '\0' \|\| // We should have a path here
8	+ argv[j][0] == '\0' \|\| // We should have a path here
9	argv[j][0] == '-' ) // We should have a path not a command line
10	Help(argv);
11	else

Removed Link Here

(-)a/devel/ode/files/patch-ode_demo_demo__jointPU.cpp (-11 lines)
1	--- ode/demo/demo_jointPU.cpp.orig 2013-12-06 21:52:14 UTC
2	+++ ode/demo/demo_jointPU.cpp
3	@@ -579,7 +579,7 @@ int main (int argc, char **argv)
4	if (0 == strcmp ("-t", argv[i]) \|\| 0 == strcmp ("--texture-path", argv[i]) ) {
5	int j = i+1;
6	if ( j+1 > argc \|\| // Check if we have enough arguments
7	- argv[j] == '\0' \|\| // We should have a path here
8	+ argv[j][0] == '\0' \|\| // We should have a path here
9	argv[j][0] == '-' ) // We should have a path not a command line
10	Help (argv);
11	else

Removed Link Here

(-)a/devel/ode/files/patch-ode_demo_demo__piston.cpp (-11 lines)
1	--- ode/demo/demo_piston.cpp.orig 2013-08-19 17:48:05 UTC
2	+++ ode/demo/demo_piston.cpp
3	@@ -659,7 +659,7 @@ int main (int argc, char **argv)
4	{
5	int j = i+1;
6	if ( j+1 > argc \|\| // Check if we have enough arguments
7	- argv[j] == '\0' \|\| // We should have a path here
8	+ argv[j][0] == '\0' \|\| // We should have a path here
9	argv[j][0] == '-' ) // We should have a path not a command line
10	Help (argv);
11	else




include/ode/collision_trimesh.h
include/ode/common.h
include/ode/compatibility.h
include/ode/config.h
include/ode/contact.h
include/ode/cooperative.h
include/ode/error.h
include/ode/export-dif.h
include/ode/mass.h
include/ode/matrix.h
include/ode/matrix_coop.h
include/ode/memory.h
include/ode/misc.h
include/ode/objects.h

include/ode/threading.h
include/ode/threading_impl.h
include/ode/timer.h
include/ode/version.h
lib/cmake/ode-0.16.2/ode-config-version.cmake
lib/cmake/ode-0.16.2/ode-config.cmake
lib/cmake/ode-0.16.2/ode-export-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/ode-0.16.2/ode-export.cmake
lib/libode.so
lib/libode.so.0.16.2
lib/libode.so.3.1.0
libdata/pkgconfig/ode.pc

Lines 1-6 Link Here

(-)b/games/alienarena/Makefile (-1 / +1 lines)
1	PORTNAME= alienarena	1	PORTNAME= alienarena
2	PORTVERSION= 2013.766	2	PORTVERSION= 2013.766
3	PORTREVISION= 11	3	PORTREVISION= 12
4	CATEGORIES= games	4	CATEGORIES= games
5	MASTER_SITES= SF/alienarena.mirror/Alien%20Arena%207.66/ \	5	MASTER_SITES= SF/alienarena.mirror/Alien%20Arena%207.66/ \
6	http://icculus.org/alienarena/Files/ \	6	http://icculus.org/alienarena/Files/ \

Lines 1-6 Link Here

(-)b/games/crashtest/Makefile (-1 / +1 lines)
1	PORTNAME= crashtest	1	PORTNAME= crashtest
2	PORTVERSION= 1.1	2	PORTVERSION= 1.1
3	PORTREVISION= 3	3	PORTREVISION= 4
4	CATEGORIES= games education	4	CATEGORIES= games education
5	MASTER_SITES= http://www.stolk.org/crashtest/	5	MASTER_SITES= http://www.stolk.org/crashtest/
6		6

Lines 1-6 Link Here

(-)b/games/gillo/Makefile (-1 / +1 lines)
1	PORTNAME= gillo	1	PORTNAME= gillo
2	DISTVERSION= 1.0beta1	2	DISTVERSION= 1.0beta1
3	PORTREVISION= 11	3	PORTREVISION= 12
4	CATEGORIES= games	4	CATEGORIES= games
5	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.0beta1	5	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.0beta1
6	DISTNAME= ${PORTNAME}-${DISTVERSION}-src	6	DISTNAME= ${PORTNAME}-${DISTVERSION}-src

Lines 1-5 Link Here

(-)b/games/irrlamb/Makefile (+1 lines)
1	PORTNAME= irrlamb	1	PORTNAME= irrlamb
2	PORTVERSION= 1.0.3	2	PORTVERSION= 1.0.3
		3	PORTREVISION= 1
3	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
4	CATEGORIES= games	5	CATEGORIES= games
5		6

Lines 1-6 Link Here

(-)b/games/stormbaancoureur/Makefile (-1 / +1 lines)
1	PORTNAME= stormbaancoureur	1	PORTNAME= stormbaancoureur
2	PORTVERSION= 2.1.6	2	PORTVERSION= 2.1.6
3	PORTREVISION= 3	3	PORTREVISION= 4
4	CATEGORIES= games	4	CATEGORIES= games
5	MASTER_SITES= http://www.stolk.org/stormbaancoureur/download/ \	5	MASTER_SITES= http://www.stolk.org/stormbaancoureur/download/ \
6	http://mirror.amdmi3.ru/distfiles/	6	http://mirror.amdmi3.ru/distfiles/

Lines 1-6 Link Here

(-)b/games/xmoto/Makefile (-1 / +1 lines)
1	PORTNAME= xmoto	1	PORTNAME= xmoto
2	PORTVERSION= 0.6.1	2	PORTVERSION= 0.6.1
3	PORTREVISION= 2	3	PORTREVISION= 3
4	CATEGORIES= games	4	CATEGORIES= games
5		5
6	MAINTAINER= amdmi3@FreeBSD.org	6	MAINTAINER= amdmi3@FreeBSD.org

Lines 1-5 Link Here

(-)b/games/xonotic/Makefile (+1 lines)
1	PORTNAME= xonotic	1	PORTNAME= xonotic
2	PORTVERSION= 0.8.5	2	PORTVERSION= 0.8.5
		3	PORTREVISION= 1
3	CATEGORIES= games	4	CATEGORIES= games
4	MASTER_SITES= http://nl.dl.xonotic.org/ \	5	MASTER_SITES= http://nl.dl.xonotic.org/ \
5	http://mirror.bitmissile.com/xonotic/releases/	6	http://mirror.bitmissile.com/xonotic/releases/

Lines 1-7 Link Here

(-)b/misc/dartsim/Makefile (-1 / +1 lines)
1	PORTNAME= dartsim	1	PORTNAME= dartsim
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 6.12.2	3	DISTVERSION= 6.12.2
4	PORTREVISION= 2	4	PORTREVISION= 3
5	CATEGORIES= misc	5	CATEGORIES= misc
6		6
7	MAINTAINER= yuri@FreeBSD.org	7	MAINTAINER= yuri@FreeBSD.org

Lines 1-6 Link Here

(-)b/misc/ompl/Makefile (-1 / +1 lines)
1	PORTNAME= ompl	1	PORTNAME= ompl
2	DISTVERSION= 1.5.2	2	DISTVERSION= 1.5.2
3	PORTREVISION= 2	3	PORTREVISION= 3
4	CATEGORIES= misc comms	4	CATEGORIES= misc comms
5		5
6	MAINTAINER= yuri@FreeBSD.org	6	MAINTAINER= yuri@FreeBSD.org

Return to bug 230359

Lines 1-9 Link Here

(-)b/devel/ode/Makefile (-33 / +25 lines)
1	PORTNAME= ode	1	PORTNAME= ode
2	PORTVERSION= 0.13	2	DISTVERSION= 0.16.2
3	PORTREVISION= 4
4	PORTEPOCH= 1	3	PORTEPOCH= 1
5	CATEGORIES= devel	4	CATEGORIES= devel
6	MASTER_SITES= SF/opende/ODE/${PORTVERSION}	5	MASTER_SITES= https://bitbucket.org/odedevs/${PORTNAME}/downloads/
7		6
8	MAINTAINER= acm@FreeBSD.org	7	MAINTAINER= acm@FreeBSD.org
9	COMMENT= Articulated rigid body dynamics library	8	COMMENT= Articulated rigid body dynamics library
Lines 12-52 WWW= https://www.ode.org/ Link Here
12	LICENSE= LGPL21 BSD3CLAUSE	11	LICENSE= LGPL21 BSD3CLAUSE
13	LICENSE_COMB= dual	12	LICENSE_COMB= dual
14		13
15	USES= tar:bzip2 libtool pathfix	14	USES= cmake:testing
16	GNU_CONFIGURE= yes
17	CONFIGURE_ARGS= --enable-shared
18	TEST_TARGET= check
19	USE_CXXSTD= c++03
20		15
21	OPTIONS_DEFINE= GIMPACT DOUBLE OU DEMOS	16	CMAKE_OFF= ODE_WITH_TESTS
		17	CMAKE_TESTING_ON= ODE_WITH_TESTS
22		18
23	GIMPACT_DESC= Enable gimpact instead of opcode support	19	CXXFLAGS+= -Wno-c++11-narrowing
24	DOUBLE_DESC= Enable double precision (BROKEN with GIMPACT)
25	OU_DESC= Enable Thread-local storage (Experimental)
26	DEMOS_DESC= Build demos (not installed)
27		20
28	GIMPACT_PREVENTS= DOUBLE	21	OPTIONS_DEFINE= DEMOS GIMPACT LIBCCD OU TRIMESH # it looks like TRIMESH isn't defined but is needed because ODE_NO_TRIMESH is never defined otherwise
29	GIMPACT_CONFIGURE_ON= --with-trimesh=gimpact	22	OPTIONS_DEFAULT= LIBCCD TRIMESH
30	GIMPACT_CONFIGURE_OFF= --with-trimesh=opcode	23
31	DOUBLE_CONFIGURE_ENABLE=double-precision	24	DEMOS_DESC= Build demos (not installed)
32	OU_CONFIGURE_ENABLE= ou	25	DEMOS_CMAKE_BOOL= ODE_WITH_DEMOS
33	DEMOS_CONFIGURE_ENABLE= demos
34	DEMOS_USES= gl localbase pkgconfig	26	DEMOS_USES= gl localbase pkgconfig
35	DEMOS_USE= GL=gl,glu	27	DEMOS_USE= GL=gl,glu
36		28
37	post-patch:	29	GIMPACT_DESC= Enable gimpact instead of opcode support
38	@${REINPLACE_CMD} -e '/if test/ s\|==\|=\|' -e 's\|^\( *CFLAGS=\)\|#\1\|;' \	30	GIMPACT_CMAKE_BOOL= ODE_WITH_GIMPACT
39	-e 's\|^\( CPPFLAGS=\)\|#\1\|' -e 's\|^\( CXXFLAGS=\)\|#\1\|' \	31	GIMPACT_PREVENTS= TRIMESH
40	-e 's\|CPPFLAGS+=" \|CPPFLAGS="$$CPPFLAGS \|' \	32
41	${WRKSRC}/configure	33	LIBCCD_DESC= Use libccd for handling some collision tests absent in ODE
42	@${FIND} ${WRKSRC} -type f -name Makefile.in -print0 \| ${XARGS} -0 ${REINPLACE_CMD} \	34	LIBCCD_CMAKE_BOOL= ODE_WITH_LIBCCD ODE_WITH_LIBCCD_SYSTEM
43	-e '/^DEFAULT_INCLUDES/ s\|$$\| -I$$(top_builddir)/include\|' \	35	LIBCCD_CXXFLAGS= -I${WRKSRC}/libccd/src/custom
44	-e '/CFLAGS/ s\|-O[12]\|\|'	36	LIBCCD_LIB_DEPENDS= libccd.so:math/libccd
45	@${REINPLACE_CMD} 's\|<malloc.h>\|<stdlib.h>\|g' \	37
46	${WRKSRC}/build/config-default.h ${WRKSRC}/ou/src/ou/malloc.cpp	38	OU_DESC= Enable Thread-local storage (Experimental)
47		39	OU_CMAKE_BOOL= ODE_WITH_OU
48	post-install:	40
49	${SED} -e '/PACKAGE/ s\|^\|//\|; /VERSION/ s\|^\|//\|' ${WRKSRC}/ode/src/config.h \	41	TRIMESH_DESC= Build with trimesh
50	> ${STAGEDIR}${PREFIX}/include/ode/config.h	42	TRIMESH_CMAKE_OFF= -DODE_NO_TRIMESH=ON
51		43
52	.include <bsd.port.mk>	44	.include <bsd.port.mk>

Lines 4-15 include/ode/collision_space.h Link Here

(-)b/devel/ode/pkg-plist (-4 / +8 lines)
4	include/ode/collision_trimesh.h	4	include/ode/collision_trimesh.h
5	include/ode/common.h	5	include/ode/common.h
6	include/ode/compatibility.h	6	include/ode/compatibility.h
7	include/ode/config.h
8	include/ode/contact.h	7	include/ode/contact.h
		8	include/ode/cooperative.h
9	include/ode/error.h	9	include/ode/error.h
10	include/ode/export-dif.h	10	include/ode/export-dif.h
11	include/ode/mass.h	11	include/ode/mass.h
12	include/ode/matrix.h	12	include/ode/matrix.h
		13	include/ode/matrix_coop.h
13	include/ode/memory.h	14	include/ode/memory.h
14	include/ode/misc.h	15	include/ode/misc.h
15	include/ode/objects.h	16	include/ode/objects.h
Lines 25-32 include/ode/rotation.h Link Here
25	include/ode/threading.h	26	include/ode/threading.h
26	include/ode/threading_impl.h	27	include/ode/threading_impl.h
27	include/ode/timer.h	28	include/ode/timer.h
28	lib/libode.a	29	include/ode/version.h
		30	lib/cmake/ode-0.16.2/ode-config-version.cmake
		31	lib/cmake/ode-0.16.2/ode-config.cmake
		32	lib/cmake/ode-0.16.2/ode-export-%%CMAKE_BUILD_TYPE%%.cmake
		33	lib/cmake/ode-0.16.2/ode-export.cmake
29	lib/libode.so	34	lib/libode.so
30	lib/libode.so.3	35	lib/libode.so.0.16.2
31	lib/libode.so.3.1.0
32	libdata/pkgconfig/ode.pc	36	libdata/pkgconfig/ode.pc