From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 7 19:30:03 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 521B9170 for ; Wed, 7 May 2014 19:30:03 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 2E8E222A for ; Wed, 7 May 2014 19:30:03 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s47JU3bc056661 for ; Wed, 7 May 2014 19:30:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s47JU3cR056660; Wed, 7 May 2014 19:30:03 GMT (envelope-from gnats) Resent-Date: Wed, 7 May 2014 19:30:03 GMT Resent-Message-Id: <201405071930.s47JU3cR056660@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dmitry Marakasov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3AB7A7CB; Wed, 7 May 2014 19:20:45 +0000 (UTC) Received: from smtpout3.timeweb.ru (smtpout3.timeweb.ru [92.53.117.25]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E56A0129; Wed, 7 May 2014 19:20:44 +0000 (UTC) Received: from [213.148.20.85] (helo=hive.panopticon) by smtp.timeweb.ru with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1Wi7Bc-00018I-59; Wed, 07 May 2014 23:07:24 +0400 Received: from hades.panopticon (hades.panopticon [192.168.0.32]) by hive.panopticon (Postfix) with ESMTP id C6A16823; Wed, 7 May 2014 23:07:23 +0400 (MSK) Received: by hades.panopticon (Postfix, from userid 1000) id 9FE4740C2A; Wed, 7 May 2014 23:07:23 +0400 (MSK) Message-Id: <20140507190723.9FE4740C2A@hades.panopticon> Date: Wed, 7 May 2014 23:07:23 +0400 (MSK) From: Dmitry Marakasov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/189438: [PATCH] devel/ode: staging, fixes Cc: acm@FreeBSD.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 May 2014 19:30:03 -0000 >Number: 189438 >Category: ports >Synopsis: [PATCH] devel/ode: staging, fixes >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed May 07 19:30:02 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Dmitry Marakasov >Release: FreeBSD 10.0-RELEASE amd64 >Organization: >Environment: System: FreeBSD hades.panopticon 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260807: Fri Jan 17 13:14:28 MSK >Description: - Add LICENSE - Support staging - Convert USE_BZIP2 and USE_GMAKE to USES - Add USES=libtool - Use new OPTIONS features All ode consumer ports build fine with these changes. Port maintainer (acm@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 1.02 (mode: change, diff: SVN) >How-To-Repeat: >Fix: --- ode-0.11.1.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 353191) +++ Makefile (working copy) @@ -10,25 +10,31 @@ MAINTAINER= acm@FreeBSD.org COMMENT= Articulated rigid body dynamics library +LICENSE= LGPL21 BSD3CLAUSE +LICENSE_COMB= dual + CONFLICTS= ode-devel-[0-9].* -USE_BZIP2= yes +USES= tar:bzip2 gmake libtool USE_GL= yes -USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +OPTIONS_DEFINE= GIMPACT GYROSCOPIC DOUBLE OU +OPTIONS_DEFAULT= GYROSCOPIC -OPTIONS_DEFINE= GIMPACT GYROSCOPIC DOUBLE OU -OPTIONS_DEFAULT= GYROSCOPIC GIMPACT_DESC= Enable gimpact instead of opcode support GYROSCOPIC_DESC= Configure ODE to work with gyroscopic term DOUBLE_DESC= Enable double precision (BROKEN with GIMPACT) OU_DESC= Enable Thread-local storage (Experimental) +GIMPACT_CONFIGURE_ON= --with-trimesh=gimpact +GIMPACT_CONFIGURE_OFF= --with-trimesh=opcode +GYROSCOPIC_CONFIGURE_ENABLE= gyroscopic +DOUBLE_CONFIGURE_ENABLE= double-precision +OU_CONFIGURE_ENABLE= ou + WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -NO_STAGE= yes .include .if ${ARCH} == "amd64" || ${ARCH} == "ia64" @@ -35,30 +41,10 @@ CFLAGS+= -fPIC -DPIC .endif -.if ${PORT_OPTIONS:MGIMPACT} && defined(WITH_DOUBLE) -IGNORE= currently double precision is not supported by gimpact +.if ${PORT_OPTIONS:MGIMPACT} && ${PORT_OPTIONS:MDOUBLE} +IGNORE= currently double precision is not supported by gimpact .endif -.if ! ${PORT_OPTIONS:MGIMPACT} -CONFIGURE_ARGS+= --with-trimesh=opcode -.else -CONFIGURE_ARGS+= --with-trimesh=gimpact -.endif - -.if ! ${PORT_OPTIONS:MGYROSCOPIC} -CONFIGURE_ARGS+= --disable-gyroscopic -.endif - -.if ${PORT_OPTIONS:MDOUBLE} -CONFIGURE_ARGS+= --enable-double-precision -.endif - -.if ${PORT_OPTIONS:MOU} -CONFIGURE_ARGS+= --enable-ou -.else -CONFIGURE_ARGS+= --disable-ou -.endif - post-patch: @${REINPLACE_CMD} -e '/if test/ s|==|=|' -e 's|^\( *CFLAGS=\)|#\1|;' \ -e 's|^\( *CPPFLAGS=\)|#\1|' -e 's|^\( *CXXFLAGS=\)|#\1|' \ @@ -75,6 +61,6 @@ post-install: ${SED} -e '/PACKAGE/ s|^|//|; /VERSION/ s|^|//|' ${WRKSRC}/ode/src/config.h \ - > ${PREFIX}/include/ode/config.h + > ${STAGEDIR}${PREFIX}/include/ode/config.h .include Index: pkg-plist =================================================================== --- pkg-plist (revision 353191) +++ pkg-plist (working copy) @@ -22,6 +22,5 @@ include/ode/rotation.h include/ode/timer.h lib/libode.a -lib/libode.la libdata/pkgconfig/ode.pc @dirrm include/ode --- ode-0.11.1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: