View | Details | Raw Unified | Return to bug 104365 | Differences between
and this patch

Collapse All | Expand All

(-)dovecot/Makefile (-11 / +43 lines)
Lines 7-14 Link Here
7
#
7
#
8
8
9
PORTNAME=	dovecot
9
PORTNAME=	dovecot
10
DISTVERSION=	1.0.rc7
10
DISTVERSION=	1.0.rc9
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 38-50 Link Here
38
.endif
37
.endif
39
38
40
OPTIONS=	KQUEUE		"kqueue(2) support"	on  \
39
OPTIONS=	KQUEUE		"kqueue(2) support"	on  \
40
		SSL		"SSL support"		on  \
41
		IPV6		"IPv6 support"		on  \
42
		POP3		"POP3 support"		on  \
43
		LDA		"LDA support"		on  \
41
		GSSAPI		"GSSAPI support"	off \
44
		GSSAPI		"GSSAPI support"	off \
42
		VPOPMAIL	"VPopMail support"	off \
45
		VPOPMAIL	"VPopMail support"	off \
43
		LDAP		"OpenLDAP support"	off \
46
		LDAP		"OpenLDAP support"	off \
44
		PGSQL		"PostgreSQL support"	off \
47
		PGSQL		"PostgreSQL support"	off \
45
		MYSQL		"MySQL support"		off \
48
		MYSQL		"MySQL support"		off \
46
		SQLITE		"SQLite support"	off \
49
		SQLITE		"SQLite support"	off
47
		IPV6		"IPv6 support"		on
48
50
49
.include <bsd.port.pre.mk>
51
.include <bsd.port.pre.mk>
50
52
Lines 54-59 Link Here
54
CONFIGURE_ARGS+=	--with-ioloop=kqueue
56
CONFIGURE_ARGS+=	--with-ioloop=kqueue
55
.endif
57
.endif
56
58
59
## SSL support
60
#
61
.if defined(WITHOUT_SSL)
62
CONFIGURE_ARGS+=	--without-ssl
63
.endif
64
65
## IPv6 support
66
#
67
.if defined(WITHOUT_IPV6) || ${OSVERSION} <= 400014
68
CONFIGURE_ARGS+=	--disable-ipv6
69
.endif
70
71
## POP3 support
72
#
73
.if defined(WITHOUT_POP3)
74
CONFIGURE_ARGS+=	--without-pop3d
75
PROTOCOLS=		imap
76
PLIST_SUB+=		POP3="@comment "
77
.else
78
PROTOCOLS=		imap pop3
79
PLIST_SUB+=		POP3=""
80
.endif
81
82
## LDA support
83
#
84
.if defined(WITHOUT_LDA)
85
CONFIGURE_ARGS+=	--without-deliver
86
PLIST_SUB+=		LDA="@comment "
87
.else
88
PLIST_SUB+=		LDA=""
89
.endif
90
57
## GSSAPI support
91
## GSSAPI support
58
#
92
#
59
.if defined(WITH_GSSAPI)
93
.if defined(WITH_GSSAPI)
Lines 100-111 Link Here
100
CONFIGURE_ARGS+=	--with-sqlite
134
CONFIGURE_ARGS+=	--with-sqlite
101
.endif
135
.endif
102
136
103
## IPv6 support
104
#
105
.if defined(WITHOUT_IPV6) || ${OSVERSION} <= 400014
106
CONFIGURE_ARGS+=	--disable-ipv6
107
.endif
108
109
post-patch:
137
post-patch:
110
.if defined(WITH_GSSAPI)
138
.if defined(WITH_GSSAPI)
111
	@${REINPLACE_CMD} -e 's,<gssapi/gssapi\.h>,<gssapi.h>,' \
139
	@${REINPLACE_CMD} -e 's,<gssapi/gssapi\.h>,<gssapi.h>,' \
Lines 114-120 Link Here
114
.endif
142
.endif
115
143
116
post-build:
144
post-build:
117
	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
145
	@${REINPLACE_CMD} \
146
		-e 's,%%PREFIX%%,${PREFIX},g' \
147
		-e 's,%%PROTOCOLS%%,${PROTOCOLS},g' \
118
		${WRKSRC}/dovecot-example.conf
148
		${WRKSRC}/dovecot-example.conf
119
149
120
pre-install:
150
pre-install:
Lines 124-129 Link Here
124
	@${MKDIR} ${DATADIR}
154
	@${MKDIR} ${DATADIR}
125
	${INSTALL_SCRIPT} ${WRKSRC}/doc/mkcert.sh ${DATADIR}
155
	${INSTALL_SCRIPT} ${WRKSRC}/doc/mkcert.sh ${DATADIR}
126
	${INSTALL_DATA} ${WRKSRC}/doc/dovecot-openssl.cnf ${DATADIR}
156
	${INSTALL_DATA} ${WRKSRC}/doc/dovecot-openssl.cnf ${DATADIR}
157
	${INSTALL_DATA} ${WRKSRC}/doc/dovecot-ldap.conf ${DATADIR}
158
	${INSTALL_DATA} ${WRKSRC}/doc/dovecot-sql.conf ${DATADIR}
127
	@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
159
	@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
128
	@${CAT} ${PKGMESSAGE}
160
	@${CAT} ${PKGMESSAGE}
129
161
(-)dovecot/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (dovecot-1.0.rc7.tar.gz) = 665ec0f09fe4f0a8f3f9efd7b9a02297
1
MD5 (dovecot-1.0.rc9.tar.gz) = fce6bd9190f8fe4cd14d596399796560
2
SHA256 (dovecot-1.0.rc7.tar.gz) = 4d877b52678d1ef81c3f176479d566e25c0c4a65d3f61093f39866d1f63c7696
2
SHA256 (dovecot-1.0.rc9.tar.gz) = b046ed7de7643e2e018cc2c18565b9b3676c7bfe61067445da09b9b461c40e1f
3
SIZE (dovecot-1.0.rc7.tar.gz) = 1273427
3
SIZE (dovecot-1.0.rc9.tar.gz) = 1449023
(-)dovecot/files/patch-dovecot-example.conf (-29 / +23 lines)
Lines 1-5 Link Here
1
--- dovecot-example.conf.orig	Fri Aug 18 21:19:13 2006
1
--- dovecot-example.conf.orig	Fri Oct 13 16:34:00 2006
2
+++ dovecot-example.conf	Fri Aug 18 21:23:26 2006
2
+++ dovecot-example.conf	Sat Oct 14 11:32:48 2006
3
@@ -9,7 +9,7 @@
3
@@ -9,7 +9,7 @@
4
 # Default values are shown for each setting, it's not required to uncomment
4
 # Default values are shown for each setting, it's not required to uncomment
5
 # any of the lines. Exception to this are paths, they're just examples with
5
 # any of the lines. Exception to this are paths, they're just examples with
Lines 9-47 Link Here
9
 # --with-ssldir=/etc/ssl
9
 # --with-ssldir=/etc/ssl
10
 
10
 
11
 # Base directory where to store runtime data.
11
 # Base directory where to store runtime data.
12
@@ -17,6 +17,7 @@
12
@@ -18,6 +18,7 @@
13
 
14
 # Protocols we want to be serving: imap imaps pop3 pop3s
13
 # Protocols we want to be serving: imap imaps pop3 pop3s
14
 # If you only want to use dovecot-auth, you can set this to "none".
15
 #protocols = imap imaps
15
 #protocols = imap imaps
16
+protocols = imap pop3
16
+protocols = %%PROTOCOLS%%
17
 
17
 
18
 # IP or host address where to listen in for connections. It's not currently
18
 # IP or host address where to listen in for connections. It's not currently
19
 # possible to specify multiple addresses. "*" listens in all IPv4 interfaces.
19
 # possible to specify multiple addresses. "*" listens in all IPv4 interfaces.
20
@@ -135,6 +136,7 @@
20
@@ -193,6 +194,7 @@
21
 # Set max. process size in megabytes. If you don't use
22
 # login_process_per_connection you might need to grow this.
23
 #login_process_size = 32
24
+login_process_size = 64
25
 
26
 # Should each login be processed in it's own process (yes), or should one
27
 # login process be allowed to process multiple connections (no)? Yes is more
28
@@ -192,6 +194,7 @@
29
 #   default_mail_env = mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n
21
 #   default_mail_env = mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n
30
 #
22
 #
31
 #default_mail_env = 
23
 #default_mail_env = 
32
+default_mail_env = mbox:/var/mail/%u
24
+default_mail_env = mbox:~/mail/:INBOX=/var/mail/%u
33
 
25
 
34
 # If you need to set multiple mailbox locations or want to change default
26
 # If you need to set multiple mailbox locations or want to change default
35
 # namespace settings, you can do it by defining namespace sections:
27
 # namespace settings, you can do it by defining namespace sections:
36
@@ -235,6 +238,7 @@
28
@@ -235,7 +237,7 @@
29
 
37
 # Grant access to these extra groups for mail processes. Typical use would be
30
 # Grant access to these extra groups for mail processes. Typical use would be
38
 # to give "mail" group write access to /var/mail to be able to create dotlocks.
31
 # to give "mail" group write access to /var/mail to be able to create dotlocks.
39
 #mail_extra_groups =
32
-#mail_extra_groups =
40
+mail_extra_groups = mail
33
+mail_extra_groups = mail
41
 
34
 
42
 # Allow full filesystem access to clients. There's no access checks other than
35
 # Allow full filesystem access to clients. There's no access checks other than
43
 # what the operating system does for the active UID/GID. It works with both
36
 # what the operating system does for the active UID/GID. It works with both
44
@@ -282,6 +286,7 @@
37
@@ -283,6 +285,7 @@
45
 # IP address. Useful for seeing who are actually using the IMAP processes
38
 # IP address. Useful for seeing who are actually using the IMAP processes
46
 # (eg. shared mailboxes or if same uid is used for multiple accounts).
39
 # (eg. shared mailboxes or if same uid is used for multiple accounts).
47
 #verbose_proctitle = no
40
 #verbose_proctitle = no
Lines 49-55 Link Here
49
 
42
 
50
 # Valid UID range for users, defaults to 500 and above. This is mostly
43
 # Valid UID range for users, defaults to 500 and above. This is mostly
51
 # to make sure that users can't log in as daemons or other system users.
44
 # to make sure that users can't log in as daemons or other system users.
52
@@ -295,6 +300,7 @@
45
@@ -296,6 +299,7 @@
53
 # belongs to supplementary groups with non-valid GIDs, those groups are
46
 # belongs to supplementary groups with non-valid GIDs, those groups are
54
 # not set.
47
 # not set.
55
 #first_valid_gid = 1
48
 #first_valid_gid = 1
Lines 57-63 Link Here
57
 #last_valid_gid = 0
50
 #last_valid_gid = 0
58
 
51
 
59
 # Maximum number of running mail processes. When this limit is reached,
52
 # Maximum number of running mail processes. When this limit is reached,
60
@@ -467,19 +473,19 @@
53
@@ -468,19 +472,19 @@
61
 
54
 
62
 protocol imap {
55
 protocol imap {
63
   # Login executable location.
56
   # Login executable location.
Lines 81-87 Link Here
81
 
74
 
82
   # Maximum IMAP command line length in bytes. Some clients generate very long
75
   # Maximum IMAP command line length in bytes. Some clients generate very long
83
   # command lines with huge mailboxes, so you may need to raise this if you get
76
   # command lines with huge mailboxes, so you may need to raise this if you get
84
@@ -489,7 +495,7 @@
77
@@ -490,7 +494,7 @@
85
   # Support for dynamically loadable plugins. mail_plugins is a space separated
78
   # Support for dynamically loadable plugins. mail_plugins is a space separated
86
   # list of plugins to load.
79
   # list of plugins to load.
87
   #mail_plugins = 
80
   #mail_plugins = 
Lines 90-96 Link Here
90
 
83
 
91
   # Send IMAP capabilities in greeting message. This makes it unnecessary for
84
   # Send IMAP capabilities in greeting message. This makes it unnecessary for
92
   # clients to request it with CAPABILITY command, so it saves one round-trip.
85
   # clients to request it with CAPABILITY command, so it saves one round-trip.
93
@@ -521,6 +527,7 @@
86
@@ -522,6 +526,7 @@
94
   #     accept '/' suffix in mailbox names in subscriptions list.
87
   #     accept '/' suffix in mailbox names in subscriptions list.
95
   # The list is space-separated.
88
   # The list is space-separated.
96
   #imap_client_workarounds = outlook-idle
89
   #imap_client_workarounds = outlook-idle
Lines 98-117 Link Here
98
 }
91
 }
99
   
92
   
100
 ##
93
 ##
101
@@ -529,10 +536,10 @@
94
@@ -530,11 +535,11 @@
102
 
95
 
103
 protocol pop3 {
96
 protocol pop3 {
104
   # Login executable location.
97
   # Login executable location.
105
-  #login_executable = /usr/libexec/dovecot/pop3-login
98
-  #login_executable = /usr/libexec/dovecot/pop3-login
106
+  #login_executable = %%PREFIX%%/libexec/dovecot/pop3-login
99
+  #login_executable = %%PREFIX%%/libexec/dovecot/pop3-login
107
 
100
 
108
   # POP3 executable location
101
   # POP3 executable location. See IMAP's mail_executable above for examples
102
   # how this could be changed.
109
-  #mail_executable = /usr/libexec/dovecot/pop3
103
-  #mail_executable = /usr/libexec/dovecot/pop3
110
+  #mail_executable = %%PREFIX%%/libexec/dovecot/pop3
104
+  #mail_executable = %%PREFIX%%/libexec/dovecot/pop3
111
 
105
 
112
   # Don't try to set mails non-recent or seen with POP3 sessions. This is
106
   # Don't try to set mails non-recent or seen with POP3 sessions. This is
113
   # mostly intended to reduce disk I/O. With maildir it doesn't move files
107
   # mostly intended to reduce disk I/O. With maildir it doesn't move files
114
@@ -577,6 +584,7 @@
108
@@ -579,6 +584,7 @@
115
   # installations.
109
   # installations.
116
   #
110
   #
117
   #pop3_uidl_format = 
111
   #pop3_uidl_format = 
Lines 119-125 Link Here
119
 
113
 
120
   # POP3 logout format string:
114
   # POP3 logout format string:
121
   #  %t - number of TOP commands
115
   #  %t - number of TOP commands
122
@@ -591,7 +599,7 @@
116
@@ -593,7 +599,7 @@
123
   # Support for dynamically loadable plugins. mail_plugins is a space separated
117
   # Support for dynamically loadable plugins. mail_plugins is a space separated
124
   # list of plugins to load.
118
   # list of plugins to load.
125
   #mail_plugins = 
119
   #mail_plugins = 
Lines 128-134 Link Here
128
 
122
 
129
   # Workarounds for various client bugs:
123
   # Workarounds for various client bugs:
130
   #   outlook-no-nuls:
124
   #   outlook-no-nuls:
131
@@ -602,6 +610,7 @@
125
@@ -604,6 +610,7 @@
132
   #     missing. This option simply sends it if it's missing.
126
   #     missing. This option simply sends it if it's missing.
133
   # The list is space-separated.
127
   # The list is space-separated.
134
   #pop3_client_workarounds = 
128
   #pop3_client_workarounds = 
Lines 136-142 Link Here
136
 }
130
 }
137
 
131
 
138
 ##
132
 ##
139
@@ -619,10 +628,11 @@
133
@@ -621,10 +628,11 @@
140
   # Support for dynamically loadable plugins. mail_plugins is a space separated
134
   # Support for dynamically loadable plugins. mail_plugins is a space separated
141
   # list of plugins to load.
135
   # list of plugins to load.
142
   #mail_plugins = 
136
   #mail_plugins = 
Lines 149-155 Link Here
149
 
143
 
150
   # UNIX socket path to master authentication server to find users.
144
   # UNIX socket path to master authentication server to find users.
151
   #auth_socket_path = /var/run/dovecot/auth-master
145
   #auth_socket_path = /var/run/dovecot/auth-master
152
@@ -633,7 +643,7 @@
146
@@ -635,7 +643,7 @@
153
 ##
147
 ##
154
 
148
 
155
 # Executable location
149
 # Executable location
(-)dovecot/pkg-plist (-3 / +5 lines)
Lines 35-48 Link Here
35
lib/dovecot/lib02_trash_plugin.so
35
lib/dovecot/lib02_trash_plugin.so
36
@dirrm lib/dovecot
36
@dirrm lib/dovecot
37
libexec/dovecot/checkpassword-reply
37
libexec/dovecot/checkpassword-reply
38
libexec/dovecot/deliver
38
%%LDA%%libexec/dovecot/deliver
39
libexec/dovecot/dict
39
libexec/dovecot/dict
40
libexec/dovecot/dovecot-auth
40
libexec/dovecot/dovecot-auth
41
libexec/dovecot/gdbhelper
41
libexec/dovecot/gdbhelper
42
libexec/dovecot/imap
42
libexec/dovecot/imap
43
libexec/dovecot/imap-login
43
libexec/dovecot/imap-login
44
libexec/dovecot/pop3
44
%%POP3%%libexec/dovecot/pop3
45
libexec/dovecot/pop3-login
45
%%POP3%%libexec/dovecot/pop3-login
46
libexec/dovecot/rawlog
46
libexec/dovecot/rawlog
47
libexec/dovecot/ssl-build-param
47
libexec/dovecot/ssl-build-param
48
@dirrm libexec/dovecot
48
@dirrm libexec/dovecot
Lines 50-53 Link Here
50
sbin/dovecotpw
50
sbin/dovecotpw
51
%%DATADIR%%/dovecot-openssl.cnf
51
%%DATADIR%%/dovecot-openssl.cnf
52
%%DATADIR%%/mkcert.sh
52
%%DATADIR%%/mkcert.sh
53
%%DATADIR%%/dovecot-ldap.conf
54
%%DATADIR%%/dovecot-sql.conf
53
@dirrm %%DATADIR%%
55
@dirrm %%DATADIR%%

Return to bug 104365