diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/cyrus-imapd22/Makefile | 8 | ||||
| -rw-r--r-- | mail/cyrus-imapd22/distinfo | 3 | ||||
| -rw-r--r-- | mail/cyrus-imapd22/patches/patch-ap | 35 |
3 files changed, 44 insertions, 2 deletions
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile index d4d2060d5d1..0dfdc1b3ee0 100644 --- a/mail/cyrus-imapd22/Makefile +++ b/mail/cyrus-imapd22/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2004/11/17 07:57:28 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2004/11/17 21:16:45 jlam Exp $ DISTNAME= cyrus-imapd-2.2.8 PKGREVISION= 4 @@ -126,6 +126,12 @@ PERL5_PACKLIST= \ .include "../../security/tcp_wrappers/buildlink3.mk" .include "../../mk/bdb.buildlink3.mk" +# Only imap/mupdate needs to be build with pthreads support, so selectively +# enable it via patches for just that one program. +# +PTHREAD_AUTO_VARS= no +.include "../../mk/pthread.buildlink3.mk" + # Change references of some manpages from foo.8 to cyrus-foo.8 to avoid # manpage conflicts with other packages. Also change references to # "/etc/{cyrus,imapd}.conf" into "${PKG_SYSCONFDIR}/{cyrus,imapd}.conf". diff --git a/mail/cyrus-imapd22/distinfo b/mail/cyrus-imapd22/distinfo index afdc7f3242f..120ff7d7eaf 100644 --- a/mail/cyrus-imapd22/distinfo +++ b/mail/cyrus-imapd22/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2004/10/17 22:07:32 recht Exp $ +$NetBSD: distinfo,v 1.14 2004/11/17 21:16:45 jlam Exp $ SHA1 (cyrus-imapd-2.2.8.tar.gz) = ee9e52598728d77d69850db3781aa4388d9a453a Size (cyrus-imapd-2.2.8.tar.gz) = 1937828 bytes @@ -10,3 +10,4 @@ SHA1 (patch-al) = a0e4d20bd11bf78f6ed2e8ee9e3cc7b8d7ba35c1 SHA1 (patch-am) = 1508cc8520632628fba6f8a5658fe10ff801ecdd SHA1 (patch-an) = 4269f1c3be1ffb015bccb71c9d4f3d1347276b34 SHA1 (patch-ao) = 155fd49ccba19e7324c87beef234e749d9d28b3a +SHA1 (patch-ap) = 95b987e83ddd53065f7ffe503d0f07694f9bcd6b diff --git a/mail/cyrus-imapd22/patches/patch-ap b/mail/cyrus-imapd22/patches/patch-ap new file mode 100644 index 00000000000..7ef846cede6 --- /dev/null +++ b/mail/cyrus-imapd22/patches/patch-ap @@ -0,0 +1,35 @@ +$NetBSD: patch-ap,v 1.1 2004/11/17 21:16:45 jlam Exp $ + +--- imap/Makefile.in.orig 2004-05-28 14:03:02.000000000 -0400 ++++ imap/Makefile.in +@@ -185,6 +185,9 @@ mupdate_err.c: mupdate_err.et + + mupdate_err.h: mupdate_err.c + ++mutex_pthread.o: mutex_pthread.c ++ $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $(PTHREAD_CFLAGS) $< ++ + ### Services + idled: idled.o mutex_fake.o libimap.a $(DEPLIBS) + $(CC) $(LDFLAGS) -o idled \ +@@ -241,16 +244,16 @@ proxyd.pure: $(PROXYDOBJS) mutex_fake.o + + mupdate: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o tls.o \ + libimap.a $(DEPLIBS) +- $(CC) $(LDFLAGS) -o mupdate \ ++ $(CC) $(LDFLAGS) $(PTHREAD_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 \ ++ $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) $(PTHREAD_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 backend.o tls.o mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) + $(CC) $(LDFLAGS) -o pop3d pop3d.o backend.o tls.o $(SERVICE) \ |