[pkgsrc/trunk]: pkgsrc/comms/jpilot JPilot's KeyRing plugin requires OpenSSL,...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/512ea0f22bc6
branches:  trunk
changeset: 485544:512ea0f22bc6
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Dec 15 16:00:23 2004 +0000

description:
JPilot's KeyRing plugin requires OpenSSL, so add the dependency by
including openssl/buildlink3.mk.  While we're here, also convert to
set USE_OLD_DES_API=yes and remove patch-ab, which was a workaround
for the OpenSSL DES problem.  Bump the PKGREVISION due to the dependency
change.

diffstat:

 comms/jpilot/Makefile         |   6 ++++--
 comms/jpilot/distinfo         |   3 +--
 comms/jpilot/patches/patch-ab |  17 -----------------
 3 files changed, 5 insertions(+), 21 deletions(-)

diffs (63 lines):

diff -r 4d937ed9ab41 -r 512ea0f22bc6 comms/jpilot/Makefile
--- a/comms/jpilot/Makefile     Wed Dec 15 14:57:58 2004 +0000
+++ b/comms/jpilot/Makefile     Wed Dec 15 16:00:23 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2004/10/03 00:13:16 tv Exp $
+# $NetBSD: Makefile,v 1.43 2004/12/15 16:00:23 jlam Exp $
 #
 
 DISTNAME=              jpilot-0.99.5
-PKGREVISION=           5
+PKGREVISION=           6
 CATEGORIES=            comms
 MASTER_SITES=          http://jpilot.org/
 
@@ -19,6 +19,7 @@
 USE_LIBTOOL=           YES
 USE_PKGLOCALEDIR=      YES
 USE_X11=               YES
+USE_OLD_DES_API=       YES
 
 GNU_CONFIGURE=         YES
 CONFIGURE_ARGS+=       --with-gtk-prefix="${BUILDLINK_PREFIX.gtk}"
@@ -56,6 +57,7 @@
 .include "../../comms/pilot-link-libs/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 4d937ed9ab41 -r 512ea0f22bc6 comms/jpilot/distinfo
--- a/comms/jpilot/distinfo     Wed Dec 15 14:57:58 2004 +0000
+++ b/comms/jpilot/distinfo     Wed Dec 15 16:00:23 2004 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.13 2004/07/06 22:31:10 wiz Exp $
+$NetBSD: distinfo,v 1.14 2004/12/15 16:00:23 jlam 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) = 23314c3f0bf01a30bdd6e61ff01d7545be154391
 SHA1 (patch-ad) = e1e7ce9e7cc1bd1e901f6763799cdfd03f3cd605
diff -r 4d937ed9ab41 -r 512ea0f22bc6 comms/jpilot/patches/patch-ab
--- a/comms/jpilot/patches/patch-ab     Wed Dec 15 14:57:58 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$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,12 @@
- 
- /* Opensll header files */
- #include <openssl/md5.h>
-+#include <openssl/opensslv.h>
-+#if OPENSSL_VERSION_NUMBER < 0x0090700fL
- #include <openssl/des.h>
-+#else
-+#include <des.h>
-+#endif
- 
- #include "libplugin.h"
-