naev: update to naev-0.7.0

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: naev: update to naev-0.7.0
From: Yorick Hardy <yorickhardy%gmail.com@localhost>
Date: Sun, 09 Jul 2017 20:13:54 +0000
Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Sun Jul 9 22:13:54 2017 +0200
Changeset:	129b01bc0aa14cba0cb5145cf8724e79b7cc7a06

Modified Files:
	naev/Makefile
	naev/PLIST
	naev/distinfo
Added Files:
	naev/patches/patch-configure.ac
Removed Files:
	naev/patches/patch-configure

Log Message:
naev: update to naev-0.7.0

Changes since 0.6.1:

  New missions
  Initial asteroids support
  Initial fleet formation support
  Fixed screen scaling
  Mission fixes
  Lua backend unified
  Lua console tab completion
  Generalized claim system

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

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

diffstat:
 naev/Makefile                   | 23 ++++++++++-------------
 naev/PLIST                      |  2 +-
 naev/distinfo                   | 14 +++++---------
 naev/patches/patch-configure    | 21 ---------------------
 naev/patches/patch-configure.ac | 40 ++++++++++++++++++++++++++++++++++++++++
 5 files changed, 56 insertions(+), 44 deletions(-)

diffs:
diff --git a/naev/Makefile b/naev/Makefile
index 340035eb24..24a2230396 100644
--- a/naev/Makefile
+++ b/naev/Makefile
@@ -3,10 +3,9 @@
 
 DISTNAME=	naev-${NAEV_VER}
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=project/naev/naev-${NAEV_VER}/}
-EXTRACT_SUFX=	.tar.bz2
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ndata-${NAEV_VER}.zip
-NAEV_VER=	0.6.1
+MASTER_SITES=	${MASTER_SITE_GITHUB:=naev/}
+GITHUB_TAG=	naev-${NAEV_VER}
+NAEV_VER=	0.7.0
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://naev.org/
@@ -16,24 +15,22 @@ LICENSE=	gnu-gpl-v3
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-lua=shared
 
-USE_TOOLS+=		pkg-config
+USE_TOOLS+=		autoconf automake pkg-config
 
 LUA_VERSIONS_ACCEPTED=	51
 
 NAEV_DATADIR=		${PREFIX}/share/${DISTNAME}
 
-# until naev catches up with latest lua
-CFLAGS+=		-DluaL_reg=luaL_Reg
-CFLAGS+=		-D_GNU_SOURCE=1
-
 SUBST_CLASSES+=		ndata
 SUBST_STAGE.ndata=	post-patch
 SUBST_FILES.ndata=	src/ndata.c
 SUBST_SED.ndata=	-e "s,@DATADIR@,${NAEV_DATADIR},"
 
-post-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${NAEV_DATADIR}
-	${INSTALL_DATA} ${DISTDIR}/ndata-${NAEV_VER}.zip ${DESTDIR}${NAEV_DATADIR}
+BUILD_TARGET=		all ndata.zip
+INSTALL_TARGET=		install install-ndata
+
+pre-configure:
+	cd ${WRKSRC} && ${SH} autogen.sh
 
 .include "../../archivers/libzip/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
@@ -41,7 +38,7 @@ post-install:
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/SDL2_image/buildlink3.mk"
-.include "../../lang/lua/buildlink3.mk"
+.include "../../lang/lua51/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/naev/PLIST b/naev/PLIST
index 364c938035..f8b758038d 100644
--- a/naev/PLIST
+++ b/naev/PLIST
@@ -8,5 +8,5 @@ share/doc/naev/README
 share/doc/naev/TODO
 share/appdata/naev.appdata.xml
 share/naev/naev-confupdate.sh
-share/${PKGNAME}/ndata-${PKGVERSION}.zip
+share/naev/ndata
 share/pixmaps/naev.png
diff --git a/naev/distinfo b/naev/distinfo
index 53b5fc47d0..255d474519 100644
--- a/naev/distinfo
+++ b/naev/distinfo
@@ -1,13 +1,9 @@
 $NetBSD: distinfo,v 1.1 2015/08/19 20:11:36 yhardy Exp $
 
-SHA1 (naev-0.6.1.tar.bz2) = 69661f0bfd7324b5da39e67c8a966e13bb440d96
-RMD160 (naev-0.6.1.tar.bz2) = 5639cd64ba7905818daf0aa218d6f421901cf788
-SHA512 (naev-0.6.1.tar.bz2) = 4766c80b49de5a7e748948f0404ac54edbc5afa80618150d1f993d66c7462ea73bfc5220d73073cb51cd76ff5dc6ecdf935d6f843051943136ceefaea9837203
-Size (naev-0.6.1.tar.bz2) = 1047908 bytes
-SHA1 (ndata-0.6.1.zip) = 364c6f647d7e779e2222ea7b816d2ad213efe4fa
-RMD160 (ndata-0.6.1.zip) = e9a94eeba50f777752a3ea1ee1dbc71700739d6d
-SHA512 (ndata-0.6.1.zip) = 71c3024e1713b094b63cb0de3c70239d61c54142b715e61d5206c5eb3cb8c7a851fc1b388ecf891110dd8bb5c2b3759af71d20f39cb6e629c71b27386a57d7fe
-Size (ndata-0.6.1.zip) = 303984255 bytes
+SHA1 (naev-0.7.0.tar.gz) = 5c5c5dc98052ef78248b8bd28fb07b23a1f8691c
+RMD160 (naev-0.7.0.tar.gz) = b689366541732392feda2991a2d38f28cb1c517f
+SHA512 (naev-0.7.0.tar.gz) = 21984eb9108cc8d656968817090c3d2067086f66d77177780c9c2764514b98bb1044e3af1fbcabddd4eb7a356145ea709748d540e1aa6e15efd1c3c7b3972723
+Size (naev-0.7.0.tar.gz) = 313689725 bytes
 SHA1 (patch-build_shave.in) = e548c7547bc81a16a7cfbf3e7a97e4e3e23787fc
-SHA1 (patch-configure) = 3b9a87b01af29745ca4030365e3b640ca8691099
+SHA1 (patch-configure.ac) = 5b725e9b9c128c6350fec1a2310d25e4f5c28f75
 SHA1 (patch-src_ndata.c) = 2dff16576a38076561b4776e842abaa20806e856
diff --git a/naev/patches/patch-configure b/naev/patches/patch-configure
deleted file mode 100644
index 93249a8263..0000000000
--- a/naev/patches/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2015/08/19 20:11:36 yhardy Exp $
-
-Fix shell script = tests.
-
---- configure.orig	2011-06-08 14:44:57.000000000 +0200
-+++ configure	2011-06-08 14:45:39.000000000 +0200
-@@ -6543,12 +6543,12 @@
- # automake to detect when the binary needs recompiling after a library has been
- # changed.
- NAEV_DEPENDENCIES="$WIDGET_LIBS"
--if test "$used_lua" == "internal"; then :
-+if test "$used_lua" = "internal"; then :
- 
-    NAEV_DEPENDENCIES="$NAEV_DEPENDENCIES $LUA_LIBS"
- 
- fi
--if test "$used_csparse" == "internal"; then :
-+if test "$used_csparse" = "internal"; then :
- 
-    NAEV_DEPENDENCIES="$NAEV_DEPENDENCIES $CSPARSE_LIBS"
- 
diff --git a/naev/patches/patch-configure.ac b/naev/patches/patch-configure.ac
new file mode 100644
index 0000000000..4dac9962cf
--- /dev/null
+++ b/naev/patches/patch-configure.ac
@@ -0,0 +1,40 @@
+$NetBSD$
+
+Add compile and linker flags for NetBSD.
+Fix shell script = tests.
+
+--- configure.ac.orig	2017-07-02 00:40:29.000000000 +0000
++++ configure.ac
+@@ -392,6 +392,9 @@ AS_IF([test "$have_sdl2" = "yes"], [
+      *-linux*)
+        SDL_CFLAGS="$SDL_CFLAGS -D_GNU_SOURCE=1"
+        ;;
++     *-netbsd*)
++       SDL_CFLAGS="$SDL_CFLAGS -D_GNU_SOURCE=1"
++       ;;
+    esac
+ # Disable mkspr
+    SDL_IMAGE_CFLAGS=
+@@ -412,6 +415,9 @@ case "$host" in
+   *-linux*)
+     GLOBAL_LIBS="$NAEV_LIBS -lm" # feels so wrong
+     ;;
++  *-netbsd*)
++    GLOBAL_LIBS="$NAEV_LIBS -lm"
++    ;;
+   *-mingw*)
+     GLOBAL_LIBS="$NAEV_LIBS -lwsock32"
+     ;;
+@@ -470,10 +476,10 @@ esac
+ # automake to detect when the binary needs recompiling after a library has been
+ # changed.
+ NAEV_DEPENDENCIES="$WIDGET_LIBS"
+-AS_IF([test "$used_lua" == "internal"], [
++AS_IF([test "$used_lua" = "internal"], [
+    NAEV_DEPENDENCIES="$NAEV_DEPENDENCIES $LUA_LIBS"
+ ])
+-AS_IF([test "$used_csparse" == "internal"], [
++AS_IF([test "$used_csparse" = "internal"], [
+    NAEV_DEPENDENCIES="$NAEV_DEPENDENCIES $CSPARSE_LIBS"
+ ])
+
Prev by Date: compiler-rt-commonsan: Reintroduce lib/interception / NetBSD
Next by Date: Removed py-inflection - sent to base
Previous by Thread: compiler-rt-commonsan: Reintroduce lib/interception / NetBSD
Next by Thread: Removed py-inflection - sent to base
Indexes:
Home | Main Index | Thread Index | Old Index