diff options
author | joerg <joerg@pkgsrc.org> | 2013-02-26 11:07:52 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2013-02-26 11:07:52 +0000 |
commit | abed1dadddef2e073799b2f30162d0f867079410 (patch) | |
tree | 03ff0f84f82f4fb9de7b0aa4a7967f13f47b4e79 /mail | |
parent | 779cb8120ee48d1e70f2ef82d5e6e2cc2bedd1c8 (diff) | |
download | pkgsrc-abed1dadddef2e073799b2f30162d0f867079410.tar.gz |
Don't use nested functions to detect support for __attribute__.
Diffstat (limited to 'mail')
-rw-r--r-- | mail/cyrus-imapd/distinfo | 4 | ||||
-rw-r--r-- | mail/cyrus-imapd/patches/patch-af | 35 |
2 files changed, 32 insertions, 7 deletions
diff --git a/mail/cyrus-imapd/distinfo b/mail/cyrus-imapd/distinfo index b68b408123c..79fa75dd167 100644 --- a/mail/cyrus-imapd/distinfo +++ b/mail/cyrus-imapd/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.32 2011/10/15 07:17:00 obache Exp $ +$NetBSD: distinfo,v 1.33 2013/02/26 11:07:52 joerg Exp $ SHA1 (cyrus-imapd-2.2.13p1.tar.gz) = b9bc268c40fbb60aeb5253d61c4bfe5cffd3fb15 RMD160 (cyrus-imapd-2.2.13p1.tar.gz) = 1604f07491d41f05563181bce46ff1b7a6e5f739 @@ -8,7 +8,7 @@ SHA1 (patch-ab) = 986fa32dd6acc088779791b7bdabde5981b61bc1 SHA1 (patch-ac) = 48557e05ef0d82413da18dd46d9c4baf802a771d SHA1 (patch-ad) = e99638a062b2695514c6859788eac3fd02cf5c1d SHA1 (patch-ae) = b1865b68a8f798a3766e53e60e9e68099df9bd54 -SHA1 (patch-af) = 2aaf1be5fcb102b047a57fe0a908b3e8f95037ea +SHA1 (patch-af) = 1a33ee4f4ce42e03a86f358dc5a99d35e7c86252 SHA1 (patch-ag) = e51020accbd2a259a9abe27e5d220e61c9ab314e SHA1 (patch-al) = d28a0e604f0ddcf22c6753be333216780558e05c SHA1 (patch-am) = 6e67366a0ad01cf075c23c5a32f1c9d456e1498f diff --git a/mail/cyrus-imapd/patches/patch-af b/mail/cyrus-imapd/patches/patch-af index fd7df2f3a45..5a8a873b0ff 100644 --- a/mail/cyrus-imapd/patches/patch-af +++ b/mail/cyrus-imapd/patches/patch-af @@ -1,8 +1,33 @@ -$NetBSD: patch-af,v 1.9 2006/11/03 05:06:54 obache Exp $ +$NetBSD: patch-af,v 1.10 2013/02/26 11:07:52 joerg Exp $ ---- configure.orig 2006-04-01 00:25:50.000000000 +0900 +--- configure.orig 2009-09-09 13:23:09.000000000 +0000 +++ configure -@@ -7701,7 +7701,7 @@ if test $ac_cv_header_db_h = yes; then +@@ -3361,10 +3361,6 @@ cat >>conftest.$ac_ext <<_ACEOF + + #include <stdlib.h> + +-int +-main () +-{ +- + static void foo(void) __attribute__ ((noreturn)); + + static void +@@ -3373,8 +3369,11 @@ foo(void) + exit(1); + } + +- ; +- return 0; ++int ++main () ++{ ++ foo(); ++ return 0; + } + _ACEOF + rm -f conftest.$ac_objext +@@ -7701,7 +7700,7 @@ if test $ac_cv_header_db_h = yes; then fi saved_LIBS=$LIBS @@ -11,7 +36,7 @@ $NetBSD: patch-af,v 1.9 2006/11/03 05:06:54 obache Exp $ do LIBS="$saved_LIBS -l$dbname" cat >conftest.$ac_ext <<_ACEOF -@@ -13460,7 +13460,11 @@ echo "${ECHO_T}$ac_cv_header_gssapi_gssa +@@ -13460,7 +13459,11 @@ echo "${ECHO_T}$ac_cv_header_gssapi_gssa fi if test $ac_cv_header_gssapi_gssapi_h = yes; then @@ -24,7 +49,7 @@ $NetBSD: patch-af,v 1.9 2006/11/03 05:06:54 obache Exp $ else { echo "$as_me:$LINENO: WARNING: Disabling GSSAPI - no include files found" >&5 echo "$as_me: WARNING: Disabling GSSAPI - no include files found" >&2;}; gssapi=no -@@ -15337,6 +15341,7 @@ elif test "${with_perl}" != "no"; then +@@ -15337,6 +15340,7 @@ elif test "${with_perl}" != "no"; then EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl" PERL_SUBDIRS="imap" PERL="${with_perl}" |