Bug 212247
| Summary: | [maintainer] [patch] games/zdoom: Add patch to properly detect port's DATADIR | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Kyle Evans <kevans> | ||||||
| Component: | Individual Port(s) | Assignee: | Dmitry Marakasov <amdmi3> | ||||||
| Status: | Closed FIXED | ||||||||
| Severity: | Affects Some People | Keywords: | patch | ||||||
| Priority: | --- | ||||||||
| Version: | Latest | ||||||||
| Hardware: | Any | ||||||||
| OS: | Any | ||||||||
| Attachments: |
|
||||||||
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.
(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. 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.
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 |
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.