From nobody Wed Sep 20 12:10:29 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 4RrHRT3hT1z4tZWk; Wed, 20 Sep 2023 12:10:29 +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 4RrHRT2NGLz3Jcg; Wed, 20 Sep 2023 12:10:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695211829; 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=pPmvmn0fnZqcCTgIV0+/+XZWwVX6y8ckyxHJnitd3MI=; b=Jt0+JXYQQ+fOKgqBsB2JcLdAxvHeCkU5dOalYLb8/m6/vK3wY6MxZWoIX9x5zd4/WxL88s kzDQn+N2WUy0sqGZn+GJG0F6OH6G2E1ytSolnMU7tYYEx/bQM2orptHbkjVQPv6ThnV6vN 7cNrjToUbWwsd8NOeCTND9Cv+3ZMUoFSnnUdIBRnwpLixFN5DkgVf+YpojG2stduzqaKbK +LV0WMgpg3cCmq0c5oJ3NgFIGHyD95ibCpUnrkIKJTlgRKtR8N0uS8rnrCBcGASV+YgMkn m96hKs5N8qIhOuuoDz6+JnU/uRfIDZRQThPfOp1TpKemWqQ1qeV+tvVKk+3hGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695211829; a=rsa-sha256; cv=none; b=a1hKNEtMOFZVz8eom3w4LJnVhHRAC3bEj/hT/Ow1EDL6fpd6hgyJvrMSZs+fXYd1eiR+hW kc0hhpEKmtqH8UpT9RyRBn9wyTtAmkXtcjRzQJzEHu+/N3/MHSihB99k65Ny3FdNJDcXCi you4/6NHQWXaU92Vx3OwmmizJ2nHrSoFCHoWIwAnqAO2zJfFezv3IOzXORHHz10dsqtNZ7 QiC9AgmzExtBHUKo1baLUdWHVS3GDUbDZkS4K2qaXe2ekN7Smgx3Q3Xg3PHEEMG/IzMoGZ beyE1t3ApfK0T9m49NJE8gL3VAyaF0RJgUoFQ82sNAyUV+U7H3A+6VHa3wSCxQ== 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=1695211829; 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=pPmvmn0fnZqcCTgIV0+/+XZWwVX6y8ckyxHJnitd3MI=; b=wMewNoeyQ1qxwFuSZUCpapxaN1cIJxRM5kzoTsOb5TD/UIPRJ+jYj1vdLe5jYGb1BDaUxj o80uh3lXyF9CrBaxq78GFCw6yUX1HHhdo8F8EQiQWu3k9fyegwzDFjOKjvnJ1U7uLbkZ/2 oTPp0n6adNay0iLCcvTVZt07vE1g5CKRzTUOzYmwxZxFfpSA6JxVmwh7IU8Qfc86oPiVQ4 WKbaoRxv/11LOOriarZ++88gXsBON+SqejZlNy6G2P8qH/drFndaO0LeP3NbxLc3zQDuIA GjHcPt/yqF1moPXMWecXfV8FIJmZsz1FkCnb0iY9sWYtvhwWw5/8yvDdcQs0Ag== 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 4RrHRT1TDQzv1y; Wed, 20 Sep 2023 12:10:29 +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 38KCATr8063332; Wed, 20 Sep 2023 12:10:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38KCATjD063329; Wed, 20 Sep 2023 12:10:29 GMT (envelope-from git) Date: Wed, 20 Sep 2023 12:10:29 GMT Message-Id: <202309201210.38KCATjD063329@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: 557d59ddfa0c - main - mail/websieve: Remove EOL Dependencies 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: 557d59ddfa0ceeee9b1b84547a34d598265e2241 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=557d59ddfa0ceeee9b1b84547a34d598265e2241 commit 557d59ddfa0ceeee9b1b84547a34d598265e2241 Author: Muhammad Moinur Rahman AuthorDate: 2023-09-20 11:47:36 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-09-20 12:10:09 +0000 mail/websieve: Remove EOL Dependencies - Remove EOLed unsupported cyrus-imapd versions - Pet portclippy - Refresh patches - Utilize OPTIONSNG to reduce clutters --- mail/websieve/Makefile | 52 ++++++++++------------------------- mail/websieve/files/patch-funclib.pl | 6 ++-- mail/websieve/files/patch-websieve.pl | 6 ++-- 3 files changed, 21 insertions(+), 43 deletions(-) diff --git a/mail/websieve/Makefile b/mail/websieve/Makefile index ba14385dc538..f20ebd934f47 100644 --- a/mail/websieve/Makefile +++ b/mail/websieve/Makefile @@ -1,6 +1,6 @@ PORTNAME= websieve PORTVERSION= 0.63.a -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${SIEVEVERSION} DISTNAME?= ${PORTNAME}-${SIEVEVERSION} @@ -17,57 +17,35 @@ SIEVEVERSION= ${PORTVERSION:S/.//g} USES= cpe perl5 shebangfix CPE_VENDOR= ${PORTNAME}_project USE_PERL5= run + SHEBANG_FILES= websieve.pl -NO_BUILD= yes NO_ARCH= yes +NO_BUILD= yes +SUB_FILES= pkg-message +OPTIONS_DEFAULT= CYRUS CYRUS_IMAPD_25 +OPTIONS_RADIO= CYRDEP +OPTIONS_RADIO_CYRDEP= CYRUS_IMAPD_25 CYRUS_IMAPD_30 OPTIONS_SINGLE= TYPE OPTIONS_SINGLE_TYPE= PERL CYRUS -OPTIONS_RADIO= CYRDEP -OPTIONS_RADIO_CYRDEP= CYRUS_IMAPD_23 CYRUS_IMAPD_24 CYRUS_IMAPD_25 \ - CYRUS_IMAPD_30 -OPTIONS_DEFAULT= CYRUS CYRUS_IMAPD_24 -TYPE_DESC= Choose which sieve backend to use -PERL_DESC= Depend on generic Perl modules -CYRUS_DESC= Depend on Cyrus IMAPd Perl modules CYRDEP_DESC= Which version of Cyrus IMAPd to depend on -CYRUS_IMAPD_23_DESC= Cyrus IMAPd version 2.3.x -CYRUS_IMAPD_24_DESC= Cyrus IMAPd version 2.4.x +CYRUS_DESC= Depend on Cyrus IMAPd Perl modules CYRUS_IMAPD_25_DESC= Cyrus IMAPd version 2.5.x CYRUS_IMAPD_30_DESC= Cyrus IMAPd version 3.0.x +PERL_DESC= Depend on generic Perl modules +TYPE_DESC= Choose which sieve backend to use -CYRUS_IMAPD_30_RUN_DEPENDS= ${SITE_ARCH}/Cyrus/SIEVE/managesieve.pm:mail/cyrus-imapd30 +CYRUS_VARS= FUNCLIB_PL=funclib.cyrus +CYRUS_VARS_OFF= FUNCLIB_PL=funclib.pl CYRUS_IMAPD_25_RUN_DEPENDS= ${SITE_ARCH}/Cyrus/SIEVE/managesieve.pm:mail/cyrus-imapd25 -CYRUS_IMAPD_24_RUN_DEPENDS= ${SITE_ARCH}/Cyrus/SIEVE/managesieve.pm:mail/cyrus-imapd24 -CYRUS_IMAPD_23_RUN_DEPENDS= ${SITE_ARCH}/Cyrus/SIEVE/managesieve.pm:mail/cyrus-imapd23 - +CYRUS_IMAPD_30_RUN_DEPENDS= ${SITE_ARCH}/Cyrus/SIEVE/managesieve.pm:mail/cyrus-imapd30 +PERL_PREVENTS= CYRUS_IMAPD_25 CYRUS_IMAPD_30 +PERL_PREVENTS_MSG=You cannot select a dependency on cyrus with the PERL option PERL_RUN_DEPENDS= p5-IMAP-Admin>=0:mail/p5-IMAP-Admin \ p5-IMAP-Sieve>=0:mail/p5-IMAP-Sieve -.include - -.if ${PORT_OPTIONS:MCYRUS} -FUNCLIB_PL= funclib.cyrus -.else -FUNCLIB_PL= funclib.pl -.endif - -SUB_FILES= pkg-message - -_check-config: my-check-config -my-check-config: -.if ${PORT_OPTIONS:MPERL} -.if !empty(PORT_OPTIONS:MCYRUS_IMAPD_23) || \ - !empty(PORT_OPTIONS:MCYRUS_IMAPD_24) || \ - !empty(PORT_OPTIONS:MCYRUS_IMAPD_25) || \ - !empty(PORT_OPTIONS:MCYRUS_IMAPD_30) - @${ECHO_MSG} "====> You cannot select a dependency on cyrus with the PERL option" -_CHECK_CONFIG_ERROR= true -.endif -.endif - post-configure: @${REINPLACE_CMD} -e "s,require[ ]*'\./\([^']*\)',require '${PREFIX}/etc/websieve/\1'," \ ${WRKSRC}/websieve.pl diff --git a/mail/websieve/files/patch-funclib.pl b/mail/websieve/files/patch-funclib.pl index be0e951d1e2f..158c946226f1 100644 --- a/mail/websieve/files/patch-funclib.pl +++ b/mail/websieve/files/patch-funclib.pl @@ -1,6 +1,6 @@ ---- funclib.pl.orig Mon Sep 24 14:50:50 2001 -+++ funclib.pl Wed Apr 23 19:24:59 2003 -@@ -51,7 +51,7 @@ +--- funclib.pl.orig 2004-07-07 00:20:09 UTC ++++ funclib.pl +@@ -51,7 +51,7 @@ sub getquota { $IMAPERROR=$imap->{'Error'} unless (defined(@tmp) && scalar(@tmp) > 1); return unless (defined(@tmp) && scalar(@tmp) > 1); #recreate array and remove extra spaces - fixes array properly diff --git a/mail/websieve/files/patch-websieve.pl b/mail/websieve/files/patch-websieve.pl index 4a8b3babc3c7..8ed87676272e 100644 --- a/mail/websieve/files/patch-websieve.pl +++ b/mail/websieve/files/patch-websieve.pl @@ -1,6 +1,6 @@ ---- websieve.pl.orig Tue Jul 6 21:20:09 2004 -+++ websieve.pl Sat Sep 29 16:02:22 2007 -@@ -640,7 +640,7 @@ +--- websieve.pl.orig 2023-09-20 11:39:29 UTC ++++ websieve.pl +@@ -640,7 +640,7 @@ sub getuserinfo { #creates global variables $mode,@rules,@mailboxes,@quota and %vacation; # get quota @quota=&getquota("INBOX") if ($havequota || !$useprocmail);