Update to upstream version 7.0.1

While on it:
- Convert to OPTION helpers for post-install targets

PR:		202758
Submitted by:	ports@stdrand.com (maintainer)

6 files changed, 23 insertions, 29 deletions

diff --git a/devel/ChipmunkPhysics/Makefile b/devel/ChipmunkPhysics/Makefile
index 9cc5e13a3143..ce609de3d6db 100644
--- a/devel/ChipmunkPhysics/Makefile
+++ b/devel/ChipmunkPhysics/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ChipmunkPhysics
-PORTVERSION=	7.0.0
-PORTREVISION=	1
+PORTVERSION=	7.0.1
 CATEGORIES=	devel
 MASTER_SITES=	http://chipmunk-physics.net/release/Chipmunk-7.x/ \
 		http://files.slembcke.net/chipmunk/release/Chipmunk-7.x/ \
@@ -30,22 +29,16 @@ DEMOS_USE=		GL=glew
 DEMOS_LIB_DEPENDS=	libglfw.so:${PORTSDIR}/graphics/glfw2
 DEMOS_CMAKE_OFF=	-DBUILD_DEMOS=OFF
 
-.include <bsd.port.options.mk>
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "README.textile VERSION.txt" ${STAGEDIR}${DOCSDIR})
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
-.endif
 
-.if ${PORT_OPTIONS:MEXAMPLES}
+post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/demo && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} "-name *\.c -or -name *\.h")
-.endif
 
-.if ${PORT_OPTIONS:MDEMOS}
+post-install-DEMOS-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/demo/chipmunk_demos ${STAGEDIR}${PREFIX}/bin
-.endif
 
 .include <bsd.port.mk>
diff --git a/devel/ChipmunkPhysics/distinfo b/devel/ChipmunkPhysics/distinfo
index 8828201d0b57..5bbe3475723d 100644
--- a/devel/ChipmunkPhysics/distinfo
+++ b/devel/ChipmunkPhysics/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Chipmunk-7.0.0.tgz) = 14ab380396a96b15951c42a2d7ca259a53ecab4e550a71857d13dcfd388a51cd
-SIZE (Chipmunk-7.0.0.tgz) = 1607961
+SHA256 (Chipmunk-7.0.1.tgz) = fe54b464777d89882a9f9d3d6deb17189af8bc5d63833b25bb1a7d16c3e69260
+SIZE (Chipmunk-7.0.1.tgz) = 1609101
diff --git a/devel/ChipmunkPhysics/files/patch-demo_CMakeLists.txt b/devel/ChipmunkPhysics/files/patch-demo_CMakeLists.txt
index 8a13b403d3bb..d665142c415f 100644
--- a/devel/ChipmunkPhysics/files/patch-demo_CMakeLists.txt
+++ b/devel/ChipmunkPhysics/files/patch-demo_CMakeLists.txt
@@ -1,6 +1,6 @@
---- demo/CMakeLists.txt.orig	2015-02-20 13:46:16 UTC
+--- demo/CMakeLists.txt.orig	2015-08-29 18:52:41 UTC
 +++ demo/CMakeLists.txt
-@@ -27,6 +27,10 @@ if(NOT MSVC)
+@@ -40,6 +40,10 @@ if(NOT MSVC)
    list(APPEND chipmunk_demos_libraries m)
  endif(NOT MSVC)
  
diff --git a/devel/ChipmunkPhysics/files/patch-include_chipmunk_chipmunk.h b/devel/ChipmunkPhysics/files/patch-include_chipmunk_chipmunk.h
index 35758c983184..04e70fe62589 100644
--- a/devel/ChipmunkPhysics/files/patch-include_chipmunk_chipmunk.h
+++ b/devel/ChipmunkPhysics/files/patch-include_chipmunk_chipmunk.h
@@ -1,12 +1,13 @@
---- include/chipmunk/chipmunk.h.orig	2015-01-13 01:54:11 UTC
+--- include/chipmunk/chipmunk.h.orig	2015-08-29 18:44:21 UTC
 +++ include/chipmunk/chipmunk.h
-@@ -32,6 +32,9 @@
- #ifdef WIN32
+@@ -29,6 +29,10 @@
  	// For alloca().
  	#include <malloc.h>
+ 	#define CP_EXPORT __declspec(dllexport)
 +#elif defined(__DragonFly__) || defined(__FreeBSD__) \
-+   || defined(__NetBSD__) || defined(__OpenBSD__) \
-+	/* already included in <stdlib.h> */
++	|| defined(__NetBSD__) || defined(__OpenBSD__) \
++	// alloca() is already included in <stdlib.h>
++	#define CP_EXPORT
  #else
  	#include <alloca.h>
- #endif
+ 	#define CP_EXPORT
diff --git a/devel/ChipmunkPhysics/files/patch-src_cpHastySpace.c b/devel/ChipmunkPhysics/files/patch-src_cpHastySpace.c
index 9b732e5000ee..4e501f4cf9d4 100644
--- a/devel/ChipmunkPhysics/files/patch-src_cpHastySpace.c
+++ b/devel/ChipmunkPhysics/files/patch-src_cpHastySpace.c
@@ -1,4 +1,4 @@
---- src/cpHastySpace.c.orig	2015-01-13 01:54:11 UTC
+--- src/cpHastySpace.c.orig	2015-07-02 16:24:47 UTC
 +++ src/cpHastySpace.c
 @@ -5,8 +5,11 @@
  #include <stdio.h>
@@ -14,18 +14,17 @@
  
  #include "chipmunk/chipmunk_private.h"
  #include "chipmunk/cpHastySpace.h"
-@@ -313,15 +316,18 @@ cpHastySpaceSetThreads(cpSpace *space, u
- 	
+@@ -314,14 +317,20 @@ cpHastySpaceSetThreads(cpSpace *space, u
  	cpHastySpace *hasty = (cpHastySpace *)space;
  	HaltThreads(hasty);
--	
+ 	
 -#ifdef __APPLE__
-+
  	if(threads == 0){
--		size_t size = sizeof(threads);
--		sysctlbyname("hw.ncpu", &threads, &size, NULL, 0);
++#ifdef __APPLE__
+ 		size_t size = sizeof(threads);
+ 		sysctlbyname("hw.ncpu", &threads, &size, NULL, 0);
 -	}
-+#if defined(_SC_NPROCESSORS_ONLN)
++#elif defined(_SC_NPROCESSORS_ONLN)
 +		threads = sysconf(_SC_NPROCESSORS_ONLN);
 +#elif defined(_WIN32)
 +		SYSTEM_INFO siSysInfo;
diff --git a/devel/ChipmunkPhysics/pkg-plist b/devel/ChipmunkPhysics/pkg-plist
index eabe9489c150..0afbc5c12c0b 100644
--- a/devel/ChipmunkPhysics/pkg-plist
+++ b/devel/ChipmunkPhysics/pkg-plist
@@ -10,6 +10,7 @@ include/chipmunk/cpSpace.h
 include/chipmunk/cpSlideJoint.h
 include/chipmunk/cpSimpleMotor.h
 include/chipmunk/cpShape.h
+include/chipmunk/cpRobust.h
 include/chipmunk/cpRotaryLimitJoint.h
 include/chipmunk/cpRatchetJoint.h
 include/chipmunk/cpPolyline.h