Attachment #60347 for bug #90606




#

PORTNAME=	dovecot
DISTVERSION=	1.0.alpha5
PORTREVISION=	2
CATEGORIES=	mail ipv6
MASTER_SITES=	http://www.dovecot.org/releases/


COMMENT=	Secure and compact IMAP and POP3 servers

USE_ICONV=	yes
USE_REINPLACE=	yes
USE_AUTOTOOLS=	automake:19 autoconf:259

GNU_CONFIGURE=	yes
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}


PKGMESSAGE=	${WRKDIR}/pkg-message

PORTDOCS=	USE-WIKI-INSTEAD \
		auth-protocol.txt auth.txt configuration.txt design.txt \
		index.txt mail-storages.txt multiaccess.txt nfs.txt \
		securecoding.txt variables.txt

.if defined(NOPORTDOCS)
CONFIGURE_ARGS+=	--without-docs
.endif

OPTIONS=	SASL2		"SASL2 support"		off \
		GSSAPI		"GSSAPI support"	off \
		VPOPMAIL	"VPopMail support"	off \
		LDAP		"OpenLDAP support"	off \
		PGSQL		"PostgreSQL support"	off \


.include <bsd.port.pre.mk>

.if ( ${OSVERSION} < 500038 ) || !defined(WITH_RCORDER)
USE_RC_SUBR=	dovecot.sh
.else
USE_RCORDER=	dovecot.sh


## SASL2 support
#
# SASL provides authentication support to
# session-based protocols. This is can be
# used by dovecot for authentication sources.
#
.if defined(WITH_SASL2)
LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
CONFIGURE_ARGS+=	--with-cyrus-sasl2
.endif

## GSSAPI support
#
.if defined(WITH_GSSAPI)
CONFIGURE_ARGS+=	--with-gssapi
.else
CONFIGURE_ARGS+=	--without-gssapi
.endif

## VPopMail Support
#
.if defined(WITH_VPOPMAIL)

.endif

post-build:
	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
		${WRKSRC}/dovecot-example.conf

pre-install:
	@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL

do-install:
	@${MKDIR} ${PREFIX}/libexec/dovecot
	${INSTALL_PROGRAM} \
		${WRKSRC}/src/auth/checkpassword-reply \
		${WRKSRC}/src/auth/dovecot-auth \
		${WRKSRC}/src/deliver/deliver \
		${WRKSRC}/src/imap/imap \
		${WRKSRC}/src/imap-login/imap-login \
		${WRKSRC}/src/pop3/pop3 \
		${WRKSRC}/src/pop3-login/pop3-login \
		${WRKSRC}/src/util/rawlog \
			${PREFIX}/libexec/dovecot/
	${INSTALL_PROGRAM} \
		${WRKSRC}/src/master/dovecot \
		${WRKSRC}/src/util/dovecotpw \
			${PREFIX}/sbin/
	${INSTALL_DATA} ${WRKDIR}/dovecot.conf.sample ${PREFIX}/etc/
.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
.endif

post-install:
	@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL

Lines 1-2 Link Here

(-)dovecot/distinfo (-2 / +3 lines)
1	MD5 (dovecot-1.0.alpha4.tar.gz) = 65f8e2cd097e80b536a75c31a974b5de	1	MD5 (dovecot-1.0.alpha5.tar.gz) = a3277835f04d73485ff5ce3cc3daeea7
2	SIZE (dovecot-1.0.alpha4.tar.gz) = 1203714	2	SHA256 (dovecot-1.0.alpha5.tar.gz) = 12330727df9ee513482b60830b0496fec338e3e866fcb18bd73a596827aaabd8
		3	SIZE (dovecot-1.0.alpha5.tar.gz) = 1266342




--- Makefile.am.orig	Mon Oct 25 21:32:25 2004
+++ Makefile.am	Sun Dec 18 15:47:31 2005
@@ -1,4 +1,10 @@
-SUBDIRS = src doc
+if BUILD_DOCS
+DOCS = doc
+endif
+
+SUBDIRS = \
+	src \
+	$(DOCS)
 
 confdir = $(sysconfdir)
 conf_DATA = dovecot-example.conf




--- configure.in.orig	Sat Dec 10 21:14:12 2005
+++ configure.in	Sun Dec 18 15:45:01 2005
@@ -260,6 +260,16 @@
 )
 AC_SUBST(moduledir)
 
+AC_ARG_WITH(docs,
+[  --with-docs            Install documentation (default)],
+	if test x$withval = xno; then
+		want_docs=no
+	else
+		want_docs=yes
+	fi,
+	want_docs=yes)
+AM_CONDITIONAL(BUILD_DOCS, test "$want_docs" = "yes")
+
 dnl * gcc specific options
 if test "x$ac_cv_c_compiler_gnu" = "xyes"; then
 	# -Wcast-qual -Wcast-align -Wconversion # too many warnings
@@ -1521,3 +1531,4 @@
 echo "Building with GSSAPI support ........ : $have_gssapi"
 echo "Building with user database modules . :$userdb"
 echo "Building with password lookup modules :$passdb"
+echo "Building with documentation ......... : $want_docs"




--- dovecot-example.conf.orig	Sun Dec 18 15:10:59 2005
+++ dovecot-example.conf	Sun Dec 18 15:15:02 2005
@@ -7,7 +7,7 @@
 # Default values are shown after each value, it's not required to uncomment
 # any of the lines. Exception to this are paths, they're just examples

 
 # IP or host address where to listen in for connections. It's not currently
 # possible to specify multiple addresses. "*" listens in all IPv4 interfaces.
@@ -153,7 +153,7 @@
 # only it has access, it's used to control access for authentication process.
 # Note that this user is NOT used to access mails.
 # http://wiki.dovecot.org/UserIds
-#login_user = dovecot
+login_user = dovecot
 
 # Set max. process size in megabytes. If you don't use
 # login_process_per_connection you might need to grow this.
@@ -148,7 +148,7 @@
 # Show more verbose process titles (in ps). Currently shows user name and
 # IP address. Useful for seeing who are actually using the IMAP processes
 # (eg. shared mailboxes or if same uid is used for multiple accounts).

 
 # Show protocol level SSL errors.
 #verbose_ssl = no
@@ -169,12 +169,12 @@
 # non-valid GID as primary group ID aren't allowed to log in. If user
 # belongs to supplementary groups with non-valid GIDs, those groups are
 # not set.

 
 # ':' separated list of directories under which chrooting is allowed for mail
 # processes (ie. /var/mail will allow chrooting to /var/mail/foo/bar too).
@@ -210,7 +210,7 @@
 #   default_mail_env = mbox:~/mail/:INBOX=/var/mail/%u
 #   default_mail_env = mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n
 #

 
 # If you need to set multiple mailbox locations or want to change default
 # namespace settings, you can do it by defining namespace sections:
@@ -400,12 +400,12 @@
 
 protocol imap {
   # Login executable location.

 
   # Maximum IMAP command line length in bytes. Some clients generate very long
   # command lines with huge mailboxes, so you may need to raise this if you get
@@ -414,7 +414,7 @@
 
   # Support for dynamically loadable modules.
   #mail_use_modules = no

 
   # Send IMAP capabilities in greeting message. This makes it unnecessary for
   # clients to request it with CAPABILITY command, so it saves one round-trip.
@@ -444,7 +444,7 @@
   #     With mbox storage a mailbox can contain either mails or submailboxes,
   #     but not both. Thunderbird separates these two by forcing server to
   #     accept '/' suffix in mailbox names in subscriptions list.

 }
   
 ##
@@ -453,10 +453,10 @@
 
 protocol pop3 {
   # Login executable location.

 
   # Don't try to set mails non-recent or seen with POP3 sessions. This is
   # mostly intended to reduce disk I/O. With maildir it doesn't move files
@@ -493,7 +493,7 @@
   # installations. %08Xu%08Xv will be the new default, so use it for new
   # installations.
   #

 
   # POP3 logout format string:
   #  %t - number of TOP commands
@@ -507,7 +507,7 @@
 
   # Support for dynamically loadable modules.
   #mail_use_modules = no

 
   # Workarounds for various client bugs:
   #   outlook-no-nuls:
@@ -516,7 +516,7 @@
   #   oe-ns-eoh:
   #     Outlook Express and Netscape Mail breaks if end of headers-line is
   #     missing. This option simply sends it if it's missing.

 }
 
 ##
@@ -524,7 +524,7 @@
 ##
 
 # Executable location

Lines 7-13 Link Here

(-)dovecot/pkg-message (-1 / +1 lines)
7	the systems passwd file and use the default /var/mail/$USER mbox	7	the systems passwd file and use the default /var/mail/$USER mbox
8	files.	8	files.
9		9
10	cd %%PREFIX%%/etc; cp dovecot.conf.sample dovecot.conf	10	cd %%PREFIX%%/etc; cp dovecot-example.conf dovecot.conf
11		11
12	echo dovecot_enable="YES" >> /etc/rc.conf	12	echo dovecot_enable="YES" >> /etc/rc.conf
13		13




@comment $FreeBSD: ports/mail/dovecot/pkg-plist,v 1.13 2005/10/20 20:55:00 pav Exp $
etc/dovecot-example.conf
lib/dovecot/imap/libimap_quota_plugin.a
lib/dovecot/imap/libimap_quota_plugin.la
lib/dovecot/imap/libimap_quota_plugin.so
lib/dovecot/imap/libquota_plugin.so
lib/dovecot/imap/libtrash_plugin.so
@dirrm lib/dovecot/imap
lib/dovecot/lda/libquota_plugin.so
lib/dovecot/lda/libtrash_plugin.so
@dirrm lib/dovecot/lda
lib/dovecot/libquota_plugin.a
lib/dovecot/libquota_plugin.la
lib/dovecot/libquota_plugin.so
lib/dovecot/libtrash_plugin.a
lib/dovecot/libtrash_plugin.la
lib/dovecot/libtrash_plugin.so
@dirrm lib/dovecot
libexec/dovecot/checkpassword-reply
libexec/dovecot/deliver
libexec/dovecot/dovecot-auth

@dirrm libexec/dovecot
sbin/dovecot
sbin/dovecotpw
%%PORTDOCS%%%%DOCSDIR%%/USE-WIKI-INSTEAD
%%PORTDOCS%%%%DOCSDIR%%/auth-protocol.txt
%%PORTDOCS%%%%DOCSDIR%%/auth.txt
%%PORTDOCS%%%%DOCSDIR%%/configuration.txt
%%PORTDOCS%%%%DOCSDIR%%/design.txt
%%PORTDOCS%%%%DOCSDIR%%/index.txt
%%PORTDOCS%%%%DOCSDIR%%/mail-storages.txt
%%PORTDOCS%%%%DOCSDIR%%/mkcert.sh
%%PORTDOCS%%%%DOCSDIR%%/multiaccess.txt
%%PORTDOCS%%%%DOCSDIR%%/nfs.txt
%%PORTDOCS%%%%DOCSDIR%%/securecoding.txt
%%PORTDOCS%%%%DOCSDIR%%/variables.txt
%%PORTDOCS%%%%DOCSDIR%%/dovecot-ldap.conf
%%PORTDOCS%%%%DOCSDIR%%/dovecot-openssl.cnf
%%PORTDOCS%%%%DOCSDIR%%/dovecot-sql.conf
%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 90606

Lines 7-14 Link Here

(-)dovecot/Makefile (-35 / +22 lines)
7	#	7	#
8		8
9	PORTNAME= dovecot	9	PORTNAME= dovecot
10	DISTVERSION= 1.0.alpha4	10	DISTVERSION= 1.0.alpha5
11	PORTREVISION= 2
12	CATEGORIES= mail ipv6	11	CATEGORIES= mail ipv6
13	MASTER_SITES= http://www.dovecot.org/releases/	12	MASTER_SITES= http://www.dovecot.org/releases/
14		13
Lines 16-21 Link Here
16	COMMENT= Secure and compact IMAP and POP3 servers	15	COMMENT= Secure and compact IMAP and POP3 servers
17		16
18	USE_ICONV= yes	17	USE_ICONV= yes
		18	USE_REINPLACE= yes
		19	USE_AUTOTOOLS= automake:19 autoconf:259
19		20
20	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
21	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	22	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
Lines 26-38 Link Here
26		27
27	PKGMESSAGE= ${WRKDIR}/pkg-message	28	PKGMESSAGE= ${WRKDIR}/pkg-message
28		29
29	DOCS= USE-WIKI-INSTEAD \	30	PORTDOCS= USE-WIKI-INSTEAD \
30	auth-protocol.txt auth.txt configuration.txt design.txt \	31	auth-protocol.txt auth.txt configuration.txt design.txt \
31	index.txt mail-storages.txt mkcert.sh multiaccess.txt \	32	index.txt mail-storages.txt multiaccess.txt nfs.txt \
32	nfs.txt securecoding.txt variables.txt \	33	securecoding.txt variables.txt
33	dovecot-ldap.conf dovecot-sql.conf dovecot-openssl.cnf	34
		35	.if defined(NOPORTDOCS)
		36	CONFIGURE_ARGS+= --without-docs
		37	.endif
34		38
35	OPTIONS= SASL2 "SASL2 support" off \	39	OPTIONS= SASL2 "SASL2 support" off \
		40	GSSAPI "GSSAPI support" off \
36	VPOPMAIL "VPopMail support" off \	41	VPOPMAIL "VPopMail support" off \
37	LDAP "OpenLDAP support" off \	42	LDAP "OpenLDAP support" off \
38	PGSQL "PostgreSQL support" off \	43	PGSQL "PostgreSQL support" off \
Lines 41-47 Link Here
41		46
42	.include <bsd.port.pre.mk>	47	.include <bsd.port.pre.mk>
43		48
44	.if ${OSVERSION} < 500038 \|\| !defined(WITH_RCORDER)	49	.if ( ${OSVERSION} < 500038 ) \|\| !defined(WITH_RCORDER)
45	USE_RC_SUBR= dovecot.sh	50	USE_RC_SUBR= dovecot.sh
46	.else	51	.else
47	USE_RCORDER= dovecot.sh	52	USE_RCORDER= dovecot.sh
Lines 49-63 Link Here
49		54
50	## SASL2 support	55	## SASL2 support
51	#	56	#
52	# SASL provides authentication support to
53	# session-based protocols. This is can be
54	# used by dovecot for authentication sources.
55	#
56	.if defined(WITH_SASL2)	57	.if defined(WITH_SASL2)
57	LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2	58	LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2
58	CONFIGURE_ARGS+= --with-cyrus-sasl2	59	CONFIGURE_ARGS+= --with-cyrus-sasl2
59	.endif	60	.endif
60		61
		62	## GSSAPI support
		63	#
		64	.if defined(WITH_GSSAPI)
		65	CONFIGURE_ARGS+= --with-gssapi
		66	.else
		67	CONFIGURE_ARGS+= --without-gssapi
		68	.endif
		69
61	## VPopMail Support	70	## VPopMail Support
62	#	71	#
63	.if defined(WITH_VPOPMAIL)	72	.if defined(WITH_VPOPMAIL)
Lines 90-122 Link Here
90	.endif	99	.endif
91		100
92	post-build:	101	post-build:
93	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' \	102	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
94	${WRKSRC}/dovecot-example.conf >${WRKDIR}/dovecot.conf.sample	103	${WRKSRC}/dovecot-example.conf
95		104
96	pre-install:	105	pre-install:
97	@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL	106	@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
98
99	do-install:
100	@${MKDIR} ${PREFIX}/libexec/dovecot
101	${INSTALL_PROGRAM} \
102	${WRKSRC}/src/auth/checkpassword-reply \
103	${WRKSRC}/src/auth/dovecot-auth \
104	${WRKSRC}/src/deliver/deliver \
105	${WRKSRC}/src/imap/imap \
106	${WRKSRC}/src/imap-login/imap-login \
107	${WRKSRC}/src/pop3/pop3 \
108	${WRKSRC}/src/pop3-login/pop3-login \
109	${WRKSRC}/src/util/rawlog \
110	${PREFIX}/libexec/dovecot/
111	${INSTALL_PROGRAM} \
112	${WRKSRC}/src/master/dovecot \
113	${WRKSRC}/src/util/dovecotpw \
114	${PREFIX}/sbin/
115	${INSTALL_DATA} ${WRKDIR}/dovecot.conf.sample ${PREFIX}/etc/
116	.if !defined(NOPORTDOCS)
117	@${MKDIR} ${DOCSDIR}
118	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
119	.endif
120		107
121	post-install:	108	post-install:
122	@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL	109	@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL

Line 0 Link Here

(-)dovecot/files/patch-Makefile.am (+14 lines)
	1	--- Makefile.am.orig Mon Oct 25 21:32:25 2004
	2	+++ Makefile.am Sun Dec 18 15:47:31 2005
	3	@@ -1,4 +1,10 @@
	4	-SUBDIRS = src doc
	5	+if BUILD_DOCS
	6	+DOCS = doc
	7	+endif
	8	+
	9	+SUBDIRS = \
	10	+ src \
	11	+ $(DOCS)
	12
	13	confdir = $(sysconfdir)
	14	conf_DATA = dovecot-example.conf

Line 0 Link Here

(-)dovecot/files/patch-configure.in (+24 lines)
	1	--- configure.in.orig Sat Dec 10 21:14:12 2005
	2	+++ configure.in Sun Dec 18 15:45:01 2005
	3	@@ -260,6 +260,16 @@
	4	)
	5	AC_SUBST(moduledir)
	6
	7	+AC_ARG_WITH(docs,
	8	+[ --with-docs Install documentation (default)],
	9	+ if test x$withval = xno; then
	10	+ want_docs=no
	11	+ else
	12	+ want_docs=yes
	13	+ fi,
	14	+ want_docs=yes)
	15	+AM_CONDITIONAL(BUILD_DOCS, test "$want_docs" = "yes")
	16	+
	17	dnl * gcc specific options
	18	if test "x$ac_cv_c_compiler_gnu" = "xyes"; then
	19	# -Wcast-qual -Wcast-align -Wconversion # too many warnings
	20	@@ -1521,3 +1531,4 @@
	21	echo "Building with GSSAPI support ........ : $have_gssapi"
	22	echo "Building with user database modules . :$userdb"
	23	echo "Building with password lookup modules :$passdb"
	24	+echo "Building with documentation ......... : $want_docs"

Lines 1-5 Link Here

(-)dovecot/files/patch-dovecot-example.conf (-22 / +13 lines)
1	--- dovecot-example.conf.orig Thu Oct 20 15:33:33 2005	1	--- dovecot-example.conf.orig Sun Dec 18 15:10:59 2005
2	+++ dovecot-example.conf Thu Oct 20 15:38:40 2005	2	+++ dovecot-example.conf Sun Dec 18 15:15:02 2005
3	@@ -7,7 +7,7 @@	3	@@ -7,7 +7,7 @@
4	# Default values are shown after each value, it's not required to uncomment	4	# Default values are shown after each value, it's not required to uncomment
5	# any of the lines. Exception to this are paths, they're just examples	5	# any of the lines. Exception to this are paths, they're just examples
Lines 18-33 Link Here
18		18
19	# IP or host address where to listen in for connections. It's not currently	19	# IP or host address where to listen in for connections. It's not currently
20	# possible to specify multiple addresses. "*" listens in all IPv4 interfaces.	20	# possible to specify multiple addresses. "*" listens in all IPv4 interfaces.
21	@@ -95,7 +95,7 @@	21	@@ -153,7 +153,7 @@
22	# only it has access, it's used to control access for authentication process.
23	# Note that this user is NOT used to access mails.
24	# http://wiki.dovecot.org/UserIds
25	-#login_user = dovecot
26	+login_user = dovecot
27
28	# Set max. process size in megabytes. If you don't use
29	# login_process_per_connection you might need to grow this.
30	@@ -148,7 +148,7 @@
31	# Show more verbose process titles (in ps). Currently shows user name and	22	# Show more verbose process titles (in ps). Currently shows user name and
32	# IP address. Useful for seeing who are actually using the IMAP processes	23	# IP address. Useful for seeing who are actually using the IMAP processes
33	# (eg. shared mailboxes or if same uid is used for multiple accounts).	24	# (eg. shared mailboxes or if same uid is used for multiple accounts).
Lines 36-42 Link Here
36		27
37	# Show protocol level SSL errors.	28	# Show protocol level SSL errors.
38	#verbose_ssl = no	29	#verbose_ssl = no
39	@@ -164,12 +164,12 @@	30	@@ -169,12 +169,12 @@
40	# non-valid GID as primary group ID aren't allowed to log in. If user	31	# non-valid GID as primary group ID aren't allowed to log in. If user
41	# belongs to supplementary groups with non-valid GIDs, those groups are	32	# belongs to supplementary groups with non-valid GIDs, those groups are
42	# not set.	33	# not set.
Lines 51-57 Link Here
51		42
52	# ':' separated list of directories under which chrooting is allowed for mail	43	# ':' separated list of directories under which chrooting is allowed for mail
53	# processes (ie. /var/mail will allow chrooting to /var/mail/foo/bar too).	44	# processes (ie. /var/mail will allow chrooting to /var/mail/foo/bar too).
54	@@ -205,7 +205,7 @@	45	@@ -210,7 +210,7 @@
55	# default_mail_env = mbox:~/mail/:INBOX=/var/mail/%u	46	# default_mail_env = mbox:~/mail/:INBOX=/var/mail/%u
56	# default_mail_env = mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n	47	# default_mail_env = mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n
57	#	48	#
Lines 60-66 Link Here
60		51
61	# If you need to set multiple mailbox locations or want to change default	52	# If you need to set multiple mailbox locations or want to change default
62	# namespace settings, you can do it by defining namespace sections:	53	# namespace settings, you can do it by defining namespace sections:
63	@@ -391,12 +391,12 @@	54	@@ -400,12 +400,12 @@
64		55
65	protocol imap {	56	protocol imap {
66	# Login executable location.	57	# Login executable location.
Lines 76-82 Link Here
76		67
77	# Maximum IMAP command line length in bytes. Some clients generate very long	68	# Maximum IMAP command line length in bytes. Some clients generate very long
78	# command lines with huge mailboxes, so you may need to raise this if you get	69	# command lines with huge mailboxes, so you may need to raise this if you get
79	@@ -405,7 +405,7 @@	70	@@ -414,7 +414,7 @@
80		71
81	# Support for dynamically loadable modules.	72	# Support for dynamically loadable modules.
82	#mail_use_modules = no	73	#mail_use_modules = no
Lines 85-91 Link Here
85		76
86	# Send IMAP capabilities in greeting message. This makes it unnecessary for	77	# Send IMAP capabilities in greeting message. This makes it unnecessary for
87	# clients to request it with CAPABILITY command, so it saves one round-trip.	78	# clients to request it with CAPABILITY command, so it saves one round-trip.
88	@@ -435,7 +435,7 @@	79	@@ -444,7 +444,7 @@
89	# With mbox storage a mailbox can contain either mails or submailboxes,	80	# With mbox storage a mailbox can contain either mails or submailboxes,
90	# but not both. Thunderbird separates these two by forcing server to	81	# but not both. Thunderbird separates these two by forcing server to
91	# accept '/' suffix in mailbox names in subscriptions list.	82	# accept '/' suffix in mailbox names in subscriptions list.
Lines 94-100 Link Here
94	}	85	}
95		86
96	##	87	##
97	@@ -444,10 +444,10 @@	88	@@ -453,10 +453,10 @@
98		89
99	protocol pop3 {	90	protocol pop3 {
100	# Login executable location.	91	# Login executable location.
Lines 107-113 Link Here
107		98
108	# Don't try to set mails non-recent or seen with POP3 sessions. This is	99	# Don't try to set mails non-recent or seen with POP3 sessions. This is
109	# mostly intended to reduce disk I/O. With maildir it doesn't move files	100	# mostly intended to reduce disk I/O. With maildir it doesn't move files
110	@@ -484,7 +484,7 @@	101	@@ -493,7 +493,7 @@
111	# installations. %08Xu%08Xv will be the new default, so use it for new	102	# installations. %08Xu%08Xv will be the new default, so use it for new
112	# installations.	103	# installations.
113	#	104	#
Lines 116-122 Link Here
116		107
117	# POP3 logout format string:	108	# POP3 logout format string:
118	# %t - number of TOP commands	109	# %t - number of TOP commands
119	@@ -498,7 +498,7 @@	110	@@ -507,7 +507,7 @@
120		111
121	# Support for dynamically loadable modules.	112	# Support for dynamically loadable modules.
122	#mail_use_modules = no	113	#mail_use_modules = no
Lines 125-131 Link Here
125		116
126	# Workarounds for various client bugs:	117	# Workarounds for various client bugs:
127	# outlook-no-nuls:	118	# outlook-no-nuls:
128	@@ -507,7 +507,7 @@	119	@@ -516,7 +516,7 @@
129	# oe-ns-eoh:	120	# oe-ns-eoh:
130	# Outlook Express and Netscape Mail breaks if end of headers-line is	121	# Outlook Express and Netscape Mail breaks if end of headers-line is
131	# missing. This option simply sends it if it's missing.	122	# missing. This option simply sends it if it's missing.
Lines 134-140 Link Here
134	}	125	}
135		126
136	##	127	##
137	@@ -515,7 +515,7 @@	128	@@ -524,7 +524,7 @@
138	##	129	##
139		130
140	# Executable location	131	# Executable location

Lines 1-5 Link Here

(-)dovecot/pkg-plist (-17 / +17 lines)
1	@comment $FreeBSD: ports/mail/dovecot/pkg-plist,v 1.13 2005/10/20 20:55:00 pav Exp $	1	@comment $FreeBSD: ports/mail/dovecot/pkg-plist,v 1.13 2005/10/20 20:55:00 pav Exp $
2	etc/dovecot.conf.sample	2	etc/dovecot-example.conf
		3	lib/dovecot/imap/libimap_quota_plugin.a
		4	lib/dovecot/imap/libimap_quota_plugin.la
		5	lib/dovecot/imap/libimap_quota_plugin.so
		6	lib/dovecot/imap/libquota_plugin.so
		7	lib/dovecot/imap/libtrash_plugin.so
		8	@dirrm lib/dovecot/imap
		9	lib/dovecot/lda/libquota_plugin.so
		10	lib/dovecot/lda/libtrash_plugin.so
		11	@dirrm lib/dovecot/lda
		12	lib/dovecot/libquota_plugin.a
		13	lib/dovecot/libquota_plugin.la
		14	lib/dovecot/libquota_plugin.so
		15	lib/dovecot/libtrash_plugin.a
		16	lib/dovecot/libtrash_plugin.la
		17	lib/dovecot/libtrash_plugin.so
		18	@dirrm lib/dovecot
3	libexec/dovecot/checkpassword-reply	19	libexec/dovecot/checkpassword-reply
4	libexec/dovecot/deliver	20	libexec/dovecot/deliver
5	libexec/dovecot/dovecot-auth	21	libexec/dovecot/dovecot-auth
Lines 11-29 Link Here
11	@dirrm libexec/dovecot	27	@dirrm libexec/dovecot
12	sbin/dovecot	28	sbin/dovecot
13	sbin/dovecotpw	29	sbin/dovecotpw
14	%%PORTDOCS%%%%DOCSDIR%%/USE-WIKI-INSTEAD
15	%%PORTDOCS%%%%DOCSDIR%%/auth-protocol.txt
16	%%PORTDOCS%%%%DOCSDIR%%/auth.txt
17	%%PORTDOCS%%%%DOCSDIR%%/configuration.txt
18	%%PORTDOCS%%%%DOCSDIR%%/design.txt
19	%%PORTDOCS%%%%DOCSDIR%%/index.txt
20	%%PORTDOCS%%%%DOCSDIR%%/mail-storages.txt
21	%%PORTDOCS%%%%DOCSDIR%%/mkcert.sh
22	%%PORTDOCS%%%%DOCSDIR%%/multiaccess.txt
23	%%PORTDOCS%%%%DOCSDIR%%/nfs.txt
24	%%PORTDOCS%%%%DOCSDIR%%/securecoding.txt
25	%%PORTDOCS%%%%DOCSDIR%%/variables.txt
26	%%PORTDOCS%%%%DOCSDIR%%/dovecot-ldap.conf
27	%%PORTDOCS%%%%DOCSDIR%%/dovecot-openssl.cnf
28	%%PORTDOCS%%%%DOCSDIR%%/dovecot-sql.conf
29	%%PORTDOCS%%@dirrm %%DOCSDIR%%