science/xdrawchem: update 1.11.1-2 → 2.0.1

5 files changed, 151 insertions, 30 deletions

diff --git a/science/xdrawchem/Makefile b/science/xdrawchem/Makefile
index 926a78490b15..2380c4e7f918 100644
--- a/science/xdrawchem/Makefile
+++ b/science/xdrawchem/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xdrawchem
-DISTVERSION=	1.11.1-2
-PORTREVISION=	1
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2.0.1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -9,22 +9,19 @@ WWW=		https://sourceforge.net/projects/xdrawchem/ \
 		https://github.com/bryanherger/xdrawchem
 
 LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libopenbabel.so:science/openbabel
 
-USES=		compiler:c++11-lang gl pkgconfig qmake qt:5
-USE_QT=		core gui network printsupport svg widgets xml buildtools:build
+USES=		cmake compiler:c++17-lang desktop-file-utils gl localbase:ldflags pkgconfig qt:6
+USE_QT=		base svg tools:build
 USE_GL=		gl
 
-USE_GITLAB=	yes
-GL_SITE=	https://salsa.debian.org
-GL_ACCOUNT=	georgesk
-GL_TAGNAME=	48f2e4817be451550a2cd80263344642a8611b15
+USE_GITHUB=	yes
+GH_ACCOUNT=	bryanherger
 
-pre-configure:
-	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|'	\
-		${WRKSRC}/xdrawchem.pro
+WRKSRC_SUBDIR=	xdrawchem-qt5
+
+LDFLAGS+=	-lexecinfo
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
diff --git a/science/xdrawchem/distinfo b/science/xdrawchem/distinfo
index c421a4325d93..ce2d1600b77b 100644
--- a/science/xdrawchem/distinfo
+++ b/science/xdrawchem/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1762920603
-SHA256 (georgesk-xdrawchem-48f2e4817be451550a2cd80263344642a8611b15_GL0.tar.gz) = ffb94399cebdcdcb9d2011476d4094ec34ee95fe684d8a000b80da4c686f97be
-SIZE (georgesk-xdrawchem-48f2e4817be451550a2cd80263344642a8611b15_GL0.tar.gz) = 719899
+TIMESTAMP = 1783471738
+SHA256 (bryanherger-xdrawchem-v2.0.1_GH0.tar.gz) = cd85efc30e266da0283bd25535387e62a6526038a7974dca14d67409735362fa
+SIZE (bryanherger-xdrawchem-v2.0.1_GH0.tar.gz) = 3062238
diff --git a/science/xdrawchem/files/patch-CMakeLists.txt b/science/xdrawchem/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..c4aa046298e8
--- /dev/null
+++ b/science/xdrawchem/files/patch-CMakeLists.txt
@@ -0,0 +1,12 @@
+--- CMakeLists.txt.orig	2026-07-08 00:52:13 UTC
++++ CMakeLists.txt
+@@ -405,5 +405,7 @@ install(FILES xdrawchem.metainfo.xml
+ )
+ 
+ # ── Tests ───────────────────────────────────────────────────────────────
+-include(CTest)
+-add_subdirectory(tests)
++if (BUILD_TESTING)
++    enable_testing()
++    add_subdirectory(tests)
++endif()
diff --git a/science/xdrawchem/files/patch-xdrawchem.pro b/science/xdrawchem/files/patch-xdrawchem.pro
deleted file mode 100644
index 829d8ac9920c..000000000000
--- a/science/xdrawchem/files/patch-xdrawchem.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- xdrawchem.pro.orig	2024-11-15 16:56:22 UTC
-+++ xdrawchem.pro
-@@ -3,7 +3,7 @@ isEmpty(PREFIX) {
- 
- # set PREFIX if not set (it is set when building RPM)
- isEmpty(PREFIX) {
--PREFIX = /usr/local
-+PREFIX = %%LOCALBASE%%
- }
- 
- DESTDIR = bin
diff --git a/science/xdrawchem/pkg-plist b/science/xdrawchem/pkg-plist
index 19ad5725bff1..a97688d7aafc 100644
--- a/science/xdrawchem/pkg-plist
+++ b/science/xdrawchem/pkg-plist
@@ -1,9 +1,61 @@
 bin/xdrawchem
+share/applications/io.github.bryanherger.xdrawchem.desktop
+share/applications/xdrawchem.desktop
+share/icons/hicolor/256x256/apps/io.github.bryanherger.xdrawchem.png
+share/metainfo/io.github.bryanherger.xdrawchem.metainfo.xml
+share/metainfo/xdrawchem.metainfo.xml
+share/pixmaps/xdrawchem.png
+%%DATADIR%%/6ring_boat.cml
+%%DATADIR%%/6ring_boat.png
+%%DATADIR%%/6ring_chair.cml
+%%DATADIR%%/6ring_chair.png
+%%DATADIR%%/CMakeLists.txt
 %%DATADIR%%/COPYRIGHT.txt
-%%DATADIR%%/LICENSE.txt
-%%DATADIR%%/doc/COPYRIGHT.txt
-%%DATADIR%%/doc/HISTORY.txt
-%%DATADIR%%/doc/LICENSE.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%%/dativetool.png
+%%DATADIR%%/deoxyribose.cml
 %%DATADIR%%/doc/arrowtool.png
 %%DATADIR%%/doc/boldtool.png
 %%DATADIR%%/doc/brackettool.png
@@ -50,7 +102,78 @@ 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