Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 26 Sep 2015 13:04:23 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r397974 - in head/net-im/gloox: . files
Message-ID:  <201509261304.t8QD4NkN065452@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: madpilot
Date: Sat Sep 26 13:04:22 2015
New Revision: 397974
URL: https://svnweb.freebsd.org/changeset/ports/397974

Log:
  - Update to 1.0.14
  - Add option to use mDNS
  
  PR:		202855
  Submitted by:	Ports Fury

Added:
  head/net-im/gloox/files/patch-src__examples__linklocal_example.cpp   (contents, props changed)
  head/net-im/gloox/files/patch-src__linklocalclient.cpp   (contents, props changed)
  head/net-im/gloox/files/patch-src__linklocalmanager.cpp   (contents, props changed)
Modified:
  head/net-im/gloox/Makefile
  head/net-im/gloox/distinfo
  head/net-im/gloox/files/patch-src__examples__e2ee_client.cpp
  head/net-im/gloox/files/patch-src__examples__e2ee_server.cpp
  head/net-im/gloox/files/patch-src__examples__ft_recv.cpp

Modified: head/net-im/gloox/Makefile
==============================================================================
--- head/net-im/gloox/Makefile	Sat Sep 26 13:02:41 2015	(r397973)
+++ head/net-im/gloox/Makefile	Sat Sep 26 13:04:22 2015	(r397974)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gloox
-PORTVERSION=	1.0.13
+PORTVERSION=	1.0.14
 CATEGORIES=	net-im
 MASTER_SITES=	http://camaya.net/download/
 
@@ -10,6 +10,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Jabber/XMPP client library
 
 LICENSE=	GPLv3
+#LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn \
 		libgnutls.so:${PORTSDIR}/security/gnutls
@@ -24,9 +25,15 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORTSCOUT=	skipv:1.0.x
 
+OPTIONS_DEFINE=		MDNSRESPONDER
+
+MDNSRESPONDER_LIB_DEPENDS=	libdns_sd.so:${PORTSDIR}/net/mDNSResponder
+MDNSRESPONDER_CONFIGURE_ENABLE=	mdns
+
 post-patch:
 	@${REINPLACE_CMD} -e \
-		 's| -ansi||' ${WRKSRC}/configure
+		's| -ansi|| ; \
+		 s|\(enable_mdns=\)yes|\1$$enableval|' ${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's| -pedantic|| ; \
 		 s| -pipe||'

Modified: head/net-im/gloox/distinfo
==============================================================================
--- head/net-im/gloox/distinfo	Sat Sep 26 13:02:41 2015	(r397973)
+++ head/net-im/gloox/distinfo	Sat Sep 26 13:04:22 2015	(r397974)
@@ -1,2 +1,2 @@
-SHA256 (gloox-1.0.13.tar.bz2) = 4d9f1eeac97c6563dde11d4bdba346a025ef27908b088b47b5c8d3d03df6ea8a
-SIZE (gloox-1.0.13.tar.bz2) = 675842
+SHA256 (gloox-1.0.14.tar.bz2) = 520b72a66fa9fea917a0336872101539f0bea30d1f871e12c31b6c2cd0203941
+SIZE (gloox-1.0.14.tar.bz2) = 696719

Modified: head/net-im/gloox/files/patch-src__examples__e2ee_client.cpp
==============================================================================
--- head/net-im/gloox/files/patch-src__examples__e2ee_client.cpp	Sat Sep 26 13:02:41 2015	(r397973)
+++ head/net-im/gloox/files/patch-src__examples__e2ee_client.cpp	Sat Sep 26 13:04:22 2015	(r397974)
@@ -1,6 +1,6 @@
---- src/examples/e2ee_client.cpp.orig
+--- src/examples/e2ee_client.cpp.orig	2015-08-11 14:37:51 UTC
 +++ src/examples/e2ee_client.cpp
-@@ -12,8 +12,8 @@
+@@ -24,8 +24,8 @@
  using namespace gloox;
  
  #include <unistd.h>

Modified: head/net-im/gloox/files/patch-src__examples__e2ee_server.cpp
==============================================================================
--- head/net-im/gloox/files/patch-src__examples__e2ee_server.cpp	Sat Sep 26 13:02:41 2015	(r397973)
+++ head/net-im/gloox/files/patch-src__examples__e2ee_server.cpp	Sat Sep 26 13:04:22 2015	(r397974)
@@ -1,6 +1,6 @@
---- src/examples/e2ee_server.cpp.orig
+--- src/examples/e2ee_server.cpp.orig	2015-08-11 14:37:51 UTC
 +++ src/examples/e2ee_server.cpp
-@@ -12,8 +12,8 @@
+@@ -24,8 +24,8 @@
  using namespace gloox;
  
  #include <unistd.h>

Modified: head/net-im/gloox/files/patch-src__examples__ft_recv.cpp
==============================================================================
--- head/net-im/gloox/files/patch-src__examples__ft_recv.cpp	Sat Sep 26 13:02:41 2015	(r397973)
+++ head/net-im/gloox/files/patch-src__examples__ft_recv.cpp	Sat Sep 26 13:04:22 2015	(r397974)
@@ -1,6 +1,6 @@
---- src/examples/ft_recv.cpp.orig
+--- src/examples/ft_recv.cpp.orig	2015-08-11 14:37:51 UTC
 +++ src/examples/ft_recv.cpp
-@@ -11,7 +11,7 @@
+@@ -23,7 +23,7 @@
  using namespace gloox;
  
  #include <unistd.h>

Added: head/net-im/gloox/files/patch-src__examples__linklocal_example.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/gloox/files/patch-src__examples__linklocal_example.cpp	Sat Sep 26 13:04:22 2015	(r397974)
@@ -0,0 +1,21 @@
+--- src/examples/linklocal_example.cpp.orig	2015-08-11 14:37:51 UTC
++++ src/examples/linklocal_example.cpp
+@@ -111,15 +111,15 @@ class LinkLocalExample : public LinkLoca
+       for( ; it != services.end(); ++it )
+       {
+         printf( "%s:\t%s.%s%s on interface %d\n", (*it).flag == LinkLocal::AddService ? "Added" : "Removed", (*it).service.c_str(), (*it).regtype.c_str(),
+-                (*it).domain.c_str(), (*it).interface );
++                (*it).domain.c_str(), (*it).iface );
+         if( !m_fClient /*&& (*it)->flag == LinkLocal::AddService && (*it)->service != "js@pitufo"*/ )
+         {
+           printf( "setting up new local client and connecting to %s.%s%s on interface %d\n",
+-                  (*it).service.c_str(), (*it).regtype.c_str(), (*it).domain.c_str(), (*it).interface );
++                  (*it).service.c_str(), (*it).regtype.c_str(), (*it).domain.c_str(), (*it).iface );
+           m_fClient = new LinkLocal::Client( JID( "js@pitufo" ) );
+           m_fClient->logInstance().registerLogHandler( LogLevelDebug, LogAreaAll, this );
+           m_fClient->registerConnectionListener( this );
+-          if( !m_fClient->connect( (*it).service, (*it).regtype, (*it).domain, (*it).interface ) )
++          if( !m_fClient->connect( (*it).service, (*it).regtype, (*it).domain, (*it).iface ) )
+           {
+             printf( "m_fClient->connect() failed\n" );
+           }

Added: head/net-im/gloox/files/patch-src__linklocalclient.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/gloox/files/patch-src__linklocalclient.cpp	Sat Sep 26 13:04:22 2015	(r397974)
@@ -0,0 +1,11 @@
+--- src/linklocalclient.cpp.orig	2015-08-11 14:37:51 UTC
++++ src/linklocalclient.cpp
+@@ -55,7 +55,7 @@ namespace gloox
+     bool Client::connect( const std::string& service, const std::string& type,
+                           const std::string& domain, int iface )
+     {
+-      m_interface = interface;
++      m_interface = iface;
+       return resolve( service, type, domain );
+     }
+ 

Added: head/net-im/gloox/files/patch-src__linklocalmanager.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/gloox/files/patch-src__linklocalmanager.cpp	Sat Sep 26 13:04:22 2015	(r397974)
@@ -0,0 +1,11 @@
+--- src/linklocalmanager.cpp.orig	2015-08-11 14:37:51 UTC
++++ src/linklocalmanager.cpp
+@@ -197,7 +197,7 @@ namespace gloox
+ 
+     void Manager::handleBrowse( Flag flag, const std::string& service, const std::string& regtype, const std::string& domain, int iface, bool moreComing )
+     {
+-      Service s( flag, service, regtype, domain, interface );
++      Service s( flag, service, regtype, domain, iface );
+       m_tmpServices.push_back( s );
+ 
+ //       switch( flag )



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509261304.t8QD4NkN065452>