- Update to 2.0.9 [1]

- Enable VPOPMAIL [2]
- Fix comments
- Sort MAN1
- Use ETCDIR
- Simplify installation
- Space/Tab twiddle

Changes:	http://www.dovecot.org/list/dovecot-news/2011-January/000184.html
		http://www.dovecot.org/list/dovecot-news/2010-December/000182.html
PR:		ports/154004 [1]
		ports/153295 [2]
Submitted by:	Alexander Wittig <alexander@wittig.name> [1]
Approved by:	maintainer (timeout, 21 days) [1]
Feature safe:	yes
This commit is contained in:
Sunpoet Po-Chuan Hsieh 2011-02-05 16:51:50 +00:00
parent 78e6cc5d4f
commit d7817ab273
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=268690
4 changed files with 90 additions and 95 deletions

View File

@ -1,30 +1,28 @@
# New ports collection makefile for: dovecot
# Date created: 12/08/2002
# Whom: Dominic Marks <dominic.marks@btinternet.com>
# New ports collection makefile for: dovecot2
# Date created: 2010/09/21
# Whom: Nagy, Attila <bra@fsn.hu>
#
# $FreeBSD$
#
PORTNAME= dovecot
PORTVERSION= 2.0.7
PORTVERSION= 2.0.9
CATEGORIES= mail ipv6
MASTER_SITES= http://www.dovecot.org/releases/${DOVECOTVERSION}/
MASTER_SITES= http://www.dovecot.org/releases/${PORTVERSION:R}/
MAINTAINER= bra@fsn.hu
COMMENT= Secure and compact IMAP and POP3 servers
LATEST_LINK= dovecot2
CONFLICTS= dovecot-1.*
DOVECOTVERSION= 2.0
CONFLICTS= dovecot-1.[0-9]*
######################################################################
# Anytime PORTVERSION changes please bump PORTREVISION of #
# mail/dovecot20-pigeonhole. Please see ports/135311 and #
# mail/dovecot2-pigeonhole. Please see ports/135311 and #
# ports/146029 for an explanation. #
# #
# Please be careful when updating this port as changes to this port #
# can break mail/dovecot20-pigeonhole. In order to ensure the least #
# can break mail/dovecot2-pigeonhole. In order to ensure the least #
# amount of breakage possible please consult the maintainer of that #
# port before updating this one. #
######################################################################
@ -34,16 +32,16 @@ USE_RC_SUBR= dovecot.sh
MAKE_JOBS_SAFE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --localstatedir=/var \
--with-statedir=/var/db/dovecot \
--without-shadow
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --localstatedir=/var \
--with-statedir=/var/db/dovecot \
--without-shadow
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
USE_LDCONFIG= ${PREFIX}/lib/dovecot
.if defined(NOPORTDOCS)
CONFIGURE_ARGS+= --without-docs
CONFIGURE_ARGS+=--without-docs
.else
DOCS= AUTHORS COPYING COPYING.LGPL COPYING.MIT INSTALL NEWS TODO README
PORTDOCS= *
@ -63,6 +61,7 @@ PROTOCOLS= imap pop3
OPTIONS= KQUEUE "kqueue(2) support" on \
SSL "SSL support" on \
GSSAPI "GSSAPI support" off \
VPOPMAIL "vpopmail support" off \
LDAP "OpenLDAP support" off \
PGSQL "PostgreSQL support" off \
MYSQL "MySQL support" off \
@ -85,114 +84,113 @@ REINPLACE= s!%%PROTOCOLS%%!${PROTOCOLS}!g;\
## kqueue(2) support
#
.if !defined(WITHOUT_KQUEUE)
CONFIGURE_ARGS+= --with-ioloop=kqueue
CONFIGURE_ARGS+=--with-ioloop=kqueue
.endif
## SSL support
#
.if defined(WITH_SSL) && !defined(WITHOUT_SSL)
PROTOCOLS+= imaps pop3s
PROTOCOLS+= imaps pop3s
.else
CONFIGURE_ARGS+= --without-ssl
CONFIGURE_ARGS+=--without-ssl
.endif
## GSSAPI support
#
.if defined(WITH_GSSAPI) && !defined(WITHOUT_GSSAPI)
CONFIGURE_ARGS+= --with-gssapi
CONFIGURE_ARGS+=--with-gssapi
.else
CONFIGURE_ARGS+= --without-gssapi
CONFIGURE_ARGS+=--without-gssapi
.endif
## VPopMail Support
# support is currently disabled
#.if defined(WITH_VPOPMAIL) && !defined(WITHOUT_VPOPMAIL)
#VPOPMAIL= ${LOCALBASE}/vpopmail/bin/vchkpw
#BUILD_DEPENDS+= ${VPOPMAIL}:${PORTSDIR}/mail/vpopmail
#CONFIGURE_ARGS+= --with-vpopmail
#.else
#CONFIGURE_ARGS+= --without-vpopmail
#.endif
#
.if defined(WITH_VPOPMAIL) && !defined(WITHOUT_VPOPMAIL)
BUILD_DEPENDS+= ${LOCALBASE}/vpopmail/bin/vchkpw:${PORTSDIR}/mail/vpopmail
CONFIGURE_ARGS+=--with-vpopmail
.else
CONFIGURE_ARGS+=--without-vpopmail
.endif
## OpenLDAP Support
#
.if defined(WITH_LDAP) && !defined(WITHOUT_LDAP)
USE_OPENLDAP= yes
CONFIGURE_ARGS+= --with-ldap
PLIST_SUB+= LDAP=""
_REQUIRE+= slapd
USE_OPENLDAP= yes
CONFIGURE_ARGS+=--with-ldap
PLIST_SUB+= LDAP=""
_REQUIRE+= slapd
.else
CONFIGURE_ARGS+= --without-ldap
PLIST_SUB+= LDAP="@comment "
CONFIGURE_ARGS+=--without-ldap
PLIST_SUB+= LDAP="@comment "
.endif
## PostgreSQL Support
#
.if defined(WITH_PGSQL) && !defined(WITHOUT_PGSQL)
USE_PGSQL= yes
CONFIGURE_ARGS+= --with-pgsql
PLIST_SUB+= SQL=""
_REQUIRE+= postgresql
USE_PGSQL= yes
CONFIGURE_ARGS+=--with-pgsql
PLIST_SUB+= SQL=""
_REQUIRE+= postgresql
.else
CONFIGURE_ARGS+= --without-pgsql
PLIST_SUB+= SQL="@comment "
CONFIGURE_ARGS+=--without-pgsql
PLIST_SUB+= SQL="@comment "
.endif
## MySQL Support
#
.if defined(WITH_MYSQL) && !defined(WITHOUT_MYSQL)
USE_MYSQL= yes
CONFIGURE_ARGS+= --with-mysql
PLIST_SUB+= SQL=""
_REQUIRE+= mysql
USE_MYSQL= yes
CONFIGURE_ARGS+=--with-mysql
PLIST_SUB+= SQL=""
_REQUIRE+= mysql
.else
CONFIGURE_ARGS+= --without-mysql
PLIST_SUB+= SQL="@comment "
CONFIGURE_ARGS+=--without-mysql
PLIST_SUB+= SQL="@comment "
.endif
## SQLite Support
#
.if defined(WITH_SQLITE) && !defined(WITHOUT_SQLITE)
USE_SQLITE= 3
CONFIGURE_ARGS+= --with-sqlite
PLIST_SUB+= SQL=""
USE_SQLITE= 3
CONFIGURE_ARGS+=--with-sqlite
PLIST_SUB+= SQL=""
.else
CONFIGURE_ARGS+= --without-sqlite
PLIST_SUB+= SQL="@comment "
CONFIGURE_ARGS+=--without-sqlite
PLIST_SUB+= SQL="@comment "
.endif
SUB_LIST+= REQUIRE="${_REQUIRE}" DOVECOT_UID=${DOVECOT_UID} DOVECOT_GID=${DOVECOT_GID} DOVENULL_UID=${DOVENULL_UID} DOVENULL_GID=${DOVENULL_GID}
SUB_FILES+= pkg-install pkg-deinstall pkg-message
SUB_LIST= REQUIRE="${_REQUIRE}" DOVECOT_UID=${DOVECOT_UID} DOVECOT_GID=${DOVECOT_GID} DOVENULL_UID=${DOVENULL_UID} DOVENULL_GID=${DOVENULL_GID}
SUB_FILES= pkg-install pkg-deinstall pkg-message
MAN1= deliver.1 \
doveadm-altmove.1 \
doveadm-auth.1 \
doveadm-config.1 \
doveadm-director.1 \
doveadm-dump.1 \
doveadm-expunge.1 \
doveadm-fetch.1 \
doveadm-force-resync.1 \
doveadm-help.1 \
doveadm-kick.1 \
doveadm-import.1 \
doveadm-log.1 \
doveadm-mailbox.1 \
doveadm-penalty.1 \
doveadm-purge.1 \
doveadm-pw.1 \
doveadm-quota.1 \
doveadm-reload.1 \
doveadm-search.1 \
doveadm-stop.1 \
doveadm-user.1 \
doveadm-who.1 \
doveadm.1 \
doveconf.1 \
dovecot-lda.1 \
dovecot.1 \
dsync.1
MAN7= doveadm-search-query.7
MAN1= deliver.1 \
doveadm-altmove.1 \
doveadm-auth.1 \
doveadm-config.1 \
doveadm-director.1 \
doveadm-dump.1 \
doveadm-expunge.1 \
doveadm-fetch.1 \
doveadm-force-resync.1 \
doveadm-help.1 \
doveadm-import.1 \
doveadm-kick.1 \
doveadm-log.1 \
doveadm-mailbox.1 \
doveadm-penalty.1 \
doveadm-purge.1 \
doveadm-pw.1 \
doveadm-quota.1 \
doveadm-reload.1 \
doveadm-search.1 \
doveadm-stop.1 \
doveadm-user.1 \
doveadm-who.1 \
doveadm.1 \
doveconf.1 \
dovecot-lda.1 \
dovecot.1 \
dsync.1
MAN7= doveadm-search-query.7
post-patch:
@${REINPLACE_CMD} -E -e '${REINPLACE}' \
@ -213,13 +211,10 @@ pre-su-install:
post-install:
.if !defined(NOPORTEXAMPLES)
@${MKDIR} ${EXAMPLESDIR}
${INSTALL_SCRIPT} ${WRKSRC}/doc/mkcert.sh ${EXAMPLESDIR}
${INSTALL_SCRIPT} ${WRKSRC}/doc/dovecot-openssl.cnf ${EXAMPLESDIR}
cd ${WRKSRC}/doc && ${INSTALL_SCRIPT} dovecot-openssl.cnf mkcert.sh ${EXAMPLESDIR}
.endif
.if !defined(NOPORTDOCS)
.for f in ${DOCS}
${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
.endfor
cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
.endif
@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
@${CAT} ${PKGMESSAGE}

View File

@ -1,2 +1,2 @@
SHA256 (dovecot-2.0.7.tar.gz) = d862ca1bf5aaa3bc15f5962058351517b8f42fa6947feeb634f4d085ec0f4ce3
SIZE (dovecot-2.0.7.tar.gz) = 3174912
SHA256 (dovecot-2.0.9.tar.gz) = 37b4f3112284eeb099e4c9e89b9d433261d8b22040bc5d6b28f275c2e70070ee
SIZE (dovecot-2.0.9.tar.gz) = 3208677

View File

@ -20,7 +20,7 @@ rcvar=`set_rcvar`
# read configuration and set defaults
load_rc_config ${name}
: ${dovecot_enable:="NO"}
: ${dovecot_config:="%%PREFIX%%/etc/dovecot/${name}.conf"}
: ${dovecot_config:="%%ETCDIR%%/${name}.conf"}
command="%%PREFIX%%/sbin/${name}"
start_precmd="start_precmd"

View File

@ -1,7 +1,7 @@
bin/doveadm
bin/doveconf
bin/dsync
%%PORTDOCS%%etc/dovecot/README
%%PORTDOCS%%%%ETCDIR%%/README
include/dovecot/abspath.h
include/dovecot/access-lookup.h
include/dovecot/anvil-client.h
@ -338,6 +338,9 @@ lib/dovecot/lib02_imap_acl_plugin.so
lib/dovecot/lib02_lazy_expunge_plugin.a
lib/dovecot/lib02_lazy_expunge_plugin.la
lib/dovecot/lib02_lazy_expunge_plugin.so
lib/dovecot/lib05_snarf_plugin.a
lib/dovecot/lib05_snarf_plugin.la
lib/dovecot/lib05_snarf_plugin.so
lib/dovecot/lib10_quota_plugin.a
lib/dovecot/lib10_quota_plugin.la
lib/dovecot/lib10_quota_plugin.so
@ -365,9 +368,6 @@ lib/dovecot/lib20_listescape_plugin.so
lib/dovecot/lib20_mail_log_plugin.a
lib/dovecot/lib20_mail_log_plugin.la
lib/dovecot/lib20_mail_log_plugin.so
lib/dovecot/lib20_mbox_snarf_plugin.a
lib/dovecot/lib20_mbox_snarf_plugin.la
lib/dovecot/lib20_mbox_snarf_plugin.so
lib/dovecot/lib20_virtual_plugin.a
lib/dovecot/lib20_virtual_plugin.la
lib/dovecot/lib20_virtual_plugin.so
@ -426,5 +426,5 @@ share/aclocal/dovecot.m4
@dirrm lib/dovecot/auth
@dirrm lib/dovecot
@dirrm include/dovecot
@dirrmtry etc/dovecot
@dirrmtry %%ETCDIR%%
@dirrmtry %%DOCSDIR%%