Index: head/games/naev-data/Makefile
===================================================================
--- head/games/naev-data/Makefile	(revision 401618)
+++ head/games/naev-data/Makefile	(revision 401619)
@@ -1,43 +1,40 @@
 # Created by: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	data
-PORTVERSION=	0.6.0
+PORTNAME=	naev
+PORTVERSION=	0.6.1
 CATEGORIES=	games
-MASTER_SITES=	SF/${PROJECTHOST}/${PKGNAMEPREFIX}${PORTVERSION}/
-PKGNAMEPREFIX=	naev-
-DISTNAME=	${PORTNAME:S/^/n/}-${PORTVERSION}
-EXTRACT_SUFX=	.zip
-DIST_SUBDIR=	${PROJECTHOST}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
+PKGNAMESUFFIX=	-data
+DISTNAME=	ndata-${PORTVERSION}
 EXTRACT_ONLY=	# empty
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Naev game data file
 
 LICENSE=	GPLv2 GPLv3 CCBYv3 CCBYSAv3 PD
 LICENSE_COMB=	multi
 LICENSE_NAME_CCBYv3=	Creative Commons Attribution 3.0 Unported license
 LICENSE_NAME_CCBYSAv3=	Creative Commons Attribution-ShareAlike 3.0 Unported license
 LICENSE_NAME_PD=	Public Domain license
 LICENSE_TEXT_CCBYv3=	The license: CCBYv3 (${LICENSE_NAME_CCBYv3}) is standard,\
 	please read from the web: http://creativecommons.org/licenses/by/3.0/
 LICENSE_TEXT_CCBYSAv3=	The license: CCBYSAv3 (${LICENSE_NAME_CCBYSAv3}) is standard,\
 	please read from the web: http://creativecommons.org/licenses/by-sa/3.0/
 LICENSE_TEXT_PD=	The license: PD (${LICENSE_NAME_PD}), please read possible explanation on the web:\
 	http://www.teachingcopyright.org/handout/public-domain-faq
 LICENSE_PERMS_CCBYv3=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_CCBYSAv3=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_PD=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-PROJECTHOST=	${PKGNAMEPREFIX:S/-//}
+USES=		zip
 NO_ARCH=	yes
 NO_BUILD=	yes
 
-DATADIR=	${PREFIX}/share/${PROJECTHOST}
 PORTDATA=	*
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${_DISTDIR}/${DISTFILES} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${DISTDIR}/${DISTFILES} ${STAGEDIR}${DATADIR}/
 
 .include <bsd.port.mk>
Index: head/games/naev-data/distinfo
===================================================================
--- head/games/naev-data/distinfo	(revision 401618)
+++ head/games/naev-data/distinfo	(revision 401619)
@@ -1,2 +1,2 @@
-SHA256 (naev/ndata-0.6.0.zip) = 07ccb9f50652bceb8064fa1e48cd9df2b4ce0e3c52b60f27398cdfc3186ac52b
-SIZE (naev/ndata-0.6.0.zip) = 302646395
+SHA256 (ndata-0.6.1.zip) = 3d7c807637f3f4795db0aab29f02a76ee25398ecb53208f08a60be1197a86996
+SIZE (ndata-0.6.1.zip) = 303984255
Index: head/games/naev-data/pkg-descr
===================================================================
--- head/games/naev-data/pkg-descr	(revision 401618)
+++ head/games/naev-data/pkg-descr	(revision 401619)
@@ -1,4 +1,4 @@
-NAEV is a 2d action/rpg space game that combines elements from the action, rpg
-and simulation genres (data file).
+Naev is a 2D space trading and combat game, in a similar vein to
+Escape Velocity (data files).
 
-WWW: http://sourceforge.net/projects/naev/
+WWW: http://blog.naev.org/