ports/169411: emulators/hatari: Update to version 1.6.1

[KATO Tsuguru]

>Number:         169411
>Category:       ports
>Synopsis:       emulators/hatari: Update to version 1.6.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 25 18:10:10 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p9 i386
>Organization:
>Environment:
>Description:
- Update to version 1.6.1

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/emulators/hatari/Makefile emulators/hatari/Makefile
--- /usr/ports/emulators/hatari/Makefile	2012-06-01 14:18:14.000000000 +0900
+++ emulators/hatari/Makefile	2012-06-19 20:46:46.000000000 +0900
@@ -6,21 +6,22 @@
 #
 
 PORTNAME=	hatari
-PORTVERSION=	1.5.0
-PORTREVISION=	2
+PORTVERSION=	1.6.1
 CATEGORIES=	emulators
-MASTER_SITES=	BERLIOS
+MASTER_SITES=	http://download.tuxfamily.org/hatari/%SUBDIR%/
+MASTER_SITE_SUBDIR=	${PORTVERSION}
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	An Atari ST emulator
 
-LICENSE=	GPLv2 GPLv3
-LICENSE_COMB=	dual
+LICENSE=	GPLv2 # (or later)
 
 BUILD_DEPENDS=	portaudio>=19:${PORTSDIR}/audio/portaudio2
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	portaudio>=19:${PORTSDIR}/audio/portaudio2
 
+OPTIONS_DEFINE=	DOCS
+
 USE_BZIP2=	yes
 USE_GNOME=	pygtk2
 USE_SDL=	sdl
@@ -41,11 +42,14 @@
 PA2_INCLUDE_DIR=-I${LOCALBASE}/include/portaudio2
 PA2_LIBRARY=	${LOCALBASE}/lib/portaudio2/libportaudio.so
 
+.include <bsd.port.options.mk>
+
 post-patch:
-	@${FIND} ${WRKSRC} -name "*.1" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|^/etc|${PREFIX}/etc| ; \
-		 s| (or /usr.*|| ; \
-		 s|/usr/share|${PREFIX}/share|'
+.for file 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}
+.endfor
 	@${REINPLACE_CMD} -e '/doc/s|^add_|#add_|' \
 		${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e '/DESTINATION/s|/icons/.*)|/pixmaps)|' \
@@ -59,7 +63,7 @@
 	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1.gz ${MANPREFIX}/man/man1
 	@${MKDIR} ${MANPREFIX}/man/fr/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/fr/${PORTNAME}.1.gz ${MANPREFIX}/man/fr/man1
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
diff -urN /usr/ports/emulators/hatari/distinfo emulators/hatari/distinfo
--- /usr/ports/emulators/hatari/distinfo	2011-08-13 04:40:36.000000000 +0900
+++ emulators/hatari/distinfo	2012-06-19 19:57:40.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (hatari-1.5.0.tar.bz2) = 0cb9c627ea6942bc60908c3a59b4b5c86a54e5bd0551cd95d8cff76bbde61e7f
-SIZE (hatari-1.5.0.tar.bz2) = 1570048
+SHA256 (hatari-1.6.1.tar.bz2) = f6142b4d0c8f1731f990fcc4cf125d9b7a1822384c46e6af79058a461443e853
+SIZE (hatari-1.6.1.tar.bz2) = 1777736
diff -urN /usr/ports/emulators/hatari/pkg-descr emulators/hatari/pkg-descr
--- /usr/ports/emulators/hatari/pkg-descr	2009-11-20 15:06:49.000000000 +0900
+++ emulators/hatari/pkg-descr	2012-06-19 19:47:44.000000000 +0900
@@ -1,4 +1,4 @@
 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.berlios.de/
+WWW: http://hatari.tuxfamily.org/
diff -urN /usr/ports/emulators/hatari/pkg-plist emulators/hatari/pkg-plist
--- /usr/ports/emulators/hatari/pkg-plist	2011-08-13 04:40:36.000000000 +0900
+++ emulators/hatari/pkg-plist	2012-06-19 20:39:54.000000000 +0900
@@ -35,6 +35,7 @@
 %%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
>Release-Note:
>Audit-Trail:
>Unformatted: