[pkgsrc/trunk]: pkgsrc/comms/jpilot Make build on -current and with openssl-0...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/819429660ce2
branches:  trunk
changeset: 477664:819429660ce2
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Jul 06 22:31:10 2004 +0000

description:
Make build on -current and with openssl-0.9.6*.
Closes PR 26089 by Michael van Elst.

diffstat:

 comms/jpilot/distinfo         |   4 ++--
 comms/jpilot/patches/patch-ab |  12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diffs (38 lines):

diff -r 701b2ab7364c -r 819429660ce2 comms/jpilot/distinfo
--- a/comms/jpilot/distinfo     Tue Jul 06 22:13:14 2004 +0000
+++ b/comms/jpilot/distinfo     Tue Jul 06 22:31:10 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2004/06/27 21:10:40 wiz Exp $
+$NetBSD: distinfo,v 1.13 2004/07/06 22:31:10 wiz Exp $
 
 SHA1 (jpilot-0.99.5.tar.gz) = 357807f50edb301db81ab9f7aaedcb5541e86eec
 Size (jpilot-0.99.5.tar.gz) = 1033716 bytes
 SHA1 (patch-aa) = f24450c6851f295163fa5440a6d60009466d33fc
-SHA1 (patch-ab) = 8de4a495141b6c3c7003cea5cbcedbbfd6929663
+SHA1 (patch-ab) = 23314c3f0bf01a30bdd6e61ff01d7545be154391
 SHA1 (patch-ad) = e1e7ce9e7cc1bd1e901f6763799cdfd03f3cd605
diff -r 701b2ab7364c -r 819429660ce2 comms/jpilot/patches/patch-ab
--- a/comms/jpilot/patches/patch-ab     Tue Jul 06 22:13:14 2004 +0000
+++ b/comms/jpilot/patches/patch-ab     Tue Jul 06 22:31:10 2004 +0000
@@ -1,13 +1,17 @@
-$NetBSD: patch-ab,v 1.6 2003/10/20 12:16:40 hubertf Exp $
+$NetBSD: patch-ab,v 1.7 2004/07/06 22:31:10 wiz Exp $
 
 --- KeyRing/keyring.c.orig     2002-12-25 07:19:04.000000000 +0100
 +++ KeyRing/keyring.c
-@@ -31,7 +31,7 @@
+@@ -31,7 +31,12 @@
  
  /* Opensll header files */
  #include <openssl/md5.h>
--#include <openssl/des.h>
-+#include <kerberosIV/des.h>
++#include <openssl/opensslv.h>
++#if OPENSSL_VERSION_NUMBER < 0x0090700fL
+ #include <openssl/des.h>
++#else
++#include <des.h>
++#endif
  
  #include "libplugin.h"