View | Details | Raw Unified | Return to bug 150719
Collapse All | Expand All

(-)Makefile (-2 / +24 lines)
Lines 7-13 Link Here
7
7
8
PORTNAME=	cyrus-imapd
8
PORTNAME=	cyrus-imapd
9
PORTVERSION=	2.3.16
9
PORTVERSION=	2.3.16
10
PORTREVISION=	2
10
PORTREVISION=	3
11
CATEGORIES=	mail ipv6
11
CATEGORIES=	mail ipv6
12
MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus/ \
12
MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus/ \
13
		http://ftp.andrew.cmu.edu/pub/cyrus/ \
13
		http://ftp.andrew.cmu.edu/pub/cyrus/ \
Lines 38-44 Link Here
38
		--with-perl=${PERL5}
38
		--with-perl=${PERL5}
39
MAKE_JOBS_UNSAFE=	yes
39
MAKE_JOBS_UNSAFE=	yes
40
40
41
OPTIONS=	BDB		"Use Berkeley DB"			on \
41
OPTIONS=	AUTOCREATE	"Use autocreate patch from UoA"		off \
42
		AUTOSIEVE	"Use autosieve patch from UoA"		off \
43
		BDB		"Use Berkeley DB"			on \
42
		DRAC		"Enable DRAC support"			off \
44
		DRAC		"Enable DRAC support"			off \
43
		IDLED		"Enable IMAP idled support"		off \
45
		IDLED		"Enable IMAP idled support"		off \
44
		LDAP_PTLOADER	"Enable LDAP ptloader"			off \
46
		LDAP_PTLOADER	"Enable LDAP ptloader"			off \
Lines 54-59 Link Here
54
56
55
.include <bsd.port.pre.mk>
57
.include <bsd.port.pre.mk>
56
58
59
# Autocreate Inbox and Autosieve patches from UoA
60
# WWW: http://email.uoa.gr/projects/cyrus/
61
62
.if defined(WITH_AUTOCREATE) || defined(WITH_AUTOSIEVE)
63
PATCH_DIST_STRIP=	-p1
64
PATCH_SITES+=	http://email.uoa.gr/download/cyrus/${PORTNAME}-${PORTVERSION}/ 
65
.endif
66
67
.if defined(WITH_AUTOCREATE)
68
AUTOCREATE_VERSION=	0.10-0
69
PATCHFILES+=	${PORTNAME}-${PORTVERSION}-autocreate-${AUTOCREATE_VERSION}.diff
70
.endif
71
72
.if defined(WITH_AUTOSIEVE)
73
AUTOSIEVE_VERSION=	0.6.0
74
PATCHFILES+=	${PORTNAME}-${PORTVERSION}-autosieve-${AUTOSIEVE_VERSION}.diff
75
.endif
76
57
.if defined(WITHOUT_BDB)
77
.if defined(WITHOUT_BDB)
58
BDB_LIB_NAME=	no
78
BDB_LIB_NAME=	no
59
.else
79
.else
Lines 202-207 Link Here
202
		@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
222
		@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
203
				  -e "s|/usr/sieve|/var/imap/sieve|g" \
223
				  -e "s|/usr/sieve|/var/imap/sieve|g" \
204
			${WRKSRC}/tools/masssievec
224
			${WRKSRC}/tools/masssievec
225
		@${REINPLACE_CMD} -e "s|-lpthread|\$$(PTHREAD_LIBS)|g" \
226
			${WRKSRC}/imap/Makefile.in
205
.if defined(WITH_DRAC)
227
.if defined(WITH_DRAC)
206
		@${RM} -rf ${WRKSRC}/autom4te.cache
228
		@${RM} -rf ${WRKSRC}/autom4te.cache
207
.endif
229
.endif
(-)distinfo (+6 lines)
Lines 1-3 Link Here
1
MD5 (cyrus-imapd-2.3.16.tar.gz) = 6a37feb1985974eee8a4a4b2932dd54c
1
MD5 (cyrus-imapd-2.3.16.tar.gz) = 6a37feb1985974eee8a4a4b2932dd54c
2
SHA256 (cyrus-imapd-2.3.16.tar.gz) = e020ac79403a683bddc136c25887fe501edcc8d73b308982f4b68ec828ab63d2
2
SHA256 (cyrus-imapd-2.3.16.tar.gz) = e020ac79403a683bddc136c25887fe501edcc8d73b308982f4b68ec828ab63d2
3
SIZE (cyrus-imapd-2.3.16.tar.gz) = 2359349
3
SIZE (cyrus-imapd-2.3.16.tar.gz) = 2359349
4
MD5 (cyrus-imapd-2.3.16-autocreate-0.10-0.diff) = 98b88f89e72bbabfd3da35fc94809247
5
SHA256 (cyrus-imapd-2.3.16-autocreate-0.10-0.diff) = a373c9d4e3b35c8ecbd4ad7806cf50196525c3c1a32c35bc18d7b6c449bd57e3
6
SIZE (cyrus-imapd-2.3.16-autocreate-0.10-0.diff) = 86056
7
MD5 (cyrus-imapd-2.3.16-autosieve-0.6.0.diff) = bb5171a5824f600b8a41cb00ab36cf02
8
SHA256 (cyrus-imapd-2.3.16-autosieve-0.6.0.diff) = b50acaf0595e320ac89fdd15b375b7e051009ebbe839c461bbb2b2a7006c23c5
9
SIZE (cyrus-imapd-2.3.16-autosieve-0.6.0.diff) = 7920
(-)files/patch-imap::Makefile.in (-16 lines)
Lines 15-33 Link Here
15
 	done
15
 	done
16
 	ln -f $(DESTDIR)$(service_path)/pop3d $(DESTDIR)$(service_path)/pop3proxyd
16
 	ln -f $(DESTDIR)$(service_path)/pop3d $(DESTDIR)$(service_path)/pop3proxyd
17
 	ln -f $(DESTDIR)$(service_path)/imapd $(DESTDIR)$(service_path)/proxyd
17
 	ln -f $(DESTDIR)$(service_path)/imapd $(DESTDIR)$(service_path)/proxyd
18
@@ -219,13 +219,13 @@
19
 	$(CC) $(LDFLAGS) -o mupdate \
20
 	 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
21
 	 mutex_pthread.o tls.o libimap.a \
22
-	 $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
23
+	 $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
24
 
25
 mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \
26
 	libimap.a $(DEPLIBS)
27
 	$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
28
 	 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
29
-	 mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
30
+	 mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
31
 
32
 pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \
33
 	$(DEPLIBS) $(SERVICE)

Return to bug 150719