Bug 225462 - comms/uhd: various cleanups including non-default LOCALBASE / PREFIX, option handling & plist fixes
Summary: comms/uhd: various cleanups including non-default LOCALBASE / PREFIX, option ...
Status: New
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Michael Reifenberger
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2018-01-25 23:00 UTC by John Hein
Modified: 2019-12-10 10:06 UTC (History)
3 users (show)

See Also:
bugzilla: maintainer-feedback? (mr)


Attachments
[patch] various cleanups including non-default LOCALBASE / PREFIX, option handling & plist fixes (103.26 KB, patch)
2018-01-25 23:00 UTC, John Hein
no flags Details | Diff
[patch] [v2] various cleanups including non-default LOCALBASE / PREFIX, option handling & plist fixes (103.28 KB, patch)
2018-02-24 11:44 UTC, John Hein
jcfyecrayz: maintainer-approval? (mr)
Details | Diff
[patch] fix broken plist after 3.14.1.1 update and fix non-default LOCALBASE problem in do-install (88.63 KB, patch)
2019-12-03 02:44 UTC, John Hein
jcfyecrayz: maintainer-approval? (mr)
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description John Hein 2018-01-25 23:00:28 UTC
Created attachment 190071 [details]
[patch] various cleanups including non-default LOCALBASE / PREFIX, option handling & plist fixes

================
Remove libdata/pkgconfig patch (see fixup-lib-pkgconfig in bsd.port.mk - 20170606).

Promote devel/boost-libs from BUILD_DEPENDS to LIB_DEPENDS (noticed by stage-qa).

Explicitly disable doxygen manual gen / install.  Before this, if case doxygen is detected, it will gen/install dox output even if DOXYGEN option is off. Fix plist for doxygen option.  check-orphans now passes with DOXYGEN on and off.

Remove old style option handling cruft.

Stop hacking cmake_install.cmake and use default do-install.  This makes LOCALBASE != /usr/local and PREFIX != LOCALBASE work (/usr/local was bogusly hard-coded anyway).

There's a bunch of files with CR line endings; fix with USES=dos2unix.

Addressed a few portlint issues.

Add LICENSE (with a comment about the Ettus Alternate License).

Fix WWW URL(s) in pkg-descr.
==================

Note: Re: portlint - I did not regen patches (makepatch) since those were not changed.  I feel doing that is just unnecessary repo churn.  If the committer feels strongly otherwise, feel free to regen patches with makepatch and retest.

QA testing:
 - poudriere testport: ok (with DOXYGEN on/off)
 - portlint: fixed some (Makefile ordering mostly), no new issues, no errors
Comment 1 John Hein 2018-01-26 02:14:57 UTC
Also note: there should be no package change here, so I don't think a PORTREVISION bump is needed.
Comment 2 John Hein 2018-02-24 11:44:19 UTC
Created attachment 190953 [details]
[patch] [v2] various cleanups including non-default LOCALBASE / PREFIX, option handling & plist fixes

r462257 updated this port.  Most of the cleanups here are still applicable.

Attached is a refreshed patch.

devel/boost-libs was promoted to LIB_DEPENDS in r462257.

Updated summary of changes (only removed the note about the boost-libs promotion):

================
Remove libdata/pkgconfig patch (see fixup-lib-pkgconfig in bsd.port.mk - 20170606).

Explicitly disable doxygen manual gen / install.  Before this, if case doxygen is detected, it will gen/install dox output even if DOXYGEN option is off. Fix plist for doxygen option.  check-orphans now passes with DOXYGEN on and off.

Remove old style option handling cruft.

Stop hacking cmake_install.cmake and use default do-install.  This makes LOCALBASE != /usr/local and PREFIX != LOCALBASE work (/usr/local was bogusly hard-coded anyway).

There's a bunch of files with CR line endings; fix with USES=dos2unix.

Addressed a few portlint issues.

Add LICENSE (with a comment about the Ettus Alternate License).

Fix WWW URL(s) in pkg-descr.
==================

Otherwise, the original description & comment 1 are the same.
Comment 3 John Hein 2018-04-16 14:44:21 UTC
Has this been reviewed?  Any comments?
Comment 4 John Hein 2018-10-09 13:54:03 UTC
ping?
Comment 5 Michael Reifenberger freebsd_committer 2018-10-22 14:32:00 UTC
Hi,
Im deeply sorry for the long delay.

The patch as is look good.
I just can't check with poudriere because py27 has an installation issue
and py37 has no py-cheetah...

Greetings
---
Mike
Comment 6 Walter Schwarzenfeld freebsd_triage 2019-08-15 05:09:19 UTC
Any new here?
Comment 7 kunda 2019-08-31 04:44:22 UTC
Any change this patch could also be a version bump to 3.14.1.0
https://github.com/EttusResearch/uhd/releases/tag/v3.14.1.0
Comment 8 commit-hook freebsd_committer 2019-08-31 12:03:26 UTC
A commit references this bug:

Author: mr
Date: Sat Aug 31 12:03:21 UTC 2019
New revision: 510382
URL: https://svnweb.freebsd.org/changeset/ports/510382

Log:
  Apply some cleanup from the PR and update to 3.14.1.0

  PR:             225462
  Submitted by:   John Hein

Changes:
  head/comms/uhd/Makefile
  head/comms/uhd/distinfo
  head/comms/uhd/files/
  head/comms/uhd/pkg-descr
  head/comms/uhd/pkg-plist
Comment 9 Walter Schwarzenfeld freebsd_triage 2019-09-12 21:56:09 UTC
Seems still not to build.
Comment 10 Walter Schwarzenfeld freebsd_triage 2019-09-12 22:03:14 UTC
(In reply to Walter Schwarzenfeld from comment #9)
Seems to hang in  [430/516] build_info.cpp
Comment 11 Walter Schwarzenfeld freebsd_triage 2019-09-28 07:28:13 UTC
Builds fine after ports r513090.
Comment 12 John Hein 2019-12-03 02:44:45 UTC
Created attachment 209637 [details]
[patch] fix broken plist after 3.14.1.1 update and fix non-default LOCALBASE problem in do-install

It looks like ports/r510382 missed the part of the patch (in attachment 190953 [details]) that had %%DOXYGEN%% in the plist for files generated when the DOXYGEN option is on (and thus would be noticed as missing files when DOXYGEN is off).  Then ports/r513090 just removed the doxygen files altogether from the plist instead of adding %%DOXYGEN%% for doxygen files in plist.

But the current plist breakage (mentioned in ports/r511541 and ports/r513193 by antoine) that makes this port BROKEN is different - it is for a few files in examples (broken by the update to 3.14.1.*).

A new patch (attached here) solves that (pardon the minor faux pas: using this bug to carry the patch as it is not directly related to the original topic - although it is a follow-up to the commits that have been applied partly because of this bug).  It has the following plist fixes:

 - fix the examples files that are not right for 3.14.1.1 (these are the bugs antoine found)

 - reinstate the doxygen files in plist (fixing the DOXYGEN=on case)

The patch _does_ also include another LOCALBASE fix.  If LOCALBASE is != /usr/local, the the REINPLACE_CMD in do-install fails to work properly.  It also quotes the substitution so that re-running 'make stage' doesn't cause a second substitution to potentially insert a wrong path.

QA:
 poudriere testport with non-default LOCALBASE: ok

No need to bump PORTREVISION I think since it's marked BROKEN.  On the other hand, someone may have built a package despite the incorrect plist (i.e., built without check-plist QA).  So at the committer's discretion, you could bump PORTREVISION.
Comment 13 commit-hook freebsd_committer 2019-12-10 10:06:59 UTC
A commit references this bug:

Author: mr
Date: Tue Dec 10 10:06:10 UTC 2019
New revision: 519654
URL: https://svnweb.freebsd.org/changeset/ports/519654

Log:
  Try to Unbreak, builds directly and with poudriere.

  PR:		225462
  Submitted by:	John Hein

Changes:
  head/comms/uhd/Makefile
  head/comms/uhd/pkg-plist