xmakemol: switch to Debian's patched version.

[Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>
Pushed By:	vms
Date:		Sat Dec 17 23:14:54 2022 +0100
Changeset:	f6b7d89f4151b2b104445147fe9326f99b12fa14

Modified Files:
	xmakemol/DESCR
	xmakemol/Makefile
	xmakemol/distinfo

Log Message:
xmakemol: switch to Debian's patched version.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f6b7d89f4151b2b104445147fe9326f99b12fa14

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 xmakemol/DESCR    |  3 +++
 xmakemol/Makefile | 21 ++++++++++++++-------
 xmakemol/distinfo |  6 +++---
 3 files changed, 20 insertions(+), 10 deletions(-)

diffs:
diff --git a/xmakemol/DESCR b/xmakemol/DESCR
index 198f60323e..93e073a4c0 100644
--- a/xmakemol/DESCR
+++ b/xmakemol/DESCR
@@ -10,3 +10,6 @@ Features include:
  - Exporting to Xpm, Encapsulated PostScript and XYZ formats
  - Toggling the visibility of groups of atoms
  - Editing the positions of subsets of atoms
+
+This version incorporates the latest patches from Debian, which provide
+additional tuning of H-bond detection.
diff --git a/xmakemol/Makefile b/xmakemol/Makefile
index bb313b2815..8e2fdf5c36 100644
--- a/xmakemol/Makefile
+++ b/xmakemol/Makefile
@@ -1,8 +1,9 @@
 # $NetBSD$
 
-DISTNAME=	xmakemol-5.16
+DISTNAME=	xmakemol-5.16h
 CATEGORIES=	biology
-MASTER_SITES=	http://savannah.nongnu.org/download/xmakemol/
+MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD/misc/vins/dists/
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	vins%NetBSD.org@localhost
 HOMEPAGE=	https://www.nongnu.org/xmakemol/
@@ -11,17 +12,23 @@ LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake perl
-
-CONFIGURE_ARGS+=	--prefix=${PREFIX}
-CONFIGURE_ARGS+=	--x-includes=${X11BASE}/include
-CONFIGURE_ARGS+=	--x-libraries=${X11BASE}/lib
+USE_TOOLS+=	autoconf automake autoreconf
 
 REPLACE_PERL=	xmake_anim.pl
 
+ELEM_FILE=	${WRKSRC}/elements
+
+MAKE_FLAGS+=	CC=${CC:Q}
+MAKE_FLAGS+=	CFLAGS='${CFLAGS} -DELEMENTS=\"${ELEM_FILE}\"'
+MAKE_FLAGS+=	CPPLAGS=${CPPLAGS:Q}
+MAKE_FLAGS+=	LDFLAGS=${LDFLAGS:Q}
+
 INSTALLATION_DIRS=	share/applications
 
+WRKSRC=	${WRKDIR}/${DISTNAME:S,h,,}
+
 post-extract:
-	     ${CP} ${FILESDIR}/xmakemol.desktop ${WRKSRC}
+	${CP} ${FILESDIR}/xmakemol.desktop ${WRKSRC}
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/xmakemol.desktop \
diff --git a/xmakemol/distinfo b/xmakemol/distinfo
index bd79b6aefc..326909e854 100644
--- a/xmakemol/distinfo
+++ b/xmakemol/distinfo
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.1.1.1 2011/03/20 23:43:21 jihbed Exp $
 
-BLAKE2s (xmakemol-5.16.tar.gz) = 46d32e147719a17f934da910b3a074606343682286eeb3b20bd25cafb3b1f74c
-SHA512 (xmakemol-5.16.tar.gz) = e967d992e0c72045022764dee9ec2ffee89f37208a313ff0154351c545cc9466e0c4ce2d07e5568ee693fc48322361c5b4579efc072443445e94f5228988d509
-Size (xmakemol-5.16.tar.gz) = 284962 bytes
+BLAKE2s (xmakemol-5.16h.tar.xz) = 104be5a568d52cceacf8aa0f4c7619d7aa2f0039b4b45ad1ece34aa2c4e895e2
+SHA512 (xmakemol-5.16h.tar.xz) = 63ce47a96aaa61872bd27cb60befe175f72b0a3560ce48056d21fce91e0d268436c73b4ddc9bd9fa539cbabe4934167da92122847e226657178e82a7d0e01280
+Size (xmakemol-5.16h.tar.xz) = 216832 bytes