git: 5d944f4bb91d - main - emulators/hatari: Update 2.5.0 => 2.6.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Mon, 11 Aug 2025 14:03:29 UTC
The branch main has been updated by vvd:

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

commit 5d944f4bb91d8a0d54315912e3b51f2892a6a5f6
Author:     Laurent Chardon <laurent.chardon@gmail.com>
AuthorDate: 2025-08-11 13:57:21 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-08-11 14:03:08 +0000

    emulators/hatari: Update 2.5.0 => 2.6.0
    
    Upstream migrated to GitLab.
    
    Changelog:
    https://framagit.org/hatari/hatari/-/releases/v2.6.0
    
    Improve manual pages patching and installation.
    Fix warnings from portclippy.
    Remove unused dependency iconv.
    
    PR:             288772
    Co-authored-by: Vladimir Druzenko <vvd@FreeBSD.org>
---
 emulators/hatari/Makefile                          | 54 +++++++++++++---------
 emulators/hatari/distinfo                          |  6 +--
 .../hatari/files/patch-tools_atari-hd-image.sh     | 14 +++---
 emulators/hatari/pkg-plist                         |  2 -
 4 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile
index e4f43322717f..11458bc0818b 100644
--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@@ -1,8 +1,7 @@
 PORTNAME=	hatari
-PORTVERSION=	2.5.0
-PORTREVISION=	1
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2.6.0
 CATEGORIES=	emulators
-MASTER_SITES=	http://download.tuxfamily.org/hatari/${PORTVERSION}/
 
 MAINTAINER=	laurent.chardon@gmail.com
 COMMENT=	Atari ST emulator
@@ -18,48 +17,56 @@ LIB_DEPENDS=	libpng.so:graphics/png \
 		libreadline.so:devel/readline \
 		libcapstone.so:devel/capstone
 
-USES=		cmake desktop-file-utils gnome python readline \
-		sdl shared-mime-info shebangfix tar:bzip2 xorg iconv
+USES=		cmake desktop-file-utils gnome localbase python readline sdl \
+		shared-mime-info shebangfix tar:bzip2 xorg
+
+USE_GITLAB=	yes
+GL_SITE=	https://framagit.org/
+
 USE_GNOME=	gtk30 pygobject3
-USE_XORG=	sm ice x11 xext
 USE_SDL=	sdl2
+USE_XORG=	ice sm x11 xext
 
 SHEBANG_FILES=	python-ui/*.py tools/*.py \
 		tools/debugger/*.py tools/hconsole/*.py
 
 CMAKE_ARGS=	-DETCDIR:PATH="${PREFIX}/etc"
 
-OPTIONS_DEFINE=		DEBUG DOCS DSP TRACE SMALL
+TEST_TARGET=	test
+
+OPTIONS_DEFINE=		DEBUG DOCS DSP SMALL TRACE
 OPTIONS_DEFAULT=	DOCS DSP TRACE
 
 DEBUG_DESC=		Build with debug information
 DOCS_DESC=		Install extra documentation
 DSP_DESC=		DSP 56k emulator for Falcon mode
-TRACE_DESC=		Tracing messages for debugging
 SMALL_DESC=		Use less memory at the expense of emulation speed
+TRACE_DESC=		Tracing messages for debugging
 
 DSP_CMAKE_BOOL=		ENABLE_DSP_EMU
-TRACE_CMAKE_BOOL=	ENABLE_TRACING
 SMALL_CMAKE_BOOL=	ENABLE_SMALL_MEM
-
-TEST_TARGET=	test
+TRACE_CMAKE_BOOL=	ENABLE_TRACING
 
 .include <bsd.port.options.mk>
 
 # CMAKE_ARGS CMAKE_BUILD_TYPE is getting overriden
 .if ${PORT_OPTIONS:MDEBUG}
-CMAKE_BUILD_TYPE=Debug
-INSTALL_TARGET=install
+CMAKE_BUILD_TYPE=	Debug
+INSTALL_TARGET=		install
 .else
-CMAKE_BUILD_TYPE=Release
+CMAKE_BUILD_TYPE=	Release
 .endif
 
 post-patch:
-.for i in doc/*.1 python-ui/*.1 tools/*.1 tools/debugger/*.1 tools/hconsole/*.1 tools/hmsa/*.1
 	@${REINPLACE_CMD} -e \
 		's|^/etc/hatari.cfg .*|${PREFIX}/etc/hatari.cfg| ; \
-		 s|/usr/share|${PREFIX}/share|' ${WRKSRC}/${i}
-.endfor
+		 s|/usr/share|${PREFIX}/share|' \
+		${WRKSRC}/doc/*.1 \
+		${WRKSRC}/python-ui/*.1 \
+		${WRKSRC}/tools/*.1 \
+		${WRKSRC}/tools/debugger/*.1 \
+		${WRKSRC}/tools/hconsole/*.1 \
+		${WRKSRC}/tools/hmsa/*.1
 	@${REINPLACE_CMD} -e \
 		's|-Wno-maybe-uninitialized||' ${WRKSRC}/src/cpu/CMakeLists.txt
 	@${REINPLACE_CMD} -e \
@@ -68,12 +75,13 @@ post-patch:
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${PREFIX}/share/man/man1
-	${INSTALL_MAN} ${WRKSRC}/python-ui/*.1 ${STAGEDIR}${PREFIX}/share/man/man1
-	${INSTALL_MAN} ${WRKSRC}/tools/*.1 ${STAGEDIR}${PREFIX}/share/man/man1
-	${INSTALL_MAN} ${WRKSRC}/tools/debugger/*.1 ${STAGEDIR}${PREFIX}/share/man/man1
-	${INSTALL_MAN} ${WRKSRC}/tools/hconsole/*.1 ${STAGEDIR}${PREFIX}/share/man/man1
-	${INSTALL_MAN} ${WRKSRC}/tools/hmsa/*.1 ${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_MAN}	${WRKSRC}/doc/*.1 \
+			${WRKSRC}/python-ui/*.1 \
+			${WRKSRC}/tools/*.1 \
+			${WRKSRC}/tools/debugger/*.1 \
+			${WRKSRC}/tools/hconsole/*.1 \
+			${WRKSRC}/tools/hmsa/*.1 \
+		${STAGEDIR}${PREFIX}/share/man/man1
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/emulators/hatari/distinfo b/emulators/hatari/distinfo
index 5a3cac4e6c7d..a000ad6cb475 100644
--- a/emulators/hatari/distinfo
+++ b/emulators/hatari/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1714071173
-SHA256 (hatari-2.5.0.tar.bz2) = d76c22fc3de69fb1bb4af3e8ba500b7e40f5a2a45d07783f24cb7101e53c3457
-SIZE (hatari-2.5.0.tar.bz2) = 2820580
+TIMESTAMP = 1754778212
+SHA256 (hatari-v2.6.0.tar.bz2) = fa1fa250c570e5096d4e2a065d0f53b20a0a5db1b7aa98fb34d5ee9a8b8ca86d
+SIZE (hatari-v2.6.0.tar.bz2) = 2130488
diff --git a/emulators/hatari/files/patch-tools_atari-hd-image.sh b/emulators/hatari/files/patch-tools_atari-hd-image.sh
index 9b92f43e239b..2b6cb31943d8 100644
--- a/emulators/hatari/files/patch-tools_atari-hd-image.sh
+++ b/emulators/hatari/files/patch-tools_atari-hd-image.sh
@@ -1,4 +1,4 @@
---- tools/atari-hd-image.sh.orig	2024-04-26 10:23:56 UTC
+--- tools/atari-hd-image.sh.orig	2025-08-09 22:33:00 UTC
 +++ tools/atari-hd-image.sh
 @@ -33,8 +33,8 @@ export PATH
  export PATH
@@ -6,19 +6,17 @@
  # check tools
 -if [ -z "$(which mkdosfs)" ] || [ -z "$(which python3)" ]; then
 -	echo "ERROR: either mkdosfs or python3 missing!"
-+if [ -z "$(which mkdosfs)" ] || [ -z "$(which %%PYTHON_VERSION%%)" ]; then
-+	echo "ERROR: either mkdosfs or %%PYTHON_VERSION%% missing!"
++if [ -z "$(which mkdosfs)" ] || [ -z "$(which %%PYTHON_CMD%%)" ]; then
++	echo "ERROR: either mkdosfs or %%PYTHON_CMD%% missing!"
  	exit 1
  fi
  
-@@ -147,8 +147,8 @@ echo "$step) Create DOS Master Boot Record / partition
+@@ -147,7 +147,7 @@ echo "$step) Create DOS Master Boot Record / partition
  # - http://en.wikipedia.org/wiki/File_Allocation_Table#Boot_Sector
  # For DOS MBR, the values are little endian.
  # -----------
 -python3 << EOF
--#!/usr/bin/env python3
-+%%PYTHON_VERSION%% << EOF
-+#!/usr/bin/env %%PYTHON_VERSION%%
++%%PYTHON_CMD%% << EOF
+ #!/usr/bin/python3
  mbr = bytearray(512)
  
- def set_long(idx, value):
diff --git a/emulators/hatari/pkg-plist b/emulators/hatari/pkg-plist
index c1b06045aef2..a7923bf0d7ca 100644
--- a/emulators/hatari/pkg-plist
+++ b/emulators/hatari/pkg-plist
@@ -12,7 +12,6 @@ share/applications/hatariui.desktop
 %%PORTDOCS%%%%DOCSDIR%%/CMakeLists.txt
 %%PORTDOCS%%%%DOCSDIR%%/authors.txt
 %%PORTDOCS%%%%DOCSDIR%%/bugs.txt
-%%PORTDOCS%%%%DOCSDIR%%/changelog.txt
 %%PORTDOCS%%%%DOCSDIR%%/coding.txt
 %%PORTDOCS%%%%DOCSDIR%%/compatibility.html
 %%PORTDOCS%%%%DOCSDIR%%/debugger.html
@@ -80,7 +79,6 @@ share/applications/hatariui.desktop
 %%DATADIR%%/hconsole/example-debugger
 %%DATADIR%%/hconsole/example.py
 %%DATADIR%%/hconsole/hconsole.py
-%%DATADIR%%/tos.img
 share/icons/hicolor/128x128/apps/hatari.png
 share/icons/hicolor/128x128/mimetypes/application-vnd.fastcopy-disk-image.png
 share/icons/hicolor/128x128/mimetypes/application-vnd.msa-disk-image.png