Bug 212247 - [maintainer] [patch] games/zdoom: Add patch to properly detect port's DATADIR
Summary: [maintainer] [patch] games/zdoom: Add patch to properly detect port's DATADIR
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: 2016-08-29 20:24 UTC by Kyle Evans
Modified: 2016-09-08 14:20 UTC (History)
0 users

See Also:


Attachments
svn(1) diff of games/zdoom (1.77 KB, patch)
2016-08-29 20:24 UTC, Kyle Evans
kevans: maintainer-approval+
Details | Diff
svn(1) diff of games/zdoom (652 bytes, patch)
2016-08-30 18:18 UTC, Kyle Evans
kevans: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Kyle Evans freebsd_committer freebsd_triage 2016-08-29 20:24:58 UTC
Created attachment 174203 [details]
svn(1) diff of games/zdoom

As originally submitted, this port does not work without a modification to the stock configuration that it generates. Add a patch to the port to generally add DATADIR (in an upstream-appropriate way) to its search paths for both IWADs and zdoom.pk3.

This patch has also been submitted upstream for inclusion in future versions.
Comment 1 Dmitry Marakasov freebsd_committer freebsd_triage 2016-08-30 16:08:02 UTC
This is not really correct, as prefix is not necessarily equal to /usr/local. You should substitude actual ${PREFIX} value there, preferably removing other paths from lookup for safety.
Comment 2 Kyle Evans freebsd_committer freebsd_triage 2016-08-30 16:17:44 UTC
(In reply to Dmitry Marakasov from comment #1)

Hi,

That's a fair point. I'll get back to this in a couple of hours -- I'd like to go ahead and work something into upstream that takes this into account as well, instead of the current scatter-shot try /usr/share, /usr/local/share. After that, I'll re-roll this patch to match.

Some of the other paths (i.e. ${PREFIX}/share/doom) are still helpful, though, considering games/doom-data specifies this as the doom-general data. I'd like to keep the DATADIR for this one intact, though, because a lot of ZDoom-specific stuff won't work on other ports, so the distinction is kind of nice.
Comment 3 Kyle Evans freebsd_committer freebsd_triage 2016-08-30 18:18:47 UTC
Created attachment 174223 [details]
svn(1) diff of games/zdoom

Hello again,

A mistake was made, both in the initial porting and this previously attempted patch.

To be consistent with (some) other Doom-related ports in the ports tree, we should go ahead and store ZDoom-related data within ${DMDIR}. All IWADs go into ${DMDIR}, all PWADs go into ${DMDIR}/zdoom.
Comment 4 commit-hook freebsd_committer freebsd_triage 2016-09-08 14:20:09 UTC
A commit references this bug:

Author: amdmi3
Date: Thu Sep  8 14:19:46 UTC 2016
New revision: 421558
URL: https://svnweb.freebsd.org/changeset/ports/421558

Log:
  - Fix path to data files
  - Add LICENSE

  PR:		212247
  Submitted by:	bsdports@kyle-evans.net (maintainer)

Changes:
  head/games/zdoom/Makefile