Date: Wed, 7 May 2014 23:07:23 +0400 (MSK) From: Dmitry Marakasov <amdmi3@amdmi3.ru> To: FreeBSD-gnats-submit@FreeBSD.org Cc: acm@FreeBSD.org Subject: ports/189438: [PATCH] devel/ode: staging, fixes Message-ID: <20140507190723.9FE4740C2A@hades.panopticon> Resent-Message-ID: <201405071930.s47JU3cR056660@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.pre.mk>
.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 <bsd.port.post.mk>
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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140507190723.9FE4740C2A>