Bug 197323 - www/deforaos-surfer : Update to 0.2.7 (and fix break)
Summary: www/deforaos-surfer : Update to 0.2.7 (and fix break)
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: John Marino
URL:
Keywords: patch-ready
Depends on:
Blocks:
 
Reported: 2015-02-04 17:02 UTC by olivier
Modified: 2015-02-06 18:36 UTC (History)
1 user (show)

See Also:


Attachments
patch for updating the port (5.91 KB, patch)
2015-02-04 17:02 UTC, olivier
no flags Details | Diff
poudriere testport log file (68.59 KB, text/plain)
2015-02-04 17:02 UTC, olivier
no flags Details
new patch for updating the port (6.78 KB, patch)
2015-02-05 11:09 UTC, olivier
no flags Details | Diff
new poudriere testport log file (68.85 KB, text/plain)
2015-02-05 11:10 UTC, olivier
no flags Details
new-new patch for updating the port (the latest?) (6.76 KB, patch)
2015-02-05 12:22 UTC, olivier
no flags Details | Diff
new patch for updating the port (6.79 KB, patch)
2015-02-05 16:54 UTC, olivier
no flags Details | Diff
poudriere testport log file (75.15 KB, text/plain)
2015-02-05 16:54 UTC, olivier
no flags Details
new patch for updating the port (6.61 KB, patch)
2015-02-05 20:37 UTC, olivier
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description olivier 2015-02-04 17:02:02 UTC
Created attachment 152554 [details]
patch for updating the port

Here is a maintainer update of deforaos-surfer to 0.2.7 and fix port breakage.
Comment 1 olivier 2015-02-04 17:02:22 UTC
Created attachment 152555 [details]
poudriere testport log file
Comment 2 John Marino freebsd_committer freebsd_triage 2015-02-05 09:49:11 UTC
There are 4 warnings in stage check:

Warning: 'bin/surfer' is not stripped consider trying INSTALL_TARGET=install-strip or using ${STRIP_CMD}
Warning: 'bin/download' is not stripped consider trying INSTALL_TARGET=install-strip or using ${STRIP_CMD}
Warning: 'bin/helper' is not stripped consider trying INSTALL_TARGET=install-strip or using ${STRIP_CMD}
Warning: you need USES=desktop-file-utils


Shouldn't all of these be fixed?
Comment 3 olivier 2015-02-05 10:50:24 UTC
(In reply to John Marino from comment #2)
It was the first time I see this "INSTALL_TARGET=install-strip" warning message: don't know how to fix them.

And about the "USES=desktop-file-utils", I didn't see it (hidded in the others warning messages). I'm updating the port right now.
Comment 4 John Marino freebsd_committer freebsd_triage 2015-02-05 10:53:08 UTC
(In reply to olivier from comment #3)
The warning offers two ways how to fix them.

BEST WAY) If the vendor makefile has the install-strip target, add this line to the port makefile "INSTALL_TARGET=install-strip"

backup way) add a post-install target and use ${STRIP_CMD} to manually strip the binary in the stage dir.  Use grep on the ports tree, there are probably hundreds of examples of this.
Comment 5 olivier 2015-02-05 11:09:52 UTC
Created attachment 152576 [details]
new patch for updating the port

Improved port with Q/A fixed: stripped binary and desktop-file-utils added.
Comment 6 olivier 2015-02-05 11:10:27 UTC
Created attachment 152577 [details]
new poudriere testport log file
Comment 7 olivier 2015-02-05 11:11:34 UTC
(In reply to John Marino from comment #4)

And how to avoid to duplicate the list of by binary file twice ?
Because I need to list them in ${STRIP_CMD} and in the plist file.
Comment 8 John Marino freebsd_committer freebsd_triage 2015-02-05 11:14:24 UTC
I would have accepted the patch the "@" wasn't in front of ${STRIP_CMD}.  We do not suppress command that occur in installation targets (with the exception of mkdir commands).

Also, you don't need to invoke STRIP_CMD three times, you can call it once with three arguments.

Please update the patch to at least remove the "@" symbol.  You don't need to update the poudriere log, that looks fine.
Comment 9 John Marino freebsd_committer freebsd_triage 2015-02-05 11:15:43 UTC
(In reply to olivier from comment #7)
I don't understand the question.

You list it in post-install because the port fails to install stripped versions of the binary.  The port-plist is just a manifest.
Comment 10 olivier 2015-02-05 12:22:10 UTC
Created attachment 152583 [details]
new-new patch for updating the port (the latest?)

I've listed the 3 files, but I can use a line like this one in place:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
Comment 11 John Marino freebsd_committer freebsd_triage 2015-02-05 12:30:53 UTC
yes, you can safely replace it with an asterisk.  There are only 3 files in that bin directory, I believe, and all three need to be stripped.

I'm ready to "promote" the PR, but I'll wait if you want to update the patch again.
Comment 12 olivier 2015-02-05 16:54:05 UTC
Created attachment 152592 [details]
new patch for updating the port

Port documentation re-enabled (software author prefer to do it).
Comment 13 olivier 2015-02-05 16:54:26 UTC
Created attachment 152593 [details]
poudriere testport log file
Comment 14 John Marino freebsd_committer freebsd_triage 2015-02-05 17:02:21 UTC
This was almost fine.

All these lines are very likely wrong:

@dir share/icons/hicolor/24x24/apps	
@dir share/icons/hicolor/24x24	
@dir share/icons/hicolor/16x16/apps
@dir share/icons/hicolor/16x16
@dir share/icons/hicolor
@dir share/icons

The error message you probably saw wanted you to *remove* the @dirrmtry lines, not replace them with @dir.  @dir is not a new name for @dirrm; it has a specific use and I don't think you are hitting that here.

Please remove all these lines from pkg-plist and verify via poudriere that it still passes as expected.  It's the only issue I see with the current patch.
Comment 15 olivier 2015-02-05 20:37:18 UTC
Created attachment 152601 [details]
new patch for updating the port

OMG… After 14 exchanges I'm still not able to provide a clean port :-(
Please, confirm this version is the good one… I'm starting a nervous breakdown :-)
Comment 16 John Marino freebsd_committer freebsd_triage 2015-02-05 23:00:02 UTC
The patch looks ok to me.  Did you run it through poudriere again to verify that stage-qa phase passes?  You don't need to upload a new log, I'll take your word for it.

( I think it will pass but it doesn't hurt to have confirmation )
Comment 17 olivier 2015-02-06 03:05:33 UTC
(In reply to John Marino from comment #16)

Yes poudriere seems totally happy:

====> Running Q/A tests (stage-qa)
====> Checking for pkg-plist issues (check-plist)
===> Parsing plist
===> Checking for items in STAGEDIR missing from pkg-plist
===> Checking for items in pkg-plist which are not in STAGEDIR
===> No pkg-plist issues found (check-plist)
====>> Checking for staging violations... done
Comment 18 John Marino freebsd_committer freebsd_triage 2015-02-06 08:24:01 UTC
okay, great!
I know that was painful, but the PR just got promoted. :)
Comment 19 John Marino freebsd_committer freebsd_triage 2015-02-06 18:36:22 UTC
crap, I got the PR wrong here too.  I used the attachment ID again.

Author: marino
Date: Fri Feb  6 14:00:25 2015
New Revision: 378540
URL: https://svnweb.freebsd.org/changeset/ports/378540
QAT: https://qat.redports.org/buildarchive/r378540/

Log:
  www/deforaos-surfer: Upgrade version 0.2.6 => 0.2.7 (UNBREAK)
  
  PR:		152601
  Submitted by:	maintainer (Olivier Cochard)

Added:
  head/www/deforaos-surfer/files/patch-ghtml-webkit.c   (contents, props changed)
  head/www/deforaos-surfer/files/patch-src-download.c   (contents, props changed)
Deleted:
  head/www/deforaos-surfer/files/patch-doc__Makefile
  head/www/deforaos-surfer/files/patch-ghtml-webkit.diff
Modified:
  head/www/deforaos-surfer/Makefile
  head/www/deforaos-surfer/distinfo
  head/www/deforaos-surfer/pkg-plist