Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 5 Jul 2019 12:36:07 +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: r505897 - head/emulators/hatari
Message-ID:  <201907051236.x65Ca7pZ061795@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: egypcio
Date: Fri Jul  5 12:36:07 2019
New Revision: 505897
URL: https://svnweb.freebsd.org/changeset/ports/505897

Log:
  emulators/hatari: update 2.1.0 to 2.2.1
  
    Makefile
      - pygtk2 is now gtk30 (upstream);
      - python:2.7 became python:3.6+;
      - option helpers changed to follow '5.13 Makefile Options'.
  
    pkg-plist
      - hatari_profile is installed by default (upstream);
      - manpages and doc up to date, removed fr/ versions;
      - all tools/ available, with respective docs.
  
    * https://hatari.tuxfamily.org/doc/release-notes.txt
  
  Reported by:	swills
  Differential Revision:	https://reviews.freebsd.org/D19628

Modified:
  head/emulators/hatari/Makefile
  head/emulators/hatari/distinfo
  head/emulators/hatari/pkg-plist

Modified: head/emulators/hatari/Makefile
==============================================================================
--- head/emulators/hatari/Makefile	Fri Jul  5 12:24:49 2019	(r505896)
+++ head/emulators/hatari/Makefile	Fri Jul  5 12:36:07 2019	(r505897)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	hatari
-PORTVERSION=	2.1.0
-PORTREVISION=	1
+PORTVERSION=	2.2.1
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.tuxfamily.org/hatari/${PORTVERSION}/
 
@@ -18,13 +17,14 @@ BROKEN_armv6=		fails to configure: CMake Error: Genera
 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
+USES=		cmake desktop-file-utils gnome python:3.6+ readline \
+		sdl shared-mime-info shebangfix tar:bzip2
+USE_GNOME=	gtk30
 USE_XORG=	sm ice x11 xext
+USE_PYTHON=	concurrent
 
-SHEBANG_FILES=	python-ui/*.py tools/atari-convert-dir.py \
-		tools/debugger/hatari_profile.py tools/hconsole/*.py
+SHEBANG_FILES=	python-ui/*.py tools/*.py \
+		tools/debugger/*.py tools/hconsole/*.py
 
 CMAKE_ARGS=	-DETCDIR:PATH="${PREFIX}/etc" \
 		-DMANDIR:PATH="man/man1" \
@@ -39,13 +39,13 @@ 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_CMAKE_BOOL=	ENABLE_SDL2
 SDL2_CFLAGS=		-I${ICONV_INCLUDE_PATH}
-WINUAE_DESC=		Build with WinUAE CPU core (experimental)
-WINUAE_CMAKE_ON=	-DENABLE_WINUAE_CPU:BOOL=ON
+WINUAE_DESC=		Build with WinUAE CPU core
+WINUAE_CMAKE_BOOL=	ENABLE_WINUAE_CPU
 
 post-patch:
-.for i in doc/hatari.1 doc/fr/hatari.1 tools/hconsole/hconsole.1
+.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}
@@ -57,11 +57,16 @@ post-patch:
 		 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
+	${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}/fr
-	${INSTALL_DATA} ${WRKSRC}/doc/fr/*.txt ${STAGEDIR}${DOCSDIR}/fr
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/emulators/hatari/distinfo
==============================================================================
--- head/emulators/hatari/distinfo	Fri Jul  5 12:24:49 2019	(r505896)
+++ head/emulators/hatari/distinfo	Fri Jul  5 12:36:07 2019	(r505897)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1541764401
-SHA256 (hatari-2.1.0.tar.bz2) = eb299460e92db4a8a2983a0725cbbc8c185f1470b8ecd791b3d102815da20924
-SIZE (hatari-2.1.0.tar.bz2) = 4072778
+TIMESTAMP = 1551106244
+SHA256 (hatari-2.2.1.tar.bz2) = 11afef30a274be84696588583d5a1d65c8046934670f718c311c956ef7106f60
+SIZE (hatari-2.2.1.tar.bz2) = 4162798

Modified: head/emulators/hatari/pkg-plist
==============================================================================
--- head/emulators/hatari/pkg-plist	Fri Jul  5 12:24:49 2019	(r505896)
+++ head/emulators/hatari/pkg-plist	Fri Jul  5 12:36:07 2019	(r505897)
@@ -2,14 +2,15 @@ bin/atari-convert-dir
 bin/atari-hd-image
 bin/gst2ascii
 bin/hatari
-bin/hatari_profile.py
+bin/hatari-prg-args
+bin/hatari_profile
 bin/hatariui
 bin/hmsa
 bin/zip2st
-man/fr/man1/hatari.1.gz
 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
@@ -18,53 +19,66 @@ 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%%/compatibility.html
+%%PORTDOCS%%%%DOCSDIR%%/changelog.txt
+%%PORTDOCS%%%%DOCSDIR%%/coding.txt
 %%PORTDOCS%%%%DOCSDIR%%/emutos.txt
-%%PORTDOCS%%%%DOCSDIR%%/fr/clavier-exemple.txt
-%%PORTDOCS%%%%DOCSDIR%%/images/callgraph.png
-%%PORTDOCS%%%%DOCSDIR%%/images/callgraph.svg
-%%PORTDOCS%%%%DOCSDIR%%/images/cpu.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%%/manual.html
 %%PORTDOCS%%%%DOCSDIR%%/memory-usage.txt
 %%PORTDOCS%%%%DOCSDIR%%/midi-linux.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-checklist.txt
 %%PORTDOCS%%%%DOCSDIR%%/release-notes.txt
+%%PORTDOCS%%%%DOCSDIR%%/scsi-driver.txt
+%%PORTDOCS%%%%DOCSDIR%%/thanks.txt
 %%PORTDOCS%%%%DOCSDIR%%/todo.txt
-%%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/release-notes.txt
-%%DATADIR%%/hatariui/uihelpers.py
-%%DATADIR%%/hconsole/example-commands
-%%DATADIR%%/hconsole/example-debugger
-%%DATADIR%%/hconsole/example.py
-%%DATADIR%%/hconsole/hconsole.py
-%%DATADIR%%/hconsole/release-notes.txt
-%%DATADIR%%/tos.img
+%%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



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