git: bbff452d00c3 - 2025Q4 - editors/abiword: Fix pkg-plist with COLSUGAR off
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 15 Nov 2025 18:31:26 UTC
The branch 2025Q4 has been updated by jhale:
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(-)
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 158df21d912e..8e932fbcbecc 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -130,12 +130,10 @@ WP_VARS= ABIWORD_PLUGINS+="wpg wordperfect"
.if ${PORT_OPTIONS:MCOL*}
ABIWORD_PLUGINS+= collab
-.if ${PORT_OPTIONS:MCOLFAKE} || ${PORT_OPTIONS:MCOLSERVICE} || ${PORT_OPTIONS:MCOLSIP} || ${PORT_OPTIONS:MCOLTCP} || ${PORT_OPTIONS:MCOLTELEPATHY} || ${PORT_OPTIONS:MCOLXMPP}
PLIST_SUB+= COLLAB=""
.else
PLIST_SUB+= COLLAB="@comment "
.endif
-.endif
post-patch:
@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
diff --git a/editors/abiword/pkg-plist b/editors/abiword/pkg-plist
index 80c735f69ee6..fa5039c27330 100644
--- a/editors/abiword/pkg-plist
+++ b/editors/abiword/pkg-plist
@@ -51,7 +51,7 @@ lib/libabiword-%%ABIVERSION%%.so
libdata/pkgconfig/abiword-%%ABIVERSION%%.pc
share/man/man1/abiword.1.gz
%%DATADIR%%-%%ABIVERSION%%/Presentation.xml
-%%COLLAB%%%%DATADIR%%-%%ABIVERSION%%/certs/cacert.pem
+%%COLSERVICE%%%%DATADIR%%-%%ABIVERSION%%/certs/cacert.pem
%%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/book.png
%%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/chip.png
%%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/fun.png
@@ -337,8 +337,8 @@ share/man/man1/abiword.1.gz
%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_FormatFrame.ui
%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_FormatTOC.ui
%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_FormatTable.ui
-%%COLLAB%%%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_GenericInput.ui
-%%COLLAB%%%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_GenericProgress.ui
+%%COLSERVICE%%%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_GenericInput.ui
+%%COLSERVICE%%%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_GenericProgress.ui
%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_Goto.ui
%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_HdrFtr.ui
%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_InsertTable.ui