naev: sync with games/naev

[Yorick Hardy <yorickhardy%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Wed Dec 23 00:07:00 2020 +0200
Changeset:	04f648ad69a8ab28813be02053f10d29b4ef591f

Modified Files:
	naev/Makefile
	naev/PLIST
	naev/distinfo
	naev/patches/patch-build_shave.in
	naev/patches/patch-configure.ac
	naev/patches/patch-src_ndata.c

Log Message:
naev: sync with games/naev

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=04f648ad69a8ab28813be02053f10d29b4ef591f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 naev/Makefile                     | 37 ++++++++++++++++++-------------------
 naev/PLIST                        |  2 +-
 naev/distinfo                     |  2 +-
 naev/patches/patch-build_shave.in |  2 +-
 naev/patches/patch-configure.ac   |  2 +-
 naev/patches/patch-src_ndata.c    |  4 ++--
 6 files changed, 24 insertions(+), 25 deletions(-)

diffs:
diff --git a/naev/Makefile b/naev/Makefile
index d8d27f03d1..e83e45ab3e 100644
--- a/naev/Makefile
+++ b/naev/Makefile
@@ -1,47 +1,46 @@
-# $NetBSD: Makefile,v 1.1 2015/08/19 20:11:36 yhardy Exp $
-#
+# $NetBSD: Makefile,v 1.7 2020/11/05 09:08:13 ryoon Exp $
 
-DISTNAME=	naev-${NAEV_VER}
+DISTNAME=	naev-0.7.0
+PKGREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GITHUB:=naev/}
-GITHUB_TAG=	naev-${NAEV_VER}
-NAEV_VER=	0.7.0
+GITHUB_TAG=	naev-${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	http://naev.org/
+HOMEPAGE=	https://github.com/naev/naev
 COMMENT=	2D space trading and combat game
 LICENSE=	gnu-gpl-v3
 
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-lua=shared
+USE_TOOLS+=	autoreconf autoconf automake
+USE_TOOLS+=	pkg-config
+GNU_CONFIGURE=	yes
 
-USE_TOOLS+=		autoconf automake pkg-config
+TOOL_DEPENDS+=	zip-[0-9]*:../../archivers/zip
 
-LUA_VERSIONS_ACCEPTED=	51
+BUILD_TARGET=	all ndata.zip
+INSTALL_TARGET=	install install-ndata
 
-NAEV_DATADIR=		${PREFIX}/share/${DISTNAME}
+CONFIGURE_ARGS+=	--enable-debug=no
+CONFIGURE_ARGS+=	--enable-lua=shared
+CONFIGURE_ARGS+=	--disable-sdltest
 
 SUBST_CLASSES+=		ndata
-SUBST_STAGE.ndata=	post-patch
+SUBST_STAGE.ndata=	pre-configure
 SUBST_FILES.ndata=	src/ndata.c
-SUBST_SED.ndata=	-e "s,@DATADIR@,${NAEV_DATADIR},"
-
-BUILD_TARGET=		all ndata.zip
-INSTALL_TARGET=		install install-ndata
-
-BUILD_DEPENDS+=	zip-[0-9]*:../../archivers/zip
+SUBST_SED.ndata=	-e "s,@DATADIR@,${PREFIX}/share/naev,"
 
 pre-configure:
 	cd ${WRKSRC} && ${SH} autogen.sh
 
 .include "../../archivers/libzip/buildlink3.mk"
+.include "../../audio/openal-soft/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../audio/SDL2_mixer/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
+.include "../../graphics/SDL2_image/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/SDL2_image/buildlink3.mk"
 .include "../../lang/lua51/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/naev/PLIST b/naev/PLIST
index 9dea216361..78dbb882e7 100644
--- a/naev/PLIST
+++ b/naev/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2015/08/19 20:11:36 yhardy Exp $
+@comment $NetBSD: PLIST,v 1.1 2019/10/01 12:25:37 nia Exp $
 bin/naev
 man/man6/naev.6
 share/appdata/naev.appdata.xml
diff --git a/naev/distinfo b/naev/distinfo
index 255d474519..4c4961137c 100644
--- a/naev/distinfo
+++ b/naev/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2015/08/19 20:11:36 yhardy Exp $
+$NetBSD: distinfo,v 1.1 2019/10/01 12:25:37 nia Exp $
 
 SHA1 (naev-0.7.0.tar.gz) = 5c5c5dc98052ef78248b8bd28fb07b23a1f8691c
 RMD160 (naev-0.7.0.tar.gz) = b689366541732392feda2991a2d38f28cb1c517f
diff --git a/naev/patches/patch-build_shave.in b/naev/patches/patch-build_shave.in
index 6fbbd78e35..95c3cd23be 100644
--- a/naev/patches/patch-build_shave.in
+++ b/naev/patches/patch-build_shave.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-build_shave.in,v 1.1 2015/08/19 20:11:36 yhardy Exp $
+$NetBSD: patch-build_shave.in,v 1.1 2019/10/01 12:25:37 nia Exp $
 
 Fix shell script.
 
diff --git a/naev/patches/patch-configure.ac b/naev/patches/patch-configure.ac
index 4dac9962cf..d7e8f2954d 100644
--- a/naev/patches/patch-configure.ac
+++ b/naev/patches/patch-configure.ac
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-configure.ac,v 1.1 2019/10/01 12:25:37 nia Exp $
 
 Add compile and linker flags for NetBSD.
 Fix shell script = tests.
diff --git a/naev/patches/patch-src_ndata.c b/naev/patches/patch-src_ndata.c
index 3907218e4c..64251e414f 100644
--- a/naev/patches/patch-src_ndata.c
+++ b/naev/patches/patch-src_ndata.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_ndata.c,v 1.1 2015/08/19 20:11:36 yhardy Exp $
+$NetBSD: patch-src_ndata.c,v 1.1 2019/10/01 12:25:37 nia Exp $
 
 Support loading data from @DATADIR@ (set in the Makefile).
 
-$NetBSD: patch-src_ndata.c,v 1.1 2015/08/19 20:11:36 yhardy Exp $
+$NetBSD: patch-src_ndata.c,v 1.1 2019/10/01 12:25:37 nia Exp $
 
 --- src/ndata.c.orig	2015-03-17 16:29:43.000000000 +0000
 +++ src/ndata.c