mail/websieve: Remove EOL Dependencies

- Remove EOLed unsupported cyrus-imapd versions
- Pet portclippy
- Refresh patches
- Utilize OPTIONSNG to reduce clutters
This commit is contained in:
Muhammad Moinur Rahman 2023-09-20 13:47:36 +02:00
parent aa80a23dae
commit 557d59ddfa
3 changed files with 30 additions and 52 deletions

View file

@ -1,6 +1,6 @@
PORTNAME= websieve PORTNAME= websieve
PORTVERSION= 0.63.a PORTVERSION= 0.63.a
PORTREVISION= 3 PORTREVISION= 4
CATEGORIES= mail CATEGORIES= mail
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${SIEVEVERSION} MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${SIEVEVERSION}
DISTNAME?= ${PORTNAME}-${SIEVEVERSION} DISTNAME?= ${PORTNAME}-${SIEVEVERSION}
@ -17,56 +17,34 @@ SIEVEVERSION= ${PORTVERSION:S/.//g}
USES= cpe perl5 shebangfix USES= cpe perl5 shebangfix
CPE_VENDOR= ${PORTNAME}_project CPE_VENDOR= ${PORTNAME}_project
USE_PERL5= run USE_PERL5= run
SHEBANG_FILES= websieve.pl SHEBANG_FILES= websieve.pl
NO_BUILD= yes
NO_ARCH= yes NO_ARCH= yes
NO_BUILD= yes
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_IMAPD_25_DESC= Cyrus IMAPd version 2.5.x
CYRUS_IMAPD_30_DESC= Cyrus IMAPd version 3.0.x
CYRUS_IMAPD_30_RUN_DEPENDS= ${SITE_ARCH}/Cyrus/SIEVE/managesieve.pm:mail/cyrus-imapd30
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
PERL_RUN_DEPENDS= p5-IMAP-Admin>=0:mail/p5-IMAP-Admin \
p5-IMAP-Sieve>=0:mail/p5-IMAP-Sieve
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MCYRUS}
FUNCLIB_PL= funclib.cyrus
.else
FUNCLIB_PL= funclib.pl
.endif
SUB_FILES= pkg-message SUB_FILES= pkg-message
_check-config: my-check-config OPTIONS_DEFAULT= CYRUS CYRUS_IMAPD_25
my-check-config: OPTIONS_RADIO= CYRDEP
.if ${PORT_OPTIONS:MPERL} OPTIONS_RADIO_CYRDEP= CYRUS_IMAPD_25 CYRUS_IMAPD_30
.if !empty(PORT_OPTIONS:MCYRUS_IMAPD_23) || \ OPTIONS_SINGLE= TYPE
!empty(PORT_OPTIONS:MCYRUS_IMAPD_24) || \ OPTIONS_SINGLE_TYPE= PERL CYRUS
!empty(PORT_OPTIONS:MCYRUS_IMAPD_25) || \
!empty(PORT_OPTIONS:MCYRUS_IMAPD_30) CYRDEP_DESC= Which version of Cyrus IMAPd to depend on
@${ECHO_MSG} "====> You cannot select a dependency on cyrus with the PERL option" CYRUS_DESC= Depend on Cyrus IMAPd Perl modules
_CHECK_CONFIG_ERROR= true CYRUS_IMAPD_25_DESC= Cyrus IMAPd version 2.5.x
.endif CYRUS_IMAPD_30_DESC= Cyrus IMAPd version 3.0.x
.endif PERL_DESC= Depend on generic Perl modules
TYPE_DESC= Choose which sieve backend to use
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_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
post-configure: post-configure:
@${REINPLACE_CMD} -e "s,require[ ]*'\./\([^']*\)',require '${PREFIX}/etc/websieve/\1'," \ @${REINPLACE_CMD} -e "s,require[ ]*'\./\([^']*\)',require '${PREFIX}/etc/websieve/\1'," \

View file

@ -1,6 +1,6 @@
--- funclib.pl.orig Mon Sep 24 14:50:50 2001 --- funclib.pl.orig 2004-07-07 00:20:09 UTC
+++ funclib.pl Wed Apr 23 19:24:59 2003 +++ funclib.pl
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@ sub getquota {
$IMAPERROR=$imap->{'Error'} unless (defined(@tmp) && scalar(@tmp) > 1); $IMAPERROR=$imap->{'Error'} unless (defined(@tmp) && scalar(@tmp) > 1);
return unless (defined(@tmp) && scalar(@tmp) > 1); return unless (defined(@tmp) && scalar(@tmp) > 1);
#recreate array and remove extra spaces - fixes array properly #recreate array and remove extra spaces - fixes array properly

View file

@ -1,6 +1,6 @@
--- websieve.pl.orig Tue Jul 6 21:20:09 2004 --- websieve.pl.orig 2023-09-20 11:39:29 UTC
+++ websieve.pl Sat Sep 29 16:02:22 2007 +++ websieve.pl
@@ -640,7 +640,7 @@ @@ -640,7 +640,7 @@ sub getuserinfo {
#creates global variables $mode,@rules,@mailboxes,@quota and %vacation; #creates global variables $mode,@rules,@mailboxes,@quota and %vacation;
# get quota # get quota
@quota=&getquota("INBOX") if ($havequota || !$useprocmail); @quota=&getquota("INBOX") if ($havequota || !$useprocmail);