Index: Makefile
===================================================================
--- Makefile	(revision 333450)
+++ Makefile	(working copy)
@@ -2,12 +2,12 @@
 # $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}
+DISTNAME=	Chipmunk-${DISTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@stdrand.com
@@ -16,8 +16,42 @@
 LICENSE=	MIT
 
 USES=		cmake
+USE_LDCONFIG=	yes
+
+OPTIONS_DEFINE=	DOCS EXAMPLES DEMOS
+DEMOS_DESC=	Install the demo program (requires GLFW and GLEW)
+
+PORTDOCS=	*
+PORTEXAMPLES=	*.c *.h
+
+.include <bsd.port.options.mk>
+
+PLIST_SUB=	VERSION=${PORTVERSION}
+
+.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} ${DOCSDIR}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} "README.textile VERSION.txt" ${DOCSDIR})
+	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR})
+.endif
 
+.if ${PORT_OPTIONS:MEXAMPLES}
+	${MKDIR} ${EXAMPLESDIR}
+	(cd ${WRKSRC}/Demo && ${COPYTREE_SHARE} . ${EXAMPLESDIR} "-name *\.c -or -name *\.h")
+.endif
+
+.if ${PORT_OPTIONS:MDEMOS}
+	${INSTALL_PROGRAM} ${WRKSRC}/Demo/chipmunk_demos ${PREFIX}/bin
+.endif
+
+NO_STAGE=	yes
 .include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo	(revision 333450)
+++ distinfo	(working copy)
@@ -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: pkg-plist
===================================================================
--- pkg-plist	(revision 333450)
+++ pkg-plist	(working copy)
@@ -1,4 +1,5 @@
-lib/libchipmunk.so.6.2.0
+%%DEMOS%%bin/chipmunk_demos
+lib/libchipmunk.so.%%VERSION%%
 lib/libchipmunk.so
 lib/libchipmunk.a
 include/chipmunk/cpVect.h