summaryrefslogtreecommitdiff
path: root/chat
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2012-04-25 16:27:50 +0000
committerdrochner <drochner@pkgsrc.org>2012-04-25 16:27:50 +0000
commitd5ea8f6e022c183f3eaf6e3e54bb3a362b16042f (patch)
treea45dd455c5def794a632456367d24ea150e24156 /chat
parent252ff444cc705766bb71f7094bfb5fefd9896d39 (diff)
downloadpkgsrc-d5ea8f6e022c183f3eaf6e3e54bb3a362b16042f.tar.gz
libgcrypt builds against "nettle" now, no need to pull in libgcrypt
Diffstat (limited to 'chat')
-rw-r--r--chat/libpurple/distinfo3
-rw-r--r--chat/libpurple/options.mk3
-rw-r--r--chat/libpurple/patches/patch-aa22
3 files changed, 25 insertions, 3 deletions
diff --git a/chat/libpurple/distinfo b/chat/libpurple/distinfo
index 6f73e092939..33b4ffb54ba 100644
--- a/chat/libpurple/distinfo
+++ b/chat/libpurple/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.33 2012/04/04 13:20:06 obache Exp $
+$NetBSD: distinfo,v 1.34 2012/04/25 16:27:50 drochner Exp $
SHA1 (pidgin-2.10.3.tar.bz2) = 7dfeabdb1ade4311c91ac9c9f988276f67ead6ee
RMD160 (pidgin-2.10.3.tar.bz2) = 10af4caee9f22a251f867e3befebcc659e2b42f3
Size (pidgin-2.10.3.tar.bz2) = 9970676 bytes
+SHA1 (patch-aa) = a41353bbcb742b4127a33b3026f87a79f406da29
SHA1 (patch-libpurple_protocols_gg_lib_libgadu.h) = 5756134e17ae2ce28d3555cd40354245e22a5bd6
diff --git a/chat/libpurple/options.mk b/chat/libpurple/options.mk
index 42d7ab68a76..ca550c2ca4d 100644
--- a/chat/libpurple/options.mk
+++ b/chat/libpurple/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.19 2011/07/13 11:02:41 wiz Exp $
+# $NetBSD: options.mk,v 1.20 2012/04/25 16:27:50 drochner Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.libpurple
PKG_SUPPORTED_OPTIONS+= avahi dbus debug farsight gnome gnutls
@@ -29,7 +29,6 @@ CONFIGURE_ARGS+= --enable-gnutls
CONFIGURE_ARGS+= --with-gnutls-includes=${BUILDLINK_PREFIX.gnutls}/include
CONFIGURE_ARGS+= --with-gnutls-libs=${BUILDLINK_PREFIX.gnutls}/lib
. include "../../security/gnutls/buildlink3.mk"
-. include "../../security/libgcrypt/buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-gnutls
PLIST.nss= yes
diff --git a/chat/libpurple/patches/patch-aa b/chat/libpurple/patches/patch-aa
new file mode 100644
index 00000000000..1b565ad706d
--- /dev/null
+++ b/chat/libpurple/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.15 2012/04/25 16:27:50 drochner Exp $
+
+--- configure.orig 2012-04-02 10:22:15.000000000 +0000
++++ configure
+@@ -20785,7 +20785,7 @@ if ${ac_cv_gnutls_libs+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+
+- LIBS="$LIBS $with_gnutls_libs -lgnutls -lgcrypt"
++ LIBS="$LIBS $with_gnutls_libs -lgnutls"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+@@ -20824,7 +20824,7 @@ $as_echo "#define HAVE_GNUTLS 1" >>confd
+ $as_echo "#define HAVE_SSL 1" >>confdefs.h
+
+ msg_gnutls="GnuTLS"
+- GNUTLS_LIBS="$with_gnutls_libs -lgnutls -lgcrypt"
++ GNUTLS_LIBS="$with_gnutls_libs -lgnutls"
+
+ enable_gnutls="yes"
+ else