4 files changed, 33 insertions, 17 deletions

diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index c632f79012e2..9f23b5d318a8 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -38,7 +38,9 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-perl=${PERL5}
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS=	BDB		"Use Berkeley DB"			on \
+OPTIONS=	AUTOCREATE	"Use autocreate INBOX patch (UoA)"	off \
+		AUTOSIEVE	"Use autosievefolder patch (UoA)"	off \
+		BDB		"Use Berkeley DB"			on \
 		DRAC		"Enable DRAC support"			off \
 		IDLED		"Enable IMAP idled support"		off \
 		LDAP_PTLOADER	"Enable LDAP ptloader"			off \
@@ -54,6 +56,27 @@ OPTIONS=	BDB		"Use Berkeley DB"			on \
 
 .include <bsd.port.pre.mk>
 
+# Autocreate Inbox and Autosieve patches from UoA
+# WWW: http://email.uoa.gr/projects/cyrus/
+
+.if defined(WITH_AUTOCREATE) || defined(WITH_AUTOSIEVE)
+PATCH_DIST_STRIP=	-p1
+PATCH_SITES+=	http://email.uoa.gr/download/cyrus/${PORTNAME}-${PORTVERSION}/ 
+.endif
+
+.if defined(WITH_AUTOCREATE)
+AUTOCREATE_VERSION=	0.10-0
+PATCHFILES+=	${PORTNAME}-${PORTVERSION}-autocreate-${AUTOCREATE_VERSION}.diff
+PLIST_SUB+=	AUTOCREATE=""
+.else
+PLIST_SUB+=	AUTOCREATE="@comment "
+.endif
+
+.if defined(WITH_AUTOSIEVE)
+AUTOSIEVE_VERSION=	0.6.0
+PATCHFILES+=	${PORTNAME}-${PORTVERSION}-autosieve-${AUTOSIEVE_VERSION}.diff
+.endif
+
 .if defined(WITHOUT_BDB)
 BDB_LIB_NAME=	no
 .else
@@ -202,6 +225,8 @@ post-patch:
 		@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
 				  -e "s|/usr/sieve|/var/imap/sieve|g" \
 			${WRKSRC}/tools/masssievec
+		@${REINPLACE_CMD} -e "s|-lpthread|\$$(PTHREAD_LIBS)|g" \
+			${WRKSRC}/imap/Makefile.in
 .if defined(WITH_DRAC)
 		@${RM} -rf ${WRKSRC}/autom4te.cache
 .endif
diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo
index b0bce30c4822..74f36875294e 100644
--- a/mail/cyrus-imapd24/distinfo
+++ b/mail/cyrus-imapd24/distinfo
@@ -1,3 +1,9 @@
 MD5 (cyrus-imapd-2.3.16.tar.gz) = 6a37feb1985974eee8a4a4b2932dd54c
 SHA256 (cyrus-imapd-2.3.16.tar.gz) = e020ac79403a683bddc136c25887fe501edcc8d73b308982f4b68ec828ab63d2
 SIZE (cyrus-imapd-2.3.16.tar.gz) = 2359349
+MD5 (cyrus-imapd-2.3.16-autocreate-0.10-0.diff) = 98b88f89e72bbabfd3da35fc94809247
+SHA256 (cyrus-imapd-2.3.16-autocreate-0.10-0.diff) = a373c9d4e3b35c8ecbd4ad7806cf50196525c3c1a32c35bc18d7b6c449bd57e3
+SIZE (cyrus-imapd-2.3.16-autocreate-0.10-0.diff) = 86056
+MD5 (cyrus-imapd-2.3.16-autosieve-0.6.0.diff) = bb5171a5824f600b8a41cb00ab36cf02
+SHA256 (cyrus-imapd-2.3.16-autosieve-0.6.0.diff) = b50acaf0595e320ac89fdd15b375b7e051009ebbe839c461bbb2b2a7006c23c5
+SIZE (cyrus-imapd-2.3.16-autosieve-0.6.0.diff) = 7920
diff --git a/mail/cyrus-imapd24/files/patch-imap::Makefile.in b/mail/cyrus-imapd24/files/patch-imap::Makefile.in
index 163deb2807c3..e1a94d35f26f 100644
--- a/mail/cyrus-imapd24/files/patch-imap::Makefile.in
+++ b/mail/cyrus-imapd24/files/patch-imap::Makefile.in
@@ -15,19 +15,3 @@ diff -u imap/Makefile.in.orig imap/Makefile.in
  	done
  	ln -f $(DESTDIR)$(service_path)/pop3d $(DESTDIR)$(service_path)/pop3proxyd
  	ln -f $(DESTDIR)$(service_path)/imapd $(DESTDIR)$(service_path)/proxyd
-@@ -219,13 +219,13 @@
- 	$(CC) $(LDFLAGS) -o mupdate \
- 	 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
- 	 mutex_pthread.o tls.o libimap.a \
--	 $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-+	 $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
- 
- mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \
- 	libimap.a $(DEPLIBS)
- 	$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
- 	 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
--	 mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-+	 mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
- 
- pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \
- 	$(DEPLIBS) $(SERVICE)
diff --git a/mail/cyrus-imapd24/pkg-plist b/mail/cyrus-imapd24/pkg-plist
index 4bd742daa036..71f3032de9c8 100644
--- a/mail/cyrus-imapd24/pkg-plist
+++ b/mail/cyrus-imapd24/pkg-plist
@@ -11,6 +11,7 @@ bin/smtptest
 bin/synctest
 cyrus/bin/arbitron
 cyrus/bin/chk_cyrus
+%%AUTOCREATE%%cyrus/bin/compile_sieve
 cyrus/bin/ctl_cyrusdb
 cyrus/bin/ctl_deliver
 cyrus/bin/ctl_mboxlist