Attachment #152749 for bug #197450

View | Details | Raw Unified | Return to bug 197450
Collapse All | Expand All




# $FreeBSD: head/net-im/gloox/Makefile 367822 2014-09-10 12:18:21Z amdmi3 $

PORTNAME=	gloox
PORTVERSION=	1.0.13
PORTREVISION=	4
CATEGORIES=	net-im
MASTER_SITES=	http://camaya.net/download/


COMMENT=	Jabber/XMPP client library

LICENSE=	GPLv3
LICENSE_FILE=	${WRKSRC}/LICENSE

LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn \
		libgnutls.so:${PORTSDIR}/security/gnutls

CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib

PORTSCOUT=	skipv:1.0.x

post-patch:
	@${REINPLACE_CMD} -e \
		's|"GNU strip"|"strip"| ; \
		 s| -ansi||' ${WRKSRC}/configure
	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
		's| -pedantic|| ; \
		 s| -pipe||'

Lines 1-2 Link Here

(-)net-im/gloox/distinfo (-2 / +2 lines)
1	SHA256 (gloox-1.0.10.tar.bz2) = 300e756af97d43f3f70f1e68e4d4c7129d587dface61633f50d2c490876f58a3	1	SHA256 (gloox-1.0.13.tar.bz2) = 4d9f1eeac97c6563dde11d4bdba346a025ef27908b088b47b5c8d3d03df6ea8a
2	SIZE (gloox-1.0.10.tar.bz2) = 670288	2	SIZE (gloox-1.0.13.tar.bz2) = 675842




--- 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,

Lines 1-10 Link Here

(-)net-im/gloox/files/patch-src__tlsgnutlsclient.h (-10 lines)
1	--- src/tlsgnutlsclient.h.orig
2	+++ src/tlsgnutlsclient.h
3	@@ -23,7 +23,6 @@
4
5	#include <gnutls/gnutls.h>
6	#include <gnutls/x509.h>
7	-#include <gcrypt.h>
8
9	namespace gloox
10	{




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

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

include/gloox/xhtmlim.h
lib/libgloox.a
lib/libgloox.so
lib/libgloox.so.13
lib/libgloox.so.13.0.0
libdata/pkgconfig/gloox.pc

Return to bug 197450

Lines 2-9 Link Here

(-)net-im/gloox/Makefile (-5 / +5 lines)
2	# $FreeBSD: head/net-im/gloox/Makefile 367822 2014-09-10 12:18:21Z amdmi3 $	2	# $FreeBSD: head/net-im/gloox/Makefile 367822 2014-09-10 12:18:21Z amdmi3 $
3		3
4	PORTNAME= gloox	4	PORTNAME= gloox
5	PORTVERSION= 1.0.10	5	PORTVERSION= 1.0.13
6	PORTREVISION= 4
7	CATEGORIES= net-im	6	CATEGORIES= net-im
8	MASTER_SITES= http://camaya.net/download/	7	MASTER_SITES= http://camaya.net/download/
9		8
Lines 11-17 Link Here
11	COMMENT= Jabber/XMPP client library	10	COMMENT= Jabber/XMPP client library
12		11
13	LICENSE= GPLv3	12	LICENSE= GPLv3
14	LICENSE_FILE= ${WRKSRC}/LICENSE
15		13
16	LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn \	14	LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn \
17	libgnutls.so:${PORTSDIR}/security/gnutls	15	libgnutls.so:${PORTSDIR}/security/gnutls
Lines 24-33 Link Here
24	CPPFLAGS+= -I${LOCALBASE}/include	22	CPPFLAGS+= -I${LOCALBASE}/include
25	LDFLAGS+= -L${LOCALBASE}/lib	23	LDFLAGS+= -L${LOCALBASE}/lib
26		24
		25	PORTSCOUT= skipv:1.0.x
		26
27	post-patch:	27	post-patch:
28	@${REINPLACE_CMD} -e \	28	@${REINPLACE_CMD} -e \
29	's\| -ansi\|\| ; \	29	's\|"GNU strip"\|"strip"\| ; \
30	s\| -lgcrypt\|\|' ${WRKSRC}/configure	30	s\| -ansi\|\|' ${WRKSRC}/configure
31	@${FIND} ${WRKSRC} -name "Makefile.in" \| ${XARGS} ${REINPLACE_CMD} -e \	31	@${FIND} ${WRKSRC} -name "Makefile.in" \| ${XARGS} ${REINPLACE_CMD} -e \
32	's\| -pedantic\|\| ; \	32	's\| -pedantic\|\| ; \
33	s\| -pipe\|\|'	33	s\| -pipe\|\|'

Lines 1-24 Link Here

(-)net-im/gloox/files/patch-src__tlsgnutlsclient.cpp (-24 lines)
1	--- src/tlsgnutlsclient.cpp.orig
2	+++ src/tlsgnutlsclient.cpp
3	@@ -18,12 +18,6 @@
4
5	#include <errno.h>
6
7	-#ifdef HAVE_PTHREAD
8	-extern "C" {
9	-GCRY_THREAD_OPTION_PTHREAD_IMPL;
10	-}
11	-#endif
12	-
13	namespace gloox
14	{
15
16	@@ -48,8 +42,6 @@
17	const std::string& /clientCerts/,
18	const StringList& /cacerts/ )
19	{
20	- gcry_control( GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread );
21	-
22	const int protocolPriority[] = {
23	#ifdef GNUTLS_TLS1_2
24	GNUTLS_TLS1_2,

Lines 2-7 Link Here

(-)net-im/gloox/pkg-plist (-2 / +4 lines)
2	include/gloox/adhoc.h	2	include/gloox/adhoc.h
3	include/gloox/adhoccommandprovider.h	3	include/gloox/adhoccommandprovider.h
4	include/gloox/adhochandler.h	4	include/gloox/adhochandler.h
		5	include/gloox/adhocplugin.h
5	include/gloox/amp.h	6	include/gloox/amp.h
6	include/gloox/annotations.h	7	include/gloox/annotations.h
7	include/gloox/annotationshandler.h	8	include/gloox/annotationshandler.h
Lines 59-64 Link Here
59	include/gloox/gpgsigned.h	60	include/gloox/gpgsigned.h
60	include/gloox/inbandbytestream.h	61	include/gloox/inbandbytestream.h
61	include/gloox/instantmucroom.h	62	include/gloox/instantmucroom.h
		63	include/gloox/iodata.h
62	include/gloox/iq.h	64	include/gloox/iq.h
63	include/gloox/iqhandler.h	65	include/gloox/iqhandler.h
64	include/gloox/jid.h	66	include/gloox/jid.h
Lines 148-153 Link Here
148	include/gloox/xhtmlim.h	150	include/gloox/xhtmlim.h
149	lib/libgloox.a	151	lib/libgloox.a
150	lib/libgloox.so	152	lib/libgloox.so
151	lib/libgloox.so.12	153	lib/libgloox.so.13
152	lib/libgloox.so.12.0.0	154	lib/libgloox.so.13.0.0
153	libdata/pkgconfig/gloox.pc	155	libdata/pkgconfig/gloox.pc