Bug 192532 - [maintainer] Update Port: www/ephemera to 4.0
Summary: [maintainer] Update Port: www/ephemera to 4.0
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Many People
Assignee: John Marino
Depends on:
Reported: 2014-08-09 18:15 UTC by jimmy
Modified: 2014-08-10 14:43 UTC (History)
1 user (show)

See Also:

diff -ruN (4.16 KB, patch)
2014-08-09 18:15 UTC, jimmy
no flags Details | Diff
diff -x files -ruN (2.40 KB, patch)
2014-08-10 00:06 UTC, jimmy
no flags Details | Diff
poudriere testport i386 (10.77 KB, text/plain)
2014-08-10 00:06 UTC, jimmy
no flags Details
poudriere testport amd64 (11.65 KB, text/plain)
2014-08-10 00:07 UTC, jimmy
no flags Details
diff -x files -ruN (2.52 KB, patch)
2014-08-10 01:09 UTC, jimmy
no flags Details | Diff
poudriere testport amd64 (12.52 KB, text/plain)
2014-08-10 01:09 UTC, jimmy
no flags Details
poudriere testport i386 (12.57 KB, text/plain)
2014-08-10 01:10 UTC, jimmy
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description jimmy 2014-08-09 18:15:14 UTC
Created attachment 145577 [details]
diff -ruN

Major version update.
Comment 1 jimmy 2014-08-09 18:18:42 UTC
files directory should be removed. Patches incorporated in distribution Makefile.
Comment 2 John Marino freebsd_committer 2014-08-09 22:20:53 UTC
This isn't right, MANCOMPRESSED is no longer used.  As this is a high-priority staging PR, before you submit a new version, can you provide verification?  In order of preference, examples of what I'm looking for are:

1) "poudriere testport" or "poudriere bulk -t" logs
2) Redports or tinderbox logs
3) "make check-plist" followed by "make stage-qa" output  (https://www.freebsd.org/doc/en/books/porters-handbook/porting-testing.html)
Comment 3 jimmy 2014-08-10 00:06:00 UTC
Created attachment 145592 [details]
diff -x files -ruN
Comment 4 jimmy 2014-08-10 00:06:33 UTC
Created attachment 145593 [details]
poudriere testport i386
Comment 5 jimmy 2014-08-10 00:07:01 UTC
Created attachment 145594 [details]
poudriere testport amd64
Comment 6 John Marino freebsd_committer 2014-08-10 00:18:54 UTC
everything looks fine except this stage-qa warning:

====> Running Q/A tests (stage-qa)
Warning: 'bin/ephemera' is not stripped consider using ${STRIP_CMD}
====> Checking for pkg-plist issues (check-plist)

I checked the port and it's used the vendor makefile to install.  One solution for the above is use "${BSD_INSTALL_PROGRAM} <original patch> <copy-to-patch>" rather than "cp" or "install" or whatever.  BSD_INSTALL_PROGRAM is an environmental variable set during "do-install" target.

The less pretty way is use a post-install target e.g.

  ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ephemera

Note that STRIP_CMD is disabled when WITH_DEBUG is set.
Comment 7 jimmy 2014-08-10 01:09:15 UTC
Created attachment 145596 [details]
diff -x files -ruN
Comment 8 jimmy 2014-08-10 01:09:44 UTC
Created attachment 145597 [details]
poudriere testport amd64
Comment 9 jimmy 2014-08-10 01:10:11 UTC
Created attachment 145598 [details]
poudriere testport i386
Comment 10 jimmy 2014-08-10 01:12:06 UTC
New distfile adds -s to vendor Makefile install to strip binary.

Corrected: Port used SQLITE_USE instead of USE_SQLITE.

New poudriere logs attached.
Comment 11 John Marino freebsd_committer 2014-08-10 07:07:27 UTC
thanks for the update! moving to patch-ready status.
Comment 12 commit-hook freebsd_committer 2014-08-10 13:25:46 UTC
A commit references this bug:

Author: marino
Date: Sun Aug 10 13:25:20 UTC 2014
New revision: 364537
URL: http://svnweb.freebsd.org/changeset/ports/364537

  www/ephemera: Upgrade version 2.9 => 4.0

  Also fix incorrect use of @sample keyword

  PR:		192532
  Submitted by:	maintainer (James Bailie)

Comment 13 John Marino freebsd_committer 2014-08-10 13:30:01 UTC
I'm not sure why I thought this was a staging PR.  That mistake bumped you to the front of the line. :)

Some advice:
1) The patch having a prefix of "/usr/local/poudriere/ports/default/" was a bother, next time start with "www".
2) Don't tell people to manually remove files, include those removals in the patch.  It makes it a lot easier for the committer.

Comment 14 jimmy 2014-08-10 14:32:20 UTC
Acknowledged: In future, patch path should start with category directory. Patch should remove files if necessary.

Did not know how to get patch to remove files. Was not reading info diff, but man diff. man diff and info diff conflict on -E option (--remove-empty-files). Now I know.
Comment 15 John Marino freebsd_committer 2014-08-10 14:43:45 UTC
i think the "remove empty files" applies to the program patch rather than diff.

"svn patch" will do the right thing, removing zero-length files and empty directories.

Anyway, this should do it:

diff -u files/iwanttodeletethis.patch /dev/null > mygreat.diff