Bug 227105 - x11-wm/bspwm: update to 0.9.5
Summary: x11-wm/bspwm: update to 0.9.5
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: Thomas Zander
URL:
Keywords: easy, patch, patch-ready
: 227545 (view as bug list)
Depends on:
Blocks:
 
Reported: 2018-03-30 09:17 UTC by Oleh Hushchenkov
Modified: 2018-04-30 05:59 UTC (History)
5 users (show)

See Also:
riggs: merge-quarterly+


Attachments
Patch (7.81 KB, patch)
2018-03-30 09:17 UTC, Oleh Hushchenkov
o.hushchenkov: maintainer-approval+
Details | Diff
Patch v2 (7.74 KB, patch)
2018-04-02 09:14 UTC, Oleh Hushchenkov
o.hushchenkov: maintainer-approval+
Details | Diff
Update patch to versionn 0.9.5 (7.74 KB, patch)
2018-04-17 04:29 UTC, Oleh Hushchenkov
o.hushchenkov: maintainer-approval+
Details | Diff
Return pkg-plist file (8.81 KB, patch)
2018-04-19 08:40 UTC, Oleh Hushchenkov
o.hushchenkov: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Oleh Hushchenkov 2018-03-30 09:17:47 UTC
Created attachment 191973 [details]
Patch

Update to 0.9.4.
Remove patch-Makefile.
Use do-install post-install-* targets.
Set CPPFLAGS and LDFLAGS.
Remove pkg-plist and use PLIST_FILES instead.
Comment 1 Alexandre C. Guimarães freebsd_committer freebsd_triage 2018-03-30 12:20:36 UTC
Hi.

Please, add localbase:ldflags to USES instead of using

CPPFLAGS+=     -I${PREFIX}/include
LDFLAGS+=      -L${PREFIX}/lib

See: https://www.freebsd.org/doc/en/books/porters-handbook/uses-localbase.html

It is also a good practice to clean the header and leave just[1]:

# $FreeBSD$

[1] the 'created by' part should be kept if do exist of course. :)
Comment 2 Oleh Hushchenkov 2018-04-02 09:14:14 UTC
Created attachment 192093 [details]
Patch v2
Comment 3 Oleh Hushchenkov 2018-04-02 09:16:38 UTC
(In reply to Alexandre C. Guimarães from comment #1)

Hi.

I am added localbase:ldflags to USES in updated patch.

Thanks for pointing on it.
Comment 4 Oleh Hushchenkov 2018-04-17 04:29:38 UTC
Created attachment 192581 [details]
Update patch to versionn 0.9.5
Comment 5 Guido Falsi freebsd_committer freebsd_triage 2018-04-18 07:22:50 UTC
There are still a few problems with this submission.

If the CONTRIB option is turned on you install extra files, which are not listed in the plist.

You should go back to external pkg-plist files and use plist substitutions depending on options. This is documented here:

https://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/plist.html#plist-sub

This is required otherwise the extra files will be simply left in the staging directory and never included in the actual package installed on the system.


Also, this is more of an opinion, but fixing the upstream provided install target is preferred to rolling out your own do-install in the port Makefile.
Comment 6 Tobias Kortkamp freebsd_committer freebsd_triage 2018-04-18 07:24:54 UTC
*** Bug 227545 has been marked as a duplicate of this bug. ***
Comment 7 Oleh Hushchenkov 2018-04-19 08:40:40 UTC
Created attachment 192643 [details]
Return pkg-plist file
Comment 8 Oleh Hushchenkov 2018-04-19 09:10:01 UTC
(In reply to Guido Falsi from comment #5)

In recently committed update to x11/sxhkd we switched from fixing the upstream provided install target to own do-install in the port Makefile and I think is better to do this in x11-wm/bspwm too.
Comment 9 Oleh Hushchenkov 2018-04-28 04:33:48 UTC
Can anyone look on this PR?
Comment 10 commit-hook freebsd_committer freebsd_triage 2018-04-29 07:15:15 UTC
A commit references this bug:

Author: riggs
Date: Sun Apr 29 07:14:15 UTC 2018
New revision: 468605
URL: https://svnweb.freebsd.org/changeset/ports/468605

Log:
  Update to upstream version 0.9.5

  Details:
  - Introduce CONTRIB OPTION
  - USES localbase:ldflags
  - Have port Makefile manage installation due to problematic upstream
    install target

  PR:		227105
  Submitted by:	gor@clogic.com.ua (maintainer)
  MFH:		2018Q2

Changes:
  head/x11-wm/bspwm/Makefile
  head/x11-wm/bspwm/distinfo
  head/x11-wm/bspwm/files/patch-Makefile
  head/x11-wm/bspwm/pkg-plist
Comment 11 commit-hook freebsd_committer freebsd_triage 2018-04-29 07:16:19 UTC
A commit references this bug:

Author: riggs
Date: Sun Apr 29 07:16:09 UTC 2018
New revision: 468606
URL: https://svnweb.freebsd.org/changeset/ports/468606

Log:
  MFH: r468605

  Update to upstream version 0.9.5

  Details:
  - Introduce CONTRIB OPTION
  - USES localbase:ldflags
  - Have port Makefile manage installation due to problematic upstream
    install target

  PR:		227105
  Submitted by:	gor@clogic.com.ua (maintainer)

  Approved by:	ports-secteam (riggs)

Changes:
_U  branches/2018Q2/
  branches/2018Q2/x11-wm/bspwm/Makefile
  branches/2018Q2/x11-wm/bspwm/distinfo
  branches/2018Q2/x11-wm/bspwm/files/patch-Makefile
  branches/2018Q2/x11-wm/bspwm/pkg-plist
Comment 12 Thomas Zander freebsd_committer freebsd_triage 2018-04-29 07:19:39 UTC
Committed and MFH'ed, thanks!

Guido has a point, though. Could you engage with the upstream developers to get the install target fixed upstream? Thanks!
Comment 13 Oleh Hushchenkov 2018-04-30 05:59:50 UTC
(In reply to Thomas Zander from comment #12)
Ok, I will contact with upstream.