[Midnightbsd-cvs] mports [16032] managesieve update
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Mar 8 16:44:10 EST 2014
Revision: 16032
http://svnweb.midnightbsd.org/mports/?rev=16032
Author: laffer1
Date: 2014-03-08 16:44:09 -0500 (Sat, 08 Mar 2014)
Log Message:
-----------
managesieve update
Modified Paths:
--------------
trunk/mail/dovecot/Makefile
trunk/mail/dovecot/distinfo
trunk/mail/dovecot/pkg-plist
Added Paths:
-----------
trunk/mail/dovecot/files/dovecot.in
Removed Paths:
-------------
trunk/mail/dovecot/files/dovecot.sh.in
Property Changed:
----------------
trunk/mail/dovecot/files/patch-configure
trunk/mail/dovecot/files/patch-dovecot-example.conf
trunk/mail/dovecot/files/pkg-deinstall.in
trunk/mail/dovecot/files/pkg-install.in
trunk/mail/dovecot/files/pkg-message.in
Modified: trunk/mail/dovecot/Makefile
===================================================================
--- trunk/mail/dovecot/Makefile 2014-03-07 12:51:54 UTC (rev 16031)
+++ trunk/mail/dovecot/Makefile 2014-03-08 21:44:09 UTC (rev 16032)
@@ -2,29 +2,42 @@
PORTNAME= dovecot
PORTVERSION= 1.2.17
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail ipv6
MASTER_SITES= http://www.dovecot.org/releases/${DOVECOTVERSION}/ \
- http://www.rename-it.nl/dovecot/1.2.14/
+ http://www.rename-it.nl/dovecot/${DOVECOTVERSION}/
MAINTAINER= ports at MidnightBSD.org
COMMENT= Secure and compact IMAP and POP3 servers
+
LICENSE= agg
-CONFLICTS= dovecot-2.*
+CONFLICTS= dovecot2-*
DOVECOTVERSION= 1.2
-USE_ICONV= yes
-USE_RC_SUBR= dovecot.sh
+######################################################################
+# Anytime PORTVERSION changes please bump PORTREVISIONs of #
+# mail/dovecot-antispam, mail/dovecot-managesieve and #
+# mail/dovecot-sieve. 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/dovecot-sieve and mail/dovecot-managesieve. In #
+# order to ensure the least amount of breakage possible please #
+# consult the maintainer of those ports before updating this one. #
+######################################################################
+USES= iconv
+USE_RC_SUBR= dovecot
+
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd6.1
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd9.1
CONFIGURE_ARGS= --localstatedir=/var \
--with-statedir=/var/db/dovecot \
--without-shadow
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= ${PREFIX}/lib/dovecot \
${PREFIX}/lib/dovecot/imap \
${PREFIX}/lib/dovecot/pop3 \
@@ -42,15 +55,11 @@
PROTOCOLS= imap pop3
-OPTIONS= KQUEUE "kqueue(2) support" on \
- SSL "SSL support" on \
- MANAGESIEVE "ManageSieve support" on \
- GSSAPI "GSSAPI support" off \
- BDB "BerkleyDB support" off \
- LDAP "OpenLDAP support" off \
- PGSQL "PostgreSQL support" off \
- MYSQL "MySQL support" off \
- SQLITE "SQLite support" off
+OPTIONS_DEFINE= KQUEUE SSL MANAGESIEVE GSSAPI VPOPMAIL BDB LDAP PGSQL MYSQL SQLITE
+OPTIONS_DEFAULT= KQUEUE SSL MANAGESIEVE
+KQUEUE_DESC= kqueue(2) support
+MANAGESIEVE_DESC= ManageSieve support
+VPOPMAIL_DESC= VPopMail support
.include <bsd.port.pre.mk>
@@ -68,14 +77,14 @@
## kqueue(2) support
#
-.if !defined(WITHOUT_KQUEUE)
+.if ${PORT_OPTIONS:MKQUEUE}
CONFIGURE_ARGS+= --with-ioloop=kqueue
.endif
## SSL support
#
-.if defined(WITH_SSL) && !defined(WITHOUT_SSL)
-PROTOCOLS+= imaps pop3s
+.if ${PORT_OPTIONS:MSSL}
+PROTOCOLS+= imaps pop3s
.else
CONFIGURE_ARGS+= --without-ssl
.endif
@@ -82,10 +91,10 @@
## ManageSieve support
#
-.if defined(WITH_MANAGESIEVE) && !defined(WITHOUT_MANAGESIEVE)
+.if ${PORT_OPTIONS:MMANAGESIEVE}
MANAGESIEVEVERSION!= ${MAKE} -C ${.CURDIR}/../dovecot-managesieve -V PORTVERSION
PATCH_SITES!= ${MAKE} -C ${.CURDIR}/../dovecot-managesieve -V MASTER_SITES
-PATCHFILES+= dovecot-1.2.14-managesieve-${MANAGESIEVEVERSION}.diff.gz
+PATCHFILES+= dovecot-${PORTVERSION}-managesieve-${MANAGESIEVEVERSION}.diff.gz
PATCH_DIST_STRIP= -p1
PROTOCOLS+= managesieve
DOCS+= README.managesieve
@@ -93,15 +102,26 @@
## GSSAPI support
#
-.if defined(WITH_GSSAPI) && !defined(WITHOUT_GSSAPI)
+.if ${PORT_OPTIONS:MGSSAPI}
CONFIGURE_ARGS+= --with-gssapi
+LDFLAGS+= -lgssapi_krb5
.else
CONFIGURE_ARGS+= --without-gssapi
.endif
+## VPopMail Support
+#
+.if ${PORT_OPTIONS:MVPOPMAIL}
+VPOPMAIL= ${LOCALBASE}/vpopmail/bin/vchkpw
+BUILD_DEPENDS+= ${VPOPMAIL}:${PORTSDIR}/mail/vpopmail
+CONFIGURE_ARGS+= --with-vpopmail
+.else
+CONFIGURE_ARGS+= --without-vpopmail
+.endif
+
## BDB Support
#
-.if defined(WITH_BDB) && !defined(WITHOUT_BDB)
+.if ${PORT_OPTIONS:MBDB}
USE_BDB= 42+
CONFIGURE_ARGS+= --with-db
CFLAGS+= -I${BDB_INCLUDE_DIR} -L${BDB_LIB_DIR}
@@ -113,7 +133,7 @@
## OpenLDAP Support
#
-.if defined(WITH_LDAP) && !defined(WITHOUT_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
USE_OPENLDAP= yes
CONFIGURE_ARGS+= --with-ldap
PLIST_SUB+= LDAP=""
@@ -125,7 +145,7 @@
## PostgreSQL Support
#
-.if defined(WITH_PGSQL) && !defined(WITHOUT_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
USE_PGSQL= yes
CONFIGURE_ARGS+= --with-pgsql
PLIST_SUB+= SQL=""
@@ -137,7 +157,7 @@
## MySQL Support
#
-.if defined(WITH_MYSQL) && !defined(WITHOUT_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
USE_MYSQL= yes
CONFIGURE_ARGS+= --with-mysql
PLIST_SUB+= SQL=""
@@ -149,7 +169,7 @@
## SQLite Support
#
-.if defined(WITH_SQLITE) && !defined(WITHOUT_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
USE_SQLITE= 3
CONFIGURE_ARGS+= --with-sqlite
PLIST_SUB+= SQL=""
@@ -168,11 +188,6 @@
s!-example\.conf[[:>:]]!.conf!g;\
s!^(confdir[[:space:]]+=[[:space:]]+)\$$\(sysconfdir\)!\1${EXAMPLESDIR}!g;\
' ${WRKSRC}/*/Makefile.in ${WRKSRC}/Makefile.in
-.if defined(WITH_GSSAPI)
- @${REINPLACE_CMD} -e '\
- s!<gssapi/gssapi\.h>!<gssapi.h>!;\
- ' ${WRKSRC}/src/auth/mech-gssapi.c ${WRKSRC}/configure
-.endif
@${LN} -f ${WRKSRC}/dovecot-example.conf ${WRKSRC}/dovecot.conf
@${LN} -f ${WRKSRC}/doc/dovecot-db-example.conf ${WRKSRC}/doc/dovecot-db.conf
@${LN} -f ${WRKSRC}/doc/dovecot-dict-sql-example.conf ${WRKSRC}/doc/dovecot-dict-sql.conf
@@ -179,7 +194,7 @@
@${LN} -f ${WRKSRC}/doc/dovecot-ldap-example.conf ${WRKSRC}/doc/dovecot-ldap.conf
@${LN} -f ${WRKSRC}/doc/dovecot-sql-example.conf ${WRKSRC}/doc/dovecot-sql.conf
-pre-install:
+pre-su-install:
@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
post-install:
@@ -194,11 +209,10 @@
| ${SED} -e 's:^@exec ::; s:%D:${PREFIX}:g;' \
> ${WRKDIR}/.PLIST.exec \
&& ${SH} ${WRKDIR}/.PLIST.exec
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
.for f in ${DOCS}
${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
.endfor
.endif
- @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.post.mk>
Modified: trunk/mail/dovecot/distinfo
===================================================================
--- trunk/mail/dovecot/distinfo 2014-03-07 12:51:54 UTC (rev 16031)
+++ trunk/mail/dovecot/distinfo 2014-03-08 21:44:09 UTC (rev 16032)
@@ -1,6 +1,4 @@
SHA256 (dovecot-1.2.17.tar.gz) = 6f39f86a06ddbaa8e264d03046c2fc8870f97ea27c1e52eb5bc96c3b754f0bed
-RMD160 (dovecot-1.2.17.tar.gz) = 59f619dba2aadef3cccd6ceb045a2e75a11700a2
SIZE (dovecot-1.2.17.tar.gz) = 2983431
-SHA256 (dovecot-1.2.14-managesieve-0.11.11.diff.gz) = 5bf1a8c983f78c2b49d9068bb57f52001126fcd1e7ab1c5daf9f3a558c08e696
-RMD160 (dovecot-1.2.14-managesieve-0.11.11.diff.gz) = 41684ecd3667feac71a325786afbef22d0a5119d
-SIZE (dovecot-1.2.14-managesieve-0.11.11.diff.gz) = 6459
+SHA256 (dovecot-1.2.17-managesieve-0.11.13.diff.gz) = 6b3a3b5263adc5d30275201fcc8c8ed0b2a659f85eb5b9be65c8000884343b3e
+SIZE (dovecot-1.2.17-managesieve-0.11.13.diff.gz) = 6461
Copied: trunk/mail/dovecot/files/dovecot.in (from rev 16031, trunk/mail/dovecot/files/dovecot.sh.in)
===================================================================
--- trunk/mail/dovecot/files/dovecot.in (rev 0)
+++ trunk/mail/dovecot/files/dovecot.in 2014-03-08 21:44:09 UTC (rev 16032)
@@ -0,0 +1,61 @@
+#!/bin/sh
+#
+# $MidnightBSD$
+
+# PROVIDE: dovecot
+# REQUIRE: %%REQUIRE%%
+# KEYWORD: shutdown
+
+# Define dovecot_* variables in one of these files:
+# /etc/rc.conf
+# /etc/rc.conf.local
+# /etc/rc.conf.d/dovecot
+
+. /etc/rc.subr
+
+name=dovecot
+rcvar=dovecot_enable
+
+# read configuration and set defaults
+load_rc_config ${name}
+: ${dovecot_enable:="NO"}
+: ${dovecot_config:="%%PREFIX%%/etc/${name}.conf"}
+
+command="%%PREFIX%%/sbin/${name}"
+start_precmd="start_precmd"
+stop_postcmd="stop_postcmd"
+restart_cmd="restart_cmd"
+extra_commands="reload"
+
+start_precmd()
+{ # Ensure runtime directories exist with correct permissions
+ local login_user login_gid
+ login_user=$(${command} ${command_args} -a | /usr/bin/awk -F ': ' '/^login_user:/ { print $2 }')
+ login_gid=$(/usr/sbin/pw usershow -n "${login_user}" 2>/dev/null | /usr/bin/cut -d: -f4)
+ /usr/bin/install -o root -g wheel -m 0755 -d ${base_dir}
+ /usr/bin/install -o root -g ${login_gid} -m 0750 -d ${login_dir}
+}
+
+stop_postcmd()
+{ # Cleanup runtime directories
+ rm -rf ${login_dir} ${base_dir} 2>/dev/null
+}
+
+restart_cmd()
+{ # Overriding makes rc.subr run this once for each instance
+ run_rc_command stop
+ run_rc_command start
+}
+
+# To start multiple instances of dovecot set dovecot_config to
+# a space seperated list of configuration files.
+if checkyesno ${name}_enable; then
+ for config in ${dovecot_config}; do
+ required_files="${config}"
+ command_args="-c ${config}"
+ base_dir=$(${command} ${command_args} -a | /usr/bin/awk -F ': ' '/^base_dir:/ { print $2 }')
+ login_dir=$(${command} ${command_args} -a | /usr/bin/awk -F ': ' '/^login_dir:/ { print $2 }')
+ pidfile="${base_dir}/master.pid"
+ run_rc_command "$1"
+ done
+fi
Deleted: trunk/mail/dovecot/files/dovecot.sh.in
===================================================================
--- trunk/mail/dovecot/files/dovecot.sh.in 2014-03-07 12:51:54 UTC (rev 16031)
+++ trunk/mail/dovecot/files/dovecot.sh.in 2014-03-08 21:44:09 UTC (rev 16032)
@@ -1,61 +0,0 @@
-#!/bin/sh
-#
-# $MidnightBSD: mports/mail/dovecot/files/dovecot.sh.in,v 1.2 2009/11/29 03:41:16 laffer1 Exp $
-
-# PROVIDE: dovecot
-# REQUIRE: %%REQUIRE%%
-# KEYWORD: shutdown
-
-# Define dovecot_* variables in one of these files:
-# /etc/rc.conf
-# /etc/rc.conf.local
-# /etc/rc.conf.d/dovecot
-
-. %%RC_SUBR%%
-
-name=dovecot
-rcvar=`set_rcvar`
-
-# read configuration and set defaults
-load_rc_config ${name}
-: ${dovecot_enable:="NO"}
-: ${dovecot_config:="%%PREFIX%%/etc/${name}.conf"}
-
-command="%%PREFIX%%/sbin/${name}"
-start_precmd="start_precmd"
-stop_postcmd="stop_postcmd"
-restart_cmd="restart_cmd"
-extra_commands="reload"
-
-start_precmd()
-{ # Ensure runtime directories exist with correct permissions
- local login_user login_gid
- login_user=$(${command} ${command_args} -a | /usr/bin/awk -F ': ' '/^login_user:/ { print $2 }')
- login_gid=$(/usr/sbin/pw usershow -n "${login_user}" 2>/dev/null | /usr/bin/cut -d: -f4)
- /usr/bin/install -o root -g wheel -m 0755 -d ${base_dir}
- /usr/bin/install -o root -g ${login_gid} -m 0750 -d ${login_dir}
-}
-
-stop_postcmd()
-{ # Cleanup runtime directories
- rm -rf ${login_dir} ${base_dir} 2>/dev/null
-}
-
-restart_cmd()
-{ # Overriding makes rc.subr run this once for each instance
- run_rc_command stop
- run_rc_command start
-}
-
-# To start multiple instances of dovecot set dovecot_config to
-# a space seperated list of configuration files.
-if checkyesno ${name}_enable; then
- for config in ${dovecot_config}; do
- required_files="${config}"
- command_args="-c ${config}"
- base_dir=$(${command} ${command_args} -a | /usr/bin/awk -F ': ' '/^base_dir:/ { print $2 }')
- login_dir=$(${command} ${command_args} -a | /usr/bin/awk -F ': ' '/^login_dir:/ { print $2 }')
- pidfile="${base_dir}/master.pid"
- run_rc_command "$1"
- done
-fi
Index: trunk/mail/dovecot/files/patch-configure
===================================================================
--- trunk/mail/dovecot/files/patch-configure 2014-03-07 12:51:54 UTC (rev 16031)
+++ trunk/mail/dovecot/files/patch-configure 2014-03-08 21:44:09 UTC (rev 16032)
Property changes on: trunk/mail/dovecot/files/patch-configure
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/mail/dovecot/files/patch-dovecot-example.conf
===================================================================
--- trunk/mail/dovecot/files/patch-dovecot-example.conf 2014-03-07 12:51:54 UTC (rev 16031)
+++ trunk/mail/dovecot/files/patch-dovecot-example.conf 2014-03-08 21:44:09 UTC (rev 16032)
Property changes on: trunk/mail/dovecot/files/patch-dovecot-example.conf
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.7
\ No newline at end of property
Index: trunk/mail/dovecot/files/pkg-deinstall.in
===================================================================
--- trunk/mail/dovecot/files/pkg-deinstall.in 2014-03-07 12:51:54 UTC (rev 16031)
+++ trunk/mail/dovecot/files/pkg-deinstall.in 2014-03-08 21:44:09 UTC (rev 16032)
Property changes on: trunk/mail/dovecot/files/pkg-deinstall.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/mail/dovecot/files/pkg-install.in
===================================================================
--- trunk/mail/dovecot/files/pkg-install.in 2014-03-07 12:51:54 UTC (rev 16031)
+++ trunk/mail/dovecot/files/pkg-install.in 2014-03-08 21:44:09 UTC (rev 16032)
Property changes on: trunk/mail/dovecot/files/pkg-install.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/mail/dovecot/files/pkg-message.in
===================================================================
--- trunk/mail/dovecot/files/pkg-message.in 2014-03-07 12:51:54 UTC (rev 16031)
+++ trunk/mail/dovecot/files/pkg-message.in 2014-03-08 21:44:09 UTC (rev 16032)
Property changes on: trunk/mail/dovecot/files/pkg-message.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/mail/dovecot/pkg-plist
===================================================================
--- trunk/mail/dovecot/pkg-plist 2014-03-07 12:51:54 UTC (rev 16031)
+++ trunk/mail/dovecot/pkg-plist 2014-03-08 21:44:09 UTC (rev 16032)
@@ -93,6 +93,7 @@
libexec/dovecot/authtest
libexec/dovecot/checkpassword-reply
libexec/dovecot/convert-tool
+libexec/dovecot/deliver
libexec/dovecot/dict
libexec/dovecot/dovecot-auth
libexec/dovecot/expire-tool
More information about the Midnightbsd-cvs
mailing list