Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 30 Jun 2023 08:31:51 GMT
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: df6eab16368c - main - =?utf-8?Q?science/openbabel:=20Update=203.1.1=20=E2=86=92=203-1-1-178;=20Add=20tests?=
Message-ID:  <202306300831.35U8VpRF000546@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=df6eab16368ce297c11e92b2400189862d2cbfbe

commit df6eab16368ce297c11e92b2400189862d2cbfbe
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-06-30 08:31:15 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-06-30 08:31:49 +0000

    science/openbabel: Update 3.1.1 → 3-1-1-178; Add tests
---
 science/openbabel/Makefile  | 22 ++++++++++++++--------
 science/openbabel/distinfo  |  6 +++---
 science/openbabel/pkg-plist |  3 +--
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/science/openbabel/Makefile b/science/openbabel/Makefile
index fb4f04212e51..4f423feebcaf 100644
--- a/science/openbabel/Makefile
+++ b/science/openbabel/Makefile
@@ -1,9 +1,9 @@
 PORTNAME=	openbabel
-DISTVERSION=	3.1.1
-PORTREVISION=	8
-DISTVERSIONSUFFIX=	-source
+DISTVERSION=	3-1-1-178
+#DISTVERSIONSUFFIX=	-source
+DISTVERSIONSUFFIX=	-g2b211d6ac
 CATEGORIES=	science
-MASTER_SITES=	https://github.com/openbabel/openbabel/releases/download/openbabel-${PORTVERSION:C/\./-/g}/
+#MASTER_SITES=	https://github.com/openbabel/openbabel/releases/download/openbabel-${PORTVERSION:C/\./-/g}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Chemical toolbox designed to speak the many languages of chemical data
@@ -18,15 +18,19 @@ LIB_DEPENDS=	libmaeparser.so:science/maeparser	\
 
 CONFLICTS_INSTALL=	babel
 
-USES=		cmake compiler:c++11-lang eigen:3 gnome pkgconfig tar:bz2
+USES=		cmake:testing compiler:c++11-lang eigen:3 gnome pkgconfig tar:bz2
 USE_CXXSTD=	gnu++98
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
+USE_GITHUB=	yes # temporary
 
 CMAKE_ON=	WITH_COORDGEN WITH_JSON OPENBABEL_USE_SYSTEM_RAPIDJSON WITH_MAEPARSER
-CMAKE_OFF=	PYTHON_BINDINGS
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-PLIST_SUB=	VERSION=3.1.0	# To be replaced by ${PORTVERSION} nexttime!
+CMAKE_OFF=	ENABLE_TESTS PYTHON_BINDINGS
+CMAKE_TESTING_ON=	ENABLE_TESTS
+
+#WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+PLIST_SUB=	VERSION=${PORTVERSION:R}
 
 OPTIONS_DEFINE=		CAIRO GUI
 OPTIONS_DEFAULT=	CAIRO GUI
@@ -60,4 +64,6 @@ post-install-PYTHON-on:
 	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S,${PREFIX}/,,})
 
+# 2 tests fail, see https://github.com/openbabel/openbabel/issues/2604
+
 .include <bsd.port.post.mk>
diff --git a/science/openbabel/distinfo b/science/openbabel/distinfo
index 6c4c375bfa7b..8164fd7c673b 100644
--- a/science/openbabel/distinfo
+++ b/science/openbabel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1609084505
-SHA256 (openbabel-3.1.1-source.tar.bz2) = a6ec8381d59ea32a4b241c8b1fbd799acb52be94ab64cdbd72506fb4e2270e68
-SIZE (openbabel-3.1.1-source.tar.bz2) = 27743669
+TIMESTAMP = 1688103397
+SHA256 (openbabel-openbabel-3-1-1-178-g2b211d6ac_GH0.tar.gz) = 86c4922526a5b16cd08ba187413ce6b8145705bdeb1b5dbbe0c3eb4d2bf91269
+SIZE (openbabel-openbabel-3-1-1-178-g2b211d6ac_GH0.tar.gz) = 36848606
diff --git a/science/openbabel/pkg-plist b/science/openbabel/pkg-plist
index 842287b2472e..5d8e38185fe6 100644
--- a/science/openbabel/pkg-plist
+++ b/science/openbabel/pkg-plist
@@ -18,7 +18,6 @@ bin/obspectrophore
 bin/obsym
 bin/obtautomer
 bin/obthermo
-bin/roundtrip
 include/inchi/inchi_api.h
 include/openbabel3/LBFGS.h
 include/openbabel3/LBFGS/LineSearchBacktracking.h
@@ -96,7 +95,6 @@ include/openbabel3/openbabel/residue.h
 include/openbabel3/openbabel/ring.h
 include/openbabel3/openbabel/rotamer.h
 include/openbabel3/openbabel/rotor.h
-include/openbabel3/openbabel/shared_ptr.h
 include/openbabel3/openbabel/spectrophore.h
 include/openbabel3/openbabel/stereo/bindings.h
 include/openbabel3/openbabel/stereo/cistrans.h
@@ -146,6 +144,7 @@ lib/openbabel/%%VERSION%%/chem3dformat.so
 lib/openbabel/%%VERSION%%/chemdoodlejsonformat.so
 lib/openbabel/%%VERSION%%/chemdrawcdx.so
 lib/openbabel/%%VERSION%%/chemdrawct.so
+lib/openbabel/%%VERSION%%/chemicaljsonformat.so
 lib/openbabel/%%VERSION%%/chemkinformat.so
 lib/openbabel/%%VERSION%%/chemtoolformat.so
 lib/openbabel/%%VERSION%%/cifformat.so



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306300831.35U8VpRF000546>