From nobody Sat Feb 17 19:21:42 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tcdvq1cLWz53xcW; Sat, 17 Feb 2024 19:21:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tcdvq19Yrz4F7M; Sat, 17 Feb 2024 19:21:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7yK7Dh5U6TS6yUv+38zmK8UAbUoJIJRc1gQxzIgWD3c=; b=kzMft/6ah9V++s3okgFYIkqaEtbFwu37kCYzajOhkb/tlcYDCt4z230gbmcV9PoEEA1FAr thcn3UgP1PE1Sb0dKYC0pyLIBYqpCIpqmqqq9T9r2pCrR92K7jayu/b6vne+7SyJ1jlWy/ 3v9WqdNjUItDUiFdIFY8QJLeyHTF7s4WDLTQg3hxhwBe0QDbBEit7FMxQphUt/eG0UdMFG PZ1aEeDu99CUHwMJ2ApnEWtXzT10MsO9LQGU34qWyvJKyrTmsfWmItN0XuEGxdGUqtY2N2 9Eohre1udkbQX9/8i8ru0eci+q0r/R8XHmf1ZBnJzhjDuqVpn8QqXIm3sWJrdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7yK7Dh5U6TS6yUv+38zmK8UAbUoJIJRc1gQxzIgWD3c=; b=I1dVFig7awcWE+onRIgYiQq6Kkq8UgIgc5bts2pVVdBHfhS35Fq7sEdW/QKzshabPT0F68 xXedS8Ga+8o+5BgeH9mSu9a4rQ9RLeicJ3rXIJwQPB7inkO03tZUK3bmu9ZJPS6iPwMDCf 8eG1X3YbkY/v6vb+L14KoBeowWYHW/fegXtJSVSRWDf/BhMA9fUf/s1miCIusjYsmCJd0Z rdCtHgUU+gXXrP1lv4QF1jvHo+UvAh96QlbGEDNwwajOQxVV6lC376wyQ/4imW5xNg8Xc7 DTtxzdYboB+jZEvWfJ1Bs8U5DwIGCc9ujI7m2/NNVsc+vZrhDGLczOMwnRHWsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708197703; a=rsa-sha256; cv=none; b=IiMezaJR0OBX/tKwrK2HRmUQBoEiO3pDOnKU8nqB/rQb/HPDat5AG7//INQJfsv9pfHHYq 9nQn1uFDh7n9U2lTMbbysWkLIiEdzq8uULibke87BkYdIQlQN6kz5a04uTcFy7CExVS0DX ijHiIyDtMzQQUr40edsi81V2ZSccOFblugxtMOGwFZU8dbfZQ9wGeXL3BPoIAxooigwKSf QW4eSnWwwopr0gSqYLMsq4HK4fcBHgEncX1AqmWSe1iDwk7SH2RLTeTvlsTbIGAaTpwV1L Hqofjlf8ePAf1dEtm5mShrdygtu5kESPeseiOM+/gSwj/begTt1cjOVgEmB/2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tcdvq0Dz7zKLV; Sat, 17 Feb 2024 19:21:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HJLg7l097927; Sat, 17 Feb 2024 19:21:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HJLgOv097924; Sat, 17 Feb 2024 19:21:42 GMT (envelope-from git) Date: Sat, 17 Feb 2024 19:21:42 GMT Message-Id: <202402171921.41HJLgOv097924@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 5ae3d44517db - main - editors/abiword: Fix build List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ae3d44517db1b27d10c40dc7651b1a752ef8df2 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=5ae3d44517db1b27d10c40dc7651b1a752ef8df2 commit 5ae3d44517db1b27d10c40dc7651b1a752ef8df2 Author: Muhammad Moinur Rahman AuthorDate: 2024-02-17 19:20:27 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-02-17 19:21:36 +0000 editors/abiword: Fix build - COLSERVICE and COLTCP options requires asio and there is also a boost capable asio that comes shipped with boost libraries. When both the libraries is installed the libraries from asio are preferred and with those the build fails. So for now disable the options and mark those options BROKEN until someone has a proper fix. [1] - Pet portclippy - Fix PLIST conditionals - Utilize OPTIONSNG while possible Reported by: dhw [1] --- editors/abiword/Makefile | 59 ++++++++++++++++++++---------------------------- 1 file changed, 25 insertions(+), 34 deletions(-) diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index 3aa25d435894..7108a9cfa952 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -21,31 +21,30 @@ LIB_DEPENDS= libboost_system.so:devel/boost-libs \ RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSerif.ttf:x11-fonts/dejavu USES= compiler:c++11-lang cpe desktop-file-utils gmake gnome iconv jpeg \ - libtool pathfix pkgconfig + libtool localbase:ldflags pathfix pkgconfig +CPE_VENDOR= abisource USE_GNOME= libxml2 gtk30 librsvg2 libxslt +USE_LDCONFIG= yes + GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --without-gnomevfs --enable-plugins="${ABIWORD_PLUGINS}" \ --enable-shared="yes" --enable-static="no" -USE_LDCONFIG= yes + INSTALL_TARGET= install-strip -CPE_VENDOR= abisource PLIST_SUB+= ABIVERSION=3.0 OPTIONS_DEFINE= CLIPART DEBUG MATHVIEW NLS PSION \ TEMPLATES WP -OPTIONS_DEFAULT=CLIPART COLSERVICE COLSUGAR COLTCP SPELLCHECK TEMPLATES -OPTIONS_SUB= yes - +OPTIONS_DEFAULT=CLIPART COLSUGAR SPELLCHECK TEMPLATES OPTIONS_GROUP= DICT COLLAB -OPTIONS_GROUP_DICT= GRAMMAR SPELLCHECK OPTIONS_GROUP_COLLAB= COLFAKE COLSERVICE COLSIP COLSUGAR COLTCP COLTELEPATHY COLXMPP +OPTIONS_GROUP_DICT= GRAMMAR SPELLCHECK +OPTIONS_SUB= yes CLIPART_DESC= Include clipart -COLLAB_DESC= Collaboration backend COLFAKE_DESC= Fake collaboration for debugging purposes only +COLLAB_DESC= Collaboration backend COLSERVICE_DESC= Collaborate with AbiCollab.net webservice COLSIP_DESC= Collaborate with the SIP/SIMPLE backend COLSUGAR_DESC= Collaborate with the Sugar/OLPC environment @@ -76,73 +75,65 @@ CLIPART_CONFIGURE_ENABLE= clipart COLFAKE_CONFIGURE_ENABLE= collab-backend-fake -COLSERVICE_CONFIGURE_ENABLE= collab-backend-service +COLSERVICE_BROKEN= Does not build with asio from system COLSERVICE_BUILD_DEPENDS= ${LOCALBASE}/include/asio.hpp:net/asio COLSERVICE_LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \ libgnutls.so:security/gnutls COLSERVICE_RUN_DEPENDS= ${LOCALBASE}/include/asio.hpp:net/asio +COLSERVICE_CONFIGURE_ENABLE= collab-backend-service COLSIP_CONFIGURE_ENABLE= collab-backend-sip -COLSUGAR_CONFIGURE_ENABLE= collab-backend-sugar COLSUGAR_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib +COLSUGAR_CONFIGURE_ENABLE= collab-backend-sugar -COLTCP_CONFIGURE_ENABLE= collab-backend-tcp +COLTCP_BROKEN= Does not build with asio from system COLTCP_BUILD_DEPENDS= ${LOCALBASE}/include/asio.hpp:net/asio COLTCP_RUN_DEPENDS= ${LOCALBASE}/include/asio.hpp:net/asio +COLTCP_CONFIGURE_ENABLE= collab-backend-tcp -COLTELEPATHY_CONFIGURE_ENABLE= collab-backend-telepathy COLTELEPATHY_LIB_DEPENDS= libtelepathy-glib.so:net-im/telepathy-glib +COLTELEPATHY_CONFIGURE_ENABLE= collab-backend-telepathy -COLXMPP_CONFIGURE_ENABLE= collab-backend-xmpp COLXMPP_LIB_DEPENDS= libloudmouth-1.so:net-im/loudmouth +COLXMPP_CONFIGURE_ENABLE= collab-backend-xmpp DEBUG_CONFIGURE_ENABLE= debug -GRAMMAR_LIB_DEPENDS= liblink-grammar.so:textproc/link-grammar GRAMMAR_IMPLIES= SPELLCHECK +GRAMMAR_LIB_DEPENDS= liblink-grammar.so:textproc/link-grammar +GRAMMAR_VARS= ABIWORD_PLUGINS+=grammar -MATHVIEW_USES= bison MATHVIEW_LIB_DEPENDS= libmathview.so:x11-toolkits/gtkmathview +MATHVIEW_USES= bison +MATHVIEW_VARS= ABIWORD_PLUGINS+=mathview NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls PSION_LIB_DEPENDS= libpsiconv.so:converters/psiconv +PSION_VARS= ABIWORD_PLUGINS+=psion SPELLCHECK_LIB_DEPENDS= libenchant.so:textproc/enchant SPELLCHECK_CONFIGURE_ENABLE= spell TEMPLATES_CONFIGURE_ENABLE= templates -WP_USE= gnome=libgsf WP_LIB_DEPENDS= libwpg-0.3.so:graphics/libwpg03 \ libwpd-0.10.so:textproc/libwpd010 \ libwps-0.4.so:textproc/libwps +WP_USE= gnome=libgsf +WP_VARS= ABIWORD_PLUGINS+="wpg wordperfect" .include .if ${PORT_OPTIONS:MCOL*} -PLIST_SUB+= COLLAB="" 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 - -.if ${PORT_OPTIONS:MGRAMMAR} -ABIWORD_PLUGINS+= grammar -.endif - -.if ${PORT_OPTIONS:MMATHVIEW} -ABIWORD_PLUGINS+= mathview -.endif - -.if ${PORT_OPTIONS:MPSION} -ABIWORD_PLUGINS+= psion -.endif - -.if ${PORT_OPTIONS:MWP} -ABIWORD_PLUGINS+= wpg wordperfect .endif post-patch: