Index: head/emulators/hatari/Makefile =================================================================== --- head/emulators/hatari/Makefile (revision 484923) +++ head/emulators/hatari/Makefile (revision 484924) @@ -1,65 +1,68 @@ # Created by: Michael Neumann # $FreeBSD$ PORTNAME= hatari -PORTVERSION= 2.0.0 -PORTREVISION= 4 +PORTVERSION= 2.1.0 CATEGORIES= emulators MASTER_SITES= http://download.tuxfamily.org/hatari/${PORTVERSION}/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= egypcio@googlemail.com COMMENT= Atari ST emulator LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/gpl.txt +BROKEN_aarch64= fails to configure: error: unrecognized CPU type +BROKEN_armv6= fails to configure: CMake Error: Generator: execution of make failed +BROKEN_powerpc64= fails to compile: sysdeps.h: redefinition of typedef 'uae_u8' + LIB_DEPENDS= libportaudio.so:audio/portaudio \ libpng.so:graphics/png USES= cmake desktop-file-utils python:2.7 readline shared-mime-info \ shebangfix tar:bzip2 +USE_GNOME= pygtk2 +USE_XORG= sm ice x11 xext + SHEBANG_FILES= python-ui/*.py tools/atari-convert-dir.py \ tools/debugger/hatari_profile.py tools/hconsole/*.py -USE_GNOME= pygtk2 + CMAKE_ARGS= -DETCDIR:PATH="${PREFIX}/etc" \ -DMANDIR:PATH="man/man1" \ -DREADLINE_FOUND:BOOL=ON -INSTALLS_ICONS= yes -BROKEN_aarch64= fails to configure: error: unrecognized CPU type -BROKEN_armv6= fails to configure: CMake Error: Generator: execution of make failed -BROKEN_powerpc64= fails to compile: sysdeps.h: redefinition of typedef 'uae_u8' +INSTALLS_ICONS= yes 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_ON= -DENABLE_SDL2:BOOL=ON SDL2_CFLAGS= -I${ICONV_INCLUDE_PATH} WINUAE_DESC= Build with WinUAE CPU core (experimental) WINUAE_CMAKE_ON= -DENABLE_WINUAE_CPU:BOOL=ON post-patch: .for i in doc/hatari.1 doc/fr/hatari.1 tools/hconsole/hconsole.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/fr/man1 ${INSTALL_MAN} ${WRKSRC}/doc/fr/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/fr/man1 post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/fr ${INSTALL_DATA} ${WRKSRC}/doc/fr/*.txt ${STAGEDIR}${DOCSDIR}/fr .include Index: head/emulators/hatari/distinfo =================================================================== --- head/emulators/hatari/distinfo (revision 484923) +++ head/emulators/hatari/distinfo (revision 484924) @@ -1,3 +1,3 @@ -TIMESTAMP = 1483078197 -SHA256 (hatari-2.0.0.tar.bz2) = 52a447a59b6979d55d1525f3c4a21ec013e4371354d6683ede71546c5e6da577 -SIZE (hatari-2.0.0.tar.bz2) = 3899087 +TIMESTAMP = 1541764401 +SHA256 (hatari-2.1.0.tar.bz2) = eb299460e92db4a8a2983a0725cbbc8c185f1470b8ecd791b3d102815da20924 +SIZE (hatari-2.1.0.tar.bz2) = 4072778 Index: head/emulators/hatari/files/patch-CMakeLists.txt =================================================================== --- head/emulators/hatari/files/patch-CMakeLists.txt (revision 484923) +++ head/emulators/hatari/files/patch-CMakeLists.txt (revision 484924) @@ -1,20 +1,16 @@ -${SDL_INCLUDE_DIR} can contain more than one directory, -so using it here as if it is a single directory can confuse -check_include_files. Instead, iterate over it. - ---- CMakeLists.txt.orig 2018-03-20 22:30:14.014771000 +0000 -+++ CMakeLists.txt 2018-03-20 22:31:23.332802000 +0000 +--- CMakeLists.txt.orig 2018-03-20 22:30:14 UTC ++++ CMakeLists.txt @@ -187,7 +187,12 @@ check_include_files(termios.h HAVE_TERMIOS_H) check_include_files(strings.h HAVE_STRINGS_H) check_include_files(malloc.h HAVE_MALLOC_H) -check_include_files(${SDL_INCLUDE_DIR}/SDL_config.h HAVE_SDL_CONFIG_H) +foreach(_sid ${SDL_INCLUDE_DIR}) + check_include_files(${_sid}/SDL_config.h HAVE_SDL_CONFIG_H) + if(HAVE_SDL_CONFIG_H) + break() + endif() +endforeach() check_include_files(sys/time.h HAVE_SYS_TIME_H) check_include_files(sys/times.h HAVE_SYS_TIMES_H) check_include_files(utime.h HAVE_UTIME_H) Index: head/emulators/hatari/files/patch-share_CMakeLists.txt =================================================================== --- head/emulators/hatari/files/patch-share_CMakeLists.txt (revision 484923) +++ head/emulators/hatari/files/patch-share_CMakeLists.txt (revision 484924) @@ -1,24 +1,26 @@ ---- share/CMakeLists.txt.orig 2015-09-10 21:16:03 UTC +--- share/CMakeLists.txt.orig 2018-02-07 18:33:55 UTC +++ share/CMakeLists.txt -@@ -5,8 +5,8 @@ foreach(size 32x32 48x48 64x64 128x128 2 +@@ -5,9 +5,8 @@ foreach(size 32x32 48x48 64x64 128x128 2 install(FILES icons/hicolor/${size}/mimetypes/application-x-st-disk-image.png DESTINATION ${ICONDIR}/${size}/mimetypes) foreach(type vnd.msa vnd.fastcopy x-stx) -- install(CODE "execute_process(COMMAND ln -sf application-x-st-disk-image.png -- ${CMAKE_INSTALL_PREFIX}/${ICONDIR}/${size}/mimetypes/application-${type}-disk-image.png) -+ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink application-x-st-disk-image.png application-${type}-disk-image.png +- install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink +- application-x-st-disk-image.png +- \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${ICONDIR}/${size}/mimetypes/application-${type}-disk-image.png) ++ install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink application-x-st-disk-image.png application-${type}-disk-image.png + WORKING_DIRECTORY \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${ICONDIR}/${size}/mimetypes) ") endforeach() endforeach() -@@ -16,8 +16,8 @@ install(FILES icons/hicolor/scalable/app +@@ -17,9 +16,8 @@ install(FILES icons/hicolor/scalable/app install(FILES icons/hicolor/scalable/mimetypes/application-x-st-disk-image.svg DESTINATION ${ICONDIR}/scalable/mimetypes) foreach(type vnd.msa vnd.fastcopy x-stx) -- install(CODE "execute_process(COMMAND ln -sf application-x-st-disk-image.svg -- ${CMAKE_INSTALL_PREFIX}/${ICONDIR}/scalable/mimetypes/application-${type}-disk-image.svg) -+ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink application-x-st-disk-image.svg application-${type}-disk-image.svg +- install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink +- application-x-st-disk-image.svg +- \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${ICONDIR}/scalable/mimetypes/application-${type}-disk-image.svg) ++ install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink application-x-st-disk-image.svg application-${type}-disk-image.svg + WORKING_DIRECTORY \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${ICONDIR}/scalable/mimetypes) ") endforeach() install(FILES mime/packages/hatari.xml DESTINATION share/mime/packages)