emulators/hatari: upgrade version 1.7.0 => 1.8.0

PR:		192476
Submitted by:	Ports Fury

4 files changed, 48 insertions, 29 deletions

diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile
index 70db03152408..73d1b4c2cea4 100644
--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@@ -2,20 +2,19 @@
 # $FreeBSD$
 
 PORTNAME=	hatari
-PORTVERSION=	1.7.0
+PORTVERSION=	1.8.0
 CATEGORIES=	emulators
-MASTER_SITES=	http://download.tuxfamily.org/hatari/${PORTVERSION}/
+MASTER_SITES=	http://download.tuxfamily.org/hatari/%SUBDIR%/
+MASTER_SITE_SUBDIR=	${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Atari ST emulator
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2 # (or later)
 
-BUILD_DEPENDS=	portaudio2>=0:${PORTSDIR}/audio/portaudio2
+BUILD_DEPENDS=	portaudio2>0:${PORTSDIR}/audio/portaudio2
 LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
-RUN_DEPENDS=	portaudio2>=0:${PORTSDIR}/audio/portaudio2
-
-OPTIONS_DEFINE=	DOCS
+RUN_DEPENDS=	portaudio2>0:${PORTSDIR}/audio/portaudio2
 
 USES=		cmake readline tar:bzip2
 USE_GNOME=	pygtk2
@@ -26,40 +25,29 @@ CMAKE_ARGS=	-DPORTAUDIO_INCLUDE_DIR:STRING="${PA2_INCLUDE_DIR}" \
 		-DETCDIR:STRING="${PREFIX}/etc" \
 		-DMANDIR:STRING="man/man1"
 
-CFLAGS+=	-I${LOCALBASE}/include/portaudio2
-PA2_INCLUDE_DIR=-I${LOCALBASE}/include/portaudio2
-PA2_LIBRARY=	${LOCALBASE}/lib/portaudio2/libportaudio.so
+OPTIONS_DEFINE=	DOCS
 
-PORTDOCS=	*
+PA2_INCLUDE_DIR=${LOCALBASE}/include/portaudio2
+PA2_LIBRARY=	${LOCALBASE}/lib/portaudio2/libportaudio.so
 
 post-patch:
-.for file in doc/hatari.1 doc/fr/hatari.1 tools/hconsole/hconsole.1
+.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}/${file}
+		 s|/usr/share|${PREFIX}/share|' ${WRKSRC}/${i}
 .endfor
-	@${REINPLACE_CMD} -e '/doc/s|^add_|#add_|' \
-		${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e '/DESTINATION/s|/icons/.*)|/pixmaps)|' \
 		${WRKSRC}/python-ui/CMakeLists.txt
 
 post-build:
-	@cd ${WRKSRC}/doc && ${GZIP_CMD} -c ${PORTNAME}.1 > ${PORTNAME}.1.gz
 	@cd ${WRKSRC}/doc/fr && ${GZIP_CMD} -c ${PORTNAME}.1 > ${PORTNAME}.1.gz
 
 post-install:
-	(cd ${WRKSRC}/doc && ${INSTALL_MAN} ${PORTNAME}.1.gz \
-		${STAGEDIR}${MANPREFIX}/man/man1)
 	@${MKDIR} ${STAGEDIR}${MANPREFIX}/man/fr/man1
 	(cd ${WRKSRC}/doc/fr && ${INSTALL_MAN} ${PORTNAME}.1.gz \
 		${STAGEDIR}${MANPREFIX}/man/fr/man1)
-
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC} && ${INSTALL_DATA} readme.txt ${STAGEDIR}${DOCSDIR})
-	(cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html [a-z]*.txt ${STAGEDIR}${DOCSDIR})
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/fr
-	(cd ${WRKSRC}/doc/fr && ${INSTALL_DATA} *.txt ${STAGEDIR}${DOCSDIR}/fr)
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}/images
-	(cd ${WRKSRC}/doc/images && ${INSTALL_DATA} *.png ${STAGEDIR}${DOCSDIR}/images)
+	(cd ${WRKSRC}/doc/fr && ${INSTALL_DATA} *.txt \
+		${STAGEDIR}${DOCSDIR}/fr)
 
 .include <bsd.port.mk>
diff --git a/emulators/hatari/distinfo b/emulators/hatari/distinfo
index cdee98237314..bdc4dc31f4dd 100644
--- a/emulators/hatari/distinfo
+++ b/emulators/hatari/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hatari-1.7.0.tar.bz2) = 2056d12807cb827585f337912238492f8b66b7ff3d9d0628090e58209a519e4d
-SIZE (hatari-1.7.0.tar.bz2) = 2254241
+SHA256 (hatari-1.8.0.tar.bz2) = 7ecf486ba578e3b4d7a3d3e86ef3e879d5e5611b39c2504e38ccafdaacb5ffeb
+SIZE (hatari-1.8.0.tar.bz2) = 1985358
diff --git a/emulators/hatari/pkg-descr b/emulators/hatari/pkg-descr
index 4914722a1c97..12b0544eb0bd 100644
--- a/emulators/hatari/pkg-descr
+++ b/emulators/hatari/pkg-descr
@@ -1,4 +1,5 @@
-Hatari is an Atari ST emulator. It tries to emulate the hardware of a ST as
-close as possible so that it is able to run most of the old ST games and demos.
+Hatari is an Atari ST emulator. It tries to emulate the hardware of a ST
+as close as possible so that it is able to run most of the old ST games
+and demos.
 
 WWW: http://hatari.tuxfamily.org/
diff --git a/emulators/hatari/pkg-plist b/emulators/hatari/pkg-plist
index d7c712fddc3f..b8ed05284738 100644
--- a/emulators/hatari/pkg-plist
+++ b/emulators/hatari/pkg-plist
@@ -15,6 +15,33 @@ man/man1/hconsole.1.gz
 man/man1/hmsa.1.gz
 man/man1/zip2st.1.gz
 share/applications/hatariui.desktop
+%%PORTDOCS%%%%DOCSDIR%%/authors.txt
+%%PORTDOCS%%%%DOCSDIR%%/compatibility.html
+%%PORTDOCS%%%%DOCSDIR%%/emutos.txt
+%%PORTDOCS%%%%DOCSDIR%%/fr/clavier-exemple.txt
+%%PORTDOCS%%%%DOCSDIR%%/images/callgraph.png
+%%PORTDOCS%%%%DOCSDIR%%/images/callgraph.svg
+%%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-notes.txt
+%%PORTDOCS%%%%DOCSDIR%%/todo.txt
 %%DATADIR%%/hatari-icon.bmp
 %%DATADIR%%/hatariui/README
 %%DATADIR%%/hatariui/TODO
@@ -38,5 +65,8 @@ share/pixmaps/hatari-icon.png
 @dirrm %%DATADIR%%/hconsole
 @dirrm %%DATADIR%%/hatariui
 @dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/fr
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry man/fr/man1
 @dirrmtry man/fr