CVS commit: [pkgsrc-2024Q1] pkgsrc/editors/abiword-plugins

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Thu Apr 11 15:02:00 UTC 2024

Modified Files:
        pkgsrc/editors/abiword-plugins [pkgsrc-2024Q1]: Makefile PLIST

Log Message:
Pullup ticket #6844 - requested by taca
editors/abiword-plugins: build fix

Revisions pulled up:
- editors/abiword-plugins/Makefile                              1.148
- editors/abiword-plugins/PLIST                                 1.15

---
   Module Name: pkgsrc
   Committed By:        gutteridge
   Date:                Mon Apr  1 15:41:08 UTC 2024

   Modified Files:
        pkgsrc/editors/abiword-plugins: Makefile PLIST

   Log Message:
   abiword-plugins: fix builds by disabling AbiCollab component

   collab no longer builds with boost/asio in some environments, when the
   AbiCollab component is built, but that service seems defunct, anyway.


To generate a diff of this commit:
cvs rdiff -u -r1.147 -r1.147.2.1 pkgsrc/editors/abiword-plugins/Makefile
cvs rdiff -u -r1.14 -r1.14.70.1 pkgsrc/editors/abiword-plugins/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/abiword-plugins/Makefile
diff -u pkgsrc/editors/abiword-plugins/Makefile:1.147 pkgsrc/editors/abiword-plugins/Makefile:1.147.2.1
--- pkgsrc/editors/abiword-plugins/Makefile:1.147       Fri Dec 29 18:24:43 2023
+++ pkgsrc/editors/abiword-plugins/Makefile     Thu Apr 11 15:02:00 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.147 2023/12/29 18:24:43 adam Exp $
+# $NetBSD: Makefile,v 1.147.2.1 2024/04/11 15:02:00 bsiegert Exp $
 
-PKGREVISION=   20
+PKGREVISION=   21
 .include       "../../editors/abiword/Makefile.common"
 DISTNAME=      abiword-${ABIVERSION}
 PKGNAME=       abiword-plugins-${ABIVERSION}
@@ -27,7 +27,7 @@ USE_LANGUAGES=        c c++
 BUILD_DIRS=    plugins
 
 # All configure_args here
-CONFIGURE_ARGS+=       --disable-default-plugins       #do not build any plugins by default
+CONFIGURE_ARGS+=       --disable-default-plugins       # Do not build any plugins by default
 CONFIGURE_ARGS+=       --enable-spell         # (Gtk+ only) include spell checking support
 CONFIGURE_ARGS+=       --with-inter7eps=no
 
@@ -37,7 +37,7 @@ CONFIGURE_ARGS+=      --with-evolution-data-s
 
 # Disabled plugins: gda rsvg mathview
 # rsvg is not needed with gtk, we don't have libgnomedb
-# and mathview doesn't work (in future versions mathveiw uses
+# and mathview doesn't work (in future versions mathview uses
 # lasem instead of gtkmathview, it might work)
 CONFIGURE_ARGS+=       --enable-plugins="\
        aiksaurus \
@@ -88,6 +88,9 @@ CONFIGURE_ARGS+=      --enable-plugins="\
        wpg \
        xslfo"
 
+# collab no longer builds with boost/asio in some environments, when the
+# AbiCollab component is built, but that service seems defunct, anyway.
+CONFIGURE_ARGS+=       --enable-collab-backend-service=no
 
 PKGCONFIG_OVERRIDE+=   libabiword.pc.in
 
@@ -106,7 +109,7 @@ BUILDLINK_TRANSFORM+=       opt:-no-undefined:
 .include "../../converters/libwps/buildlink3.mk"
 .include "../../chat/loudmouth/buildlink3.mk"
 .include "../../chat/telepathy-glib/buildlink3.mk"
-.include "../../devel/asio/buildlink3.mk"
+#.include "../../devel/asio/buildlink3.mk"
 .include "../../devel/libgsf/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"

Index: pkgsrc/editors/abiword-plugins/PLIST
diff -u pkgsrc/editors/abiword-plugins/PLIST:1.14 pkgsrc/editors/abiword-plugins/PLIST:1.14.70.1
--- pkgsrc/editors/abiword-plugins/PLIST:1.14   Sun Sep 13 21:56:55 2015
+++ pkgsrc/editors/abiword-plugins/PLIST        Thu Apr 11 15:02:00 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2015/09/13 21:56:55 nros Exp $
+@comment $NetBSD: PLIST,v 1.14.70.1 2024/04/11 15:02:00 bsiegert Exp $
 lib/abiword-3.0/plugins/aiksaurus.la
 lib/abiword-3.0/plugins/applix.la
 lib/abiword-3.0/plugins/babelfish.la
@@ -48,7 +48,6 @@ lib/abiword-3.0/plugins/wpg.la
 lib/abiword-3.0/plugins/xslfo.la
 lib/libAiksaurusGtk3.la
 share/abiword-3.0/Presentation.xml
-share/abiword-3.0/certs/cacert.pem
 share/abiword-3.0/omml_xslt/mml2omml.xsl
 share/abiword-3.0/omml_xslt/omml2mml.xsl
 share/abiword-3.0/ui/ap_UnixDialog_CollaborationAccounts.ui
@@ -57,8 +56,6 @@ share/abiword-3.0/ui/ap_UnixDialog_Colla
 share/abiword-3.0/ui/ap_UnixDialog_CollaborationEditAccount.ui
 share/abiword-3.0/ui/ap_UnixDialog_CollaborationJoin.ui
 share/abiword-3.0/ui/ap_UnixDialog_CollaborationShare.ui
-share/abiword-3.0/ui/ap_UnixDialog_GenericInput.ui
-share/abiword-3.0/ui/ap_UnixDialog_GenericProgress.ui
 share/abiword-3.0/ui/ots.ui
 share/abiword-3.0/xsltml/README
 share/abiword-3.0/xsltml/cmarkup.xsl