Date: Wed, 13 Jan 2021 00:52:20 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r561407 - in head/science/xdrawchem: . files Message-ID: <202101130052.10D0qKxe031990@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Wed Jan 13 00:52:20 2021 New Revision: 561407 URL: https://svnweb.freebsd.org/changeset/ports/561407 Log: science/xdrawchem: 1.10.2-1 -> 1.11.0-2 Deleted: head/science/xdrawchem/files/patch-xdrawchem_ioiface.cpp head/science/xdrawchem/files/patch-xdrawchem_ioiface.h head/science/xdrawchem/files/patch-xdrawchem_molecule.h head/science/xdrawchem/files/patch-xdrawchem_molecule__obmol.cpp head/science/xdrawchem/files/patch-xdrawchem_molecule__smiles.cpp Modified: head/science/xdrawchem/Makefile head/science/xdrawchem/distinfo head/science/xdrawchem/files/patch-xdrawchem.pro head/science/xdrawchem/pkg-plist Modified: head/science/xdrawchem/Makefile ============================================================================== --- head/science/xdrawchem/Makefile Wed Jan 13 00:31:38 2021 (r561406) +++ head/science/xdrawchem/Makefile Wed Jan 13 00:52:20 2021 (r561407) @@ -1,25 +1,25 @@ # $FreeBSD$ PORTNAME= xdrawchem -DISTVERSION= 1.10.2-1 -PORTREVISION= 4 +DISTVERSION= 1.11.0-2 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org COMMENT= Two-dimensional molecule drawing program -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/doc/GPL.txt +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libopenbabel.so:science/openbabel USES= compiler:c++11-lang gl qmake qt:5 -USE_GITHUB= yes -GH_ACCOUNT= bryanherger -USE_QT= core gui network printsupport widgets xml buildtools_build +USE_QT= core gui network printsupport svg widgets xml buildtools_build USE_GL= gl -WRKSRC_SUBDIR= ${PORTNAME}-qt5 +USE_GITLAB= yes +GL_SITE= https://salsa.debian.org +GL_ACCOUNT= georgesk +GL_COMMIT= a3f74c34eb09fa72ee16848ec6901049ca5309d5 pre-configure: ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ Modified: head/science/xdrawchem/distinfo ============================================================================== --- head/science/xdrawchem/distinfo Wed Jan 13 00:31:38 2021 (r561406) +++ head/science/xdrawchem/distinfo Wed Jan 13 00:52:20 2021 (r561407) @@ -1,3 +1,3 @@ -TIMESTAMP = 1533775206 -SHA256 (bryanherger-xdrawchem-1.10.2-1_GH0.tar.gz) = 009b525e570cd79b3e59880877871e258071fecdef6c397d7533f3920faa9a7e -SIZE (bryanherger-xdrawchem-1.10.2-1_GH0.tar.gz) = 2888990 +TIMESTAMP = 1610498160 +SHA256 (georgesk-xdrawchem-a3f74c34eb09fa72ee16848ec6901049ca5309d5_GL0.tar.gz) = 856ac96c7e5a71270dc3fdf90a7c3e453b8f13f53167fd266635177a61370e85 +SIZE (georgesk-xdrawchem-a3f74c34eb09fa72ee16848ec6901049ca5309d5_GL0.tar.gz) = 719368 Modified: head/science/xdrawchem/files/patch-xdrawchem.pro ============================================================================== --- head/science/xdrawchem/files/patch-xdrawchem.pro Wed Jan 13 00:31:38 2021 (r561406) +++ head/science/xdrawchem/files/patch-xdrawchem.pro Wed Jan 13 00:52:20 2021 (r561407) @@ -1,13 +1,42 @@ ---- xdrawchem.pro.orig 2017-01-09 12:25:32 UTC +--- xdrawchem.pro.orig 2021-01-06 18:45:48 UTC +++ xdrawchem.pro -@@ -6,8 +6,8 @@ exists(/usr/include/openbabel-2.0/openbabel/mol.h) { - INCLUDEPATH += /usr/include/openbabel-2.0 +@@ -2,17 +2,17 @@ TEMPLATE = app + TARGET = xdrawchem + + # edit to match your OB install +-exists(/usr/include/openbabel3/openbabel/mol.h) { +-INCLUDEPATH += /usr/include/openbabel3 ++exists(%%LOCALBASE%%/include/openbabel3/openbabel/mol.h) { ++INCLUDEPATH += %%LOCALBASE%%/include/openbabel3 LIBS += -lopenbabel } --exists(/usr/local/include/openbabel-2.0/openbabel/mol.h) { --INCLUDEPATH += /usr/local/include/openbabel-2.0 +-exists(/usr/local/include/openbabel-3.0/openbabel/mol.h) { +-INCLUDEPATH += /usr/local/include/openbabel-3.0 +exists(%%LOCALBASE%%/include/openbabel3/openbabel/mol.h) { +INCLUDEPATH += %%LOCALBASE%%/include/openbabel3 LIBS += -lopenbabel } - exists(/Developer/openbabel-2.4.1/include/openbabel/mol.h) { +-exists(/Developer/openbabel-3.0/include/openbabel/mol.h) { +-INCLUDEPATH += /Developer/openbabel-3.0/include +-LIBS += -L/Developer/openbabel-3.0/lib/Debug -lopenbabel ++exists(%%LOCALBASE%%/openbabel3/include/openbabel/mol.h) { ++INCLUDEPATH += /Developer/openbabel3/include ++LIBS += -L/Developer/openbabel3/lib/Debug -lopenbabel + } + # exit if openbabel wasn't found + contains( LIBS, -lopenbabel ) { +@@ -20,12 +20,12 @@ contains( LIBS, -lopenbabel ) { + error(OpenBabel was not found. Edit xdrawchem.pro and add valid include and lib values) + # if you get this error, comment the above with #, uncomment the variables below, and set + # the paths to match your OpenBabel install +-#INCLUDEPATH += /usr/local/include/openbabel-3.0 ++#INCLUDEPATH += %%LOCALBASE%%/include/openbabel-3.0 + #LIBS += -lopenbabel + } + # set PREFIX if not set (it is set when building RPM) + isEmpty(PREFIX) { +-PREFIX = /usr/local ++PREFIX = %%LOCALBASE%% + } + + DESTDIR = bin Modified: head/science/xdrawchem/pkg-plist ============================================================================== --- head/science/xdrawchem/pkg-plist Wed Jan 13 00:31:38 2021 (r561406) +++ head/science/xdrawchem/pkg-plist Wed Jan 13 00:52:20 2021 (r561407) @@ -1,57 +1,9 @@ bin/xdrawchem -%%DATADIR%%/6ring_boat.cml -%%DATADIR%%/6ring_boat.png -%%DATADIR%%/6ring_chair.cml -%%DATADIR%%/6ring_chair.png -%%DATADIR%%/CMakeLists.txt %%DATADIR%%/COPYRIGHT.txt -%%DATADIR%%/GPL.txt -%%DATADIR%%/HISTORY.txt -%%DATADIR%%/adenine.cml -%%DATADIR%%/alanine.cml -%%DATADIR%%/anthracene.cml -%%DATADIR%%/arginine.cml -%%DATADIR%%/arrowtool.png -%%DATADIR%%/asparagine.cml -%%DATADIR%%/aspartic_acid.cml -%%DATADIR%%/back.xpm -%%DATADIR%%/benzene.cml -%%DATADIR%%/benzene.png -%%DATADIR%%/biotin.cml -%%DATADIR%%/biphenyl.cml -%%DATADIR%%/boc.cml -%%DATADIR%%/boldtool.png -%%DATADIR%%/brackettool.png -%%DATADIR%%/caslist.txt -%%DATADIR%%/chaintool.png -%%DATADIR%%/copytool.png -%%DATADIR%%/curvearrowtool.png -%%DATADIR%%/cuttool.png -%%DATADIR%%/cyclobutane.cml -%%DATADIR%%/cyclobutane.png -%%DATADIR%%/cycloheptane.cml -%%DATADIR%%/cyclohexane.cml -%%DATADIR%%/cyclohexane.png -%%DATADIR%%/cyclooctane.cml -%%DATADIR%%/cyclopentadiene-sp.cml -%%DATADIR%%/cyclopentadiene.cml -%%DATADIR%%/cyclopentadiene.png -%%DATADIR%%/cyclopentane.cml -%%DATADIR%%/cyclopentane.png -%%DATADIR%%/cyclopropane.cml -%%DATADIR%%/cyclopropane.png -%%DATADIR%%/cysteine.cml -%%DATADIR%%/cytosine.cml -%%DATADIR%%/d-fructose.cml -%%DATADIR%%/d-glucose.cml -%%DATADIR%%/dabcyl.cml -%%DATADIR%%/dabsyl.cml -%%DATADIR%%/dansyl.cml -%%DATADIR%%/dashtool.png -%%DATADIR%%/deoxyribose.cml +%%DATADIR%%/LICENSE.txt %%DATADIR%%/doc/COPYRIGHT.txt -%%DATADIR%%/doc/GPL.txt %%DATADIR%%/doc/HISTORY.txt +%%DATADIR%%/doc/LICENSE.txt %%DATADIR%%/doc/arrowtool.png %%DATADIR%%/doc/boldtool.png %%DATADIR%%/doc/brackettool.png @@ -98,78 +50,7 @@ bin/xdrawchem %%DATADIR%%/doc/toolmenu.html %%DATADIR%%/doc/underlinetool.png %%DATADIR%%/doc/uptool.png -%%DATADIR%%/downtool.png -%%DATADIR%%/edans.cml -%%DATADIR%%/editcut.png -%%DATADIR%%/editpaste.png -%%DATADIR%%/erasetool.png -%%DATADIR%%/filenew.png -%%DATADIR%%/fileopen.png -%%DATADIR%%/fileprint.png -%%DATADIR%%/filesave.png -%%DATADIR%%/fmoc.cml -%%DATADIR%%/forward.xpm -%%DATADIR%%/glutamic_acid.cml -%%DATADIR%%/glutamine.cml -%%DATADIR%%/glycine.cml -%%DATADIR%%/guanine.cml -%%DATADIR%%/histidine.cml -%%DATADIR%%/home.xpm -%%DATADIR%%/imidazole.cml -%%DATADIR%%/imidazole.png -%%DATADIR%%/indole.cml -%%DATADIR%%/isoleucine.cml -%%DATADIR%%/italictool.png -%%DATADIR%%/justifycentertool.png -%%DATADIR%%/justifylefttool.png -%%DATADIR%%/justifyrighttool.png -%%DATADIR%%/lassotool.png -%%DATADIR%%/leucine.cml -%%DATADIR%%/line1.png -%%DATADIR%%/line2.png -%%DATADIR%%/line3.png -%%DATADIR%%/line4.png -%%DATADIR%%/line5.png -%%DATADIR%%/linetool.png -%%DATADIR%%/lysine.cml -%%DATADIR%%/mag_minus.png -%%DATADIR%%/mag_plus.png -%%DATADIR%%/methionine.cml -%%DATADIR%%/naphthalene.cml -%%DATADIR%%/nitrophenylalanine.cml -%%DATADIR%%/pastetool.png -%%DATADIR%%/phenylalanine.cml -%%DATADIR%%/proline.cml -%%DATADIR%%/purine.cml -%%DATADIR%%/pyrimidine.cml %%DATADIR%%/retro.txt -%%DATADIR%%/ribose.cml -%%DATADIR%%/ringtool.png -%%DATADIR%%/selecttool.png -%%DATADIR%%/serine.cml -%%DATADIR%%/statine.cml -%%DATADIR%%/steroid.cml -%%DATADIR%%/subscript.png -%%DATADIR%%/superscript.png -%%DATADIR%%/sym_1e.png -%%DATADIR%%/sym_2e.png -%%DATADIR%%/sym_2e_line.png -%%DATADIR%%/sym_delta_minus.png -%%DATADIR%%/sym_delta_plus.png -%%DATADIR%%/sym_minus.png -%%DATADIR%%/sym_plus.png -%%DATADIR%%/symboltool.png -%%DATADIR%%/texttool.png -%%DATADIR%%/threonine.cml -%%DATADIR%%/thymine.cml -%%DATADIR%%/tryptophan.cml -%%DATADIR%%/tyrosine.cml -%%DATADIR%%/underlinetool.png -%%DATADIR%%/uptool.png -%%DATADIR%%/uracil.cml -%%DATADIR%%/valine.cml -%%DATADIR%%/wavytool.png -%%DATADIR%%/xdrawchem-icon.png %%DATADIR%%/xdrawchem_da.qm %%DATADIR%%/xdrawchem_de.qm %%DATADIR%%/xdrawchem_en.qm
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101130052.10D0qKxe031990>