Created attachment 226219 [details] cataclysm-dda-0f.patch Changes: https://github.com/CleverRaven/Cataclysm-DDA/blob/0.F/data/changelog.txt
^Triage: [tags] in issue Titles are deprecated. ^Triage: If there is a changelog or release notes URL available for this version, please add it to the URL field. ^Triage: Maintainer-feedback flag (+) not required unless requested (?) first. The installation of the man page should not be silenced. No need to update a new patch, though! Q/A: Makefile: [86]: do not use muted INSTALL_foo commands (i.e., those that start with '@'). These should be printed. Thanks!
Fails to patch. ===> License CC-BY-SA-3.0 accepted by the user ===> cataclysm-dda-0.f,1 depends on file: /usr/local/sbin/pkg - found ===> Fetching all distfiles required by cataclysm-dda-0.f,1 for building ===> Extracting for cataclysm-dda-0.f,1 => SHA256 Checksum OK for CleverRaven-Cataclysm-DDA-0.F_GH0.tar.gz. ===> Patching for cataclysm-dda-0.f,1 ===> Applying FreeBSD patches for cataclysm-dda-0.f,1 from /data/fernape_data/FreeBSD-repos/ports/games/cataclysm-dda/files 1 out of 1 hunks failed--saving rejects to src/translations.cpp.rej ===> FAILED Applying FreeBSD patch-src-translations.cpp ===> FAILED to apply cleanly FreeBSD patch(es) patch-src-translations.cpp *** Error code 1 upstream has some defined(BSD) instead of defined(__FreeBSD__) Would you have a look at it? Thanks!
(In reply to Fernando Apesteguía from comment #2) Oops, that file should be deleted, but somehow the deletion didn't get reflected in the git diff.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=c0e6f62c86b7a687a2101c83b2f2f140fccff9a0 commit c0e6f62c86b7a687a2101c83b2f2f140fccff9a0 Author: Fernando Apesteguía <fernape@FreeBSD.org> AuthorDate: 2021-07-06 10:03:49 +0000 Commit: Fernando Apesteguía <fernape@FreeBSD.org> CommitDate: 2021-07-06 11:39:19 +0000 games/cataclysm-dda: update to 0.F While here: * Unmute INSTALL command * Sort variables PR: 256977 Reported by: greg@unrelenting.technology (maintainer) games/cataclysm-dda/Makefile | 43 +- games/cataclysm-dda/distinfo | 6 +- .../files/patch-src-translations.cpp (gone) | 11 - games/cataclysm-dda/pkg-plist | 1207 +++++++++++++------- 4 files changed, 797 insertions(+), 470 deletions(-)
Committed, Thanks!
Created attachment 226313 [details] cataclysm-dda-forgotten.patch Oh — apparently the reason that removal wasn't included was that I forgot to git add the files directory. So an important patch was also forgotten. Sorry for the trouble, please commit this fix
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=546ae7667782e11fc0e65c9c7e605f06a9eb087a commit 546ae7667782e11fc0e65c9c7e605f06a9eb087a Author: Fernando Apesteguía <fernape@FreeBSD.org> AuthorDate: 2021-07-09 05:11:56 +0000 Commit: Fernando Apesteguía <fernape@FreeBSD.org> CommitDate: 2021-07-09 05:49:30 +0000 games/cataclysm-dda: Add missing patch Submitter forgot to include a patch in the previous update PR: 256977 Reported by: greg@unrelenting.technology (maintainer) Fixes: c0e6f62c86b7 - games/cataclysm-dda: update to 0.F games/cataclysm-dda/files/patch-Makefile (new) | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
Done. Thanks!