Hi. This is minor update for xmoto and its dependency - ode. Both tested for a long time on amd64 and i386.
ODE highlights: - Demos are programs. Treat hem accordingly. - remove s/-lpthread/-pthread/ - take maintainership Full changelog: http://ode-wiki.org/wiki/index.php?title=Changelog#Changes_for_0.12 ok to commit? Index: Makefile =================================================================== RCS file: /cvs/ports/games/xmoto/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- Makefile 19 Sep 2012 08:15:09 -0000 1.14 +++ Makefile 8 Oct 2012 17:51:32 -0000 @@ -2,10 +2,9 @@ COMMENT = challenging 2D motocross platform game -V = 0.5.9 +V = 0.5.10 DISTNAME = xmoto-${V}-src PKGNAME = xmoto-${V} -REVISION= 3 CATEGORIES = games MAINTAINER = Antti Harri <i...@openbsd.fi> Index: distinfo =================================================================== RCS file: /cvs/ports/games/xmoto/distinfo,v retrieving revision 1.3 diff -u -r1.3 distinfo --- distinfo 15 Apr 2012 08:49:05 -0000 1.3 +++ distinfo 8 Oct 2012 17:51:32 -0000 @@ -1,5 +1,2 @@ -MD5 (xmoto-0.5.9-src.tar.gz) = 2Na3pAUTlTBlC4qa4upt8w== -RMD160 (xmoto-0.5.9-src.tar.gz) = NP29PnsmxnjrTA5aR3tF3gIWd4Y= -SHA1 (xmoto-0.5.9-src.tar.gz) = B3V6zM54FR3IhzvvgnDfDlYZZ3I= -SHA256 (xmoto-0.5.9-src.tar.gz) = dNdXRHatMhxD22wN9tN4lUBo4lFOP0rK4cwyLfigM+Q= -SIZE (xmoto-0.5.9-src.tar.gz) = 40385328 +SHA256 (xmoto-0.5.10-src.tar.gz) = LSQ45Ghapfwaqfc7++Jok9f8l/rdbhzJ/bCcjRbfnh4= +SIZE (xmoto-0.5.10-src.tar.gz) = 40766628 Index: Makefile =================================================================== RCS file: /cvs/ports/devel/ode/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- Makefile 11 Sep 2011 12:11:05 -0000 1.5 +++ Makefile 8 Oct 2012 17:44:46 -0000 @@ -1,15 +1,15 @@ # $OpenBSD: Makefile,v 1.5 2011/09/11 12:11:05 armani Exp $ COMMENT = high performance library for simulating rigid body dynamics -SHARED_LIBS += ode 0.0 # .2.1 -DISTNAME = ode-0.11.1 -REVISION = 2 +SHARED_LIBS += ode 1.0 # 3.0 +DISTNAME = ode-0.12 CATEGORIES = devel HOMEPAGE = http://www.ode.org/ +MAINTAINER = Kirill Bychkov <ki...@openbsd.org> + MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=opende/} -EXTRACT_SUFX = .tar.bz2 # LGPLv2.1 PERMIT_PACKAGE_CDROM = Yes @@ -17,8 +17,8 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB += GL GLU ICE SM X11 Xau Xdamage Xdmcp Xext Xfixes Xxf86vm c drm m -WANTLIB += pthread pthread-stubs stdc++ xcb +WANTLIB += GL GLU X11 Xdamage Xext Xfixes Xxf86vm c drm m +WANTLIB += pthread stdc++ xcb USE_LIBTOOL = Yes @@ -33,7 +33,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/LICENSE.TXT ${PREFIX}/share/doc/ode/LICENSE ${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/ode/README ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ode/ - ${INSTALL_DATA} ${WRKSRC}/ode/demo/.libs/demo_* \ + ${INSTALL_PROGRAM} ${WRKSRC}/ode/demo/.libs/demo_* \ ${PREFIX}/share/examples/ode/ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ode/textures/ ${INSTALL_DATA} ${WRKSRC}/drawstuff/textures/* \ Index: distinfo =================================================================== RCS file: /cvs/ports/devel/ode/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo 17 Oct 2010 19:12:33 -0000 1.2 +++ distinfo 28 Aug 2012 15:34:33 -0000 @@ -1,5 +1,2 @@ -MD5 (ode-0.11.1.tar.bz2) = cSV5r6vCoVqlbjmfdhcUdw== -RMD160 (ode-0.11.1.tar.bz2) = z7+0SERjYenCfI470nqK4IUCNNY= -SHA1 (ode-0.11.1.tar.bz2) = WszTQcazaDXUm+uSfjknK/eIaWI= -SHA256 (ode-0.11.1.tar.bz2) = h3iEqGo9U/PF8uNfvYo9wjwgJJ8GNsdvbvQfa/V6A6E= -SIZE (ode-0.11.1.tar.bz2) = 1720088 +SHA256 (ode-0.12.tar.gz) = k97A/fUrMkR8JYc5Xi2Vkdqbu5hL/dWbJJI6s2sWNeU= +SIZE (ode-0.12.tar.gz) = 2279716 Index: patches/patch-configure =================================================================== RCS file: patches/patch-configure diff -N patches/patch-configure --- patches/patch-configure 6 Aug 2009 10:59:21 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,41 +0,0 @@ -$OpenBSD: patch-configure,v 1.2 2009/08/06 10:59:21 jasper Exp $ - -s/-lpthread/-pthread/ - ---- configure.orig Mon May 25 02:15:39 2009 -+++ configure Tue Aug 4 17:43:36 2009 -@@ -17197,7 +17197,7 @@ else - ODE_PRECISION=-DdSINGLE - fi - --CPPFLAGS+=" $ODE_PRECISION" -+CPPFLAGS="$CPPFLAGS $ODE_PRECISION" - - - -@@ -19074,13 +19074,13 @@ else - fi - - --{ $as_echo "$as_me:$LINENO: checking for main in -lpthread" >&5 --$as_echo_n "checking for main in -lpthread... " >&6; } -+{ $as_echo "$as_me:$LINENO: checking for main in -pthread" >&5 -+$as_echo_n "checking for main in -pthread... " >&6; } - if test "${ac_cv_lib_pthread_main+set}" = set; then - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lpthread $LIBS" -+LIBS="-pthread $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -19134,7 +19134,7 @@ fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_main" >&5 - $as_echo "$ac_cv_lib_pthread_main" >&6; } - if test "x$ac_cv_lib_pthread_main" = x""yes; then -- LIBS="$LIBS -lpthread" -+ LIBS="$LIBS -pthread" - fi - - Index: patches/patch-ode_demo_Makefile_in =================================================================== RCS file: /cvs/ports/devel/ode/patches/patch-ode_demo_Makefile_in,v retrieving revision 1.1 diff -u -p -r1.1 patch-ode_demo_Makefile_in --- patches/patch-ode_demo_Makefile_in 6 Aug 2009 10:59:21 -0000 1.1 +++ patches/patch-ode_demo_Makefile_in 28 Aug 2012 15:34:33 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-ode_demo_Makefile_in,v 1.1 2009/08/06 10:59:21 jasper Exp $ ---- ode/demo/Makefile.in.orig Tue Aug 4 17:53:23 2009 -+++ ode/demo/Makefile.in Tue Aug 4 17:54:36 2009 -@@ -459,7 +459,7 @@ top_build_prefix = @top_build_prefix@ +--- ode/demo/Makefile.in.orig Sun Feb 12 02:15:05 2012 ++++ ode/demo/Makefile.in Sun May 13 11:14:46 2012 +@@ -475,7 +475,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(abs_top_srcdir)/include \ Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/ode/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- pkg/PLIST 6 Aug 2009 10:59:21 -0000 1.2 +++ pkg/PLIST 28 Aug 2012 15:34:33 -0000 @@ -20,6 +20,7 @@ include/ode/odecpp.h include/ode/odecpp_collision.h include/ode/odeinit.h include/ode/odemath.h +include/ode/odemath_legacy.h include/ode/rotation.h include/ode/timer.h lib/libode.a @@ -31,39 +32,40 @@ share/doc/ode/ share/doc/ode/LICENSE share/doc/ode/README share/examples/ode/ -share/examples/ode/demo_I -share/examples/ode/demo_basket -share/examples/ode/demo_boxstack -share/examples/ode/demo_buggy -share/examples/ode/demo_cards -share/examples/ode/demo_chain1 -share/examples/ode/demo_chain2 -share/examples/ode/demo_collision -share/examples/ode/demo_convex_cd -share/examples/ode/demo_crash -share/examples/ode/demo_cyl -share/examples/ode/demo_cylvssphere -share/examples/ode/demo_feedback -share/examples/ode/demo_friction -share/examples/ode/demo_gyroscopic -share/examples/ode/demo_heightfield -share/examples/ode/demo_hinge -share/examples/ode/demo_jointPR -share/examples/ode/demo_jointPU -share/examples/ode/demo_joints -share/examples/ode/demo_kinematic -share/examples/ode/demo_motion -share/examples/ode/demo_motor -share/examples/ode/demo_moving_convex -share/examples/ode/demo_moving_trimesh -share/examples/ode/demo_ode -share/examples/ode/demo_piston -share/examples/ode/demo_plane2d -share/examples/ode/demo_slider -share/examples/ode/demo_space -share/examples/ode/demo_space_stress -share/examples/ode/demo_step -share/examples/ode/demo_trimesh +@bin share/examples/ode/demo_I +@bin share/examples/ode/demo_basket +@bin share/examples/ode/demo_boxstack +@bin share/examples/ode/demo_buggy +@bin share/examples/ode/demo_cards +@bin share/examples/ode/demo_chain1 +@bin share/examples/ode/demo_chain2 +@bin share/examples/ode/demo_collision +@bin share/examples/ode/demo_convex_cd +@bin share/examples/ode/demo_crash +@bin share/examples/ode/demo_cyl +@bin share/examples/ode/demo_cylvssphere +@bin share/examples/ode/demo_feedback +@bin share/examples/ode/demo_friction +@bin share/examples/ode/demo_gyroscopic +@bin share/examples/ode/demo_heightfield +@bin share/examples/ode/demo_hinge +@bin share/examples/ode/demo_jointPR +@bin share/examples/ode/demo_jointPU +@bin share/examples/ode/demo_joints +@bin share/examples/ode/demo_kinematic +@bin share/examples/ode/demo_motion +@bin share/examples/ode/demo_motor +@bin share/examples/ode/demo_moving_convex +@bin share/examples/ode/demo_moving_trimesh +@bin share/examples/ode/demo_ode +@bin share/examples/ode/demo_piston +@bin share/examples/ode/demo_plane2d +@bin share/examples/ode/demo_slider +@bin share/examples/ode/demo_space +@bin share/examples/ode/demo_space_stress +@bin share/examples/ode/demo_step +@bin share/examples/ode/demo_tracks +@bin share/examples/ode/demo_trimesh share/examples/ode/textures/ share/examples/ode/textures/checkered.ppm share/examples/ode/textures/ground.ppm
