From owner-svn-ports-all@FreeBSD.ORG Sun May 11 23:02:24 2014 Return-Path: Delivered-To: svn-ports-all@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 D7E8F959; Sun, 11 May 2014 23:02:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 B9D722E2D; Sun, 11 May 2014 23:02:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4BN2OXq047324; Sun, 11 May 2014 23:02:24 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4BN2OfW047322; Sun, 11 May 2014 23:02:24 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201405112302.s4BN2OfW047322@svn.freebsd.org> From: Dmitry Marakasov Date: Sun, 11 May 2014 23:02:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353745 - head/devel/ode 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.18 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: Sun, 11 May 2014 23:02:25 -0000 Author: amdmi3 Date: Sun May 11 23:02:23 2014 New Revision: 353745 URL: http://svnweb.freebsd.org/changeset/ports/353745 QAT: https://qat.redports.org/buildarchive/r353745/ Log: - Support staging - Convert USE_BZIP2 to USES - Convert USE_GMAKE to USES - Add USES=libtool, drop .la file - Add LICENSE - Use new OPTIONS features - Fix checking for illegal options combination PR: 189438 Submitted by: amdmi3 Approved by: portmgr blanket Modified: head/devel/ode/Makefile head/devel/ode/pkg-plist Modified: head/devel/ode/Makefile ============================================================================== --- head/devel/ode/Makefile Sun May 11 22:50:31 2014 (r353744) +++ head/devel/ode/Makefile Sun May 11 23:02:23 2014 (r353745) @@ -3,6 +3,7 @@ PORTNAME= ode PORTVERSION= 0.11.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= SF/opende/ODE/${PORTVERSION} @@ -10,53 +11,39 @@ MASTER_SITES= SF/opende/ODE/${PORTVERSIO 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_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" CFLAGS+= -fPIC -DPIC .endif -.if ${PORT_OPTIONS:MGIMPACT} && defined(WITH_DOUBLE) -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 +.if ${PORT_OPTIONS:MGIMPACT} && ${PORT_OPTIONS:MDOUBLE} +IGNORE= currently double precision is not supported by gimpact .endif post-patch: @@ -75,6 +62,6 @@ post-patch: 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 Modified: head/devel/ode/pkg-plist ============================================================================== --- head/devel/ode/pkg-plist Sun May 11 22:50:31 2014 (r353744) +++ head/devel/ode/pkg-plist Sun May 11 23:02:23 2014 (r353745) @@ -22,6 +22,5 @@ include/ode/odemath.h include/ode/rotation.h include/ode/timer.h lib/libode.a -lib/libode.la libdata/pkgconfig/ode.pc @dirrm include/ode