Index: head/mail/courier-imap/Makefile =================================================================== --- head/mail/courier-imap/Makefile (revision 448527) +++ head/mail/courier-imap/Makefile (revision 448528) @@ -1,149 +1,125 @@ # Created by: Neil Blakey-Milner # $FreeBSD$ PORTNAME= courier-imap -PORTVERSION= 4.18.0 +PORTVERSION= 4.18.1 PORTEPOCH= 2 CATEGORIES= mail ipv6 MASTER_SITES= SF/courier/imap/${PORTVERSION} MAINTAINER= madpilot@FreeBSD.org COMMENT= IMAP (and POP3) server that provides access to Maildir mailboxes BUILD_DEPENDS= courierauthconfig:security/courier-authlib-base RUN_DEPENDS= courierauthconfig:security/courier-authlib-base \ ${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool LIB_DEPENDS= libcourier-unicode.so:devel/courier-unicode -USES= gmake perl5 ssl tar:bzip2 +USES= gmake localbase:ldflags perl5 ssl tar:bzip2 GNU_CONFIGURE= yes USE_RC_SUBR= courier-imap-imapd courier-imap-imapd-ssl \ courier-imap-pop3d courier-imap-pop3d-ssl -CPPFLAGS+= -I${LOCALBASE}/include -I${PREFIX}/include -LDFLAGS+= -L${LOCALBASE}/lib -L${PREFIX}/lib CONFIGURE_ENV= REHASH=${SCRIPTDIR}/c_rehash MAKE_ENV:= ${CONFIGURE_ENV} ALL_TARGET= all makeimapaccess makedat +SUB_FILES= pkg-message +SUB_LIST= CONFDIR=${CONFDIR} + # # options available: # # WITH_SYSLOG_FACILITY: The syslogfacility to use # OPTIONS_DEFINE= FAM TRASHQUOTA GDBM IPV6 GNUTLS FAM_DESC= Fam support for IDLE command TRASHQUOTA_DESC= Include deleted mails in the quota GNUTLS_DESC= Use GnuTLS instead of OpenSSL (Enables SNI) FAM_USES= fam .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.opt) .include "${.CURDIR}/../../security/courier-authlib/Makefile.opt" .endif CONFDIR?= ${PREFIX}/etc/${PORTNAME} USERDB?= ${PREFIX}/etc/userdb LIBEXECDIR?= ${PREFIX}/libexec/${PORTNAME} PLIST_SUB= CONFDIR=${CONFDIR:S,^${PREFIX}/,,} \ LIBEXECDIR=${LIBEXECDIR:S,^${PREFIX}/,,} CONFIGURE_ARGS= --sysconfdir=${CONFDIR} \ --localstatedir="${PREFIX}/var" \ --datadir=${DATADIR} \ --libexecdir=${LIBEXECDIR} \ --enable-workarounds-for-imap-client-bugs \ --enable-unicode \ --disable-root-check \ --with-locking-method=fcntl \ COURIERAUTHCONFIG=${PREFIX}/bin/courierauthconfig -.include +GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls \ + libgcrypt.so:security/libgcrypt +GNUTLS_CONFIGURE_WITH= gnutls +GNUTLS_USES= pkgconfig -.if ${PORT_OPTIONS:MGNUTLS} -CONFIGURE_ARGS+=--with-gnutls -LIB_DEPENDS+= libgnutls.so:security/gnutls -USES+= pkgconfig -.endif +IPV6_CONFIGURE_OFF= --without-ipv6 +TRASHQUOTA_CONFIGURE_ON=--with-trashquota + .include .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep) .include "${.CURDIR}/../../security/courier-authlib/Makefile.dep" .endif .if ${PORT_OPTIONS:MSYSLOG_FACILITY} CONFIGURE_ARGS+=--with-syslog=${WITH_SYSLOG_FACILITY} .endif .if ${PORT_OPTIONS:MAUTH_USERDB} .if ${PORT_OPTIONS:MGDBM} CONFIGURE_ARGS+=--with-db=gdbm --with-userdb=${USERDB} LIB_DEPENDS+= libgdbm.so:databases/gdbm .else CONFIGURE_ARGS+=--with-db=db --with-userdb=${USERDB} .endif .endif -.if ! ${PORT_OPTIONS:MIPV6} -CONFIGURE_ARGS+=--without-ipv6 -.endif - -.if ${PORT_OPTIONS:MTRASHQUOTA} -CONFIGURE_ARGS+=--with-trashquota -.endif - -.if ${PORT_OPTIONS:MFAM} -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -.endif - EXTRA_DOCS= AUTHORS INSTALL NEWS \ libs/imap/ChangeLog \ libs/imap/README \ libs/imap/README.proxy \ libs/maildir/README.imapkeywords.html \ libs/maildir/README.maildirfilter.html \ libs/maildir/README.maildirquota.txt \ libs/maildir/README.sharedfolders.txt \ libs/tcpd/README.couriertls \ -post-patch: -.if ! ${PORT_OPTIONS:MFAM} +post-patch-FAM-off: @${REINPLACE_CMD} -e 's|$$LIBFAM||g; s|HAVE_FAM|DO_NOT_HAVE_FAM|g' \ ${WRKSRC}/libs/maildir/configure -.endif + +post-patch: @${REINPLACE_CMD} -e 's|^case x$$lockmethod in|${TEST} \&\& &|g' \ ${WRKSRC}/libs/liblock/configure @${REINPLACE_CMD} -e 's|%%INSTALL_MAN%%|${INSTALL_MAN}|' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|TLS_PROTOCOL=SSL3|TLS_PROTOCOL=SSL23|g' \ ${WRKSRC}/libs/imap/pop3d-ssl.dist.in \ ${WRKSRC}/libs/imap/imapd-ssl.dist.in post-install: ${INSTALL_SCRIPT} ${WRKSRC}/makeimapaccess ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_SCRIPT} ${WRKSRC}/makedat ${STAGEDIR}${PREFIX}/bin/ .for i in imapd pop3d ${INSTALL_DATA} ${WRKSRC}/libs/imap/${i}.cnf ${STAGEDIR}${CONFDIR}/${i}.cnf.dist .endfor @${MKDIR} ${STAGEDIR}${DOCSDIR} .for a in ${EXTRA_DOCS} ${INSTALL_DATA} ${WRKSRC}/${a} ${STAGEDIR}${DOCSDIR} .endfor - - @${ECHO_MSG} "In case you use authpam, you should put the following lines" - @${ECHO_MSG} "in your /etc/pam.d/imap" - @${ECHO_MSG} "auth required pam_unix.so try_first_pass" - @${ECHO_MSG} "account required pam_unix.so try_first_pass" - @${ECHO_MSG} "session required pam_permit.so" - - @${ECHO_MSG} "" - @${ECHO_MSG} "You will have to run ${DATADIR}/mkimapdcert to create" - @${ECHO_MSG} "a self-signed certificate if you want to use imapd-ssl." - @${ECHO_MSG} "And you will have to copy and edit the *.dist files to *" - @${ECHO_MSG} "in ${CONFDIR}." - @${ECHO_MSG} "" .include Index: head/mail/courier-imap/distinfo =================================================================== --- head/mail/courier-imap/distinfo (revision 448527) +++ head/mail/courier-imap/distinfo (revision 448528) @@ -1,3 +1,3 @@ -TIMESTAMP = 1499031625 -SHA256 (courier-imap-4.18.0.tar.bz2) = fa8c2e3b71295c9fa124dfad350f688263ddf7f2b15709f2d44d0f9722de7c52 -SIZE (courier-imap-4.18.0.tar.bz2) = 3202389 +TIMESTAMP = 1503327728 +SHA256 (courier-imap-4.18.1.tar.bz2) = 371b95b29cf6aae3c5967cb92a52c018059950ffb46b540d187b29d57f2f9a0b +SIZE (courier-imap-4.18.1.tar.bz2) = 3203392 Index: head/mail/courier-imap/files/pkg-message.in =================================================================== --- head/mail/courier-imap/files/pkg-message.in (nonexistent) +++ head/mail/courier-imap/files/pkg-message.in (revision 448528) @@ -0,0 +1,11 @@ +In case you use authpam, you should put the following lines +in your /etc/pam.d/imap: + +auth required pam_unix.so try_first_pass +account required pam_unix.so try_first_pass +session required pam_permit.so + +You will have to run %%DATADIR%%/mkimapdcert to create +a self-signed certificate if you want to use imapd-ssl. +And you will have to copy and edit the *.dist files to * +in %%CONFDIR%%. Property changes on: head/mail/courier-imap/files/pkg-message.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property