Bug 279825 - graphics/epsonscan2-non-free-plugin: unbreak build
Summary: graphics/epsonscan2-non-free-plugin: unbreak build
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: Rainer Hurling
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2024-06-18 02:08 UTC by J.R. Oldroyd
Modified: 2024-07-07 19:49 UTC (History)
1 user (show)

See Also:
fbsd: maintainer-feedback+

Attachments
patch to fix version check in Makefile (669 bytes, text/plain)
2024-06-18 02:08 UTC, J.R. Oldroyd 		fbsd: maintainer-approval+
Details
patch that takes different Linux versions into account (913 bytes, patch)
2024-07-07 16:55 UTC, Rainer Hurling 		rhurlin: maintainer-approval?
Details | Diff
Show Obsolete (1) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description J.R. Oldroyd 2024-06-18 02:08:37 UTC 
Created attachment 251532 [details]
patch to fix version check in Makefile

Add RUN_DEPENDS flavor to version check.
Comment 1 Rainer Hurling freebsd_committer freebsd_triage 2024-07-07 16:55:06 UTC 
Created attachment 251926 [details]
patch that takes different Linux versions into account

Thanks for the patch.

However, I think the port should pay attention to which Linux version is installed and look for the corresponding linux_libusb variant (currently c7 or rl9).

What do you think? Can you please test again if this is ok? Thank you.
Comment 2 J.R. Oldroyd 2024-07-07 19:16:30 UTC 
Comment on attachment 251926 [details]
patch that takes different Linux versions into account

That change works for me too.  Thanks Rainer.
Comment 3 commit-hook freebsd_committer freebsd_triage 2024-07-07 19:44:29 UTC 
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a2ba2e8a3ba655ffac931d7789a2037e53c7c5d8

commit a2ba2e8a3ba655ffac931d7789a2037e53c7c5d8
Author:     J.R. Oldroyd <fbsd@opal.com>
AuthorDate: 2024-07-07 19:33:33 +0000
Commit:     Rainer Hurling <rhurlin@FreeBSD.org>
CommitDate: 2024-07-07 19:40:29 +0000

    graphics/epsonscan2-non-free-plugin: Unbreak build

    Fixes build taking into account the Linux version

    Co-authored-by: rhurlin@FreeBSD.org

    PR:             279825
    Approved by:    J.R. Oldroyd <fbsd@opal.com> (maintainer)
    MFH:            2024Q3

 graphics/epsonscan2-non-free-plugin/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Comment 4 commit-hook freebsd_committer freebsd_triage 2024-07-07 19:46:31 UTC 
A commit in branch 2024Q3 references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c2221f5f5a11c2744557eaaddec9b8a7f03dcf1e

commit c2221f5f5a11c2744557eaaddec9b8a7f03dcf1e
Author:     J.R. Oldroyd <fbsd@opal.com>
AuthorDate: 2024-07-07 19:33:33 +0000
Commit:     Rainer Hurling <rhurlin@FreeBSD.org>
CommitDate: 2024-07-07 19:45:18 +0000

    graphics/epsonscan2-non-free-plugin: Unbreak build

    Fixes build taking into account the Linux version

    Co-authored-by: rhurlin@FreeBSD.org

    PR:             279825
    Approved by:    J.R. Oldroyd <fbsd@opal.com> (maintainer)
    MFH:            2024Q3

    (cherry picked from commit a2ba2e8a3ba655ffac931d7789a2037e53c7c5d8)

 graphics/epsonscan2-non-free-plugin/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Comment 5 Rainer Hurling freebsd_committer freebsd_triage 2024-07-07 19:49:36 UTC 
Hi J.R.,
Thanks for the fast approval.

I committed on main and on quarterly (2024Q3).