6 files changed, 23 insertions, 20 deletions

diff --git a/science/openbabel/Makefile b/science/openbabel/Makefile
index 6beb751f26c8..e5a35a1fbffd 100644
--- a/science/openbabel/Makefile
+++ b/science/openbabel/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	openbabel
-PORTVERSION=	2.2.0
-PORTREVISION=	1
+PORTVERSION=	2.2.1
 CATEGORIES=	science
 MASTER_SITES=	SF
 
@@ -32,7 +31,7 @@ BROKEN=		does not compile on ia64 (gcc internal error)
 .endif
 
 .if (${OSVERSION} < 700042)
-LIB_DEPENDS+=   boost_thread.4:${PORTSDIR}/devel/boost-python
+LIB_DEPENDS+=	boost_thread.4:${PORTSDIR}/devel/boost-python
 .endif
 
 post-extract:
diff --git a/science/openbabel/distinfo b/science/openbabel/distinfo
index 5832f2af1fad..6aff5e21e4a7 100644
--- a/science/openbabel/distinfo
+++ b/science/openbabel/distinfo
@@ -1,3 +1,3 @@
-MD5 (openbabel-2.2.0.tar.gz) = 643a18c7ba09254d36e93afd6277346f
-SHA256 (openbabel-2.2.0.tar.gz) = a898b79336c7372c901bcc7e5f83db7b8e79f8e864be6a262f515b3e088bc607
-SIZE (openbabel-2.2.0.tar.gz) = 6127264
+MD5 (openbabel-2.2.1.tar.gz) = 1c9cc42bb212aef3b6e50c00460b2fe6
+SHA256 (openbabel-2.2.1.tar.gz) = 822345d70778de1d2d9afe65a659f1719b8ca300066fb1fa2f473bc97c457e80
+SIZE (openbabel-2.2.1.tar.gz) = 6507473
diff --git a/science/openbabel/pkg-plist b/science/openbabel/pkg-plist
index 44d0108a5f4f..a92d035438a1 100644
--- a/science/openbabel/pkg-plist
+++ b/science/openbabel/pkg-plist
@@ -245,6 +245,9 @@ lib/openbabel/%%VERSION%%/nwchemformat.so
 lib/openbabel/%%VERSION%%/opendxformat.a
 lib/openbabel/%%VERSION%%/opendxformat.la
 lib/openbabel/%%VERSION%%/opendxformat.so
+lib/openbabel/%%VERSION%%/outformat.a
+lib/openbabel/%%VERSION%%/outformat.la
+lib/openbabel/%%VERSION%%/outformat.so
 lib/openbabel/%%VERSION%%/pcmodelformat.a
 lib/openbabel/%%VERSION%%/pcmodelformat.la
 lib/openbabel/%%VERSION%%/pcmodelformat.so
@@ -318,6 +321,7 @@ lib/openbabel/%%VERSION%%/zindoformat.a
 lib/openbabel/%%VERSION%%/zindoformat.la
 lib/openbabel/%%VERSION%%/zindoformat.so
 libdata/pkgconfig/openbabel-2.0.pc
+%%DATADIR%%/%%VERSION%%/MACCS.txt
 %%DATADIR%%/%%VERSION%%/SMARTS_InteLigand.txt
 %%DATADIR%%/%%VERSION%%/UFF.prm
 %%DATADIR%%/%%VERSION%%/aromatic.txt
diff --git a/science/py-openbabel/Makefile b/science/py-openbabel/Makefile
index eb529a638f50..3b7d03ececcb 100644
--- a/science/py-openbabel/Makefile
+++ b/science/py-openbabel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	openbabel
-PORTVERSION=	2.2.0
+PORTVERSION=	2.2.1
 CATEGORIES=	science python
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -21,6 +21,6 @@ USE_PYDISTUTILS=	yes
 BUILD_WRKSRC=	${WRKSRC}/scripts/python
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
-PYDISTUTILS_PKGVERSION=	1.3
+PYDISTUTILS_PKGVERSION=	1.4
 
 .include <bsd.port.mk>
diff --git a/science/py-openbabel/distinfo b/science/py-openbabel/distinfo
index 5832f2af1fad..6aff5e21e4a7 100644
--- a/science/py-openbabel/distinfo
+++ b/science/py-openbabel/distinfo
@@ -1,3 +1,3 @@
-MD5 (openbabel-2.2.0.tar.gz) = 643a18c7ba09254d36e93afd6277346f
-SHA256 (openbabel-2.2.0.tar.gz) = a898b79336c7372c901bcc7e5f83db7b8e79f8e864be6a262f515b3e088bc607
-SIZE (openbabel-2.2.0.tar.gz) = 6127264
+MD5 (openbabel-2.2.1.tar.gz) = 1c9cc42bb212aef3b6e50c00460b2fe6
+SHA256 (openbabel-2.2.1.tar.gz) = 822345d70778de1d2d9afe65a659f1719b8ca300066fb1fa2f473bc97c457e80
+SIZE (openbabel-2.2.1.tar.gz) = 6507473
diff --git a/science/py-openbabel/pkg-plist b/science/py-openbabel/pkg-plist
index 4671490fe928..8ae081ce5f37 100644
--- a/science/py-openbabel/pkg-plist
+++ b/science/py-openbabel/pkg-plist
@@ -1,9 +1,9 @@
-lib/python2.5/site-packages/_openbabel.so
-lib/python2.5/site-packages/openbabel.py
-lib/python2.5/site-packages/openbabel.pyc
-lib/python2.5/site-packages/openbabel.pyo
-lib/python2.5/site-packages/pybel.py
-lib/python2.5/site-packages/pybel.pyc
-lib/python2.5/site-packages/pybel.pyo
-@dirrmtry lib/python2.5/site-packages
-@dirrmtry lib/python2.5
+%%PYTHON_SITELIBDIR%%/_openbabel.so
+%%PYTHON_SITELIBDIR%%/openbabel.py
+%%PYTHON_SITELIBDIR%%/openbabel.pyc
+%%PYTHON_SITELIBDIR%%/openbabel.pyo
+%%PYTHON_SITELIBDIR%%/pybel.py
+%%PYTHON_SITELIBDIR%%/pybel.pyc
+%%PYTHON_SITELIBDIR%%/pybel.pyo
+@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry %%PYTHON_LIBDIR%%