From nobody Thu Jul 20 17:43:26 2023 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 4R6Kmc2BJHz4nSXt; Thu, 20 Jul 2023 17:43:28 +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 4R6KmH4DdYz3Mr7; Thu, 20 Jul 2023 17:43:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689875007; 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=2U/MlNMqJ0a8XYA5CevjB+wkcVqtLzQXPMPAA/k/PqA=; b=MaV+LsFmCc2RYaO/76CYJU2W8zhShmoucIKo3eIcU41q+KygLg7jAdZ7hCCVLju2JrauQc jOX0adt0mUDNIY9F3ES+yfMkpMqQSN/PilpNCjro8fxssUv4FNuW2wrFlfjK7myY47jX// GKpcUA2tsA7vgHXLifEUWgX7zTDUC4C9VhT3idDrHoJhOuyNnprg6p0+aj2TtsUPbTnI48 LJ+bc2i3MLQD18f9oKDM31jG8EvIFlyKOwP0bIOGhE3scHvc8AzLPRq/1hbetIhDNvTcA1 KXvY/2S4F1TkxuXGpbetnvKUwA8ZbR3D3IhRa+IjAYD0fYCacxF90v3VHIWZjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689875007; 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=2U/MlNMqJ0a8XYA5CevjB+wkcVqtLzQXPMPAA/k/PqA=; b=PbnIbrLEUN6E3Ksg4cH9737NmNVJNwJ7hN6TgtooRpRCywWSmOHDNC/HC7Se4DjqXYSMTN 5L4Z1AphEMhgG8aTRw+6Bqq6WnmTK4JeK55Xx21kBkLOYwFtrlqYZPnoI0z+ZWj85TEyN+ XOPNk8bR+hi10ktXrUWm1KCtrD/01btIQHzEF6HsG4KlTzwCXHnsVnfp+mXdXfykBwW3mH jNkXo1hRn4YACbYSsUkc2nTdz3ZaXEeVvtkfXH3UCMk25ZWe7qVe3SUqwGpjAlq+k8hMl2 WrXJ4VGiE1qpS6WNDxTM641NEbEPj6LLn3L1FH+kPHnkvK2FNQMDMvEUCC9lWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689875007; a=rsa-sha256; cv=none; b=UDxoPtl9Z38T84oxBQe2jUi9ndRmofPLFd+KDTugGWsyT77QQOgFrA29NDYuHpFyt1t+5p UcRPjtPjU/f9ZEvydqnV3RmFIYNdt7bqHa/jeA0+574zS/bss86hqfaDsMAn/VqS4ci2tB ivIoeLIV36WRDxiSlmbTJ6PnP77sFCdGgtlqUti4FB6fXv6l2V/fakV6Kdfy89y1204OQZ NNLWgTNV6Yd7lO1YjsVBuPR6yGKjuLFJV9Nz3vMR6gx1WtVEsKjgCqUMeApGONS4uGOnjj hS2usrD04RbsediXJqygOMsZkWjfv+o2SdODElPD9kcpAfUnZLXAOt+bpHjz1g== 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 4R6KmG2SwHzgWP; Thu, 20 Jul 2023 17:43:26 +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 36KHhQR5036724; Thu, 20 Jul 2023 17:43:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36KHhQbD036723; Thu, 20 Jul 2023 17:43:26 GMT (envelope-from git) Date: Thu, 20 Jul 2023 17:43:26 GMT Message-Id: <202307201743.36KHhQbD036723@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: 678f8c187609 - main - irc/bitchx: Fix build with llvm16 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: 678f8c1876091fe03c0fca32a84b8c40a25d2e55 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=678f8c1876091fe03c0fca32a84b8c40a25d2e55 commit 678f8c1876091fe03c0fca32a84b8c40a25d2e55 Author: Muhammad Moinur Rahman AuthorDate: 2023-07-20 14:52:58 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-07-20 17:42:36 +0000 irc/bitchx: Fix build with llvm16 - Pet portclippy - STRIP files as required - Replace @exec with @rmtry Sponsored by: The FreeBSD Foundation --- irc/bitchx/Makefile | 38 ++++++++++++++++++++++++-------------- irc/bitchx/pkg-plist | 2 +- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile index cb75f006c146..45c71ac286d5 100644 --- a/irc/bitchx/Makefile +++ b/irc/bitchx/Makefile @@ -1,6 +1,6 @@ PORTNAME= bitchx PORTVERSION= 1.2.1 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES+= irc MASTER_SITES= SF/${PORTNAME}/ircii-pana/${PORTNAME}-${DISTVERSION} @@ -13,40 +13,45 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYRIGHT USES= cpe gmake ncurses + GNU_CONFIGURE= yes CONFIGURE_ARGS+=--exec-prefix="${PREFIX}/share" \ --bindir="${PREFIX}/bin" \ --datadir="${PREFIX}/share" \ --libdir="${PREFIX}/share" +MAKE_JOBS_UNSAFE= yes + CONFLICTS_INSTALL?= zh-bitchx -OPTIONS_SUB= yes +DATADIR= ${PREFIX}/share/bx +DOCSDIR= ${PREFIX}/share/bx/help PLIST_SUB+= DISTVERSION=${DISTVERSION} -DOCSDIR= ${PREFIX}/share/bx/help PORTDOCS= * -DATADIR= ${PREFIX}/share/bx - -MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= DOCS LANG_HE IPV6 LATIN PLUGINS SSL TOGGLES OPTIONS_DEFAULT= PLUGINS SSL +OPTIONS_SUB= yes LATIN_DESC= Recommended for ISO-8859-1 display PLUGINS_DESC= Build a handful of BitchX plugins TOGGLES_DESC= Disable annoyance toggles IPV6_CONFIGURE_ENABLE= ipv6 - -SSL_CONFIGURE_WITH= ssl="${OPENSSLBASE}" -SSL_USES= ssl - 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 \ europa fserv hint nap nicklist pkga possum qbx qmail wavplay +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091 +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 @@ -55,14 +60,14 @@ post-patch-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/bitchx-docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} -post-patch-LATIN-on: - ${REINPLACE_CMD} -e 's|#undef LATIN1|#define LATIN1|' \ - ${WRKSRC}/include/config.h - post-patch-LANG_HE-on: ${REINPLACE_CMD} -e 's|#undef WANT_HEBREW|#define WANT_HEBREW|' \ ${WRKSRC}/include/config.h +post-patch-LATIN-on: + ${REINPLACE_CMD} -e 's|#undef LATIN1|#define LATIN1|' \ + ${WRKSRC}/include/config.h + post-patch-TOGGLES-on: ${REINPLACE_CMD} -e 's|DEFAULT_AUTO_AWAY ON|DEFAULT_AUTO_AWAY OFF|' \ ${WRKSRC}/include/config.h @@ -71,4 +76,9 @@ post-patch-TOGGLES-on: ${REINPLACE_CMD} -e 's|DEFAULT_AUTO_REJOIN ON|DEFAULT_AUTO_REJOIN OFF|' \ ${WRKSRC}/include/config.h +post-stage: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/share/bx/plugins/*.so + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/share/bx/wserv + .include diff --git a/irc/bitchx/pkg-plist b/irc/bitchx/pkg-plist index c3bed8d5e068..d90c66f1e53e 100644 --- a/irc/bitchx/pkg-plist +++ b/irc/bitchx/pkg-plist @@ -1,4 +1,3 @@ -@unexec if [ -f %D/%%DATADIR%%/script/bxglobal.old ]; then rm -f %D/share/bx/script/bxglobal.old; fi bin/BitchX bin/BitchX-%%DISTVERSION%% bin/scr-bx @@ -76,3 +75,4 @@ man/man1/BitchX.1.gz %%DATADIR%%/translation/UNITED_KINGDOM %%DATADIR%%/translation/UNITED_KINGDOM_COM %%DATADIR%%/wserv +@rmtry %%DATADIR%%/script/bxglobal.old