update to 1.4.1

Notified by: Alvin Oga

3 files changed, 41 insertions, 8 deletions

diff --git a/biology/pymol/Makefile b/biology/pymol/Makefile
index 665e0d1dde2b..dd1f70fa088a 100644
--- a/biology/pymol/Makefile
+++ b/biology/pymol/Makefile
@@ -18,12 +18,12 @@ RUN_DEPENDS=	${PYNUMERIC} \
 LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-VERSION=	1.3r1
-SVNREVISION=	3913
+VERSION=	1.4.1
+SVNREVISION=	3946
 
 USE_BZIP2=	yes
 WRKSRC=		${WRKDIR}/pymol-${PORTVERSION}
-USE_GL=		glut
+USE_GL=		glut glew
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 PLIST_SUB=	PYTHON_VER=${PYTHON_VER}
@@ -44,7 +44,7 @@ do-fetch-svn:
 	#svn ls https://pymol.svn.sourceforge.net/svnroot/pymol/tags
 	#http://pymol.svn.sourceforge.net/viewvc/pymol/trunk/
 	${RM} -rf pymol-${VERSION}.${SVNREVISION}
-	svn -r ${SVNREVISION} export https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol pymol-${VERSION}.${SVNREVISION}
+	svn -r ${SVNREVISION} export http://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol pymol-${VERSION}.${SVNREVISION}
 	tar cvfj pymol-${VERSION}.${SVNREVISION}.tar.bz2 pymol-${VERSION}.${SVNREVISION}
 	scp pymol-${VERSION}.${SVNREVISION}.tar.bz2 freefall.freebsd.org:public_distfiles/pymol/
 
diff --git a/biology/pymol/distinfo b/biology/pymol/distinfo
index 85c487d610d5..8472777d7006 100644
--- a/biology/pymol/distinfo
+++ b/biology/pymol/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pymol-1.3r1.3913.tar.bz2) = 32b1995d6c87d35b71fe5025e81e9b68b0d96d60825d8aac33685e70d73e8d87
-SIZE (pymol-1.3r1.3913.tar.bz2) = 6967557
+SHA256 (pymol-1.4.1.3946.tar.bz2) = 0b505ed6275fa1aeec6036830d28c8ee5feedfd67bcac7def873f0481f2cb558
+SIZE (pymol-1.4.1.3946.tar.bz2) = 9038319
diff --git a/biology/pymol/pkg-plist b/biology/pymol/pkg-plist
index 8d8509e8bf8c..4c01bb24eb22 100644
--- a/biology/pymol/pkg-plist
+++ b/biology/pymol/pkg-plist
@@ -68,6 +68,8 @@ bin/pymol
 %%PYTHON_SITELIBDIR%%/chempy/models.pyc
 %%PYTHON_SITELIBDIR%%/chempy/mol.py
 %%PYTHON_SITELIBDIR%%/chempy/mol.pyc
+%%PYTHON_SITELIBDIR%%/chempy/mol2.py
+%%PYTHON_SITELIBDIR%%/chempy/mol2.pyc
 %%PYTHON_SITELIBDIR%%/chempy/neighbor.py
 %%PYTHON_SITELIBDIR%%/chempy/neighbor.pyc
 %%PYTHON_SITELIBDIR%%/chempy/pdb.py
@@ -122,8 +124,20 @@ bin/pymol
 %%PYTHON_SITELIBDIR%%/pmg_tk/skins/__init__.pyc
 %%PYTHON_SITELIBDIR%%/pmg_tk/skins/normal/__init__.py
 %%PYTHON_SITELIBDIR%%/pmg_tk/skins/normal/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pmg_tk/skins/normal/SimpleColorChooser.py
+%%PYTHON_SITELIBDIR%%/pmg_tk/skins/normal/SimpleColorChooser.pyc
+%%PYTHON_SITELIBDIR%%/pmg_tk/skins/normal/ColorMap.py
+%%PYTHON_SITELIBDIR%%/pmg_tk/skins/normal/ColorMap.pyc
+%%PYTHON_SITELIBDIR%%/pmg_tk/skins/normal/ColorRampModel.py
+%%PYTHON_SITELIBDIR%%/pmg_tk/skins/normal/ColorRampModel.pyc
+%%PYTHON_SITELIBDIR%%/pmg_tk/skins/normal/ModalWindow.py
+%%PYTHON_SITELIBDIR%%/pmg_tk/skins/normal/ModalWindow.pyc
 %%PYTHON_SITELIBDIR%%/pmg_tk/skins/normal/builder.py
 %%PYTHON_SITELIBDIR%%/pmg_tk/skins/normal/builder.pyc
+%%PYTHON_SITELIBDIR%%/pmg_tk/skins/normal/hist.py
+%%PYTHON_SITELIBDIR%%/pmg_tk/skins/normal/volume.py
+%%PYTHON_SITELIBDIR%%/pmg_tk/skins/normal/hist.pyc
+%%PYTHON_SITELIBDIR%%/pmg_tk/skins/normal/volume.pyc
 %%PYTHON_SITELIBDIR%%/pmg_tk/startup/__init__.py
 %%PYTHON_SITELIBDIR%%/pmg_tk/startup/__init__.pyc
 %%PYTHON_SITELIBDIR%%/pmg_tk/startup/apbs_tools.py
@@ -132,7 +146,7 @@ bin/pymol
 %%PYTHON_SITELIBDIR%%/pmg_tk/startup/remote_pdb_load.pyc
 %%PYTHON_SITELIBDIR%%/pmg_wx/__init__.py
 %%PYTHON_SITELIBDIR%%/pmg_wx/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pymol-1.2.0-py%%PYTHON_VER%%.egg-info
+%%PYTHON_SITELIBDIR%%/pymol-1.4.0-py%%PYTHON_VER%%.egg-info
 %%PYTHON_SITELIBDIR%%/pymol/__init__.py
 %%PYTHON_SITELIBDIR%%/pymol/__init__.pyc
 %%PYTHON_SITELIBDIR%%/pymol/_cmd.so
@@ -146,6 +160,8 @@ bin/pymol
 %%PYTHON_SITELIBDIR%%/pymol/checking.pyc
 %%PYTHON_SITELIBDIR%%/pymol/cmd.py
 %%PYTHON_SITELIBDIR%%/pymol/cmd.pyc
+%%PYTHON_SITELIBDIR%%/pymol/colorramping.py
+%%PYTHON_SITELIBDIR%%/pymol/colorramping.pyc
 %%PYTHON_SITELIBDIR%%/pymol/commanding.py
 %%PYTHON_SITELIBDIR%%/pymol/commanding.pyc
 %%PYTHON_SITELIBDIR%%/pymol/completing.py
@@ -178,6 +194,8 @@ bin/pymol
 %%PYTHON_SITELIBDIR%%/pymol/gui.pyc
 %%PYTHON_SITELIBDIR%%/pymol/helping.py
 %%PYTHON_SITELIBDIR%%/pymol/helping.pyc
+%%PYTHON_SITELIBDIR%%/pymol/headering.py
+%%PYTHON_SITELIBDIR%%/pymol/headering.pyc
 %%PYTHON_SITELIBDIR%%/pymol/importing.py
 %%PYTHON_SITELIBDIR%%/pymol/importing.pyc
 %%PYTHON_SITELIBDIR%%/pymol/internal.py
@@ -389,7 +407,11 @@ bin/pymol
 %%PYTHON_SITELIBDIR%%/pymol/pymol_path/data/pymol/cmyk.png
 %%PYTHON_SITELIBDIR%%/pymol/pymol_path/data/pymol/matrices/BLOSUM62
 %%PYTHON_SITELIBDIR%%/pymol/pymol_path/data/pymol/splash.old.png
-%%PYTHON_SITELIBDIR%%/pymol/pymol_path/data/pymol/splash.png
+%%PYTHON_SITELIBDIR%%/pymol/pymol_path/data/pymol/hsv.ppm
+%%PYTHON_SITELIBDIR%%/pymol/pymol_path/data/shaders/default.fs
+%%PYTHON_SITELIBDIR%%/pymol/pymol_path/data/shaders/default.vs
+%%PYTHON_SITELIBDIR%%/pymol/pymol_path/data/shaders/volume.fs
+%%PYTHON_SITELIBDIR%%/pymol/pymol_path/data/shaders/volume.vs
 %%PYTHON_SITELIBDIR%%/pymol/pymol_path/data/tut/1hpv.pdb
 %%PYTHON_SITELIBDIR%%/pymol/pymol_path/examples/chempy/generate_amber.py
 %%PYTHON_SITELIBDIR%%/pymol/pymol_path/examples/chempy/generate_mmff.py
@@ -749,6 +771,16 @@ bin/pymol
 %%PYTHON_SITELIBDIR%%/pymol/xray.pyc
 %%PYTHON_SITELIBDIR%%/pymol/xwin.py
 %%PYTHON_SITELIBDIR%%/pymol/xwin.pyc
+%%PYTHON_SITELIBDIR%%/web/__init__.py
+%%PYTHON_SITELIBDIR%%/web/__init__.pyc
+%%PYTHON_SITELIBDIR%%/web/pymolhttpd.py
+%%PYTHON_SITELIBDIR%%/web/pymolhttpd.pyc
+%%PYTHON_SITELIBDIR%%/web/examples/__init__.py
+%%PYTHON_SITELIBDIR%%/web/examples/__init__.pyc
+%%PYTHON_SITELIBDIR%%/web/examples/justhttpd.py
+%%PYTHON_SITELIBDIR%%/web/examples/justhttpd.pyc
+@dirrm %%PYTHON_SITELIBDIR%%/web/examples
+@dirrm %%PYTHON_SITELIBDIR%%/web
 @dirrm %%PYTHON_SITELIBDIR%%/pymol/wizard
 @dirrm %%PYTHON_SITELIBDIR%%/pymol/pymol_path/test/ref
 @dirrm %%PYTHON_SITELIBDIR%%/pymol/pymol_path/test/inp
@@ -764,6 +796,7 @@ bin/pymol
 @dirrm %%PYTHON_SITELIBDIR%%/pymol/pymol_path/examples/chempy
 @dirrm %%PYTHON_SITELIBDIR%%/pymol/pymol_path/examples
 @dirrm %%PYTHON_SITELIBDIR%%/pymol/pymol_path/data/tut
+@dirrm %%PYTHON_SITELIBDIR%%/pymol/pymol_path/data/shaders
 @dirrm %%PYTHON_SITELIBDIR%%/pymol/pymol_path/data/pymol/matrices
 @dirrm %%PYTHON_SITELIBDIR%%/pymol/pymol_path/data/pymol
 @dirrm %%PYTHON_SITELIBDIR%%/pymol/pymol_path/data/pmg_tk/bitmaps/builder