diff options
author | Rene Ladan <rene@FreeBSD.org> | 2019-01-16 10:38:53 +0000 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2019-01-16 10:38:53 +0000 |
commit | b28919518c79ea725561d387b6dad68216510022 (patch) | |
tree | 04d01398c2406a4eadf8d2cb23e2b972a4e20f68 /mail/cyrus-imapd23 | |
parent | 6d13a9cc7668745e6c93e2b3ff03a3f45eec0955 (diff) | |
download | ports-b28919518c79ea725561d387b6dad68216510022.tar.gz ports-b28919518c79ea725561d387b6dad68216510022.zip |
mail/cyrus-imapd23: remove support for expired mail/drac and pet portlint
Notes
Notes:
svn path=/head/; revision=490463
Diffstat (limited to 'mail/cyrus-imapd23')
-rw-r--r-- | mail/cyrus-imapd23/Makefile | 18 | ||||
-rw-r--r-- | mail/cyrus-imapd23/files/extra-patch-cmulocal_sasl2.m4 | 22 | ||||
-rw-r--r-- | mail/cyrus-imapd23/files/extra-patch-cmulocal_ucdsnmp.m4 | 27 | ||||
-rw-r--r-- | mail/cyrus-imapd23/files/extra-patch-configure.in | 13 |
4 files changed, 3 insertions, 77 deletions
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile index f75dc9640eba..cb72d2c3710f 100644 --- a/mail/cyrus-imapd23/Makefile +++ b/mail/cyrus-imapd23/Makefile @@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-imapd/ PKGNAMESUFFIX= 23 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}/COPYRIGHT @@ -40,7 +40,7 @@ MAKE_JOBS_UNSAFE= yes CPE_VENDOR= cmu CPE_PRODUCT= cyrus_imap_server -OPTIONS_DEFINE= AUTOCREATE AUTOSIEVE BDB DRAC IDLED \ +OPTIONS_DEFINE= AUTOCREATE AUTOSIEVE BDB IDLED \ LDAP_PTLOADER LISTEXT MURDER MYSQL \ NETSCAPEHACK NNTP PGSQL REPLICATION SNMP_5 \ SQLITE DOCS EXAMPLES @@ -51,10 +51,6 @@ AUTOSIEVE_DESC= Use autosievefolder patch (UoA) BDB_USES= bdb BDB_CONFIGURE_ON= --with-bdb-incdir=${BDB_INCLUDE_DIR} \ --with-bdb-libdir=${LOCALBASE}/lib -DRAC_DESC= Enable DRAC support -DRAC_CONFIGURE_ON= --with-drac=${LOCALBASE} -DRAC_BUILD_DEPENDS= ${LOCALBASE}/lib/libdrac.a:mail/drac -DRAC_USES= autoreconf IDLED_DESC= Enable IMAP idled support IDLED_CONFIGURE_ENABLE= idled LDAP_PTLOADER_DESC= Enable LDAP ptloader @@ -98,11 +94,6 @@ AUTOSIETE_PATCH_SITES= http://email.uoa.gr/download/cyrus/${PORTNAME}-2.3.16/:au AUTOSIEVE_PATCHFILES= ${PORTNAME}-2.3.16-autosieve-${AUTOSIEVE_VERSION}.diff AUTOSIEVE_BROKEN= Not buildable with autosieve patch -DRAC_EXTRA_PATCHES= ${WRKSRC}/contrib/drac_auth.patch \ - ${FILESDIR}/extra-patch-configure.in \ - ${FILESDIR}/extra-patch-cmulocal_ucdsnmp.m4 \ - ${FILESDIR}/extra-patch-cmulocal_sasl2.m4 - MANDIRS= ${CYRUS_PREFIX}/man PORTDOCS= * @@ -154,9 +145,6 @@ post-patch: -e "s|/usr/sieve|/var/imap/sieve|g" \ ${WRKSRC}/tools/masssievec -post-patch-DRAC-on: - @${RM} -r ${WRKSRC}/autom4te.cache - post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${FILESDIR}/imapd.conf \ @@ -193,7 +181,7 @@ post-install-DOCS-on: # need to create it. post-install-EXAMPLES-on: .for f in ${CONFS:Nnormal.conf} - @${INSTALL_DATA} ${WRKSRC}/master/conf/${f} \ + ${INSTALL_DATA} ${WRKSRC}/master/conf/${f} \ ${STAGEDIR}${EXAMPLESDIR} @${ECHO_CMD} ${EXAMPLESDIR:S,^${PREFIX}/,,}/${f} >>${TMPPLIST} .endfor diff --git a/mail/cyrus-imapd23/files/extra-patch-cmulocal_sasl2.m4 b/mail/cyrus-imapd23/files/extra-patch-cmulocal_sasl2.m4 deleted file mode 100644 index 53131668fcfd..000000000000 --- a/mail/cyrus-imapd23/files/extra-patch-cmulocal_sasl2.m4 +++ /dev/null @@ -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 diff --git a/mail/cyrus-imapd23/files/extra-patch-cmulocal_ucdsnmp.m4 b/mail/cyrus-imapd23/files/extra-patch-cmulocal_ucdsnmp.m4 deleted file mode 100644 index 829d92d23585..000000000000 --- a/mail/cyrus-imapd23/files/extra-patch-cmulocal_ucdsnmp.m4 +++ /dev/null @@ -1,27 +0,0 @@ -Index: cmulocal/ucdsnmp.m4 -diff -u cmulocal/ucdsnmp.m4.orig cmulocal/ucdsnmp.m4 ---- cmulocal/ucdsnmp.m4.orig Tue May 25 10:27:58 2004 -+++ cmulocal/ucdsnmp.m4 Sat Dec 10 16:34:09 2005 -@@ -31,9 +31,12 @@ - - if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then - CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include" -- LIB_UCDSNMP=$SNMP_LIBS -+ LIB_UCDSNMP="$SNMP_LIBS -lwrap" -+ PERLLIBDIR=`$PERL -e 'use Config; print "$Config{archlibexp}/CORE";'` -+ LDFLAGS_UCDSNMP="-L${PERLLIBDIR} -R${PERLLIBDIR}" - AC_DEFINE(HAVE_NETSNMP,1,[Do we have Net-SNMP support?]) - AC_SUBST(LIB_UCDSNMP) -+ AC_SUBST(LDFLAGS_UCDSNMP) - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) -@@ -59,7 +62,7 @@ - LIB_UCDSNMP="" - if test "$with_snmp" != no; then - AC_DEFINE(HAVE_UCDSNMP,1,[Do we have UCD-SNMP support?]) -- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp" -+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap" - AC_CHECK_LIB(rpm, rpmdbOpen, - LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt",,-lpopt) - fi diff --git a/mail/cyrus-imapd23/files/extra-patch-configure.in b/mail/cyrus-imapd23/files/extra-patch-configure.in deleted file mode 100644 index 35336cab632f..000000000000 --- a/mail/cyrus-imapd23/files/extra-patch-configure.in +++ /dev/null @@ -1,13 +0,0 @@ -Index: configure.in -diff -u configure.in.orig configure.in ---- configure.in.orig 2010-11-26 14:14:12.403327543 +0900 -+++ configure.in 2010-11-26 14:14:47.834464148 +0900 -@@ -391,7 +391,7 @@ - AC_CHECK_LIB(fl,main) - - AC_CHECK_HEADERS(pcreposix.h rxposix.h) -- if test "$ac_cv_header_pcreposix_h" == "yes"; then -+ if test "$ac_cv_header_pcreposix_h" = "yes"; then - LIBS="$LIBS -lpcre -lpcreposix"; - AC_DEFINE(ENABLE_REGEX, [], [Do we have a regex library?]) - else |