From owner-svn-ports-head@freebsd.org Sun May 10 21:40:09 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A72202F4DA2; Sun, 10 May 2020 21:40:09 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49KyCY3qvpz3DJC; Sun, 10 May 2020 21:40:09 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 65CCFBEC0; Sun, 10 May 2020 21:40:09 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04ALe9W1050593; Sun, 10 May 2020 21:40:09 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04ALe9sg050592; Sun, 10 May 2020 21:40:09 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202005102140.04ALe9sg050592@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Sun, 10 May 2020 21:40:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r534867 - in head/science/ghemical: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/science/ghemical: . files X-SVN-Commit-Revision: 534867 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 May 2020 21:40:09 -0000 Author: yuri Date: Sun May 10 21:40:08 2020 New Revision: 534867 URL: https://svnweb.freebsd.org/changeset/ports/534867 Log: science/ghemical: Not compatible with the upcoming OpenBabel-3 => disable this internal option Added: head/science/ghemical/files/patch-src_filetrans.cpp (contents, props changed) Modified: head/science/ghemical/Makefile Modified: head/science/ghemical/Makefile ============================================================================== --- head/science/ghemical/Makefile Sun May 10 21:36:49 2020 (r534866) +++ head/science/ghemical/Makefile Sun May 10 21:40:08 2020 (r534867) @@ -3,7 +3,7 @@ PORTNAME= ghemical PORTVERSION= 3.0.0 -PORTREVISION= 19 +PORTREVISION= 20 CATEGORIES= science MASTER_SITES= http://bioinformatics.org/ghemical/download/%SUBDIR%/ MASTER_SITE_SUBDIR= release20111012 current @@ -22,7 +22,6 @@ LIB_DEPENDS= libblas.so:math/blas \ libint.so:science/libint \ liblapack.so:math/lapack \ liboglappth.so:science/liboglappth \ - libopenbabel.so:science/openbabel \ libmopac7.so:biology/mopac \ libmpqc.so:science/mpqc RUN_DEPENDS= xdg-open:devel/xdg-utils @@ -30,7 +29,7 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils USES= compiler:c++11-lang fortran gettext gl gmake gnome pathfix \ pkgconfig xorg GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-gtk --enable-threads --enable-openbabel +CONFIGURE_ARGS= --enable-gtk --enable-threads --disable-openbabel # not compatible with OpenBabel-3 so it is disabled USE_GNOME= cairo gdkpixbuf2 gtk20 libglade2 intltool pangox-compat USE_GL= gl glu USE_XORG= x11 @@ -43,5 +42,6 @@ PLIST_SUB= GHEMICAL_VERSION="${PORTVERSION}" post-patch: @${REINPLACE_CMD} -e \ 's|"mozilla "|"xdg-open "|' ${WRKSRC}/src/gtk_app.cpp + @${REINPLACE_CMD} -e 's|openbabel-2.0|openbabel-3|' ${WRKSRC}/configure # attempt at OpenBabel-3 compatibility .include Added: head/science/ghemical/files/patch-src_filetrans.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/ghemical/files/patch-src_filetrans.cpp Sun May 10 21:40:08 2020 (r534867) @@ -0,0 +1,28 @@ +attempt at OpenBabel-3 compatibility +--- src/filetrans.cpp.orig 2011-09-14 17:10:38 UTC ++++ src/filetrans.cpp +@@ -38,6 +38,8 @@ using namespace std; + #include + #include + #include ++#include ++#include + + using namespace std; + using namespace OpenBabel; +@@ -46,6 +48,7 @@ using namespace OpenBabel; + #define FORMAT_PATH (char *) project::appdata_path + #endif // FORMAT_PATH + ++#if 0 + namespace OpenBabel + { + extern OBAromaticTyper aromtyper; +@@ -55,6 +58,7 @@ namespace OpenBabel + extern OBChainsParser chainsparser; + extern OBIsotopeTable isotab; + } ++#endif + + /*################################################################################################*/ +