[pkgsrc/trunk]: pkgsrc/security/libgcrypt add hack for missing socklen_t type...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c62b9bab6e8b
branches:  trunk
changeset: 485698:c62b9bab6e8b
user:      grant <grant%pkgsrc.org@localhost>
date:      Sat Dec 18 23:54:58 2004 +0000

description:
add hack for missing socklen_t typedef handling. fixes build on
Darwin.

diffstat:

 security/libgcrypt/distinfo         |   4 ++--
 security/libgcrypt/hacks.mk         |  12 ++++++++++++
 security/libgcrypt/patches/patch-ac |  13 ++++++++++---
 3 files changed, 24 insertions(+), 5 deletions(-)

diffs (55 lines):

diff -r 26734020a071 -r c62b9bab6e8b security/libgcrypt/distinfo
--- a/security/libgcrypt/distinfo       Sat Dec 18 22:35:05 2004 +0000
+++ b/security/libgcrypt/distinfo       Sat Dec 18 23:54:58 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2004/10/25 13:03:53 gavan Exp $
+$NetBSD: distinfo,v 1.11 2004/12/18 23:54:58 grant Exp $
 
 SHA1 (libgcrypt-1.2.0.tar.gz) = 3785a47abcb1c15079b18c5df47a474dfe647ec2
 Size (libgcrypt-1.2.0.tar.gz) = 949159 bytes
 SHA1 (patch-aa) = d8f659e4aac872abb152252731fd29bdaac635e3
 SHA1 (patch-ab) = bd713f7cbc6782ced8c2fd2b5541ac52d2a10fbe
-SHA1 (patch-ac) = 03768fa8386f09d9dbd63c04123d780fb3a56de5
+SHA1 (patch-ac) = 50934ca0527e5c33bdcfec20a9f505c5176abafe
 SHA1 (patch-ad) = f32281612b51c5bb3788cf03c6f5615bdfc0d3e8
diff -r 26734020a071 -r c62b9bab6e8b security/libgcrypt/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/libgcrypt/hacks.mk       Sat Dec 18 23:54:58 2004 +0000
@@ -0,0 +1,12 @@
+# $NetBSD: hacks.mk,v 1.1 2004/12/18 23:54:58 grant Exp $
+
+# config.h #defines socklen_t if it is not defined, but libgcrypt does
+# not propogate this to the installed gcrypt.h, so packages using it
+# subsequently fail.
+#
+# hack around this by using the same #define (if present) in gcrypt.h.
+post-configure:
+       socklen=`${GREP} '^#define socklen_t' ${WRKSRC}/config.h`; \
+               ${MV} ${WRKSRC}/src/gcrypt.h ${WRKSRC}/src/gcrypt.h.old; \
+               ${SED} -e "s,^/\* socklen_t \*/,$$socklen," \
+                       ${WRKSRC}/src/gcrypt.h.old > ${WRKSRC}/src/gcrypt.h
diff -r 26734020a071 -r c62b9bab6e8b security/libgcrypt/patches/patch-ac
--- a/security/libgcrypt/patches/patch-ac       Sat Dec 18 22:35:05 2004 +0000
+++ b/security/libgcrypt/patches/patch-ac       Sat Dec 18 23:54:58 2004 +0000
@@ -1,11 +1,18 @@
-$NetBSD: patch-ac,v 1.1 2004/10/23 08:57:33 shannonjr Exp $
+$NetBSD: patch-ac,v 1.2 2004/12/18 23:54:58 grant Exp $
 
---- src/gcrypt.h.orig  2004-04-15 03:10:37.000000000 -0600
+--- src/gcrypt.h.orig  2004-04-15 19:10:37.000000000 +1000
 +++ src/gcrypt.h
-@@ -29,6 +29,7 @@
+@@ -29,6 +29,14 @@
  
  #include <sys/types.h>
  #include <sys/socket.h>
++/*
++ * The following line (socklen_t comment) is used in the pkgsrc
++ * post-configure target to patch this file.
++ */
++
++/* socklen_t */
++
 +#include <sys/time.h>
  
  /* This is required for error code compatibility. */