[pkgsrc/pkgsrc-2004Q4]: pkgsrc/security/libgcrypt Pullup ticket 172 - request...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f5ba0dcdafab
branches:  pkgsrc-2004Q4
changeset: 485756:f5ba0dcdafab
user:      snj <snj%pkgsrc.org@localhost>
date:      Tue Dec 21 19:10:13 2004 +0000

description:
Pullup ticket 172 - requested by grant beattie
build fix for libgcrypt

Module Name:    pkgsrc
Committed By:   grant
Date:           Tue Dec 21 08:57:48 UTC 2004

Modified Files:
        pkgsrc/security/libgcrypt: hacks.mk

Log Message:
fix socklen_t hack by falling through to ${TRUE} if ${GREP} fails
(pattern not matched). ugh, bash.

fixes build on Linux. reported by minskim@

diffstat:

 security/libgcrypt/hacks.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 80ff0e3faf49 -r f5ba0dcdafab security/libgcrypt/hacks.mk
--- a/security/libgcrypt/hacks.mk       Tue Dec 21 11:40:49 2004 +0000
+++ b/security/libgcrypt/hacks.mk       Tue Dec 21 19:10:13 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2004/12/18 23:54:58 grant Exp $
+# $NetBSD: hacks.mk,v 1.1.2.1 2004/12/21 19:10:13 snj 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
@@ -6,7 +6,7 @@
 #
 # hack around this by using the same #define (if present) in gcrypt.h.
 post-configure:
-       socklen=`${GREP} '^#define socklen_t' ${WRKSRC}/config.h`; \
+       socklen=`${GREP} '^#define socklen_t' ${WRKSRC}/config.h || ${TRUE}`; \
                ${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