Attachment #65901 for bug #97565

Lines 8-13 Link Here

(-)/home/rafan/tmp/ports/dovecot/Makefile (+5 lines)
8		8
9	PORTNAME= dovecot	9	PORTNAME= dovecot
10	DISTVERSION= 1.0.beta8	10	DISTVERSION= 1.0.beta8
		11	PORTREVISION= 1
11	CATEGORIES= mail ipv6	12	CATEGORIES= mail ipv6
12	MASTER_SITES= http://www.dovecot.org/releases/	13	MASTER_SITES= http://www.dovecot.org/releases/
13		14
Lines 44-49 Link Here
44	SQLITE "SQLite support" off	45	SQLITE "SQLite support" off
45		46
46	.include <bsd.port.pre.mk>	47	.include <bsd.port.pre.mk>
		48
		49	.if ${OSVERSION} < 500039
		50	EXTRA_PATCHES+= ${PATCHDIR}/extra-c89-fix
		51	.endif
47		52
48	## kqueue(2) support	53	## kqueue(2) support
49	#	54	#




Index: src/master/master-settings.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/master-settings.c,v
retrieving revision 1.125
diff -u -r1.125 master-settings.c
--- src/master/master-settings.c	24 Apr 2006 13:18:45 -0000	1.125
+++ src/master/master-settings.c	12 May 2006 13:00:00 -0000
@@ -366,7 +366,6 @@
 	MEMBER(pop3_logout_format) "top=%t/%p, retr=%r/%b, del=%d/%m, size=%s",
 
 	/* .. */
-	MEMBER(login_uid) 0,
 	MEMBER(listen_fd) -1,
 	MEMBER(ssl_listen_fd) -1
 };
Index: src/master/master-settings.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/master-settings.h,v
retrieving revision 1.83
diff -u -r1.83 master-settings.h
--- src/master/master-settings.h	14 Apr 2006 18:20:57 -0000	1.83
+++ src/master/master-settings.h	12 May 2006 13:00:00 -0000
@@ -116,14 +116,15 @@
 	const char *pop3_logout_format;
 
 	/* .. */
-	uid_t login_uid;
+	int listen_fd, ssl_listen_fd;
 
-	const char *imap_generated_capability;
+	uid_t login_uid;
 
-	int listen_fd, ssl_listen_fd;
 	struct ip_addr listen_ip, ssl_listen_ip;
 	unsigned int listen_port, ssl_listen_port;
 
+	const char *imap_generated_capability;
+
 	array_t ARRAY_DEFINE(plugin_envs, const char *);
 };
 

Return to bug 97565

Line 0 Link Here

(-)/home/rafan/tmp/ports/dovecot/files/extra-c89-fix (+41 lines)
	1	Index: src/master/master-settings.c
	2	===================================================================
	3	RCS file: /var/lib/cvs/dovecot/src/master/master-settings.c,v
	4	retrieving revision 1.125
	5	diff -u -r1.125 master-settings.c
	6	--- src/master/master-settings.c 24 Apr 2006 13:18:45 -0000 1.125
	7	+++ src/master/master-settings.c 12 May 2006 13:00:00 -0000
	8	@@ -366,7 +366,6 @@
	9	MEMBER(pop3_logout_format) "top=%t/%p, retr=%r/%b, del=%d/%m, size=%s",
	10
	11	/* .. */
	12	- MEMBER(login_uid) 0,
	13	MEMBER(listen_fd) -1,
	14	MEMBER(ssl_listen_fd) -1
	15	};
	16	Index: src/master/master-settings.h
	17	===================================================================
	18	RCS file: /var/lib/cvs/dovecot/src/master/master-settings.h,v
	19	retrieving revision 1.83
	20	diff -u -r1.83 master-settings.h
	21	--- src/master/master-settings.h 14 Apr 2006 18:20:57 -0000 1.83
	22	+++ src/master/master-settings.h 12 May 2006 13:00:00 -0000
	23	@@ -116,14 +116,15 @@
	24	const char *pop3_logout_format;
	25
	26	/* .. */
	27	- uid_t login_uid;
	28	+ int listen_fd, ssl_listen_fd;
	29
	30	- const char *imap_generated_capability;
	31	+ uid_t login_uid;
	32
	33	- int listen_fd, ssl_listen_fd;
	34	struct ip_addr listen_ip, ssl_listen_ip;
	35	unsigned int listen_port, ssl_listen_port;
	36
	37	+ const char *imap_generated_capability;
	38	+
	39	array_t ARRAY_DEFINE(plugin_envs, const char *);
	40	};
	41