Index: head/devel/ChipmunkPhysics/Makefile
===================================================================
--- head/devel/ChipmunkPhysics/Makefile	(revision 339392)
+++ head/devel/ChipmunkPhysics/Makefile	(revision 339393)
@@ -1,23 +1,55 @@
 # Created by: Tim Cas <ports@stdrand.com>
 # $FreeBSD$
 
 PORTNAME=	ChipmunkPhysics
-PORTVERSION=	6.2.0
+PORTVERSION=	6.2.1
 CATEGORIES=	devel
 MASTER_SITES=	http://chipmunk-physics.net/release/Chipmunk-6.x/ \
 		http://files.slembcke.net/chipmunk/release/Chipmunk-6.x/ \
 		http://files.libsiege.org/chipmunk/
 DISTNAME=	Chipmunk-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@stdrand.com
 COMMENT=	2D physics engine written in C
 
 LICENSE=	MIT
 
 USES=		cmake
+USE_LDCONFIG=	yes
+PLIST_SUB=	VERSION=${PORTVERSION}
+
+OPTIONS_DEFINE=	DOCS EXAMPLES DEMOS
+DEMOS_DESC=	Install the demo program (requires GLFW and GLEW)
+
+PORTDOCS=	*
+PORTEXAMPLES=	*.c *.h
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDEMOS}
+USE_GL=		glew
+LIB_DEPENDS+=	libglfw.so:${PORTSDIR}/graphics/glfw
+PLIST_SUB+=	DEMOS=""
+.else
 CMAKE_ARGS=	-DBUILD_DEMOS=OFF
+PLIST_SUB+=	DEMOS="@comment "
+.endif
 
-USE_LDCONFIG=	yes
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	${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}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	(cd ${WRKSRC}/Demo && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} "-name *\.c -or -name *\.h")
+.endif
+
+.if ${PORT_OPTIONS:MDEMOS}
+	${INSTALL_PROGRAM} ${WRKSRC}/Demo/chipmunk_demos ${STAGEDIR}${PREFIX}/bin
+.endif
 
 .include <bsd.port.mk>
Index: head/devel/ChipmunkPhysics/distinfo
===================================================================
--- head/devel/ChipmunkPhysics/distinfo	(revision 339392)
+++ head/devel/ChipmunkPhysics/distinfo	(revision 339393)
@@ -1,2 +1,2 @@
-SHA256 (Chipmunk-6.2.0.tgz) = 75fd4098b98dd23e5c1f78a1c9e3080768fb6256143e261638a624163cde5af8
-SIZE (Chipmunk-6.2.0.tgz) = 1071081
+SHA256 (Chipmunk-6.2.1.tgz) = 83a47da80c506541c00e1919c0dc83e5f94d13f6534ae15ad663359c171bc7aa
+SIZE (Chipmunk-6.2.1.tgz) = 1076190
Index: head/devel/ChipmunkPhysics/pkg-plist
===================================================================
--- head/devel/ChipmunkPhysics/pkg-plist	(revision 339392)
+++ head/devel/ChipmunkPhysics/pkg-plist	(revision 339393)
@@ -1,30 +1,31 @@
-lib/libchipmunk.so.6.2.0
+%%DEMOS%%bin/chipmunk_demos
+lib/libchipmunk.so.%%VERSION%%
 lib/libchipmunk.so
 lib/libchipmunk.a
 include/chipmunk/cpVect.h
 include/chipmunk/cpSpatialIndex.h
 include/chipmunk/cpSpace.h
 include/chipmunk/cpShape.h
 include/chipmunk/cpPolyShape.h
 include/chipmunk/cpBody.h
 include/chipmunk/cpBB.h
 include/chipmunk/cpArbiter.h
 include/chipmunk/constraints/util.h
 include/chipmunk/constraints/cpSlideJoint.h
 include/chipmunk/constraints/cpSimpleMotor.h
 include/chipmunk/constraints/cpRotaryLimitJoint.h
 include/chipmunk/constraints/cpRatchetJoint.h
 include/chipmunk/constraints/cpPivotJoint.h
 include/chipmunk/constraints/cpPinJoint.h
 include/chipmunk/constraints/cpGrooveJoint.h
 include/chipmunk/constraints/cpGearJoint.h
 include/chipmunk/constraints/cpDampedSpring.h
 include/chipmunk/constraints/cpDampedRotarySpring.h
 include/chipmunk/constraints/cpConstraint.h
 include/chipmunk/chipmunk_unsafe.h
 include/chipmunk/chipmunk_types.h
 include/chipmunk/chipmunk_private.h
 include/chipmunk/chipmunk_ffi.h
 include/chipmunk/chipmunk.h
 @dirrm include/chipmunk/constraints
 @dirrm include/chipmunk