From nobody Sat Mar 30 17:39:03 2024 X-Original-To: dev-commits-ports-main@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 4V6Pf00DxPz5G5Zm; Sat, 30 Mar 2024 17:39:04 +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 4V6Pdz6p1Mz4QxF; Sat, 30 Mar 2024 17:39:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711820344; 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=vVLZPl1ah5IawBm2MVHSgkzgA/No/HMVf/rjLBU2xew=; b=qljGbs1x1uNdqP6PkFu071BV4CNRVoldseDAQdrjFoGIoRRh4ZRTI7dak55/blArv3HYPu CzdOoXy1eB1E3OTXYbIhGxsQ6w7VcxTx5AR38LK8TuqdpKH3P8wRCfpybJMqs512ORIlLA ilVm7Xw06WTXSnNfeSu+9eb7HsqqwxTHfWmCuVXKxs2yLJRgIXmgNNCnpKnP9risMYFMsc t1gm5yAiHqZ2iy8/3zNt9gB1ErmbFrFJbl2i4mBps4YIiqv6Zsb69uFRfmH242qkqukJPi Klq9z47uThHq0A31g82Lp7Wz6zWcx6ouDS7CyhASWXOI2zIhwk4CeuMDIIT10Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711820344; a=rsa-sha256; cv=none; b=lp8GMtM2VAbQvQjVO2xIbWS5uVGLlX+fU2V0478WyB3B8acdpNESaPwn5rZVB2n52WO9vW 5nOCFQKOUsaSWe4UiZgnc0waYVnURKbjOKs53u60Z8yVgzxtZo7MWABWyTLAxf7XTqiVtH P6zPpGRcwpRloaDlUn7J8daYvEVGCllqbHFV+s2Kebxx3Agkr6okubspOiT94Gel1+5MMi QlNKIQWmUgt4WoHF6c4kePcbkaZhcwnlTrxzGKC6Hwg9V/7ldv43h/df8W6fr6h9bchQ3P lQfyWPzXaqbaxfPXZl/cs97lx1nQOenEM/3c59wRhpYEf09SvHYuQG+4lJ/KMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711820344; 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=vVLZPl1ah5IawBm2MVHSgkzgA/No/HMVf/rjLBU2xew=; b=QCd1syfXaojQyvmC82OQ4ED1ZQwmkw7Uotf+8HcRB92TKubxKLQtnzYrD3HhIrRqUoPYyr s25seIYNCSCsqpYnMi2CnDykfWRXIa+5dcdzWvh5MpHxGtSyXhbv/Ut3iH9CsYX0L6VmD9 e8rWNX0QBra31yxuC7X44BmPZ3hh0gvMRLzoBdf9a5QweaJ4eFIvtBmbcTle/1IfLiBVTK ePQLQSvBGrHZEDaVaL9Fz6Ym3HFNyhxtS721NDktVweMBXXQS/EM5D8L6KumnfsRbcCFsC 8F6fH+qv84FJgfIczJtKku+Ms0OlKoGBwvfMQonAFrPXWRKbLT6S4USTAsRqXQ== 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 4V6Pdz6P9sz13k6; Sat, 30 Mar 2024 17:39:03 +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 42UHd3lX057186; Sat, 30 Mar 2024 17:39:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42UHd3UQ057183; Sat, 30 Mar 2024 17:39:03 GMT (envelope-from git) Date: Sat, 30 Mar 2024 17:39:03 GMT Message-Id: <202403301739.42UHd3UQ057183@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: a60237f6826d - main - irc/bitchx: undeprecate the port and assume maintainership thereof List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a60237f6826d3a95002e9e843357e4eab2ccbfc6 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=a60237f6826d3a95002e9e843357e4eab2ccbfc6 commit a60237f6826d3a95002e9e843357e4eab2ccbfc6 Author: Alexey Dokuchaev AuthorDate: 2024-03-30 17:36:50 +0000 Commit: Alexey Dokuchaev CommitDate: 2024-03-30 17:36:50 +0000 irc/bitchx: undeprecate the port and assume maintainership thereof Try to address incompatible function pointer types warnings better: for `fserv' plugin, just force the expected type with explicit cast as offending function does not use its arguments; disable `arcfour' plugin for the time being because this case requires a deeper look. --- irc/bitchx/Makefile | 18 +++++------------- irc/bitchx/pkg-plist | 2 +- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile index 023fb3ec6181..418bc460ce55 100644 --- a/irc/bitchx/Makefile +++ b/irc/bitchx/Makefile @@ -5,21 +5,17 @@ PORTEPOCH= 1 CATEGORIES+= irc MASTER_SITES= SF/${PORTNAME}/ircii-pana/${PORTNAME}-${DISTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= danfe@FreeBSD.org COMMENT= Feature-rich scriptable IRC client WWW= http://www.bitchx.org/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYRIGHT -DEPRECATED= Last stable release 2014, last upstream commit in 2019. There have been multiple concerns over security and it also lacks unicode support. Please consider using irc/irssi -EXPIRATION_DATE=2024-03-31 - USES= cpe gmake ncurses - GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share -CONFIGURE_ARGS+=--exec-prefix="${PREFIX}/share" \ +CONFIGURE_ARGS= --exec-prefix="${PREFIX}/share" \ --bindir="${PREFIX}/bin" \ --datadir="${PREFIX}/share" \ --libdir="${PREFIX}/share" @@ -47,18 +43,14 @@ PLUGINS_CONFIGURE_WITH= plugins="${PLUGIN_LIST:C/\$$/,/g}" SSL_USES= ssl SSL_CONFIGURE_WITH= ssl="${OPENSSLBASE}" -PLUGIN_LIST= abot acro arcfour autocycle blowfish cavlink cdrom encrypt \ +PLUGIN_LIST= abot acro autocycle blowfish cavlink cdrom encrypt \ europa fserv hint nap nicklist pkga possum qbx qmail wavplay -.include - -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) -CFLAGS+= -Wno-error=incompatible-function-pointer-types -.endif - post-patch: ${REINPLACE_CMD} -e 's|bzip2|true|g' ${WRKSRC}/Makefile.in ${REINPLACE_CMD} -e 's|SSLeay|ERR_get_error|' ${WRKSRC}/configure + ${REINPLACE_CMD} -e 's|impress_me,|(int (*)(void *, char *))&|' \ + ${WRKSRC}/dll/fserv/fserv.c post-patch-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/irc/bitchx/pkg-plist b/irc/bitchx/pkg-plist index d7fb3074558d..c4363ae5b3c4 100644 --- a/irc/bitchx/pkg-plist +++ b/irc/bitchx/pkg-plist @@ -9,7 +9,7 @@ share/man/man1/BitchX.1.gz @dir %%DATADIR%%/plugins %%PLUGINS%%%%DATADIR%%/plugins/BitchX.hints %%PLUGINS%%%%DATADIR%%/plugins/acro.so -%%PLUGINS%%%%DATADIR%%/plugins/arcfour.so +@comment %%PLUGINS%%%%DATADIR%%/plugins/arcfour.so %%PLUGINS%%%%DATADIR%%/plugins/autobot.so %%PLUGINS%%%%DATADIR%%/plugins/autocycle.so %%PLUGINS%%%%DATADIR%%/plugins/blowfish.so