Bug 198684 - [PATCH] games/naev and games/naev-data: Update to 0.6.0
Summary: [PATCH] games/naev and games/naev-data: Update to 0.6.0
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Dmitry Marakasov
URL:
Keywords: patch
Depends on:
Blocks:
 
Reported: 2015-03-18 13:35 UTC by lightside
Modified: 2015-04-23 20:36 UTC (History)
1 user (show)

See Also:
bugzilla: maintainer-feedback? (acm)


Attachments
Proposed patch for games/naev-data (since 375273 revision) (2.02 KB, patch)
2015-03-18 13:35 UTC, lightside
no flags Details | Diff
Proposed patch for games/naev (since 375598 revision) (3.42 KB, patch)
2015-03-18 13:36 UTC, lightside
no flags Details | Diff
The poudriere testport log (FreeBSD 10 amd64): games/naev-data (8.96 KB, text/plain)
2015-03-18 13:37 UTC, lightside
no flags Details
The poudriere testport log (FreeBSD 10 amd64, with default options, i.e. all enabled): games/naev (7.85 KB, application/x-bzip2)
2015-03-18 13:38 UTC, lightside
no flags Details
The poudriere testport log (FreeBSD 10 amd64, with all options disabled): games/naev (7.42 KB, application/x-bzip2)
2015-03-18 13:39 UTC, lightside
no flags Details
The poudriere testport log (FreeBSD 10 amd64, with all options enabled, except SDL2): games/naev (7.65 KB, application/x-bzip2)
2015-03-18 13:40 UTC, lightside
no flags Details
Proposed patch for games/naev-data (since 375273 revision) (1.99 KB, patch)
2015-03-19 03:01 UTC, lightside
no flags Details | Diff
Proposed patch for games/naev-data (since 375273 revision) (2.18 KB, patch)
2015-03-20 07:24 UTC, lightside
no flags Details | Diff
The poudriere testport log (FreeBSD 10 amd64): games/naev-data (8.93 KB, text/plain)
2015-03-20 07:34 UTC, lightside
no flags Details
Proposed patch for games/naev-data (since 375273 revision) (2.19 KB, patch)
2015-03-20 08:22 UTC, lightside
no flags Details | Diff
Proposed patch for games/naev-data (since 375273 revision) (2.17 KB, patch)
2015-04-02 02:56 UTC, lightside
no flags Details | Diff
Proposed patch for games/naev (since 375598 revision) (3.93 KB, patch)
2015-04-02 02:57 UTC, lightside
no flags Details | Diff
Proposed patch for games/naev-data (since 375273 revision) (2.16 KB, patch)
2015-04-02 03:26 UTC, lightside
no flags Details | Diff
Proposed patch for games/naev-data (since 375273 revision) (3.10 KB, patch)
2015-04-02 06:57 UTC, lightside
no flags Details | Diff
Proposed patch for games/naev (since 375598 revision) (30.20 KB, patch)
2015-04-11 01:20 UTC, lightside
no flags Details | Diff
The poudriere testport log (FreeBSD 10 amd64, with default options, i.e. all enabled): games/naev (7.68 KB, application/x-bzip2)
2015-04-11 01:22 UTC, lightside
no flags Details
The games/naev-devel port in shar format (3.69 KB, text/plain)
2015-04-11 01:24 UTC, lightside
no flags Details
The poudriere testport log (FreeBSD 10 amd64): games/naev-devel (22.00 KB, application/x-bzip2)
2015-04-11 01:25 UTC, lightside
no flags Details
Proposed patch for games/naev (since 375598 revision) (29.13 KB, patch)
2015-04-11 23:39 UTC, lightside
no flags Details | Diff
Proposed patch for games/naev (since 375598 revision) (35.20 KB, patch)
2015-04-13 16:59 UTC, lightside
no flags Details | Diff
The poudriere testport log (FreeBSD 10 amd64, with default options, i.e. all enabled): games/naev (7.71 KB, application/x-bzip2)
2015-04-13 17:00 UTC, lightside
no flags Details
Proposed patch for games/naev (since 375598 revision) (35.25 KB, patch)
2015-04-20 08:05 UTC, lightside
no flags Details | Diff
The poudriere testport log (FreeBSD 10 amd64, with default options, i.e. all enabled): games/naev (7.56 KB, application/x-bzip2)
2015-04-20 08:05 UTC, lightside
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description lightside 2015-03-18 13:35:55 UTC
Created attachment 154479 [details]
Proposed patch for games/naev-data (since 375273 revision)

Patch to update games/naev and games/naev-data ports from 0.5.3 to 0.6.0 version.

Look following links for changes:
http://blog.naev.org/2015/03/naev-0-6-0-release/
https://github.com/naev/naev/compare/naev-0.5.3...naev-0.6.0

Changes for games/naev-data:
- Adapt MASTER_SITES
- Adapt EXTRACT_SUFX [*]
- Add license information
- Use defined PROJECTHOST variable
- Add NO_ARCH=yes, because there are no architecture specific files
- Change WWW to SF address

Changes for games/naev:
- Adapt MASTER_SITES
- Add license information
- Add library dependency on archivers/libzip and math/suitesparse ports
- Adapt runtime dependency
- Add PORTDATA and PORTDOCS variables
- Add DOCS and SDL2 options
- Add OPENAL, SDL2 and SDL_MIXER to default options, as defined by developer(s) inside of configure file
- Use options helpers
- Adapt PLIST_FILES
- Remove do-install target
- Change WWW to SF address

I changed Google Code address to SourceForge, because of following author's blog post:
http://blog.naev.org/2015/03/github-issue-tracker-changes/
There is a possibility to use "http://naev.org" for WWW.

* No need to use USES=zip here as portlint suggests, because of custom do-extract target, which just copies a distfile.
Comment 1 lightside 2015-03-18 13:36:40 UTC
Created attachment 154480 [details]
Proposed patch for games/naev (since 375598 revision)
Comment 2 lightside 2015-03-18 13:37:36 UTC
Created attachment 154481 [details]
The poudriere testport log (FreeBSD 10 amd64): games/naev-data
Comment 3 lightside 2015-03-18 13:38:35 UTC
Created attachment 154482 [details]
The poudriere testport log (FreeBSD 10 amd64, with default options, i.e. all enabled): games/naev
Comment 4 lightside 2015-03-18 13:39:23 UTC
Created attachment 154483 [details]
The poudriere testport log (FreeBSD 10 amd64, with all options disabled): games/naev
Comment 5 lightside 2015-03-18 13:40:02 UTC
Created attachment 154484 [details]
The poudriere testport log (FreeBSD 10 amd64, with all options enabled, except SDL2): games/naev
Comment 6 lightside 2015-03-19 03:01:48 UTC
Created attachment 154501 [details]
Proposed patch for games/naev-data (since 375273 revision)

Possible to use PORTDATA variable for games/naev-data port.
Comment 7 Dmitry Marakasov freebsd_committer freebsd_triage 2015-03-20 06:49:55 UTC
Why not install distfile directly from ${_DISTDIR} in do-install: for naev-data?
I'd also consider removing DIST_SUBDIR and pkg-message for naev - don't see a purpose in these.
Otherwise looks good.
Comment 8 lightside 2015-03-20 07:24:03 UTC
Created attachment 154552 [details]
Proposed patch for games/naev-data (since 375273 revision)

(In reply to comment #7)
> Why not install distfile directly from ${_DISTDIR} in do-install: for naev-data?

I think, this question is related to the maintainer, because I didn't change the installation logic here. But I also thought about this and agree to propose these changes.

(In reply to comment #7)
> I'd also consider removing DIST_SUBDIR and pkg-message for naev
> - don't see a purpose in these.

I think, the current purpose of DIST_SUBDIR is ok, because it is already exists for previous versions and ndata-${PORTVERSION}.zip is related to naev. Otherwise, in case of direct use of GitHub without games/naev-data port it might make sense, in my opinion.
Comment 9 lightside 2015-03-20 07:34:17 UTC
Created attachment 154553 [details]
The poudriere testport log (FreeBSD 10 amd64): games/naev-data
Comment 10 lightside 2015-03-20 08:22:41 UTC
Created attachment 154555 [details]
Proposed patch for games/naev-data (since 375273 revision)

Use EXTRACT_ONLY with empty value, actually.
Comment 11 lightside 2015-04-02 02:56:12 UTC
Created attachment 155110 [details]
Proposed patch for games/naev-data (since 375273 revision)

Paraphrased empty value of EXTRACT_ONLY define for naev-data port.
Comment 12 lightside 2015-04-02 02:57:07 UTC
Created attachment 155111 [details]
Proposed patch for games/naev (since 375598 revision)

Removed pkg-message file from naev port, as Dmitry Marakasov suggested in comment #7.
Comment 13 lightside 2015-04-02 03:26:27 UTC
Created attachment 155112 [details]
Proposed patch for games/naev-data (since 375273 revision)

emoved proposed LICENSE define, because it's not complete.
There are many licenses listed inside of naev-data distfile archive in dat/gfx/ARTWORK_LICENSE and dat/snd/SOUND_LICENSE files. Link for reference:
http://wiki.naev.org/wiki/Licensing
Comment 14 lightside 2015-04-02 03:27:34 UTC
(In reply to comment #13)
> emoved proposed LICENSE define

Removed proposed LICENSE define
Comment 15 lightside 2015-04-02 04:35:21 UTC
It's possible to extract license files from distfile archive of naev-data port, but I think, that this is not required in this case, because data and license files are inside of the same (installed) distfile archive. They might be explained afterwards by other people, if needed. At least, this is not affect the final result.
Comment 16 lightside 2015-04-02 06:57:54 UTC
Created attachment 155114 [details]
Proposed patch for games/naev-data (since 375273 revision)

Ok, I managed to complete the license information for naev-data port.
Comment 17 lightside 2015-04-11 01:20:31 UTC
Created attachment 155437 [details]
Proposed patch for games/naev (since 375598 revision)

Added some (adapted) upstream patches for games/naev port. They fixes some issues found after 0.6.0 release version, like memory leaks and management of pointers. These patches might be removed after next release.

There are issues for games/naev-data also, related to lua scripts, missions, etc., which fixed by upstream (to this time):
https://github.com/naev/naev/compare/naev-0.6.0...a1f430f

The Naev is in development.
Comment 18 lightside 2015-04-11 01:22:25 UTC
Created attachment 155438 [details]
The poudriere testport log (FreeBSD 10 amd64, with default options, i.e. all enabled): games/naev
Comment 19 lightside 2015-04-11 01:24:55 UTC
Created attachment 155439 [details]
The games/naev-devel port in shar format

I attached shar archive with games/naev-devel port, which uses development version from GitHub, based on Git commits. But I don't propose it, if there are no interested people.
Comment 20 lightside 2015-04-11 01:25:53 UTC
Created attachment 155440 [details]
The poudriere testport log (FreeBSD 10 amd64): games/naev-devel
Comment 21 lightside 2015-04-11 23:39:52 UTC
Created attachment 155486 [details]
Proposed patch for games/naev (since 375598 revision)

Cleaned up upstream patches for games/naev port.
Comment 22 lightside 2015-04-13 16:59:18 UTC
Created attachment 155550 [details]
Proposed patch for games/naev (since 375598 revision)

Adapt patches in files directory, after ports r383894 changes for ports-mgmt/portlint v2.16.3.

References for used patches (because the overview was lost, compared to previous changes):
- Turn player_missions in an array of pointers
https://github.com/naev/naev/commit/74b9a086a20f80f21ce2f3866b31318e651a6235
- Don't use a pointer to a pointer
https://github.com/naev/naev/commit/155a7fdaf07e1b5549e6314a433425b4187bb33f
- Correctly pass boarding ship to pilot board hook
https://github.com/naev/naev/commit/8b4ceb3c5db7171b65f918f278e2d3a0685bf0f2
- Avoid regenerating the land tabs over top of themselves
https://github.com/naev/naev/commit/9fd2a7dcb3690bc1befe7f9a05d02e204dcfe8a1
- Regenerate the player's ship list when removing a ship
https://github.com/naev/naev/commit/34651062f0f26b43489214137862148c7cf842c1
- Run pilot board hook for all pilot, not just player
https://github.com/naev/naev/commit/0b545ee49f33632e892e242807543d6b386a02af
- * Hook param off by one.
https://github.com/naev/naev/commit/6f4005f921650c1a8930721bbd1c0eab163673f8
- * Too many bugs in the code, should fix bugs with pilot hooks when using >1 parameter.
https://github.com/naev/naev/commit/3ba9cafb369f94115c897717b6f38415348f4c8f
- Fixed "buy map" button not showing up until after land hooks.
https://github.com/naev/naev/commit/b9bad809027529c0b0e95d9b8a011cb880229a5d
Comment 23 lightside 2015-04-13 17:00:16 UTC
Created attachment 155551 [details]
The poudriere testport log (FreeBSD 10 amd64, with default options, i.e. all enabled): games/naev
Comment 24 lightside 2015-04-14 19:44:34 UTC
(In reply to comment #22)

- Memory leak fix
https://github.com/naev/naev/commit/173bad4a7bab85903575798a51259ff6f3dd42c8
Comment 25 lightside 2015-04-20 08:05:21 UTC
Created attachment 155760 [details]
Proposed patch for games/naev (since 375598 revision)

Converted games/naev port to USES=autoreconf:build after ports r384310 changes.
Comment 26 lightside 2015-04-20 08:05:48 UTC
Created attachment 155761 [details]
The poudriere testport log (FreeBSD 10 amd64, with default options, i.e. all enabled): games/naev
Comment 27 commit-hook freebsd_committer freebsd_triage 2015-04-23 20:36:59 UTC
A commit references this bug:

Author: amdmi3
Date: Thu Apr 23 20:36:29 UTC 2015
New revision: 384609
URL: https://svnweb.freebsd.org/changeset/ports/384609

Log:
  - Update to 0.6.0

  PR:		198684
  Submitted by:	lightside@gmx.com
  Approved by:	maintainer timeout

Changes:
  head/games/naev/Makefile
  head/games/naev/distinfo
  head/games/naev/files/patch-src_board.c
  head/games/naev/files/patch-src_equipment.c
  head/games/naev/files/patch-src_hook.c
  head/games/naev/files/patch-src_info.c
  head/games/naev/files/patch-src_land.c
  head/games/naev/files/patch-src_land.h
  head/games/naev/files/patch-src_land__outfits.c
  head/games/naev/files/patch-src_land__shipyard.c
  head/games/naev/files/patch-src_mission.c
  head/games/naev/files/patch-src_mission.h
  head/games/naev/files/patch-src_nlua__hook.c
  head/games/naev/files/patch-src_nlua__misn.c
  head/games/naev/files/patch-src_npc.c
  head/games/naev/files/patch-src_pilot__hook.c
  head/games/naev/files/patch-src_player.c
  head/games/naev/files/patch-src_space.c
  head/games/naev/files/pkg-message.in
  head/games/naev/pkg-descr
  head/games/naev-data/Makefile
  head/games/naev-data/distinfo
  head/games/naev-data/pkg-descr