Enclosed a diff for bringing xdrawchem to the latest version. Noticeable change is the move to QT5.
Tested on amd64. Drawing, and calculation functionality work as promised. Index: Makefile =================================================================== RCS file: /cvs/ports/x11/xdrawchem/Makefile,v retrieving revision 1.25 diff -u -p -r1.25 Makefile --- Makefile 23 Oct 2017 17:11:06 -0000 1.25 +++ Makefile 17 Apr 2018 20:38:44 -0000 @@ -2,31 +2,25 @@ COMMENT= two-dimensional molecule drawing program -DISTNAME= xdrawchem-1.9.9 -REVISION= 9 +DISTNAME= xdrawchem-1.10.2 CATEGORIES= x11 biology -HOMEPAGE= http://xdrawchem.sourceforge.net/ +HOMEPAGE= https://www.woodsidelabs.com/chemistry/xdrawchem.php # GPLv2 PERMIT_PACKAGE_CDROM= Yes -WANTLIB += GL ICE SM X11 X11-xcb Xau Xcursor Xdamage Xdmcp Xext Xfixes -WANTLIB += Xft Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm c drm expat -WANTLIB += fontconfig freetype glapi jpeg lcms m mng openbabel>=4 png -WANTLIB += pthread ${COMPILER_LIBCXX} xcb xcb-dri2 xcb-glx z +WANTLIB+= ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5PrintSupport +WANTLIB+= Qt5Widgets Qt5Xml c m openbabel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xdrawchem/} -MODULES= x11/qt3 +EXTRACT_SUFX= -1.rpmsrc.tar.gz -LIB_DEPENDS = misc/openbabel>=2.2.0 +MODULES= devel/qmake \ + x11/qt5 +LIB_DEPENDS= misc/openbabel>=2.2.3 -USE_GMAKE= Yes - -MAKE_FLAGS= LDFLAGS+="-lqt-mt -pthread -L${X11BASE}/lib" - -CONFIGURE_STYLE=gnu CONFIGURE_ARGS= --with-qtincdir=${MODQT_INCDIR} \ --with-qtlibdir=${MODQT_LIBDIR} Index: distinfo =================================================================== RCS file: /cvs/ports/x11/xdrawchem/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo 18 Jan 2015 03:16:05 -0000 1.3 +++ distinfo 17 Apr 2018 20:38:44 -0000 @@ -1,2 +1,2 @@ -SHA256 (xdrawchem-1.9.9.tar.gz) = M+Re6Lk3uk6nf7KK3KZhlZQ3FalBA5qV0KS+0J1M+eM= -SIZE (xdrawchem-1.9.9.tar.gz) = 982481 +SHA256 (xdrawchem-1.10.2-1.rpmsrc.tar.gz) = qoJJh9YobNgALcvaMePVLdncLjKcxKWTWu4K7MpRHCU= +SIZE (xdrawchem-1.10.2-1.rpmsrc.tar.gz) = 732969 Index: patches/patch-xdrawchem_Makefile_in =================================================================== RCS file: patches/patch-xdrawchem_Makefile_in diff -N patches/patch-xdrawchem_Makefile_in --- patches/patch-xdrawchem_Makefile_in 2 Sep 2008 21:11:12 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ -$OpenBSD: patch-xdrawchem_Makefile_in,v 1.1 2008/09/02 21:11:12 ajacoutot Exp $ ---- xdrawchem/Makefile.in.orig Wed Feb 7 05:52:13 2007 -+++ xdrawchem/Makefile.in Wed Feb 7 05:53:33 2007 -@@ -459,6 +459,13 @@ distclean-compile: - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -+boshcp.o: boshcp.cpp -+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -O0 -c -o $@ $<; \ -+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+ - .cpp.obj: - @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ - @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi Index: patches/patch-xdrawchem_application_cpp =================================================================== RCS file: patches/patch-xdrawchem_application_cpp diff -N patches/patch-xdrawchem_application_cpp --- patches/patch-xdrawchem_application_cpp 23 Jan 2007 15:43:05 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-xdrawchem_application_cpp,v 1.1.1.1 2007/01/23 15:43:05 ajacoutot Exp $ ---- xdrawchem/application.cpp.orig Tue Jan 16 16:05:03 2007 -+++ xdrawchem/application.cpp Tue Jan 16 16:05:40 2007 -@@ -58,6 +58,7 @@ using std::endl; - #ifdef UNIX - #include <stdlib.h> - #include <time.h> -+#include <unistd.h> - #endif - - #include "defs.h" Index: patches/patch-xdrawchem_application_ob_cpp =================================================================== RCS file: patches/patch-xdrawchem_application_ob_cpp diff -N patches/patch-xdrawchem_application_ob_cpp --- patches/patch-xdrawchem_application_ob_cpp 30 Nov 2014 05:41:35 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-xdrawchem_application_ob_cpp,v 1.1 2014/11/30 05:41:35 brad Exp $ - -Replace the malloc.h header with stdlib.h. - ---- xdrawchem/application_ob.cpp.orig Thu Nov 20 05:20:49 2014 -+++ xdrawchem/application_ob.cpp Thu Nov 20 05:21:25 2014 -@@ -9,7 +9,7 @@ - #include <iostream> - #include <fstream> - #include <string.h> --#include <malloc.h> -+#include <stdlib.h> - - using std::cout; - using std::endl; Index: patches/patch-xdrawchem_ioiface_cpp =================================================================== RCS file: patches/patch-xdrawchem_ioiface_cpp diff -N patches/patch-xdrawchem_ioiface_cpp --- patches/patch-xdrawchem_ioiface_cpp 22 May 2017 18:28:05 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-xdrawchem_ioiface_cpp,v 1.1 2017/05/22 18:28:05 espie Exp $ - -Index: xdrawchem/ioiface.cpp ---- xdrawchem/ioiface.cpp.orig -+++ xdrawchem/ioiface.cpp -@@ -39,7 +39,7 @@ struct Point { - - struct pt_cmp { - -- bool operator() (const Point& one, const Point& two) { return one<two; } -+ bool operator() (const Point& one, const Point& two) const { return one<two; } - - }; - Index: patches/patch-xdrawchem_molecule_obmol_cpp =================================================================== RCS file: patches/patch-xdrawchem_molecule_obmol_cpp diff -N patches/patch-xdrawchem_molecule_obmol_cpp --- patches/patch-xdrawchem_molecule_obmol_cpp 15 Apr 2018 19:27:49 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,32 +0,0 @@ -$OpenBSD: patch-xdrawchem_molecule_obmol_cpp,v 1.2 2018/04/15 19:27:49 naddy Exp $ - -Index: xdrawchem/molecule_obmol.cpp ---- xdrawchem/molecule_obmol.cpp.orig -+++ xdrawchem/molecule_obmol.cpp -@@ -22,7 +22,7 @@ struct Point { - - struct pt_cmp { - -- bool operator() (const Point& one, const Point& two) { return one<two; } -+ bool operator() (const Point& one, const Point& two) const { return one<two; } - - }; - -@@ -198,7 +198,7 @@ OBMol * Molecule::convertToOBMol() { - atom.SetType( type ); - - if (!obmol->AddAtom(atom)) -- return(false); -+ return NULL; - atom.Clear(); - } - -@@ -212,7 +212,7 @@ OBMol * Molecule::convertToOBMol() { - bst = tmp_bond->Stereo(); - if (bst == STEREO_UP) flag |= OB_WEDGE_BOND; - if (bst == STEREO_DOWN) flag |= OB_HASH_BOND; -- if (!obmol->AddBond(start,end,order,flag)) return(false); -+ if (!obmol->AddBond(start,end,order,flag)) return NULL; - } - - obmol->EndModify(); Index: patches/patch-xdrawchem_pro =================================================================== RCS file: patches/patch-xdrawchem_pro diff -N patches/patch-xdrawchem_pro --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-xdrawchem_pro 17 Apr 2018 20:38:44 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: xdrawchem.pro +--- xdrawchem.pro.orig ++++ xdrawchem.pro +@@ -46,7 +46,7 @@ ringdir.files = ring/* + doc.path = $${PREFIX}/share/xdrawchem/doc + doc.files = doc/* + INSTALLS += ringdir doc +-QMAKE_CXXFLAGS_DEBUG += -O0 -g3 ++QMAKE_CXXFLAGS_DEBUG += + + CONFIG += debug + QT += xml network core widgets printsupport network gui Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/xdrawchem/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- pkg/PLIST 20 Aug 2008 16:09:23 -0000 1.2 +++ pkg/PLIST 17 Apr 2018 20:38:44 -0000 @@ -2,11 +2,18 @@ @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 @@ -15,17 +22,26 @@ 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 @@ -33,6 +49,7 @@ 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/doc/ @comment share/xdrawchem/doc/COPYRIGHT.txt @@ -41,6 +58,9 @@ share/xdrawchem/doc/HISTORY.txt share/xdrawchem/doc/arrowtool.png share/xdrawchem/doc/boldtool.png share/xdrawchem/doc/brackettool.png +share/xdrawchem/doc/cb.png +share/xdrawchem/doc/cbf.png +share/xdrawchem/doc/cbh.png share/xdrawchem/doc/cinna.png share/xdrawchem/doc/color_pulldown.png share/xdrawchem/doc/copytool.png @@ -81,7 +101,15 @@ 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 @@ -94,26 +122,56 @@ 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
