Attachment 152749 Details for Bug 197450 – net-im_gloox.diff

[patch] net-im_gloox.diff

net-im_gloox.diff (text/plain), 3.62 KB, created by tkato432 on 2015-02-08 19:15:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2015-02-08 19:15:05 UTC

Size: 3.62 KB

patch

obsolete

>diff -urN /usr/ports/net-im/gloox/Makefile net-im/gloox/Makefile
>--- /usr/ports/net-im/gloox/Makefile	2014-09-11 04:29:10.000000000 +0900
>+++ net-im/gloox/Makefile	2015-02-09 00:00:00.000000000 +0900
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/net-im/gloox/Makefile 367822 2014-09-10 12:18:21Z amdmi3 $
> 
> PORTNAME=	gloox
>-PORTVERSION=	1.0.10
>-PORTREVISION=	4
>+PORTVERSION=	1.0.13
> CATEGORIES=	net-im
> MASTER_SITES=	http://camaya.net/download/
> 
>@@ -11,7 +10,6 @@
> COMMENT=	Jabber/XMPP client library
> 
> LICENSE=	GPLv3
>-LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn \
> 		libgnutls.so:${PORTSDIR}/security/gnutls
>@@ -24,10 +22,12 @@
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
>+PORTSCOUT=	skipv:1.0.x
>+
> post-patch:
> 	@${REINPLACE_CMD} -e \
>-		's| -ansi|| ; \
>-		 s| -lgcrypt||' ${WRKSRC}/configure
>+		's|"GNU strip"|"strip"| ; \
>+		 s| -ansi||' ${WRKSRC}/configure
> 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
> 		's| -pedantic|| ; \
> 		 s| -pipe||'
>diff -urN /usr/ports/net-im/gloox/distinfo net-im/gloox/distinfo
>--- /usr/ports/net-im/gloox/distinfo	2014-06-21 17:42:51.000000000 +0900
>+++ net-im/gloox/distinfo	2015-02-09 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (gloox-1.0.10.tar.bz2) = 300e756af97d43f3f70f1e68e4d4c7129d587dface61633f50d2c490876f58a3
>-SIZE (gloox-1.0.10.tar.bz2) = 670288
>+SHA256 (gloox-1.0.13.tar.bz2) = 4d9f1eeac97c6563dde11d4bdba346a025ef27908b088b47b5c8d3d03df6ea8a
>+SIZE (gloox-1.0.13.tar.bz2) = 675842
>diff -urN /usr/ports/net-im/gloox/files/patch-src__tlsgnutlsclient.cpp net-im/gloox/files/patch-src__tlsgnutlsclient.cpp
>--- /usr/ports/net-im/gloox/files/patch-src__tlsgnutlsclient.cpp	2014-06-21 17:42:51.000000000 +0900
>+++ net-im/gloox/files/patch-src__tlsgnutlsclient.cpp	1970-01-01 09:00:00.000000000 +0900
>@@ -1,24 +0,0 @@
>---- src/tlsgnutlsclient.cpp.orig
>-+++ src/tlsgnutlsclient.cpp
>-@@ -18,12 +18,6 @@
>- 
>- #include <errno.h>
>- 
>--#ifdef HAVE_PTHREAD
>--extern "C" {
>--GCRY_THREAD_OPTION_PTHREAD_IMPL;
>--}
>--#endif
>--
>- namespace gloox
>- {
>- 
>-@@ -48,8 +42,6 @@
>-                            const std::string& /*clientCerts*/,
>-                            const StringList& /*cacerts*/ )
>-   {
>--    gcry_control( GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread );
>--
>-     const int protocolPriority[] = {
>- #ifdef GNUTLS_TLS1_2
>-       GNUTLS_TLS1_2,
>diff -urN /usr/ports/net-im/gloox/files/patch-src__tlsgnutlsclient.h net-im/gloox/files/patch-src__tlsgnutlsclient.h
>--- /usr/ports/net-im/gloox/files/patch-src__tlsgnutlsclient.h	2014-06-21 17:42:51.000000000 +0900
>+++ net-im/gloox/files/patch-src__tlsgnutlsclient.h	1970-01-01 09:00:00.000000000 +0900
>@@ -1,10 +0,0 @@
>---- src/tlsgnutlsclient.h.orig
>-+++ src/tlsgnutlsclient.h
>-@@ -23,7 +23,6 @@
>- 
>- #include <gnutls/gnutls.h>
>- #include <gnutls/x509.h>
>--#include <gcrypt.h>
>- 
>- namespace gloox
>- {
>diff -urN /usr/ports/net-im/gloox/pkg-plist net-im/gloox/pkg-plist
>--- /usr/ports/net-im/gloox/pkg-plist	2014-11-22 17:05:36.000000000 +0900
>+++ net-im/gloox/pkg-plist	2015-02-09 00:00:00.000000000 +0900
>@@ -2,6 +2,7 @@
> include/gloox/adhoc.h
> include/gloox/adhoccommandprovider.h
> include/gloox/adhochandler.h
>+include/gloox/adhocplugin.h
> include/gloox/amp.h
> include/gloox/annotations.h
> include/gloox/annotationshandler.h
>@@ -59,6 +60,7 @@
> include/gloox/gpgsigned.h
> include/gloox/inbandbytestream.h
> include/gloox/instantmucroom.h
>+include/gloox/iodata.h
> include/gloox/iq.h
> include/gloox/iqhandler.h
> include/gloox/jid.h
>@@ -148,6 +150,6 @@
> include/gloox/xhtmlim.h
> lib/libgloox.a
> lib/libgloox.so
>-lib/libgloox.so.12
>-lib/libgloox.so.12.0.0
>+lib/libgloox.so.13
>+lib/libgloox.so.13.0.0
> libdata/pkgconfig/gloox.pc

Actions: View | Diff

Attachments on bug 197450: 152749