diff options
| author | grant <grant@pkgsrc.org> | 2004-12-18 23:54:58 +0000 |
|---|---|---|
| committer | grant <grant@pkgsrc.org> | 2004-12-18 23:54:58 +0000 |
| commit | fa6a9ffd9251ecfe476475a3e19ba95fd34c65b7 (patch) | |
| tree | 181e7c2caa451f20e63bd6f670902fff25dad027 | |
| parent | eb18c312122dd137b3600a51bc7d199c4ae8ba52 (diff) | |
| download | pkgsrc-fa6a9ffd9251ecfe476475a3e19ba95fd34c65b7.tar.gz | |
add hack for missing socklen_t typedef handling. fixes build on
Darwin.
| -rw-r--r-- | security/libgcrypt/distinfo | 4 | ||||
| -rw-r--r-- | security/libgcrypt/hacks.mk | 12 | ||||
| -rw-r--r-- | security/libgcrypt/patches/patch-ac | 13 |
3 files changed, 24 insertions, 5 deletions
diff --git a/security/libgcrypt/distinfo b/security/libgcrypt/distinfo index 51621601d23..3b7d07ad4df 100644 --- a/security/libgcrypt/distinfo +++ b/security/libgcrypt/distinfo @@ -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 --git a/security/libgcrypt/hacks.mk b/security/libgcrypt/hacks.mk new file mode 100644 index 00000000000..6cc16cf046f --- /dev/null +++ b/security/libgcrypt/hacks.mk @@ -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 --git a/security/libgcrypt/patches/patch-ac b/security/libgcrypt/patches/patch-ac index 3785b9bc667..c1e62aed6b3 100644 --- a/security/libgcrypt/patches/patch-ac +++ b/security/libgcrypt/patches/patch-ac @@ -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. */ |