Attachment 109674 Details for Bug 150719 – cyrus-imapd-2.3.16_3.patch

[patch] cyrus-imapd-2.3.16_3.patch

cyrus-imapd-2.3.16_3.patch (text/plain), 4.04 KB, created by Martin Matuska on 2010-09-19 15:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Matuska

Created: 2010-09-19 15:10:01 UTC

Size: 4.04 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/mail/cyrus-imapd23/Makefile,v
>retrieving revision 1.190
>diff -u -r1.190 Makefile
>--- Makefile	15 Sep 2010 18:34:42 -0000	1.190
>+++ Makefile	19 Sep 2010 14:00:17 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	cyrus-imapd
> PORTVERSION=	2.3.16
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	mail ipv6
> MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus/ \
> 		http://ftp.andrew.cmu.edu/pub/cyrus/ \
>@@ -38,7 +38,9 @@
> 		--with-perl=${PERL5}
> MAKE_JOBS_UNSAFE=	yes
> 
>-OPTIONS=	BDB		"Use Berkeley DB"			on \
>+OPTIONS=	AUTOCREATE	"Use autocreate patch from UoA"		off \
>+		AUTOSIEVE	"Use autosieve patch from 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,24 @@
> 
> .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
>+.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 +222,8 @@
> 		@${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
>Index: distinfo
>===================================================================
>RCS file: /home/pcvs/ports/mail/cyrus-imapd23/distinfo,v
>retrieving revision 1.53
>diff -u -r1.53 distinfo
>--- distinfo	21 Dec 2009 15:39:10 -0000	1.53
>+++ distinfo	19 Sep 2010 14:00:17 -0000
>@@ -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
>Index: files/patch-imap::Makefile.in
>===================================================================
>RCS file: /home/pcvs/ports/mail/cyrus-imapd23/files/patch-imap::Makefile.in,v
>retrieving revision 1.2
>diff -u -r1.2 patch-imap::Makefile.in
>--- files/patch-imap::Makefile.in	20 Dec 2005 17:35:41 -0000	1.2
>+++ files/patch-imap::Makefile.in	19 Sep 2010 14:00:17 -0000
>@@ -15,19 +15,3 @@
>  	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)

Actions: View | Diff

Attachments on bug 150719: 109674