diff options
| author | jlam <jlam@pkgsrc.org> | 2004-12-15 16:00:23 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-12-15 16:00:23 +0000 |
| commit | 609c937d4172d891afb3ee8d7a11942ef35e9896 (patch) | |
| tree | 051d0fbca14ce72154a2a2594d79db81e3c68198 /comms | |
| parent | 8f84de9622461748022422a0a5974d04cf5f227e (diff) | |
| download | pkgsrc-609c937d4172d891afb3ee8d7a11942ef35e9896.tar.gz | |
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 (limited to 'comms')
| -rw-r--r-- | comms/jpilot/Makefile | 6 | ||||
| -rw-r--r-- | comms/jpilot/distinfo | 3 | ||||
| -rw-r--r-- | comms/jpilot/patches/patch-ab | 17 |
3 files changed, 5 insertions, 21 deletions
diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile index b04ee685514..88fa24bb094 100644 --- a/comms/jpilot/Makefile +++ b/comms/jpilot/Makefile @@ -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_DIRS+= gnome1-1.0 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 @@ post-install: .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 --git a/comms/jpilot/distinfo b/comms/jpilot/distinfo index 35378777129..00b8c917f8f 100644 --- a/comms/jpilot/distinfo +++ b/comms/jpilot/distinfo @@ -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 --git a/comms/jpilot/patches/patch-ab b/comms/jpilot/patches/patch-ab deleted file mode 100644 index bf929dac22f..00000000000 --- a/comms/jpilot/patches/patch-ab +++ /dev/null @@ -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" - |