5 files changed, 32 insertions, 29 deletions
diff --git a/games/naev-data/Makefile b/games/naev-data/Makefile
index 1269fcdde1c5..b1832f1521d5 100644
--- a/games/naev-data/Makefile
+++ b/games/naev-data/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	data
-PORTVERSION=	0.3.9
+PORTVERSION=	0.4.1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PKGNAMEPREFIX=	naev-
diff --git a/games/naev-data/distinfo b/games/naev-data/distinfo
index 257620d9d3ae..5e38affbd820 100644
--- a/games/naev-data/distinfo
+++ b/games/naev-data/distinfo
@@ -1,3 +1,3 @@
-MD5 (naev/ndata-0.3.9) = 83dd92bdf1f06bf9634db9df9c6dda0a
-SHA256 (naev/ndata-0.3.9) = a66efe693e12e0b028baca32f8e39adc423562cfb79123e891489d598a51ae17
-SIZE (naev/ndata-0.3.9) = 75841558
+MD5 (naev/ndata-0.4.1) = 5d4a5b1f1f63fb45d9006075011cfdb0
+SHA256 (naev/ndata-0.4.1) = 1ff21f589c980bdfd6c43fdffb83cc7de8a3dcf3e0481c787fcaffb3f2f2206f
+SIZE (naev/ndata-0.4.1) = 140364178
diff --git a/games/naev/Makefile b/games/naev/Makefile
index 0429b9e99be2..6dae3334498e 100644
--- a/games/naev/Makefile
+++ b/games/naev/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	naev
-PORTVERSION=	0.3.9
-PORTREVISION=	2
+PORTVERSION=	0.4.1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DIST_SUBDIR=	${PORTNAME}
@@ -19,16 +18,25 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		freetype:${PORTSDIR}/print/freetype2
 RUN_DEPENDS=	${LOCALBASE}/share/${PORTNAME}/ndata-${PORTVERSION}:${PORTSDIR}/games/naev-data
 
+USE_AUTOTOOLS=	automake:19:env aclocal:19:env autoconf:262:env
 USE_BZIP2=	yes
 USE_DOS2UNIX=	conf.example
+GNU_CONFIGURE=	yes
 USE_GL=		gl
 USE_GMAKE=	yes
 USE_GNOME=	libxml2
-USE_SDL=	sdl image mixer
+USE_SDL=	sdl image
 
+CONFIGURE_ARGS=	--with-ndata-path=${DATADIR}/ndata-${PORTVERSION}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+
+MAN6=		naev.6
 PLIST_FILES=	bin/${PORTNAME}
 SUB_FILES=	pkg-message
 
+OPTIONS=	OPENAL 		"Use the OpenAL sound backend"	on \
+		SDL_MIXER	"Use the SDL_mixer sound backend"	on
+
 .include <bsd.port.pre.mk>
 
 .if !defined(NOPORTDOCS)
@@ -36,12 +44,23 @@ PLIST_FILES+=	%%DOCSDIR%%/conf.example
 PLIST_DIRS=	%%DOCSDIR%%
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -i "" -e 's|%%DATADIR%%|${DATADIR}|g' -e 's|%%PORTVERSION%%|${PORTVERSION}|g' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -i "" -e 's|CFLAGS +=|CFLAGS ?=|g' ${WRKSRC}/build/Makefile.posix
+.if defined(WITH_OPENAL)
+USE_OPENAL=		yes
+CONFIGURE_ARGS+=	--with-openal=yes
+.else
+CONFIGURE_ARGS+=	--with-openal=no
+.endif
+
+.if defined(WITH_SDL_MIXER)
+USE_SDL+=		mixer
+CONFIGURE_ARGS+=	--with-sdlmixer=yes
+.else
+CONFIGURE_ARGS+=	--with-sdlmixer=no
+.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.6 ${PREFIX}/man/man6
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/conf.example ${DOCSDIR}
diff --git a/games/naev/distinfo b/games/naev/distinfo
index dd5d5c56f13e..930ae9953208 100644
--- a/games/naev/distinfo
+++ b/games/naev/distinfo
@@ -1,3 +1,3 @@
-MD5 (naev/naev-0.3.9.tar.bz2) = 964ad3d816a677a7f060bae8e93fb0fd
-SHA256 (naev/naev-0.3.9.tar.bz2) = c98618b517fb729ed06995eec8a02e6d0a4f95de2b7a073385acde9849765f54
-SIZE (naev/naev-0.3.9.tar.bz2) = 881254
+MD5 (naev/naev-0.4.1.tar.bz2) = 76620a0b64398db58084385599cc3f8f
+SHA256 (naev/naev-0.4.1.tar.bz2) = 1989d16e57a7db2c1755647247db5854c15a6d1b6d2ce8e25568e639bac3a388
+SIZE (naev/naev-0.4.1.tar.bz2) = 631175
diff --git a/games/naev/files/patch-Makefile b/games/naev/files/patch-Makefile
deleted file mode 100644
index 70eca2f1266f..000000000000
--- a/games/naev/files/patch-Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile	2009-04-24 14:27:38.000000000 -0500
-+++ Makefile	2009-04-28 17:32:14.000000000 -0500
-@@ -9,11 +9,11 @@
- #
- # Possible choices: LINUX|FREEBSD|WIN32|MACOSX
- #
--OS ?= LINUX
-+OS ?= FREEBSD
- 
- 
- # Data path
--#NDATA_DEF := \"../ndata\"
-+NDATA_DEF := \"%%DATADIR%%/ndata-%%PORTVERSION%%\"
- 
- 
- ifeq ($(OS),LINUX)