3 files changed, 86 insertions, 11 deletions

diff --git a/graphics/py-cgkit/Makefile b/graphics/py-cgkit/Makefile
index 3db9c5182643..b9a84a7503b3 100644
--- a/graphics/py-cgkit/Makefile
+++ b/graphics/py-cgkit/Makefile
@@ -7,29 +7,36 @@
 #
 
 PORTNAME=	cgkit
-PORTVERSION=	2.0.0a
+PORTVERSION=	2.0.0a5
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-${PORTVERSION}lpha4
+DISTNAME=	${PORTNAME}-${PORTVERSION}lpha5
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python Computer Graphics Kit
 
 BUILD_DEPENDS=	bjam:${PORTSDIR}/devel/boost-python scons:${PORTSDIR}/devel/scons
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenGL:${PORTSDIR}/graphics/py-opengl \
-		${PYTHON_SITELIBDIR}/numarray/__init__.py:${PORTSDIR}/math/py-numarray \
-		${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game \
-		${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging \
-		${PYTHON_SITELIBDIR}/protocols/__init__.py:${PORTSDIR}/devel/py-protocols \
-		aqsis:${PORTSDIR}/graphics/aqsis
 
 USE_XLIB=	yes
 USE_REINPLACE=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
+.if defined(INSTALL_CGKIT_LIGHT)
+PLIST_SUB+=	CGKIT_LIGHT="@comment "
+.else
+PLIST_SUB+=	CGKIT_LIGHT=""
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/OpenGL:${PORTSDIR}/graphics/py-opengl \
+		${PYTHON_SITELIBDIR}/numarray/__init__.py:${PORTSDIR}/math/py-numarray \
+		${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game \
+		${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging \
+		${PYTHON_SITELIBDIR}/protocols/__init__.py:${PORTSDIR}/devel/py-protocols \
+		${PYTHON_SITELIBDIR}/serial/__init__.py:${PORTSDIR}/comms/py-serial \
+		aqsis:${PORTSDIR}/graphics/aqsis
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ( ${OSVERSION} < 502126 )
@@ -48,6 +55,13 @@ pre-everything::
 	@${ECHO_MSG} "Define WITH_LIB3DS if you want to be able to import 3ds files"
 	@${ECHO_MSG}
 .endif
+
+.if !defined(INSTALL_CGKIT_LIGHT)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "Define INSTALL_CGKIT_LIGHT if you do not want to install any external dependencies"
+	@${ECHO_MSG}
+.endif
+
 post-extract:
 	@cd ${WRKSRC}; \
 	for FILE in $($$DOS2UNIX_FILES); do \
@@ -62,6 +76,9 @@ pre-configure:
 .if defined(WITH_LIB3DS)
 	@${REINPLACE_CMD} -e "s/^#//1" ${WRKSRC}/config.cfg;
 .endif
+.if defined(INSTALL_CGKIT_LIGHT)
+	@${ECHO} "INSTALL_CGKIT_LIGHT = True" >> ${WRKSRC}/config.cfg;
+.endif
 	@${REINPLACE_CMD} -e "/%%LOCALBASE%%/s//${LOCALBASE:S/\//\\\//g}/g" \
 	    -e "/%%X11BASE%%/s//${X11BASE:S/\//\\\//g}/g" ${WRKSRC}/supportlib/cpp_config.cfg ${WRKSRC}/config.cfg; \
 	cd ${WRKSRC}/supportlib; \
diff --git a/graphics/py-cgkit/distinfo b/graphics/py-cgkit/distinfo
index 03baa150a011..77bd9f226421 100644
--- a/graphics/py-cgkit/distinfo
+++ b/graphics/py-cgkit/distinfo
@@ -1,2 +1,2 @@
-MD5 (cgkit-2.0.0alpha4.tar.gz) = 63dc4e4e6d42b7a9b910c64f448b56af
-SIZE (cgkit-2.0.0alpha4.tar.gz) = 583080
+MD5 (cgkit-2.0.0alpha5.tar.gz) = 445ec6c79397bc3567bb60e0692223bc
+SIZE (cgkit-2.0.0alpha5.tar.gz) = 636565
diff --git a/graphics/py-cgkit/pkg-plist b/graphics/py-cgkit/pkg-plist
index 981eb19a7201..a73a42810f58 100644
--- a/graphics/py-cgkit/pkg-plist
+++ b/graphics/py-cgkit/pkg-plist
@@ -53,13 +53,34 @@ bin/viewer.py
 %%PYTHON_SITELIBDIR%%/cgkit/Interfaces/iworldobject.py
 %%PYTHON_SITELIBDIR%%/cgkit/Interfaces/iworldobject.pyc
 %%PYTHON_SITELIBDIR%%/cgkit/Interfaces/iworldobject.pyo
+%%PYTHON_SITELIBDIR%%/cgkit/_Image.py
+%%PYTHON_SITELIBDIR%%/cgkit/_Image.pyc
+%%PYTHON_SITELIBDIR%%/cgkit/_Image.pyo
+%%PYTHON_SITELIBDIR%%/cgkit/_ImageDraw.py
+%%PYTHON_SITELIBDIR%%/cgkit/_ImageDraw.pyc
+%%PYTHON_SITELIBDIR%%/cgkit/_ImageDraw.pyo
+%%PYTHON_SITELIBDIR%%/cgkit/_OpenGL/GL.py
+%%PYTHON_SITELIBDIR%%/cgkit/_OpenGL/GL.pyc
+%%PYTHON_SITELIBDIR%%/cgkit/_OpenGL/GL.pyo
+%%PYTHON_SITELIBDIR%%/cgkit/_OpenGL/GLU.py
+%%PYTHON_SITELIBDIR%%/cgkit/_OpenGL/GLU.pyc
+%%PYTHON_SITELIBDIR%%/cgkit/_OpenGL/GLU.pyo
+%%PYTHON_SITELIBDIR%%/cgkit/_OpenGL/GLUT.py
+%%PYTHON_SITELIBDIR%%/cgkit/_OpenGL/GLUT.pyc
+%%PYTHON_SITELIBDIR%%/cgkit/_OpenGL/GLUT.pyo
+%%PYTHON_SITELIBDIR%%/cgkit/_OpenGL/__init__.py
+%%PYTHON_SITELIBDIR%%/cgkit/_OpenGL/__init__.pyc
+%%PYTHON_SITELIBDIR%%/cgkit/_OpenGL/__init__.pyo
 %%PYTHON_SITELIBDIR%%/cgkit/__init__.py
 %%PYTHON_SITELIBDIR%%/cgkit/__init__.pyc
 %%PYTHON_SITELIBDIR%%/cgkit/__init__.pyo
-%%PYTHON_SITELIBDIR%%/cgkit/_core.so
+%%CGKIT_LIGHT%%%%PYTHON_SITELIBDIR%%/cgkit/_core.so
 %%PYTHON_SITELIBDIR%%/cgkit/_slparser.py
 %%PYTHON_SITELIBDIR%%/cgkit/_slparser.pyc
 %%PYTHON_SITELIBDIR%%/cgkit/_slparser.pyo
+%%PYTHON_SITELIBDIR%%/cgkit/all/__init__.py
+%%PYTHON_SITELIBDIR%%/cgkit/all/__init__.pyc
+%%PYTHON_SITELIBDIR%%/cgkit/all/__init__.pyo
 %%PYTHON_SITELIBDIR%%/cgkit/application.py
 %%PYTHON_SITELIBDIR%%/cgkit/application.pyc
 %%PYTHON_SITELIBDIR%%/cgkit/application.pyo
@@ -72,6 +93,12 @@ bin/viewer.py
 %%PYTHON_SITELIBDIR%%/cgkit/autocam.py
 %%PYTHON_SITELIBDIR%%/cgkit/autocam.pyc
 %%PYTHON_SITELIBDIR%%/cgkit/autocam.pyo
+%%PYTHON_SITELIBDIR%%/cgkit/beziercurve.py
+%%PYTHON_SITELIBDIR%%/cgkit/beziercurve.pyc
+%%PYTHON_SITELIBDIR%%/cgkit/beziercurve.pyo
+%%PYTHON_SITELIBDIR%%/cgkit/beziercurvegeom.py
+%%PYTHON_SITELIBDIR%%/cgkit/beziercurvegeom.pyc
+%%PYTHON_SITELIBDIR%%/cgkit/beziercurvegeom.pyo
 %%PYTHON_SITELIBDIR%%/cgkit/boundingbox.py
 %%PYTHON_SITELIBDIR%%/cgkit/boundingbox.pyc
 %%PYTHON_SITELIBDIR%%/cgkit/boundingbox.pyo
@@ -195,6 +222,30 @@ bin/viewer.py
 %%PYTHON_SITELIBDIR%%/cgkit/keydefs.py
 %%PYTHON_SITELIBDIR%%/cgkit/keydefs.pyc
 %%PYTHON_SITELIBDIR%%/cgkit/keydefs.pyo
+%%PYTHON_SITELIBDIR%%/cgkit/light/__init__.py
+%%PYTHON_SITELIBDIR%%/cgkit/light/__init__.pyc
+%%PYTHON_SITELIBDIR%%/cgkit/light/__init__.pyo
+%%PYTHON_SITELIBDIR%%/cgkit/light/_core.py
+%%PYTHON_SITELIBDIR%%/cgkit/light/_core.pyc
+%%PYTHON_SITELIBDIR%%/cgkit/light/_core.pyo
+%%PYTHON_SITELIBDIR%%/cgkit/light/cgtypes/__init__.py
+%%PYTHON_SITELIBDIR%%/cgkit/light/cgtypes/__init__.pyc
+%%PYTHON_SITELIBDIR%%/cgkit/light/cgtypes/__init__.pyo
+%%PYTHON_SITELIBDIR%%/cgkit/light/cgtypes/mat3.py
+%%PYTHON_SITELIBDIR%%/cgkit/light/cgtypes/mat3.pyc
+%%PYTHON_SITELIBDIR%%/cgkit/light/cgtypes/mat3.pyo
+%%PYTHON_SITELIBDIR%%/cgkit/light/cgtypes/mat4.py
+%%PYTHON_SITELIBDIR%%/cgkit/light/cgtypes/mat4.pyc
+%%PYTHON_SITELIBDIR%%/cgkit/light/cgtypes/mat4.pyo
+%%PYTHON_SITELIBDIR%%/cgkit/light/cgtypes/quat.py
+%%PYTHON_SITELIBDIR%%/cgkit/light/cgtypes/quat.pyc
+%%PYTHON_SITELIBDIR%%/cgkit/light/cgtypes/quat.pyo
+%%PYTHON_SITELIBDIR%%/cgkit/light/cgtypes/vec3.py
+%%PYTHON_SITELIBDIR%%/cgkit/light/cgtypes/vec3.pyc
+%%PYTHON_SITELIBDIR%%/cgkit/light/cgtypes/vec3.pyo
+%%PYTHON_SITELIBDIR%%/cgkit/light/cgtypes/vec4.py
+%%PYTHON_SITELIBDIR%%/cgkit/light/cgtypes/vec4.pyc
+%%PYTHON_SITELIBDIR%%/cgkit/light/cgtypes/vec4.pyo
 %%PYTHON_SITELIBDIR%%/cgkit/lightsource.py
 %%PYTHON_SITELIBDIR%%/cgkit/lightsource.pyc
 %%PYTHON_SITELIBDIR%%/cgkit/lightsource.pyo
@@ -213,6 +264,9 @@ bin/viewer.py
 %%PYTHON_SITELIBDIR%%/cgkit/mayaascii.py
 %%PYTHON_SITELIBDIR%%/cgkit/mayaascii.pyc
 %%PYTHON_SITELIBDIR%%/cgkit/mayaascii.pyo
+%%PYTHON_SITELIBDIR%%/cgkit/motionpath.py
+%%PYTHON_SITELIBDIR%%/cgkit/motionpath.pyc
+%%PYTHON_SITELIBDIR%%/cgkit/motionpath.pyo
 %%PYTHON_SITELIBDIR%%/cgkit/noise.py
 %%PYTHON_SITELIBDIR%%/cgkit/noise.pyc
 %%PYTHON_SITELIBDIR%%/cgkit/noise.pyo
@@ -365,7 +419,11 @@ bin/viewer.py
 %%PYTHON_SITELIBDIR%%/cgkit/x3dimport.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/cgkit/GUI
 @dirrm %%PYTHON_SITELIBDIR%%/cgkit/Interfaces
+@dirrm %%PYTHON_SITELIBDIR%%/cgkit/_OpenGL
+@dirrm %%PYTHON_SITELIBDIR%%/cgkit/all
 @dirrm %%PYTHON_SITELIBDIR%%/cgkit/glove
+@dirrm %%PYTHON_SITELIBDIR%%/cgkit/light/cgtypes
+@dirrm %%PYTHON_SITELIBDIR%%/cgkit/light
 @dirrm %%PYTHON_SITELIBDIR%%/cgkit/spacedevice
 @dirrm %%PYTHON_SITELIBDIR%%/cgkit/wintab
 @dirrm %%PYTHON_SITELIBDIR%%/cgkit