mail/cyrus-imapd30: remove support for expired mail/drac and pet portlint

This commit is contained in:
Rene Ladan 2019-01-16 10:42:11 +00:00
parent d2d834e2d4
commit e6a6dd0596
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=490465
2 changed files with 1 additions and 41 deletions

View file

@ -10,7 +10,7 @@ MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-imapd/ \
PKGNAMESUFFIX= 30
MAINTAINER= ume@FreeBSD.org
COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols
COMMENT= Cyrus mail server, supporting POP3 and IMAP4 protocols
LICENSE= BSD4CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
@ -49,7 +49,6 @@ CPE_PRODUCT= cyrus_imap_server
OPTIONS_DEFINE= AUTOCREATE BACKUP CLAMAV HTTP IDLED LDAP LMDB MURDER \
MYSQL NNTP PGSQL REPLICATION SNMP SQLITE SQUAT XAPIAN \
DOCS
#OPTIONS_DEFINE+= DRAC
OPTIONS_DEFAULT= AUTOCREATE IDLED SQLITE SQUAT
OPTIONS_SUB= yes
AUTOCREATE_DESC= Enable autocreate support
@ -59,9 +58,6 @@ BACKUP_CONFIGURE_ENABLE=backup
CLAMAV_DESC= Use ClamAV
CLAMAV_CONFIGURE_WITH= clamav
CLAMAV_LIB_DEPENDS= libclamav.so:security/clamav
DRAC_DESC= Enable DRAC support
DRAC_CONFIGURE_ON= --with-drac=${LOCALBASE}
DRAC_BUILD_DEPENDS= ${LOCALBASE}/lib/libdrac.a:mail/drac
HTTP_DESC= Enable HTTP support
HTTP_CONFIGURE_ENABLE= http
HTTP_LIB_DEPENDS= libical.so:devel/libical \
@ -153,11 +149,6 @@ CYRUS_PERL_MAN3=Cyrus::Annotator::Daemon Cyrus::Annotator::Message \
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDRAC}
IGNORE= DRAC is not available
# EXTRA_PATCHES+= ${FILESDIR}/extra-patch-cmulocal__sasl2.m4
.endif
.if ${PORT_OPTIONS:MHTTP} || ${PORT_OPTIONS:MSQLITE}
USES+= sqlite
.endif
@ -183,12 +174,6 @@ PLIST_SUB+= SQUATTER=""
PLIST_SUB+= SQUATTER="@comment "
.endif
.if ${PORT_OPTIONS:MDRAC}
pre-patch:
${PATCH} -d ${PATCH_WRKSRC} --forward --quiet -E -p1 \
< ${WRKSRC}/contrib/drac_auth.patch
.endif
post-patch:
@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
-e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
@ -202,9 +187,6 @@ post-patch:
-e 's|$$(mandir)/\(man[8]\)|${PREFIX}/cyrus/man/\1|g' \
${WRKSRC}/Makefile.in
post-patch-DRAC-on:
@${RM} -r ${WRKSRC}/autom4te.cache
post-install:
${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
${INSTALL_DATA} ${FILESDIR}/imapd.conf \

View file

@ -1,22 +0,0 @@
Index: cmulocal/sasl2.m4
diff -u cmulocal/sasl2.m4.orig cmulocal/sasl2.m4
--- cmulocal/sasl2.m4.orig 2009-05-20 21:24:48.000000000 +0900
+++ cmulocal/sasl2.m4 2009-12-22 00:31:16.153536453 +0900
@@ -105,7 +105,7 @@
if test "$gss_impl" = "auto" -o "$gss_impl" = "heimdal"; then
gss_failed=0
AC_CHECK_LIB(gssapi,gss_unwrap,gss_impl="heimdal",gss_failed=1,
- ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET})
+ ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} -lhx509)
if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
gss_impl="failed"
fi
@@ -173,7 +173,7 @@
GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
elif test "$gss_impl" = "heimdal"; then
CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
+ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err -lhx509"
GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
elif test "$gss_impl" = "cybersafe03"; then
# Version of CyberSafe with two libraries