diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile index 008cd0cd7404..f5a2385efb33 100644 --- a/emulators/hatari/Makefile +++ b/emulators/hatari/Makefile @@ -1,69 +1,68 @@ # Created by: Michael Neumann PORTNAME= hatari -PORTVERSION= 2.2.1 +PORTVERSION= 2.3.1 CATEGORIES= emulators MASTER_SITES= http://download.tuxfamily.org/hatari/${PORTVERSION}/ MAINTAINER= egypcio@FreeBSD.org COMMENT= Atari ST emulator LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/gpl.txt BROKEN_armv6= fails to configure: CMake Error: Generator: execution of make failed LIB_DEPENDS= libportaudio.so:audio/portaudio \ libpng.so:graphics/png USES= cmake desktop-file-utils gnome python:3.6+ readline \ sdl shared-mime-info shebangfix tar:bzip2 xorg USE_GNOME= gtk30 USE_XORG= sm ice x11 xext -USE_PYTHON= concurrent SHEBANG_FILES= python-ui/*.py tools/*.py \ tools/debugger/*.py tools/hconsole/*.py CMAKE_ARGS= -DETCDIR:PATH="${PREFIX}/etc" \ -DMANDIR:PATH="man/man1" \ -DREADLINE_FOUND:BOOL=ON OPTIONS_DEFINE= DEBUG DOCS SDL2 WINUAE DEBUG_CFLAGS_OFF= -DNDEBUG SDL2_DESC= Use SDL2 libraries instead of SDL 1.2 SDL2_USES= iconv SDL2_USE= sdl=sdl2 SDL2_USE_OFF= sdl=sdl SDL2_CMAKE_BOOL= ENABLE_SDL2 SDL2_CFLAGS= -I${ICONV_INCLUDE_PATH} WINUAE_DESC= Build with WinUAE CPU core WINUAE_CMAKE_BOOL= ENABLE_WINUAE_CPU 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 @${REINPLACE_CMD} -e \ 's|-Wno-maybe-uninitialized||' ${WRKSRC}/src/cpu/CMakeLists.txt @${REINPLACE_CMD} -e \ 's|%%PYTHON_CMD%%|${PYTHON_CMD}| ; \ s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|' ${WRKSRC}/tools/atari-hd-image.sh post-install: ${MKDIR} ${STAGEDIR}${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/python-ui/*.1 ${STAGEDIR}${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/tools/*.1 ${STAGEDIR}${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/tools/debugger/*.1 ${STAGEDIR}${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/tools/hconsole/*.1 ${STAGEDIR}${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/tools/hmsa/*.1 ${STAGEDIR}${MANPREFIX}/man/man1 post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${STAGEDIR}${DOCSDIR} .include diff --git a/emulators/hatari/distinfo b/emulators/hatari/distinfo index f05fcc7204dc..535bcf7864db 100644 --- a/emulators/hatari/distinfo +++ b/emulators/hatari/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551106244 -SHA256 (hatari-2.2.1.tar.bz2) = 11afef30a274be84696588583d5a1d65c8046934670f718c311c956ef7106f60 -SIZE (hatari-2.2.1.tar.bz2) = 4162798 +TIMESTAMP = 1645876638 +SHA256 (hatari-2.3.1.tar.bz2) = 44a2f62ca995e38d9e0874806956f0b9c3cc84ea89e0169a63849b63cd3b64bd +SIZE (hatari-2.3.1.tar.bz2) = 4334129 diff --git a/emulators/hatari/files/patch-tools_atari-hd-image.sh b/emulators/hatari/files/patch-tools_atari-hd-image.sh index 3aa918524042..0d26d83f5fb3 100644 --- a/emulators/hatari/files/patch-tools_atari-hd-image.sh +++ b/emulators/hatari/files/patch-tools_atari-hd-image.sh @@ -1,24 +1,24 @@ ---- tools/atari-hd-image.sh.orig 2018-02-20 07:08:43 UTC +--- tools/atari-hd-image.sh.orig 2022-02-26 12:11:11 UTC +++ tools/atari-hd-image.sh @@ -33,8 +33,8 @@ PATH=/sbin:$PATH export PATH # check tools --if [ -z $(which mkdosfs) ] || [ -z $(which python) ]; then +-if [ -z "$(which mkdosfs)" ] || [ -z "$(which python)" ]; then - echo "ERROR: either mkdosfs or python tool missing!" -+if [ -z $(which mkdosfs) ] || [ -z $(which %%PYTHON_VERSION%%) ]; then ++if [ -z "$(which mkdosfs)" ] || [ -z "$(which %%PYTHON_VERSION%%)" ]; then + echo "ERROR: either mkdosfs or %%PYTHON_VERSION%% tool missing!" exit 1 fi -@@ -147,8 +147,8 @@ echo "$step) Create DOS Master Boot Reco +@@ -147,8 +147,8 @@ 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. # ----------- -python << EOF --#!/usr/bin/env python -+%%PYTHON_CMD%% << EOF -+#!%%PYTHON_CMD%% +-#!/usr/bin/env python3 ++%%PYTHON_VERSION%% << EOF ++#!/usr/bin/env %%PYTHON_VERSION%%3 mbr = bytearray(512) def set_long(idx, value): diff --git a/emulators/hatari/pkg-plist b/emulators/hatari/pkg-plist index 376ced66b8d8..65cb802df457 100644 --- a/emulators/hatari/pkg-plist +++ b/emulators/hatari/pkg-plist @@ -1,112 +1,112 @@ bin/atari-convert-dir bin/atari-hd-image bin/gst2ascii bin/hatari bin/hatari-prg-args bin/hatari_profile bin/hatariui bin/hmsa bin/zip2st +%%DATADIR%%/hatari-icon.bmp +%%DATADIR%%/hatariui/README +%%DATADIR%%/hatariui/TODO +%%DATADIR%%/hatariui/config.py +%%DATADIR%%/hatariui/conftypes.py +%%DATADIR%%/hatariui/debugui.py +%%DATADIR%%/hatariui/dialogs.py +%%DATADIR%%/hatariui/hatari-icon.png +%%DATADIR%%/hatariui/hatari-logo.png +%%DATADIR%%/hatariui/hatari.py +%%DATADIR%%/hatariui/hatariui.py +%%DATADIR%%/hatariui/%%CMAKE_BUILD_TYPE%%-notes.txt +%%DATADIR%%/hatariui/uihelpers.py +%%DATADIR%%/hconsole/example-commands +%%DATADIR%%/hconsole/example-debugger +%%DATADIR%%/hconsole/example.py +%%DATADIR%%/hconsole/hconsole.py +%%DATADIR%%/hconsole/%%CMAKE_BUILD_TYPE%%-notes.txt +%%DATADIR%%/tos.img man/man1/atari-convert-dir.1.gz man/man1/atari-hd-image.1.gz man/man1/gst2ascii.1.gz man/man1/hatari-prg-args.1.gz man/man1/hatari.1.gz man/man1/hatari_profile.1.gz man/man1/hatariui.1.gz man/man1/hconsole.1.gz man/man1/hmsa.1.gz man/man1/zip2st.1.gz share/applications/hatari.desktop share/applications/hatariui.desktop -share/doc/hatari/authors.txt -share/doc/hatari/compatibility.html -share/doc/hatari/emutos.txt -share/doc/hatari/images/callgraph.png -share/doc/hatari/images/callgraph.svg -share/doc/hatari/images/cpu.png -share/doc/hatari/images/devices.png -share/doc/hatari/images/fileselector.png -share/doc/hatari/images/floppydisks.png -share/doc/hatari/images/harddisks.png -share/doc/hatari/images/joystick.png -share/doc/hatari/images/kcachegrind.png -share/doc/hatari/images/keyboard.png -share/doc/hatari/images/main.png -share/doc/hatari/images/memory.png -share/doc/hatari/images/monitor.png -share/doc/hatari/images/newfloppy.png -share/doc/hatari/images/screen.png -share/doc/hatari/images/sound.png -share/doc/hatari/images/system.png -share/doc/hatari/images/tos.png -share/doc/hatari/keymap-sample.txt -share/doc/hatari/manual.html -share/doc/hatari/memory-usage.txt -share/doc/hatari/midi-linux.txt -share/doc/hatari/release-notes.txt -share/doc/hatari/todo.txt %%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 %%PORTDOCS%%%%DOCSDIR%%/emutos.txt +%%PORTDOCS%%%%DOCSDIR%%/images/callgraph.png +%%PORTDOCS%%%%DOCSDIR%%/images/callgraph.svg +%%PORTDOCS%%%%DOCSDIR%%/images/cpu.png +%%PORTDOCS%%%%DOCSDIR%%/images/devices-portmidi.png +%%PORTDOCS%%%%DOCSDIR%%/images/devices.png +%%PORTDOCS%%%%DOCSDIR%%/images/fileselector.png +%%PORTDOCS%%%%DOCSDIR%%/images/floppydisks.png +%%PORTDOCS%%%%DOCSDIR%%/images/harddisks.png +%%PORTDOCS%%%%DOCSDIR%%/images/joystick.png +%%PORTDOCS%%%%DOCSDIR%%/images/kcachegrind.png +%%PORTDOCS%%%%DOCSDIR%%/images/keyboard.png +%%PORTDOCS%%%%DOCSDIR%%/images/main.png +%%PORTDOCS%%%%DOCSDIR%%/images/memory.png +%%PORTDOCS%%%%DOCSDIR%%/images/monitor.png +%%PORTDOCS%%%%DOCSDIR%%/images/newfloppy.png +%%PORTDOCS%%%%DOCSDIR%%/images/screen.png +%%PORTDOCS%%%%DOCSDIR%%/images/sound.png +%%PORTDOCS%%%%DOCSDIR%%/images/system.png +%%PORTDOCS%%%%DOCSDIR%%/images/tos.png %%PORTDOCS%%%%DOCSDIR%%/keymap-sample.txt +%%PORTDOCS%%%%DOCSDIR%%/m68k-linux.txt +%%PORTDOCS%%%%DOCSDIR%%/m68k-netbsd.txt +%%PORTDOCS%%%%DOCSDIR%%/manual.css +%%PORTDOCS%%%%DOCSDIR%%/manual.html %%PORTDOCS%%%%DOCSDIR%%/memory-usage.txt %%PORTDOCS%%%%DOCSDIR%%/midi-linux.txt -%%PORTDOCS%%%%DOCSDIR%%/release-checklist.txt -%%PORTDOCS%%%%DOCSDIR%%/release-notes.txt +%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-checklist.txt +%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes.txt %%PORTDOCS%%%%DOCSDIR%%/scsi-driver.txt %%PORTDOCS%%%%DOCSDIR%%/thanks.txt +%%PORTDOCS%%%%DOCSDIR%%/toc.js %%PORTDOCS%%%%DOCSDIR%%/todo.txt %%PORTDOCS%%%%DOCSDIR%%/video-recording.txt -share/hatari/hatari-icon.bmp -share/hatari/hatariui/README -share/hatari/hatariui/TODO -share/hatari/hatariui/config.py -share/hatari/hatariui/conftypes.py -share/hatari/hatariui/debugui.py -share/hatari/hatariui/dialogs.py -share/hatari/hatariui/hatari-icon.png -share/hatari/hatariui/hatari-logo.png -share/hatari/hatariui/hatari.py -share/hatari/hatariui/hatariui.py -share/hatari/hatariui/release-notes.txt -share/hatari/hatariui/uihelpers.py -share/hatari/hconsole/example-commands -share/hatari/hconsole/example-debugger -share/hatari/hconsole/example.py -share/hatari/hconsole/hconsole.py -share/hatari/hconsole/release-notes.txt -share/hatari/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 share/icons/hicolor/128x128/mimetypes/application-x-st-disk-image.png share/icons/hicolor/128x128/mimetypes/application-x-stx-disk-image.png share/icons/hicolor/256x256/apps/hatari.png share/icons/hicolor/256x256/mimetypes/application-vnd.fastcopy-disk-image.png share/icons/hicolor/256x256/mimetypes/application-vnd.msa-disk-image.png share/icons/hicolor/256x256/mimetypes/application-x-st-disk-image.png share/icons/hicolor/256x256/mimetypes/application-x-stx-disk-image.png share/icons/hicolor/32x32/apps/hatari.png share/icons/hicolor/32x32/mimetypes/application-vnd.fastcopy-disk-image.png share/icons/hicolor/32x32/mimetypes/application-vnd.msa-disk-image.png share/icons/hicolor/32x32/mimetypes/application-x-st-disk-image.png share/icons/hicolor/32x32/mimetypes/application-x-stx-disk-image.png share/icons/hicolor/48x48/apps/hatari.png share/icons/hicolor/48x48/mimetypes/application-vnd.fastcopy-disk-image.png share/icons/hicolor/48x48/mimetypes/application-vnd.msa-disk-image.png share/icons/hicolor/48x48/mimetypes/application-x-st-disk-image.png share/icons/hicolor/48x48/mimetypes/application-x-stx-disk-image.png share/icons/hicolor/64x64/apps/hatari.png share/icons/hicolor/64x64/mimetypes/application-vnd.fastcopy-disk-image.png share/icons/hicolor/64x64/mimetypes/application-vnd.msa-disk-image.png share/icons/hicolor/64x64/mimetypes/application-x-st-disk-image.png share/icons/hicolor/64x64/mimetypes/application-x-stx-disk-image.png share/icons/hicolor/scalable/apps/hatari.svg share/icons/hicolor/scalable/mimetypes/application-vnd.fastcopy-disk-image.svg share/icons/hicolor/scalable/mimetypes/application-vnd.msa-disk-image.svg share/icons/hicolor/scalable/mimetypes/application-x-st-disk-image.svg share/icons/hicolor/scalable/mimetypes/application-x-stx-disk-image.svg share/mime/packages/hatari.xml