Date: Tue, 31 Dec 2013 05:48:16 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/185342: net-im/gloox: Update to version 1.0.9 Message-ID: <20131231054816.99876746197b36fd1bdef527@yahoo.com> Resent-Message-ID: <201312302110.rBULAAMg098892@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185342 >Category: ports >Synopsis: net-im/gloox: Update to version 1.0.9 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Dec 30 21:10:10 UTC 2013 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 8.4-RELEASE-p4 i386 >Organization: >Environment: >Description: - Update to version 1.0.9 New file: files/patch-src__examples__e2ee_client.cpp files/patch-src__examples__e2ee_server.cpp files/patch-src__examples__ft_recv.cpp files/patch-src__tlsgnutlsclient.cpp files/patch-src__tlsgnutlsclient.h >How-To-Repeat: >Fix: diff -urN /usr/ports/net-im/gloox/Makefile net-im/gloox/Makefile --- /usr/ports/net-im/gloox/Makefile 2013-11-06 21:59:10.000000000 +0900 +++ net-im/gloox/Makefile 2013-12-31 00:00:00.000000000 +0900 @@ -2,32 +2,28 @@ # $FreeBSD: head/net-im/gloox/Makefile 327756 2013-09-20 22:13:34Z bapt $ PORTNAME= gloox -PORTVERSION= 1.0 -PORTREVISION= 3 +PORTVERSION= 1.0.9 CATEGORIES= net-im MASTER_SITES= http://camaya.net/download/ MAINTAINER= ports@FreeBSD.org COMMENT= Jabber/XMPP client library -LIB_DEPENDS= idn.17:${PORTSDIR}/dns/libidn \ - gnutls.26:${PORTSDIR}/security/gnutls +LICENSE= GPLv3 + +LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn \ + libgnutls.so:${PORTSDIR}/security/gnutls -USE_AUTOTOOLS= libtool USE_BZIP2= yes -USES= pathfix pkgconfig -GNU_CONFIGURE= yes -CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +USES= pathfix pkgconfig +USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -NO_STAGE= yes +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib + post-patch: - @${REINPLACE_CMD} -e 's|libgnutls-config|pkg-config gnutls|' ${WRKSRC}/configure -post-install: - @${FIND} ${PREFIX}/include/gloox ! -type d | \ - ${SED} "s,${PREFIX}/,," >> ${TMPPLIST} - @${FIND} ${PREFIX}/include/gloox -type d | ${SORT} -r | \ - ${SED} "s,${PREFIX}/,@dirrm ," >> ${TMPPLIST} + @${REINPLACE_CMD} -e \ + 's|-lgcrypt||' ${WRKSRC}/configure .include <bsd.port.mk> diff -urN /usr/ports/net-im/gloox/distinfo net-im/gloox/distinfo --- /usr/ports/net-im/gloox/distinfo 2013-11-06 21:59:10.000000000 +0900 +++ net-im/gloox/distinfo 2013-12-31 00:00:00.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (gloox-1.0.tar.bz2) = b53f3e83e97f2f8d46e482620389b7778b7b0d95b2518ce5e1ae6d81bb2bcde8 -SIZE (gloox-1.0.tar.bz2) = 603434 +SHA256 (gloox-1.0.9.tar.bz2) = 143dd50e1edc4eb1d304fa28bdd6ab9e53b60c37c1726dd0e34c06c51f9a453e +SIZE (gloox-1.0.9.tar.bz2) = 670206 diff -urN /usr/ports/net-im/gloox/files/patch-src__examples__e2ee_client.cpp net-im/gloox/files/patch-src__examples__e2ee_client.cpp --- /usr/ports/net-im/gloox/files/patch-src__examples__e2ee_client.cpp 1970-01-01 09:00:00.000000000 +0900 +++ net-im/gloox/files/patch-src__examples__e2ee_client.cpp 2013-12-31 00:00:00.000000000 +0900 @@ -0,0 +1,13 @@ +--- src/examples/e2ee_client.cpp.orig ++++ src/examples/e2ee_client.cpp +@@ -12,8 +12,8 @@ + using namespace gloox; + + #include <unistd.h> +-#include <stdio.h> +-#include <locale.h> ++#include <ctime> ++#include <clocale> + #include <string> + + #include <cstdio> // [s]print[f] diff -urN /usr/ports/net-im/gloox/files/patch-src__examples__e2ee_server.cpp net-im/gloox/files/patch-src__examples__e2ee_server.cpp --- /usr/ports/net-im/gloox/files/patch-src__examples__e2ee_server.cpp 1970-01-01 09:00:00.000000000 +0900 +++ net-im/gloox/files/patch-src__examples__e2ee_server.cpp 2013-12-31 00:00:00.000000000 +0900 @@ -0,0 +1,13 @@ +--- src/examples/e2ee_server.cpp.orig ++++ src/examples/e2ee_server.cpp +@@ -12,8 +12,8 @@ + using namespace gloox; + + #include <unistd.h> +-#include <stdio.h> +-#include <locale.h> ++#include <ctime> ++#include <clocale> + #include <string> + + #include <cstdio> // [s]print[f] diff -urN /usr/ports/net-im/gloox/files/patch-src__examples__ft_recv.cpp net-im/gloox/files/patch-src__examples__ft_recv.cpp --- /usr/ports/net-im/gloox/files/patch-src__examples__ft_recv.cpp 1970-01-01 09:00:00.000000000 +0900 +++ net-im/gloox/files/patch-src__examples__ft_recv.cpp 2013-12-31 00:00:00.000000000 +0900 @@ -0,0 +1,11 @@ +--- src/examples/ft_recv.cpp.orig ++++ src/examples/ft_recv.cpp +@@ -11,7 +11,7 @@ + using namespace gloox; + + #include <unistd.h> +-#include <stdio.h> ++#include <ctime> + #include <string> + + #include <cstdio> // [s]print[f] 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 1970-01-01 09:00:00.000000000 +0900 +++ net-im/gloox/files/patch-src__tlsgnutlsclient.cpp 2013-12-31 00:00:00.000000000 +0900 @@ -0,0 +1,24 @@ +--- 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 1970-01-01 09:00:00.000000000 +0900 +++ net-im/gloox/files/patch-src__tlsgnutlsclient.h 2013-12-31 00:00:00.000000000 +0900 @@ -0,0 +1,10 @@ +--- 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-descr net-im/gloox/pkg-descr --- /usr/ports/net-im/gloox/pkg-descr 2013-11-06 21:59:10.000000000 +0900 +++ net-im/gloox/pkg-descr 2013-12-31 00:00:00.000000000 +0900 @@ -1,8 +1,6 @@ gloox is a full-featured Jabber/XMPP client without GUI, written in C++ and implemented as a shared library. It makes writing spec-compliant clients easy and allows for hassle-free integration -of Jabber/XMPP functionality into extisting applications. gloox -is released under the GNU GPL. Commercial licensing and support -are available. +of Jabber/XMPP functionality into extisting applications. WWW: http://camaya.net/gloox diff -urN /usr/ports/net-im/gloox/pkg-plist net-im/gloox/pkg-plist --- /usr/ports/net-im/gloox/pkg-plist 2013-11-06 21:59:10.000000000 +0900 +++ net-im/gloox/pkg-plist 2013-12-31 00:00:00.000000000 +0900 @@ -1,6 +1,155 @@ bin/gloox-config +include/gloox/adhoc.h +include/gloox/adhoccommandprovider.h +include/gloox/adhochandler.h +include/gloox/amp.h +include/gloox/annotations.h +include/gloox/annotationshandler.h +include/gloox/atomicrefcount.h +include/gloox/attention.h +include/gloox/base64.h +include/gloox/bookmarkhandler.h +include/gloox/bookmarkstorage.h +include/gloox/bytestream.h +include/gloox/bytestreamdatahandler.h +include/gloox/bytestreamhandler.h +include/gloox/capabilities.h +include/gloox/carbons.h +include/gloox/chatstate.h +include/gloox/chatstatefilter.h +include/gloox/chatstatehandler.h +include/gloox/client.h +include/gloox/clientbase.h +include/gloox/component.h +include/gloox/compressionbase.h +include/gloox/compressiondatahandler.h +include/gloox/compressiondefault.h +include/gloox/connectionbase.h +include/gloox/connectionbosh.h +include/gloox/connectiondatahandler.h +include/gloox/connectionhandler.h +include/gloox/connectionhttpproxy.h +include/gloox/connectionlistener.h +include/gloox/connectionsocks5proxy.h +include/gloox/connectiontcpbase.h +include/gloox/connectiontcpclient.h +include/gloox/connectiontcpserver.h +include/gloox/connectiontls.h +include/gloox/connectiontlsserver.h +include/gloox/dataform.h +include/gloox/dataformfield.h +include/gloox/dataformfieldcontainer.h +include/gloox/dataformitem.h +include/gloox/dataformreported.h +include/gloox/delayeddelivery.h +include/gloox/disco.h +include/gloox/discohandler.h +include/gloox/disconodehandler.h +include/gloox/error.h +include/gloox/event.h +include/gloox/eventdispatcher.h +include/gloox/eventhandler.h +include/gloox/featureneg.h +include/gloox/flexoff.h +include/gloox/flexoffhandler.h +include/gloox/forward.h +include/gloox/gloox.h +include/gloox/glooxversion.h +include/gloox/gpgencrypted.h +include/gloox/gpgsigned.h +include/gloox/inbandbytestream.h +include/gloox/instantmucroom.h +include/gloox/iq.h +include/gloox/iqhandler.h +include/gloox/jid.h +include/gloox/jinglecontent.h +include/gloox/jinglefiletransfer.h +include/gloox/jingleiceudp.h +include/gloox/jingleplugin.h +include/gloox/jinglepluginfactory.h +include/gloox/jinglesession.h +include/gloox/jinglesessionhandler.h +include/gloox/jinglesessionmanager.h +include/gloox/jingletransport.h +include/gloox/lastactivity.h +include/gloox/lastactivityhandler.h +include/gloox/linklocal.h +include/gloox/linklocalclient.h +include/gloox/linklocalhandler.h +include/gloox/linklocalmanager.h +include/gloox/loghandler.h +include/gloox/logsink.h +include/gloox/macros.h +include/gloox/md5.h +include/gloox/message.h +include/gloox/messageevent.h +include/gloox/messageeventfilter.h +include/gloox/messageeventhandler.h +include/gloox/messagefilter.h +include/gloox/messagehandler.h +include/gloox/messagesession.h +include/gloox/messagesessionhandler.h +include/gloox/mucinvitationhandler.h +include/gloox/mucroom.h +include/gloox/mucroomconfighandler.h +include/gloox/mucroomhandler.h +include/gloox/mutex.h +include/gloox/mutexguard.h +include/gloox/nickname.h +include/gloox/oob.h +include/gloox/parser.h +include/gloox/presence.h +include/gloox/presencehandler.h +include/gloox/privacyitem.h +include/gloox/privacylisthandler.h +include/gloox/privacymanager.h +include/gloox/privatexml.h +include/gloox/privatexmlhandler.h +include/gloox/pubsub.h +include/gloox/pubsubevent.h +include/gloox/pubsubitem.h +include/gloox/pubsubmanager.h +include/gloox/pubsubresulthandler.h +include/gloox/receipt.h +include/gloox/registration.h +include/gloox/registrationhandler.h +include/gloox/resource.h +include/gloox/rosteritem.h +include/gloox/rosterlistener.h +include/gloox/rostermanager.h +include/gloox/search.h +include/gloox/searchhandler.h +include/gloox/sha.h +include/gloox/shim.h +include/gloox/sihandler.h +include/gloox/simanager.h +include/gloox/siprofileft.h +include/gloox/siprofilefthandler.h +include/gloox/siprofilehandler.h +include/gloox/socks5bytestream.h +include/gloox/socks5bytestreammanager.h +include/gloox/socks5bytestreamserver.h +include/gloox/softwareversion.h +include/gloox/stanza.h +include/gloox/stanzaextension.h +include/gloox/statisticshandler.h +include/gloox/subscription.h +include/gloox/subscriptionhandler.h +include/gloox/tag.h +include/gloox/taghandler.h +include/gloox/tlsbase.h +include/gloox/tlsdefault.h +include/gloox/tlshandler.h +include/gloox/uniquemucroom.h +include/gloox/util.h +include/gloox/vcard.h +include/gloox/vcardhandler.h +include/gloox/vcardmanager.h +include/gloox/vcardupdate.h +include/gloox/xhtmlim.h lib/libgloox.a lib/libgloox.la lib/libgloox.so -lib/libgloox.so.8 +lib/libgloox.so.11 libdata/pkgconfig/gloox.pc +@dirrm include/gloox >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131231054816.99876746197b36fd1bdef527>