git: e276e87ae4bf - main - news/nzbhydra2: Update version 4.7.4=>5.3.3

From: Muhammad Moinur Rahman <bofh_at_FreeBSD.org>
Date: Tue, 12 Dec 2023 16:44:50 UTC
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e276e87ae4bf600e4899a21ad0f91984b4f89188

commit e276e87ae4bf600e4899a21ad0f91984b4f89188
Author:     Kreeblah <kreeblah@gmail.com>
AuthorDate: 2023-12-12 16:38:07 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-12-12 16:38:07 +0000

    news/nzbhydra2: Update version 4.7.4=>5.3.3
    
    Changelog: https://github.com/theotherp/nzbhydra2/releases/tag/v5.3.5
    
    PR:             274418
    Approved by:    submitter is maintainer
---
 news/nzbhydra2/Makefile           | 17 ++++++++---------
 news/nzbhydra2/distinfo           |  6 +++---
 news/nzbhydra2/files/nzbhydra2.in |  2 ++
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/news/nzbhydra2/Makefile b/news/nzbhydra2/Makefile
index 8380785573f8..99db5cee0da1 100644
--- a/news/nzbhydra2/Makefile
+++ b/news/nzbhydra2/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	nzbhydra2
-DISTVERSION=	4.7.4
-DISTVERSIONSUFFIX=	-linux
+DISTVERSION=	5.3.3
+DISTVERSIONSUFFIX=	-generic
 CATEGORIES=	news java
 MASTER_SITES=	https://github.com/theotherp/${PORTNAME}/releases/download/v${DISTVERSION}/
 
@@ -22,7 +22,8 @@ NO_WRKSUBDIR=	yes
 
 SUB_FILES=	nzbhydra2
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} \
-		JAVA=${JAVA}
+		JAVA=${JAVA} \
+		DISTVERSION=${DISTVERSION}
 
 JAVA_VERSION=	17+
 JAVA_VENDOR=	openjdk
@@ -32,7 +33,6 @@ USERS=		nzbhydra2
 GROUPS=		nzbhydra2
 
 PLIST_FILES=	${DATADIR}/lib/core-${DISTVERSION}-exec.jar \
-		${DATADIR}/nzbhydra2 \
 		${DATADIR}/nzbhydra2wrapperPy3.py \
 		${DATADIR}/changelog.md \
 		${DATADIR}/readme.md \
@@ -40,11 +40,10 @@ PLIST_FILES=	${DATADIR}/lib/core-${DISTVERSION}-exec.jar \
 
 post-extract:
 	# Cleanup unnecessary files
-	@${RM} -r ${WRKSRC}/systemd ${WRKSRC}/sysv ${WRKSRC}/rc.d ${WRKSRC}/upstart ${WRKSRC}/nzbhydra2wrapper.py
-
-pre-install:
-	# temp fix for https://github.com/theotherp/nzbhydra2/issues/812
-	${RM} -r ${WRKSRC}/data
+	@${RM} -r ${WRKSRC}/systemd ${WRKSRC}/sysv ${WRKSRC}/rc.d \
+		${WRKSRC}/upstart ${WRKSRC}/nzbhydra2wrapper.py  \
+		${WRKSRC}/other ${WRKSRC}/executables ${WRKSRC}/WindowsService \
+		${WRKSRC}/NZBHydra2*
 
 do-install:
 	@${MKDIR} ${STAGEDIR}/${DATADIR}
diff --git a/news/nzbhydra2/distinfo b/news/nzbhydra2/distinfo
index 14f3161ecf8a..88eb11269223 100644
--- a/news/nzbhydra2/distinfo
+++ b/news/nzbhydra2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1671278127
-SHA256 (nzbhydra2-4.7.4-linux.zip) = 70ca65452f1e80f010a61bd5a760961efcab04e06cd0599403b174af753d8a84
-SIZE (nzbhydra2-4.7.4-linux.zip) = 83396533
+TIMESTAMP = 1700556557
+SHA256 (nzbhydra2-5.3.3-generic.zip) = 61e656a066ed01dd4214c52609c051c7f2e1451a9f7080510f731863ac461a92
+SIZE (nzbhydra2-5.3.3-generic.zip) = 195956868
diff --git a/news/nzbhydra2/files/nzbhydra2.in b/news/nzbhydra2/files/nzbhydra2.in
index 490cceb158c0..c20452637d24 100644
--- a/news/nzbhydra2/files/nzbhydra2.in
+++ b/news/nzbhydra2/files/nzbhydra2.in
@@ -45,6 +45,8 @@ nzbhydra2_precmd()
 	export XDG_CONFIG_HOME=${nzbhydra2_data_dir}
 	export NZBHYDRA_DISABLE_UPDATE=1
 
+	find "%%PREFIX%%/share/nzbhydra2/lib/" ! -name "core-%%DISTVERSION%%-exec.jar" -delete
+
 	if [ -f ${pidfile} ]; then
 		rm -f ${pidfile}
 		echo "Removing stale pidfile."