[pkgsrc/trunk]: pkgsrc/mail/cyrus-imapd22 Only imap/mupdate needs to be build...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/39d9139fe5d1
branches:  trunk
changeset: 483715:39d9139fe5d1
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Nov 17 21:16:45 2004 +0000

description:
Only imap/mupdate needs to be build with pthreads support, so selectively
enable it via patches for just that one program.

diffstat:

 mail/cyrus-imapd22/Makefile         |   8 +++++++-
 mail/cyrus-imapd22/distinfo         |   3 ++-
 mail/cyrus-imapd22/patches/patch-ap |  35 +++++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 2 deletions(-)

diffs (75 lines):

diff -r c3ec35f97fde -r 39d9139fe5d1 mail/cyrus-imapd22/Makefile
--- a/mail/cyrus-imapd22/Makefile       Wed Nov 17 21:10:51 2004 +0000
+++ b/mail/cyrus-imapd22/Makefile       Wed Nov 17 21:16:45 2004 +0000
@@ -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 @@
 .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 -r c3ec35f97fde -r 39d9139fe5d1 mail/cyrus-imapd22/distinfo
--- a/mail/cyrus-imapd22/distinfo       Wed Nov 17 21:10:51 2004 +0000
+++ b/mail/cyrus-imapd22/distinfo       Wed Nov 17 21:16:45 2004 +0000
@@ -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-am) = 1508cc8520632628fba6f8a5658fe10ff801ecdd
 SHA1 (patch-an) = 4269f1c3be1ffb015bccb71c9d4f3d1347276b34
 SHA1 (patch-ao) = 155fd49ccba19e7324c87beef234e749d9d28b3a
+SHA1 (patch-ap) = 95b987e83ddd53065f7ffe503d0f07694f9bcd6b
diff -r c3ec35f97fde -r 39d9139fe5d1 mail/cyrus-imapd22/patches/patch-ap
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/cyrus-imapd22/patches/patch-ap       Wed Nov 17 21:16:45 2004 +0000
@@ -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) \