The problem with gcc attributes is that they are being defined away in

config.h because the AC_C___ATTRIBUTE__ test is broken.

(Note: the secound argument to AC_TRY_COMPILE is what goes in main).

4 files changed, 56 insertions, 23 deletions

diff --git a/archivers/archangel/distinfo b/archivers/archangel/distinfo
index 5bf1b9a4290..9645be30ea7 100644
--- a/archivers/archangel/distinfo
+++ b/archivers/archangel/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.9 2012/01/28 01:52:48 sbd Exp $
+$NetBSD: distinfo,v 1.10 2012/01/28 04:37:36 sbd Exp $
 
 SHA1 (archangel-20050730.tar.gz) = 966948ebac01a71732e93afd72fe5c4a21ba1ed8
 RMD160 (archangel-20050730.tar.gz) = 16b5f1d7dae8d45b22d0e371a90e0673c5e58caa
 Size (archangel-20050730.tar.gz) = 673307 bytes
 SHA1 (patch-aa) = cc5369ee02b35a0f4c21bed18802a3919f89bc63
 SHA1 (patch-ab) = 580fac24f5c2ee698ea58dce3b75bc4301db75bf
-SHA1 (patch-ac) = f7cd2a68ae6349e9ce2570ee269c70d7dd565c8f
-SHA1 (patch-ad) = 7d4ec3b88e2453d81c041ec37859c804b36a0090
+SHA1 (patch-ac) = 55c35373a9baeb99310285d8a848ff9567305fd5
+SHA1 (patch-aclocal.m4) = 6939dbc5a5acd8046248cdbd23c73fb1e5790f03
+SHA1 (patch-ad) = 895e65f995cdc52a14140fe021b072155ea55882
 SHA1 (patch-ae) = 21e2e651af0d828813b26cd036b7583a5dd3eebe
diff --git a/archivers/archangel/patches/patch-ac b/archivers/archangel/patches/patch-ac
index 35b2d7e7c49..d4e6e2383de 100644
--- a/archivers/archangel/patches/patch-ac
+++ b/archivers/archangel/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.1 2005/10/31 05:11:41 minskim Exp $
+$NetBSD: patch-ac,v 1.2 2012/01/28 04:37:36 sbd Exp $
 
---- configure.orig	2005-07-31 15:23:59.000000000 -0700
+--- configure.orig	2005-07-31 22:23:59.000000000 +0000
 +++ configure
 @@ -3157,7 +3157,8 @@ done
  
@@ -12,3 +12,25 @@ $NetBSD: patch-ac,v 1.1 2005/10/31 05:11:41 minskim Exp $
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
+@@ -3597,10 +3598,6 @@ cat >>conftest.$ac_ext <<_ACEOF
+ 
+ #include <stdlib.h>
+ 
+-int
+-main ()
+-{
+-
+ static void foo(void) __attribute__ ((noreturn));
+ 
+ static void
+@@ -3609,6 +3606,10 @@ foo(void)
+   exit(1);
+ }
+ 
++int
++main ()
++{
++
+   ;
+   return 0;
+ }
diff --git a/archivers/archangel/patches/patch-aclocal.m4 b/archivers/archangel/patches/patch-aclocal.m4
new file mode 100644
index 00000000000..3ff1cc13b2a
--- /dev/null
+++ b/archivers/archangel/patches/patch-aclocal.m4
@@ -0,0 +1,22 @@
+$NetBSD: patch-aclocal.m4,v 1.1 2012/01/28 04:37:36 sbd Exp $
+
+--- aclocal.m4.orig	2005-07-24 07:33:36.000000000 +0000
++++ aclocal.m4
+@@ -13,8 +13,7 @@ AC_MSG_CHECKING(for __attribute__)
+ AC_CACHE_VAL(ac_cv___attribute__, [
+ AC_TRY_COMPILE([
+ #include <stdlib.h>
+-],
+-[
++
+ static void foo(void) __attribute__ ((noreturn));
+ 
+ static void
+@@ -23,6 +22,7 @@ foo(void)
+   exit(1);
+ }
+ ],
++[],
+ ac_cv___attribute__=yes,
+ ac_cv___attribute__=no)])
+ if test "$ac_cv___attribute__" = "yes"; then
diff --git a/archivers/archangel/patches/patch-ad b/archivers/archangel/patches/patch-ad
index 446aa54bdd9..25eaa271126 100644
--- a/archivers/archangel/patches/patch-ad
+++ b/archivers/archangel/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.3 2012/01/28 01:52:49 sbd Exp $
+$NetBSD: patch-ad,v 1.4 2012/01/28 04:37:36 sbd Exp $
 
 --- aa.c.orig	2005-07-31 22:20:23.000000000 +0000
 +++ aa.c
@@ -12,19 +12,7 @@ $NetBSD: patch-ad,v 1.3 2012/01/28 01:52:49 sbd Exp $
  
  #include <ctype.h>
  
-@@ -221,7 +224,10 @@ asystem(aa_t *aa, const char *file, int
- 		(void) close(fdv[0]);
- 		(void) write(fdv[1], aa->phrase, strlen(aa->phrase));
- 		(void) write(fdv[1], "\n", 1);
--		(void) wait(&status);
-+#if !defined(__GLIBC__) || !defined(__USE_BSD)
-+#define __WAIT_STATUS	int *
-+#endif
-+		(void) wait((__WAIT_STATUS)&status);
- 		(void) close(fdv[1]);
- 		break;
- 	}
-@@ -534,7 +540,7 @@ readfile(aa_t *aa, aaent_t *aep, char *n
+@@ -534,7 +537,7 @@ readfile(aa_t *aa, aaent_t *aep, char *n
  #ifdef HAVE_SETXATTR            
  /* set the external attributes */
  static int
@@ -33,7 +21,7 @@ $NetBSD: patch-ad,v 1.3 2012/01/28 01:52:49 sbd Exp $
  {
  	char	*ap;
  	char	*eq;
-@@ -549,7 +555,11 @@ ext_attr_set(aa_t *aa, aaent_t *aep, cha
+@@ -549,7 +552,11 @@ ext_attr_set(aa_t *aa, aaent_t *aep, cha
  			warn("WARNING: malformed attribute (%s) for \"%s\"", ap, name);
  		} else {
  			*eq = 0x0;
@@ -45,7 +33,7 @@ $NetBSD: patch-ad,v 1.3 2012/01/28 01:52:49 sbd Exp $
  				warn("WARNING: can't setxattr (%s) for \"%s\"", ap, name);
  			}
  			*eq = '=';
-@@ -605,7 +615,11 @@ extractfile(aa_t *aa, aaent_t *aep, char
+@@ -605,7 +612,11 @@ extractfile(aa_t *aa, aaent_t *aep, char
  				warn("extractfile: can't open \"%s\" mode %x", name, mode);
  				return 0;
  			}
@@ -57,7 +45,7 @@ $NetBSD: patch-ad,v 1.3 2012/01/28 01:52:49 sbd Exp $
  				warn("extractfile: can't set access/modification time for \"%s\"", name);
  			}
  			if (aep->sub.xattrlen > 0) {
-@@ -927,9 +941,17 @@ ext_attr_get(aa_t *aa, aaent_t *aep, cha
+@@ -927,9 +938,17 @@ ext_attr_get(aa_t *aa, aaent_t *aep, cha
  	int	 cc;
  	int	 vc;
  
@@ -75,7 +63,7 @@ $NetBSD: patch-ad,v 1.3 2012/01/28 01:52:49 sbd Exp $
  				warnx("file \"%s\" attribute \"%s\" is too long, skipping...", path, key);
  			} else {
  				ac += snprintf(&attrs[ac], sizeof(attrs) - ac, "%s=%s\n", key, val);
-@@ -982,7 +1004,11 @@ addent(aa_t *aa, char *name, int namelen
+@@ -982,7 +1001,11 @@ addent(aa_t *aa, char *name, int namelen
  #endif
  	a.sub.size = sp->st_size;
  	a.sub.blocks = sp->st_blocks;