[pkgsrc/trunk]: pkgsrc/archivers/archangel Make this package build on platfor...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cc2769b8d635
branches:  trunk
changeset: 501875:cc2769b8d635
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Mon Oct 31 05:11:41 2005 +0000

description:
Make this package build on platforms with setxattr(2) (e.g., Linux and
Darwin).

diffstat:

 archivers/archangel/distinfo         |   6 +++-
 archivers/archangel/patches/patch-aa |  13 ++++++++
 archivers/archangel/patches/patch-ab |  14 +++++++++
 archivers/archangel/patches/patch-ac |  14 +++++++++
 archivers/archangel/patches/patch-ad |  53 ++++++++++++++++++++++++++++++++++++
 5 files changed, 99 insertions(+), 1 deletions(-)

diffs (124 lines):

diff -r 96308f7ec586 -r cc2769b8d635 archivers/archangel/distinfo
--- a/archivers/archangel/distinfo      Mon Oct 31 04:42:38 2005 +0000
+++ b/archivers/archangel/distinfo      Mon Oct 31 05:11:41 2005 +0000
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.5 2005/07/31 22:31:04 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/10/31 05:11:41 minskim 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) = 8cfb116a12ec927f00d2059d5e9b59e1e2d564c3
diff -r 96308f7ec586 -r cc2769b8d635 archivers/archangel/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/archivers/archangel/patches/patch-aa      Mon Oct 31 05:11:41 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2005/10/31 05:11:41 minskim Exp $
+
+--- configure.ac.orig  2005-07-31 15:23:51.000000000 -0700
++++ configure.ac
+@@ -26,7 +26,7 @@ AC_SUBST(AUTOHEADER)
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS([sys/bitypes.h sys/param.h sys/endian.h sys/wait.h machine/endian.h])
++AC_CHECK_HEADERS([sys/bitypes.h sys/param.h sys/endian.h sys/wait.h machine/endian.h sys/xattr.h])
+ AC_CHECK_HEADERS([bzlib.h dirent.h err.h errno.h fcntl.h fnmatch.h grp.h inttypes.h locale.h pwd.h regex.h stdint.h string.h zlib.h])
+ 
+ dnl Checks for struct members
diff -r 96308f7ec586 -r cc2769b8d635 archivers/archangel/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/archivers/archangel/patches/patch-ab      Mon Oct 31 05:11:41 2005 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.1 2005/10/31 05:11:41 minskim Exp $
+
+--- config.h.in.orig   2005-10-30 20:52:01.000000000 -0800
++++ config.h.in
+@@ -136,6 +136,9 @@
+ /* Define to 1 if you have the <sys/wait.h> header file. */
+ #undef HAVE_SYS_WAIT_H
+ 
++/* Define to 1 if you have the <sys/xattr.h> header file. */
++#undef HAVE_SYS_XATTR_H
++
+ /* Define to 1 if the system has the type `uint16_t'. */
+ #undef HAVE_UINT16_T
+ 
diff -r 96308f7ec586 -r cc2769b8d635 archivers/archangel/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/archivers/archangel/patches/patch-ac      Mon Oct 31 05:11:41 2005 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1 2005/10/31 05:11:41 minskim Exp $
+
+--- configure.orig     2005-07-31 15:23:59.000000000 -0700
++++ configure
+@@ -3157,7 +3157,8 @@ done
+ 
+ 
+ 
+-for ac_header in sys/bitypes.h sys/param.h sys/endian.h sys/wait.h machine/endian.h
++
++for ac_header in sys/bitypes.h sys/param.h sys/endian.h sys/wait.h machine/endian.h sys/xattr.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
diff -r 96308f7ec586 -r cc2769b8d635 archivers/archangel/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/archivers/archangel/patches/patch-ad      Mon Oct 31 05:11:41 2005 +0000
@@ -0,0 +1,53 @@
+$NetBSD: patch-ad,v 1.1 2005/10/31 05:11:41 minskim Exp $
+
+--- aa.c.orig  2005-07-31 15:20:23.000000000 -0700
++++ aa.c
+@@ -48,6 +48,9 @@
+ #include <sys/endian.h>
+ #endif
+ 
++#ifdef HAVE_SYS_XATTR_H
++#include <sys/xattr.h>
++#endif
+ 
+ #include <ctype.h>
+ 
+@@ -534,7 +537,7 @@ readfile(aa_t *aa, aaent_t *aep, char *n
+ #ifdef HAVE_SETXATTR            
+ /* set the external attributes */
+ static int
+-ext_attr_set(aa_t *aa, aaent_t *aep, char *name);
++ext_attr_set(aa_t *aa, aaent_t *aep, char *name)
+ {
+       char    *ap;
+       char    *eq;
+@@ -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;
++#ifdef __APPLE__
++                      if (setxattr(name, ap, eq + 1, (int)(nl - eq) - 1, 0, XATTR_CREATE) < 0) {
++#else
+                       if (setxattr(name, ap, eq + 1, (int)(nl - eq) - 1, XATTR_CREATE) < 0) {
++#endif
+                               warn("WARNING: can't setxattr (%s) for \"%s\"", ap, name);
+                       }
+                       *eq = '=';
+@@ -927,9 +934,17 @@ ext_attr_get(aa_t *aa, aaent_t *aep, cha
+       int      cc;
+       int      vc;
+ 
++#ifdef __APPLE__
++      if ((cc = listxattr(path, keys, sizeof(keys), 0)) > 0) {
++#else
+       if ((cc = listxattr(path, keys, sizeof(keys))) > 0) {
++#endif
+               for (ac = 0, key = keys ; (int)(key - keys) < cc ; key += strlen(key)) {
++#ifdef __APPLE__
++                      if ((vc = getxattr(path, key, val, sizeof(val), 0, 0)) < 0) {
++#else
+                       if ((vc = getxattr(path, key, val, sizeof(val))) < 0) {
++#endif
+                               warnx("file \"%s\" attribute \"%s\" is too long, skipping...", path, key);
+                       } else {
+                               ac += snprintf(&attrs[ac], sizeof(attrs) - ac, "%s=%s\n", key, val);