Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 14 Nov 2018 14:01:50 +0000 (UTC)
From:      =?UTF-8?Q?Vin=c3=adcius_Zavam?= <egypcio@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r484924 - in head/emulators/hatari: . files
Message-ID:  <201811141401.wAEE1oBl029920@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: egypcio
Date: Wed Nov 14 14:01:50 2018
New Revision: 484924
URL: https://svnweb.freebsd.org/changeset/ports/484924

Log:
  emulators/hatari: update to v2.1.0
  
    - adopt the port;
    - silent portlint;
    - change USE_XORG as suggested by stage-qa;
    - patches under files/ updated using makepatch;
  
  Approved by:	araujo (mentor)
  Differential Revision:	https://reviews.freebsd.org/D17919

Modified:
  head/emulators/hatari/Makefile
  head/emulators/hatari/distinfo
  head/emulators/hatari/files/patch-CMakeLists.txt
  head/emulators/hatari/files/patch-share_CMakeLists.txt

Modified: head/emulators/hatari/Makefile
==============================================================================
--- head/emulators/hatari/Makefile	Wed Nov 14 13:57:30 2018	(r484923)
+++ head/emulators/hatari/Makefile	Wed Nov 14 14:01:50 2018	(r484924)
@@ -2,33 +2,36 @@
 # $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
 

Modified: head/emulators/hatari/distinfo
==============================================================================
--- head/emulators/hatari/distinfo	Wed Nov 14 13:57:30 2018	(r484923)
+++ head/emulators/hatari/distinfo	Wed Nov 14 14:01:50 2018	(r484924)
@@ -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

Modified: head/emulators/hatari/files/patch-CMakeLists.txt
==============================================================================
--- head/emulators/hatari/files/patch-CMakeLists.txt	Wed Nov 14 13:57:30 2018	(r484923)
+++ head/emulators/hatari/files/patch-CMakeLists.txt	Wed Nov 14 14:01:50 2018	(r484924)
@@ -1,9 +1,5 @@
-${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)

Modified: head/emulators/hatari/files/patch-share_CMakeLists.txt
==============================================================================
--- head/emulators/hatari/files/patch-share_CMakeLists.txt	Wed Nov 14 13:57:30 2018	(r484923)
+++ head/emulators/hatari/files/patch-share_CMakeLists.txt	Wed Nov 14 14:01:50 2018	(r484924)
@@ -1,23 +1,25 @@
---- 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()



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811141401.wAEE1oBl029920>