Bug 190083
| Summary: | [stage] Add staging support to www/foswiki | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | joe | ||||||
| Component: | Individual Port(s) | Assignee: | John Marino <marino> | ||||||
| Status: | Closed FIXED | ||||||||
| Severity: | Affects Only Me | CC: | marino, miwi | ||||||
| Priority: | Normal | ||||||||
| Version: | Latest | ||||||||
| Hardware: | Any | ||||||||
| OS: | Any | ||||||||
| Attachments: |
|
||||||||
|
Description
joe
2014-05-21 20:20:00 UTC
Responsible Changed From-To: freebsd-ports-bugs->swills swills@ wants this submitter's PRs (via the GNATS Auto Assign Tool) patch apply not clean in files/pkg-install.in. how about using @sample in plist? Created attachment 144178 [details]
Stage support to foswiki
Files/pkg* reject. files/pkg-install.in needs deleted. Everything else is OK about the patch. I would have liked to have seen test logs and an updated patch that deletes pkg-install.in, but I'll move it to patch-ready in case a committer want to risk it. and I guess it falls back to me... (In reply to joe from comment #5) > files/pkg-install.in needs deleted. Everything else is OK about the patch. hmmm, it applied for me ok (pkg-install.in was deleted too). There was a little fuzz on the Makefile but no rejected hunks. I used svn patch though. I did some minor tweaks to make portlint happy, and I removed not one but two extra <pre> inclusions, but FYI it didn't pass all checks: =========================================================================== ====> 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: %%WWWDIR%%/lib/LocalSite.cfg.sample ===> Checking for directories owned by MTREEs ===> Checking for directories handled by dependencies ===> Checking for items in pkg-plist which are not in STAGEDIR Error: Missing: %sample %WWWDIR%%/lib/LocalSite.cfg.sample Error: Missing: @comment %%CONFDIR%%/foswiki.conf.sample ===> Error: Plist issues found. *** Error code 1 Let's see how hard it is to clean up... I got those fixed, but %%WWWOWN%% and %%WWWGRP%% were never defined in PLIST_SUB. The fun never stops... ====>> Checking for extra files and directories ====>> Installing from package find: www/foswiki: No such file or directory find: www/foswiki/data: No such file or directory find: www/foswiki/data: No such file or directory find: www/foswiki/pub: No such file or directory find: www/foswiki/lib: No such file or directory find: www/foswiki/locale: No such file or directory find: www/foswiki/pub: No such file or directory find: www/foswiki/bin: No such file or directory find: www/foswiki/templates: No such file or directory find: www/foswiki/tools: No such file or directory chmod: www/foswiki/data/mime.types: No such file or directory All this @exec find stuff has to go, use @mode instead. Yuck. A commit references this bug: Author: marino Date: Wed Aug 6 23:02:17 UTC 2014 New revision: 364229 URL: http://svnweb.freebsd.org/changeset/ports/364229 Log: Stage www/foswiki PR: 190083 Submitted by: Joe (thralling.com) Tons of TLC: marino Changes: head/www/foswiki/Makefile head/www/foswiki/bsd.foswiki.mk head/www/foswiki/files/pkg-install.in head/www/foswiki/pkg-plist The original line was this: @unexec if [ "`md5 -q %D/%%WWWDIR%%/lib/LocalSite.cfg`" = "c648a70f925757e7e982a5a13d47cfe7" ]; then rm -f %D/%%WWWDIR%%/lib/LocalSite.cfg; fi The new line was: %sample %WWWDIR%%/lib/LocalSite.cfg.sample You probably meant: @sample %WWWDIR%%/lib/LocalSite.cfg.sample But it wouldn't have worked anyway because it only works on files ending in "conf.sample", not "cfg.sample". Right now LocalSite.cfg isn't handled at all, if it exists. We really need to get you on poudriere. :) |
