Diff below updates x11/xdrawchem to 1.11.0, which is actually a fork
that fixes many bugs and adds some convenience features:
- Bumped to OpenBabel3
- Changed license to GPLv3+ from GPLv2+
- Changed some shortcuts
- Added more font options
- Added zooming with control keys
- Added redo
- Fixed cut/paste
- Fixed undo
- Fixed lasso tool
- Fixed grid
- Fixed custom rings
- Fixed rounding issues with drawings
- Fixed many other bugs and segmentation faults
HOMEPAGE has been updated to reflect the move to this fork.
This is the same version as ported by FreeBSD and several Linux
flavours.
Run tested on amd64.
Comments/OK?
diff --git Makefile Makefile
index 6eb1adddfca..9a1837c4571 100644
--- Makefile
+++ Makefile
@@ -1,30 +1,30 @@
COMMENT= two-dimensional molecule drawing program
-DISTNAME= xdrawchem-1.10.2
+V= 1.11.0
+DISTNAME= xdrawchem-${V}
+
CATEGORIES= x11 biology
-REVISION= 1
-HOMEPAGE= https://www.woodsidelabs.com/chemistry/xdrawchem.php
+HOMEPAGE= https://gitlab.com/yamanq/xdrawchem/
MAINTAINER= Bjorn Ketelaars <[email protected]>
-# GPLv2
+# GPLv3+
PERMIT_PACKAGE= Yes
WANTLIB+= ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5PrintSupport
-WANTLIB+= Qt5Widgets Qt5Xml c m openbabel
-
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xdrawchem/}
+WANTLIB+= Qt5Svg Qt5Widgets Qt5Xml c m openbabel
-EXTRACT_SUFX= -1.rpmsrc.tar.gz
+MASTER_SITES= https://gitlab.com/yamanq/xdrawchem/-/archive/v${V}/
MODULES= devel/qmake \
x11/qt5
-LIB_DEPENDS= misc/openbabel>=2.2.3
-CONFIGURE_ARGS= --with-qtincdir=${MODQT_INCDIR} \
- --with-qtlibdir=${MODQT_LIBDIR}
+LIB_DEPENDS= misc/openbabel>=3.0.0 \
+ x11/qt5/qtsvg
NO_TEST= Yes
+WRKDIST=
${WRKDIR}/xdrawchem-v1.11.0-53047f64b571b5f01623bf897eb9e2b212778031
+
.include <bsd.port.mk>
diff --git distinfo distinfo
index daf4d1a7af4..6608620ffb0 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (xdrawchem-1.10.2-1.rpmsrc.tar.gz) =
qoJJh9YobNgALcvaMePVLdncLjKcxKWTWu4K7MpRHCU=
-SIZE (xdrawchem-1.10.2-1.rpmsrc.tar.gz) = 732969
+SHA256 (xdrawchem-1.11.0.tar.gz) = iHOlg1xyeVHRUNMkID/kQ/VmkEGMd/kCcXXllKyWu6Y=
+SIZE (xdrawchem-1.11.0.tar.gz) = 713047
diff --git patches/patch-xdrawchem_pro patches/patch-xdrawchem_pro
index 7a50ee5206a..020d9f3018f 100644
--- patches/patch-xdrawchem_pro
+++ patches/patch-xdrawchem_pro
@@ -1,7 +1,22 @@
Index: xdrawchem.pro
--- xdrawchem.pro.orig
+++ xdrawchem.pro
-@@ -46,7 +46,7 @@ ringdir.files = ring/*
+@@ -2,11 +2,11 @@ TEMPLATE = app
+ TARGET = xdrawchem
+
+ # edit to match your OB install
+-exists(/usr/include/openbabel3/openbabel/mol.h) {
+-INCLUDEPATH += /usr/include/openbabel3
++exists($${PREFIX}/include/openbabel3/openbabel/mol.h) {
++INCLUDEPATH += /usr/local/include/openbabel3
+ LIBS += -lopenbabel
+ }
+-exists(/usr/local/include/openbabel-3.0/openbabel/mol.h) {
++exists($${PREFIX}/include/openbabel-3.0/openbabel/mol.h) {
+ INCLUDEPATH += /usr/local/include/openbabel-3.0
+ LIBS += -lopenbabel
+ }
+@@ -45,7 +45,7 @@ ringdir.files = ring/*
doc.path = $${PREFIX}/share/xdrawchem/doc
doc.files = doc/*
INSTALLS += ringdir doc
@@ -9,4 +24,4 @@ Index: xdrawchem.pro
+QMAKE_CXXFLAGS_DEBUG +=
CONFIG += debug
- QT += xml network core widgets printsupport network gui
+ QT += xml svg network core widgets printsupport network gui
diff --git patches/patch-xdrawchem_render2d_text_cpp
patches/patch-xdrawchem_render2d_text_cpp
deleted file mode 100644
index e52b17b6c0d..00000000000
--- patches/patch-xdrawchem_render2d_text_cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix segfault when using (hot)key on bond twice in a row. Taken from
-https://github.com/bryanherger/xdrawchem/pull/12
-
-Index: xdrawchem/render2d_text.cpp
---- xdrawchem/render2d_text.cpp.orig
-+++ xdrawchem/render2d_text.cpp
-@@ -380,6 +380,9 @@ void Render2D::keyPressEvent( QKeyEvent * k )
- }
-
- if ( highlightobject->Type() != TYPE_TEXT ) {
-+ delete localtexteditor;
-+ localtexteditor = 0;
-+
- hotkeymode = false;
- mode = hkprevmode;
- return;
diff --git pkg/PLIST pkg/PLIST
index 651a84392b1..2876e6cb3f1 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,59 +1,12 @@
@bin bin/xdrawchem
share/xdrawchem/
-share/xdrawchem/6ring_boat.cml
-share/xdrawchem/6ring_boat.png
-share/xdrawchem/6ring_chair.cml
-share/xdrawchem/6ring_chair.png
-share/xdrawchem/CMakeLists.txt
share/xdrawchem/COPYRIGHT.txt
-share/xdrawchem/GPL.txt
-share/xdrawchem/HISTORY.txt
-share/xdrawchem/adenine.cml
-share/xdrawchem/alanine.cml
-share/xdrawchem/anthracene.cml
-share/xdrawchem/arginine.cml
-share/xdrawchem/arrowtool.png
-share/xdrawchem/asparagine.cml
-share/xdrawchem/aspartic_acid.cml
-share/xdrawchem/back.xpm
-share/xdrawchem/benzene.cml
-share/xdrawchem/benzene.png
-share/xdrawchem/biotin.cml
-share/xdrawchem/biphenyl.cml
-share/xdrawchem/boc.cml
-share/xdrawchem/boldtool.png
-share/xdrawchem/brackettool.png
-share/xdrawchem/caslist.txt
-share/xdrawchem/chaintool.png
-share/xdrawchem/copytool.png
-share/xdrawchem/curvearrowtool.png
-share/xdrawchem/cuttool.png
-share/xdrawchem/cyclobutane.cml
-share/xdrawchem/cyclobutane.png
-share/xdrawchem/cycloheptane.cml
-share/xdrawchem/cyclohexane.cml
-share/xdrawchem/cyclohexane.png
-share/xdrawchem/cyclooctane.cml
-share/xdrawchem/cyclopentadiene-sp.cml
-share/xdrawchem/cyclopentadiene.cml
-share/xdrawchem/cyclopentadiene.png
-share/xdrawchem/cyclopentane.cml
-share/xdrawchem/cyclopentane.png
-share/xdrawchem/cyclopropane.cml
-share/xdrawchem/cyclopropane.png
-share/xdrawchem/cysteine.cml
-share/xdrawchem/cytosine.cml
-share/xdrawchem/d-fructose.cml
-share/xdrawchem/d-glucose.cml
-share/xdrawchem/dabcyl.cml
-share/xdrawchem/dabsyl.cml
-share/xdrawchem/dansyl.cml
-share/xdrawchem/dashtool.png
-share/xdrawchem/deoxyribose.cml
+share/xdrawchem/LICENSE.txt
share/xdrawchem/doc/
-@comment share/xdrawchem/doc/COPYRIGHT.txt
@comment share/xdrawchem/doc/GPL.txt
+@comment share/xdrawchem/doc/COPYRIGHT.txt
share/xdrawchem/doc/HISTORY.txt
+share/xdrawchem/doc/LICENSE.txt
share/xdrawchem/doc/arrowtool.png
share/xdrawchem/doc/boldtool.png
share/xdrawchem/doc/brackettool.png
@@ -100,78 +53,7 @@ share/xdrawchem/doc/toolbar.html
share/xdrawchem/doc/toolmenu.html
share/xdrawchem/doc/underlinetool.png
share/xdrawchem/doc/uptool.png
-share/xdrawchem/downtool.png
-share/xdrawchem/edans.cml
-share/xdrawchem/editcut.png
-share/xdrawchem/editpaste.png
-share/xdrawchem/erasetool.png
-share/xdrawchem/filenew.png
-share/xdrawchem/fileopen.png
-share/xdrawchem/fileprint.png
-share/xdrawchem/filesave.png
-share/xdrawchem/fmoc.cml
-share/xdrawchem/forward.xpm
-share/xdrawchem/glutamic_acid.cml
-share/xdrawchem/glutamine.cml
-share/xdrawchem/glycine.cml
-share/xdrawchem/guanine.cml
-share/xdrawchem/histidine.cml
-share/xdrawchem/home.xpm
-share/xdrawchem/imidazole.cml
-share/xdrawchem/imidazole.png
-share/xdrawchem/indole.cml
-share/xdrawchem/isoleucine.cml
-share/xdrawchem/italictool.png
-share/xdrawchem/justifycentertool.png
-share/xdrawchem/justifylefttool.png
-share/xdrawchem/justifyrighttool.png
-share/xdrawchem/lassotool.png
-share/xdrawchem/leucine.cml
-share/xdrawchem/line1.png
-share/xdrawchem/line2.png
-share/xdrawchem/line3.png
-share/xdrawchem/line4.png
-share/xdrawchem/line5.png
-share/xdrawchem/linetool.png
-share/xdrawchem/lysine.cml
-share/xdrawchem/mag_minus.png
-share/xdrawchem/mag_plus.png
-share/xdrawchem/methionine.cml
-share/xdrawchem/naphthalene.cml
-share/xdrawchem/nitrophenylalanine.cml
-share/xdrawchem/pastetool.png
-share/xdrawchem/phenylalanine.cml
-share/xdrawchem/proline.cml
-share/xdrawchem/purine.cml
-share/xdrawchem/pyrimidine.cml
share/xdrawchem/retro.txt
-share/xdrawchem/ribose.cml
-share/xdrawchem/ringtool.png
-share/xdrawchem/selecttool.png
-share/xdrawchem/serine.cml
-share/xdrawchem/statine.cml
-share/xdrawchem/steroid.cml
-share/xdrawchem/subscript.png
-share/xdrawchem/superscript.png
-share/xdrawchem/sym_1e.png
-share/xdrawchem/sym_2e.png
-share/xdrawchem/sym_2e_line.png
-share/xdrawchem/sym_delta_minus.png
-share/xdrawchem/sym_delta_plus.png
-share/xdrawchem/sym_minus.png
-share/xdrawchem/sym_plus.png
-share/xdrawchem/symboltool.png
-share/xdrawchem/texttool.png
-share/xdrawchem/threonine.cml
-share/xdrawchem/thymine.cml
-share/xdrawchem/tryptophan.cml
-share/xdrawchem/tyrosine.cml
-share/xdrawchem/underlinetool.png
-share/xdrawchem/uptool.png
-share/xdrawchem/uracil.cml
-share/xdrawchem/valine.cml
-share/xdrawchem/wavytool.png
-share/xdrawchem/xdrawchem-icon.png
share/xdrawchem/xdrawchem_da.qm
share/xdrawchem/xdrawchem_de.qm
share/xdrawchem/xdrawchem_en.qm
