Bug 278929 - editors/abiword: Fix deselected COLLAB option
Summary: editors/abiword: Fix deselected COLLAB option
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: Jason E. Hale
URL:
Keywords:
: 291032 (view as bug list)
Depends on:
Blocks:
 
Reported: 2024-05-12 09:17 UTC by Harald Schmalzbauer
Modified: 2025-11-15 18:32 UTC (History)
4 users (show)

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

Attachments
Add .else clause to if noneCOL, adding @comment to PLIST_SUB (321 bytes, patch)
2024-05-12 09:17 UTC, Harald Schmalzbauer 		no flags Details | Diff
Alternative patch (581 bytes, patch)
2025-04-24 10:25 UTC, Piotr Smyrak 		no flags Details | Diff
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 Harald Schmalzbauer 2024-05-12 09:17:22 UTC 
Created attachment 250594 [details]
Add .else clause to if noneCOL, adding @comment to PLIST_SUB

Packaging fails when disabling COLLAB, attached patch does the missing @comment
Comment 1 Piotr Smyrak 2025-04-24 10:25:18 UTC 
Created attachment 259828 [details]
Alternative patch

I believe it is possible to simplify the approach, by moving the closing .endif up, which allows us avoid duplicating lines.
Comment 2 Jason E. Hale freebsd_committer freebsd_triage 2025-11-15 18:27:13 UTC 
*** Bug 291032 has been marked as a duplicate of this bug. ***
Comment 3 commit-hook freebsd_committer freebsd_triage 2025-11-15 18:28:07 UTC 
A commit in branch main references this bug:

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

commit 2c4e0e5335c05f56851687d99b0c826e13d95353
Author:     Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2025-11-15 18:19:22 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2025-11-15 18:27:30 +0000

    editors/abiword: Fix pkg-plist with COLSUGAR off

    PR:             278929
    Reported by:    Harald Schmalzbauer <bugzilla.freebsd@omnilan.de>
    MFH:            2025Q4

 editors/abiword/Makefile  | 2 --
 editors/abiword/pkg-plist | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)
Comment 4 Jason E. Hale freebsd_committer freebsd_triage 2025-11-15 18:29:27 UTC 
There were other problems, but this should be fixed now. Sorry it took so long!
Comment 5 commit-hook freebsd_committer freebsd_triage 2025-11-15 18:32:08 UTC 
A commit in branch 2025Q4 references this bug:

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

commit bbff452d00c3816c59b43cf480875cc3fb9b4c71
Author:     Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2025-11-15 18:19:22 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2025-11-15 18:31:17 +0000

    editors/abiword: Fix pkg-plist with COLSUGAR off

    PR:             278929
    Reported by:    Harald Schmalzbauer <bugzilla.freebsd@omnilan.de>
    MFH:            2025Q4

    (cherry picked from commit 2c4e0e5335c05f56851687d99b0c826e13d95353)

 editors/abiword/Makefile  | 2 --
 editors/abiword/pkg-plist | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)