Bug 215671 - [maintainer-update] games/chocolate-doom 2.2.1 to 2.3.0
Summary: [maintainer-update] games/chocolate-doom 2.2.1 to 2.3.0
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Torsten Zuehlsdorff
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2016-12-30 14:49 UTC by jakub_lach
Modified: 2017-01-04 16:53 UTC (History)
1 user (show)

See Also:

Attachments
2.2.1 to 2.3.0 patch (3.38 KB, patch)
2016-12-30 14:49 UTC, jakub_lach 		no flags Details | Diff
2.2.1 to 2.3.0 patch v2 (3.25 KB, patch)
2017-01-04 12:14 UTC, jakub_lach 		no flags Details | Diff
2.2.1 to 2.3.0 patch v3 (3.43 KB, patch)
2017-01-04 16:40 UTC, jakub_lach 		no flags Details | Diff
Show Obsolete (2) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description jakub_lach 2016-12-30 14:49:31 UTC 
Created attachment 178397 [details]
2.2.1 to 2.3.0 patch

Not many changes.

* Added png dependency as suggested per % make stage && make check-plist && make stage-qa && make package process. 
* I do not use bash-completion so I'm unsure where do we want these.
Comment 1 Torsten Zuehlsdorff freebsd_committer freebsd_triage 2017-01-04 11:38:35 UTC 
The patch fails a stage-qa:

====> Running Q/A tests (stage-qa)
====> Checking for pkg-plist issues (check-plist)
===> Parsing plist
===> Checking for items in STAGEDIR missing from pkg-plist
Error: Orphaned: %%PORTDOCS%%%%DOCSDIR%%/NEWS.md
Error: Orphaned: %%PORTDOCS%%%%DOCSDIR%%/NOT-BUGS.md
Error: Orphaned: %%PORTDOCS%%%%DOCSDIR%%/PHILOSOPHY.md
Error: Orphaned: %%PORTDOCS%%%%DOCSDIR%%/README.Music.md
Error: Orphaned: %%PORTDOCS%%%%DOCSDIR%%/README.md
===> Checking for items in pkg-plist which are not in STAGEDIR
Error: Missing: %%DOCSDIR%%/NEWS
Error: Missing: %%DOCSDIR%%/NOT-BUGS
Error: Missing: %%DOCSDIR%%/PHILOSOPHY
Error: Missing: %%DOCSDIR%%/README
Error: Missing: %%DOCSDIR%%/README.Music
===> Error: Plist issues found.
*** Error code 1

Can you please check it again?

Also please create the diff against the port or the ports-tree, not against the full path of /usr/ports/. Most committer have ports-tree located in another directory. So i needed to adjust the paths in the patch manually.

Greetings,
Torsten
Comment 2 jakub_lach 2017-01-04 12:11:13 UTC 
I've manually removed plist entries starting with %%PORTDOCS%%%%DOCSDIR%% as was done prior with earlier versions. Could you check 2.2.1 too? They both pass % make stage && make check-plist && make stage-qa && make package here, maybe diff got broken?
Comment 3 jakub_lach 2017-01-04 12:14:10 UTC 
Created attachment 178504 [details]
2.2.1 to 2.3.0 patch v2
Comment 4 Torsten Zuehlsdorff freebsd_committer freebsd_triage 2017-01-04 12:30:05 UTC 
Thanks for the updated patch - this was much easier :)

But the problems still stand. make check-plist raises the errors quoted above. Did you try a "make clean" at the beginning? I can reproduce the errors manually and via poudriere.
Comment 5 jakub_lach 2017-01-04 13:25:58 UTC 
DOCS is unset here be default. I will check that.
Comment 6 jakub_lach 2017-01-04 16:40:56 UTC 
Created attachment 178515 [details]
2.2.1 to 2.3.0 patch v3

I've finally reproduced the problem and it should be corrected now, sorry for the hiccup.
Comment 7 commit-hook freebsd_committer freebsd_triage 2017-01-04 16:53:04 UTC 
A commit references this bug:

Author: tz
Date: Wed Jan  4 16:52:11 UTC 2017
New revision: 430577
URL: https://svnweb.freebsd.org/changeset/ports/430577

Log:
  games/chocolate-doom: Update from 2.2.1 to 2.3.0

  Changelog: https://github.com/chocolate-doom/chocolate-doom/releases/tag/chocolate-doom-2.3.0

  PR:           215671
  Submitted by: jakub_lach@mailplus.pl (maintainer)

Changes:
  head/games/chocolate-doom/Makefile
  head/games/chocolate-doom/distinfo
  head/games/chocolate-doom/pkg-plist
Comment 8 Torsten Zuehlsdorff freebsd_committer freebsd_triage 2017-01-04 16:53:36 UTC 
Now it works! Committed, thanks!