diff -urN /usr/ports/emulators/hatari/Makefile emulators/hatari/Makefile
--- /usr/ports/emulators/hatari/Makefile	2009-11-09 02:06:56.000000000 +0900
+++ emulators/hatari/Makefile	2009-11-15 04:20:59.000000000 +0900
@@ -6,30 +6,43 @@
 #
 
 PORTNAME=	hatari
-PORTVERSION=	1.2.0
+PORTVERSION=	1.3.1
 CATEGORIES=	emulators
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	BERLIOS
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An Atari ST emulator
 
-USE_GNOME=	gnometarget
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
+
 USE_BZIP2=	yes
-USE_SDL=	yes
+USE_SDL=	sdl
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--datadir=${DATADIR}
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+
+MANLANG=	"" fr
+MAN1=		${PORTNAME}.1
+
+CPPFLAGS=	`libpng-config --I_opts`
+LDFLAGS=	`libpng-config --L_opts`
 
-MAN1=		hatari.1
-MANCOMPRESSED=	no
+post-patch:
+	@${REINPLACE_CMD} -e '/if test/s|==|=|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e '/^ICONPATH/s|/icons/.*$$|/pixmaps|' \
+		${WRKSRC}/python-ui/Makefile
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/hatari.1 ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 ${MANPREFIX}/man/man1
+	@${MKDIR} ${MANPREFIX}/man/fr/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/fr/${PORTNAME}.1 ${MANPREFIX}/man/fr/man1
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}/fr
+	${INSTALL_DATA} ${WRKSRC}/doc/fr/*.txt ${DOCSDIR}/fr
 	@${MKDIR} ${DOCSDIR}/images
 	${INSTALL_DATA} ${WRKSRC}/doc/images/*.png ${DOCSDIR}/images
 .endif
diff -urN /usr/ports/emulators/hatari/distinfo emulators/hatari/distinfo
--- /usr/ports/emulators/hatari/distinfo	2009-11-09 02:06:56.000000000 +0900
+++ emulators/hatari/distinfo	2009-11-15 03:43:01.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (hatari-1.2.0.tar.bz2) = 4aecd42784fae8c5e8c9a9a341146fbb
-SHA256 (hatari-1.2.0.tar.bz2) = f2ea252bf8095d357fbc3da66a5be9e988935970d8c3a36f680c1ceeaee15b43
-SIZE (hatari-1.2.0.tar.bz2) = 878589
+MD5 (hatari-1.3.1.tar.bz2) = 112b544ec4affb7c04e931088e62a115
+SHA256 (hatari-1.3.1.tar.bz2) = ebae927ad99a029f8cd8796463df2113357a7636c2199e00290ad4a35856e0da
+SIZE (hatari-1.3.1.tar.bz2) = 1045627
diff -urN /usr/ports/emulators/hatari/pkg-descr emulators/hatari/pkg-descr
--- /usr/ports/emulators/hatari/pkg-descr	2004-03-16 18:58:16.000000000 +0900
+++ emulators/hatari/pkg-descr	2009-11-15 03:39:41.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.sourceforge.net/
+WWW: http://hatari.berlios.de/
diff -urN /usr/ports/emulators/hatari/pkg-plist emulators/hatari/pkg-plist
--- /usr/ports/emulators/hatari/pkg-plist	2009-11-09 02:06:57.000000000 +0900
+++ emulators/hatari/pkg-plist	2009-11-15 04:18:08.000000000 +0900
@@ -1,18 +1,23 @@
 bin/hatari
+bin/hatari-console.py
+bin/hatariui
 bin/hmsa
 bin/zip2st
-%%PORTDOCS%%%%DOCSDIR%%/alsa-midi.txt
+share/applications/hatariui.desktop
 %%PORTDOCS%%%%DOCSDIR%%/authors.txt
 %%PORTDOCS%%%%DOCSDIR%%/changelog.txt
 %%PORTDOCS%%%%DOCSDIR%%/compatibility.html
 %%PORTDOCS%%%%DOCSDIR%%/emutos.txt
+%%PORTDOCS%%%%DOCSDIR%%/fr/clavier-exemple.txt
 %%PORTDOCS%%%%DOCSDIR%%/images/devices.png
-%%PORTDOCS%%%%DOCSDIR%%/images/discs.png
 %%PORTDOCS%%%%DOCSDIR%%/images/fileselector.png
+%%PORTDOCS%%%%DOCSDIR%%/images/floppydisks.png
+%%PORTDOCS%%%%DOCSDIR%%/images/harddisks.png
 %%PORTDOCS%%%%DOCSDIR%%/images/joystick.png
 %%PORTDOCS%%%%DOCSDIR%%/images/keyboard.png
 %%PORTDOCS%%%%DOCSDIR%%/images/main.png
 %%PORTDOCS%%%%DOCSDIR%%/images/memory.png
+%%PORTDOCS%%%%DOCSDIR%%/images/newfloppy.png
 %%PORTDOCS%%%%DOCSDIR%%/images/screen.png
 %%PORTDOCS%%%%DOCSDIR%%/images/sound.png
 %%PORTDOCS%%%%DOCSDIR%%/images/system.png
@@ -20,11 +25,27 @@
 %%PORTDOCS%%%%DOCSDIR%%/keymap-sample.txt
 %%PORTDOCS%%%%DOCSDIR%%/manual.html
 %%PORTDOCS%%%%DOCSDIR%%/memory-usage.txt
+%%PORTDOCS%%%%DOCSDIR%%/midi-linux.txt
 %%PORTDOCS%%%%DOCSDIR%%/readme.txt
 %%PORTDOCS%%%%DOCSDIR%%/release-notes.txt
 %%PORTDOCS%%%%DOCSDIR%%/todo.txt
 %%DATADIR%%/hatari-icon.bmp
+%%DATADIR%%/hatariui/Changelog
+%%DATADIR%%/hatariui/README
+%%DATADIR%%/hatariui/TODO
+%%DATADIR%%/hatariui/config.py
+%%DATADIR%%/hatariui/debugui.py
+%%DATADIR%%/hatariui/dialogs.py
+%%DATADIR%%/hatariui/hatari-icon.png
+%%DATADIR%%/hatariui/hatari.png
+%%DATADIR%%/hatariui/hatari.py
+%%DATADIR%%/hatariui/hatariui.py
+%%DATADIR%%/hatariui/uihelpers.py
 %%DATADIR%%/tos.img
+share/pixmaps/hatari-icon.png
+@dirrm %%DATADIR%%/hatariui
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/fr
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/applications