Hello, the dev team of mcabber [1] has taken over the development of loudmouth [2], so I've updated loudmouth to the latest released version and changed the upstream location.
I've removed all of the patches from the port (except for one), since most of them are merged/fixed upstream or are made obsolete. The one patch I didn't remove has to do with tests and I've updated it to apply cleanly, although I'm not sure if it's really needed. Since loudmouth is a shared library, I've also updated it's minor version because new functions were added to the library. I didn't spot any changes on existing functions. I've compiled all three ports that are using this lib, net/mcabber, net/irssi-xmpp, and net/freetalk successfully, but only really tested it with mcabber for a couple of hours. Seems to be working ok though and fixes a bug that I've encountered in 1.4.3 [3]. I'm attaching the diff, can someone take a look at this? Cheers, dgrig PS. This is my first time messing around with ports (and cvs), so please let me know if I've done something terribly wrong. [1]: http://mcabber.com/ [2]: https://github.com/mcabber/loudmouth/issues/13 [3]: https://github.com/mcabber/loudmouth/pull/15
Index: Makefile =================================================================== RCS file: /cvs/ports/net/loudmouth/Makefile,v retrieving revision 1.26 diff -u -p -r1.26 Makefile --- Makefile 11 Mar 2016 20:28:29 -0000 1.26 +++ Makefile 20 Apr 2017 23:39:34 -0000 @@ -2,13 +2,13 @@ COMMENT= lightweight Jabber client library -V= 1.4.3 +V= 1.5.3 DISTNAME= loudmouth-$V -REVISION= 6 -SHARED_LIBS += loudmouth-1 3.0 # .1.0 +REVISION= 0 +SHARED_LIBS += loudmouth-1 3.1 # .1.0 CATEGORIES= net devel -HOMEPAGE= http://groups.google.com/group/loudmouth-dev/ +HOMEPAGE= https://mcabber.com/ # LGPLv2.1 PERMIT_PACKAGE_CDROM= Yes @@ -17,7 +17,7 @@ WANTLIB += crypto glib-2.0 idn>=16 pcre MODULES= devel/gettext -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/loudmouth/${V:C/^([0-9]+\.[0-9]+).*/\1/}/} +MASTER_SITES= ${HOMEPAGE}/files/loudmouth/ EXTRACT_SUFX= .tar.bz2 LIB_DEPENDS= devel/glib2 \ Index: distinfo =================================================================== RCS file: /cvs/ports/net/loudmouth/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo 18 Jan 2015 03:14:42 -0000 1.6 +++ distinfo 20 Apr 2017 23:39:34 -0000 @@ -1,2 +1,2 @@ -SHA256 (loudmouth-1.4.3.tar.bz2) = lak/XQCbceqBk9mUqhHzEbwzCj7+G3zXTcSPEcf5KeM= -SIZE (loudmouth-1.4.3.tar.bz2) = 366818 +SHA256 (loudmouth-1.5.3.tar.bz2) = VDKUFcsbrLeDwg9fH5dd5PxGAWXQ2KHjt4k2e19p0yw= +SIZE (loudmouth-1.5.3.tar.bz2) = 375974 Index: patches/patch-configure =================================================================== RCS file: patches/patch-configure diff -N patches/patch-configure --- patches/patch-configure 18 Nov 2008 11:41:23 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ -$OpenBSD: patch-configure,v 1.3 2008/11/18 11:41:23 jasper Exp $ ---- configure.orig Wed Oct 29 21:25:57 2008 -+++ configure Tue Nov 18 12:33:20 2008 -@@ -21423,6 +21423,7 @@ cat >>conftest.$ac_ext <<_ACEOF - - #include <stdio.h> - #include <stdlib.h> -+#include <string.h> - - #include <check.h> - -@@ -21532,6 +21533,7 @@ cat >>conftest.$ac_ext <<_ACEOF - - #include <stdio.h> - #include <stdlib.h> -+#include <string.h> - - #include <check.h> - Index: patches/patch-loudmouth_Makefile_in =================================================================== RCS file: patches/patch-loudmouth_Makefile_in diff -N patches/patch-loudmouth_Makefile_in --- patches/patch-loudmouth_Makefile_in 20 Aug 2008 16:11:11 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -$OpenBSD: patch-loudmouth_Makefile_in,v 1.1 2008/08/20 16:11:11 jasper Exp $ ---- loudmouth/Makefile.in.orig Mon Aug 4 13:37:02 2008 -+++ loudmouth/Makefile.in Mon Aug 4 13:37:12 2008 -@@ -306,8 +306,7 @@ libloudmouthinclude_HEADERS = \ - - libloudmouth_1_la_LIBADD = \ - $(LOUDMOUTH_LIBS) \ -- $(LIBIDN_LIBS) \ -- -lresolv -+ $(LIBIDN_LIBS) - - libloudmouth_1_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ Index: patches/patch-loudmouth_lm-error_c =================================================================== RCS file: patches/patch-loudmouth_lm-error_c diff -N patches/patch-loudmouth_lm-error_c --- patches/patch-loudmouth_lm-error_c 23 Mar 2012 13:28:25 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-loudmouth_lm-error_c,v 1.1 2012/03/23 13:28:25 ajacoutot Exp $ - -error: #error "Only <glib.h> can be included directly." - ---- loudmouth/lm-error.c.orig Sun Mar 18 07:26:55 2012 -+++ loudmouth/lm-error.c Sun Mar 18 07:27:04 2012 -@@ -19,7 +19,7 @@ - */ - - #include <config.h> --#include <glib/gerror.h> -+#include <glib.h> - #include "lm-error.h" - - /** Index: patches/patch-loudmouth_lm-sock_c =================================================================== RCS file: patches/patch-loudmouth_lm-sock_c diff -N patches/patch-loudmouth_lm-sock_c --- patches/patch-loudmouth_lm-sock_c 31 Aug 2008 12:16:14 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -$OpenBSD: patch-loudmouth_lm-sock_c,v 1.2 2008/08/31 12:16:14 jasper Exp $ ---- loudmouth/lm-sock.c.orig Sun Aug 31 13:42:29 2008 -+++ loudmouth/lm-sock.c Sun Aug 31 13:43:08 2008 -@@ -29,7 +29,9 @@ - #include <string.h> - #include <unistd.h> - #include <sys/socket.h> -+#include <sys/types.h> - #include <fcntl.h> -+#include <netinet/in_systm.h> - - /* Needed for BSD, LM-130 */ - #ifdef HAVE_NETINET_IN_SYSTM_H Index: patches/patch-loudmouth_lm-ssl-openssl_c =================================================================== RCS file: patches/patch-loudmouth_lm-ssl-openssl_c diff -N patches/patch-loudmouth_lm-ssl-openssl_c --- patches/patch-loudmouth_lm-ssl-openssl_c 19 Jan 2009 10:54:27 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,18 +0,0 @@ -$OpenBSD: patch-loudmouth_lm-ssl-openssl_c,v 1.1 2009/01/19 10:54:27 jasper Exp $ ---- loudmouth/lm-ssl-openssl.c.orig Mon Jan 19 11:50:51 2009 -+++ loudmouth/lm-ssl-openssl.c Mon Jan 19 11:51:45 2009 -@@ -305,6 +305,14 @@ _lm_ssl_initialize (LmSSL *ssl) - g_warning ("SSL_CTX_new() == NULL"); - abort(); - } -+ /* Set the NO_TICKET option on the context to allow for talk to Google Talk -+ * which apparently seems to be having a problem handling empty session -+ * tickets due to a bug in Java. -+ * -+ * See http://twistedmatrix.com/trac/ticket/3463 and -+ * Loudmouth [#28]. -+ */ -+ SSL_CTX_set_options (ssl->ssl_ctx, SSL_OP_NO_TICKET); - /*if (access("/etc/ssl/cert.pem", R_OK) == 0) - cert_file = "/etc/ssl/cert.pem"; - if (!SSL_CTX_load_verify_locations(ssl->ssl_ctx, Index: patches/patch-tests-Makefile_in =================================================================== RCS file: /cvs/ports/net/loudmouth/patches/patch-tests-Makefile_in,v retrieving revision 1.2 diff -u -p -r1.2 patch-tests-Makefile_in --- patches/patch-tests-Makefile_in 20 Aug 2008 16:11:11 -0000 1.2 +++ patches/patch-tests-Makefile_in 20 Apr 2017 23:39:34 -0000 @@ -1,21 +1,21 @@ $OpenBSD: patch-tests-Makefile_in,v 1.2 2008/08/20 16:11:11 jasper Exp $ ---- tests/Makefile.in.orig Mon Aug 4 13:23:35 2008 -+++ tests/Makefile.in Mon Aug 4 13:24:03 2008 -@@ -52,7 +52,7 @@ test_objects_LDADD = $(LDADD) - am_test_parser_OBJECTS = test-parser.$(OBJEXT) - test_parser_OBJECTS = $(am_test_parser_OBJECTS) - test_parser_LDADD = $(LDADD) +--- tests/Makefile.in.orig Thu Apr 20 23:41:42 2017 ++++ tests/Makefile.in Thu Apr 20 23:43:17 2017 +@@ -123,7 +123,7 @@ AM_V_at = $(am__v_at_@AM_V@) + am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) + am__v_at_0 = @ + am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I${TRUEPREFIX}/include - depcomp = $(SHELL) $(top_srcdir)/depcomp + depcomp = $(SHELL) $(top_srcdir)/build/depcomp am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -127,7 +127,7 @@ INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ + am__mv = mv -f +@@ -266,7 +266,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + KRB5CONFIG = @KRB5CONFIG@ + LD = @LD@ -LDFLAGS = @LDFLAGS@ +LDFLAGS = @LDFLAGS@ -lcheck LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ - LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@ LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBIDN_CFLAGS = @LIBIDN_CFLAGS@ Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/loudmouth/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- pkg/PLIST 16 Mar 2015 18:07:53 -0000 1.2 +++ pkg/PLIST 20 Apr 2017 23:39:34 -0000 @@ -22,15 +22,14 @@ share/gtk-doc/html/loudmouth/home.png share/gtk-doc/html/loudmouth/index.html share/gtk-doc/html/loudmouth/index.sgml share/gtk-doc/html/loudmouth/left.png -share/gtk-doc/html/loudmouth/loudmouth-lm-connection.html -share/gtk-doc/html/loudmouth/loudmouth-lm-error.html -share/gtk-doc/html/loudmouth/loudmouth-lm-message-handler.html -share/gtk-doc/html/loudmouth/loudmouth-lm-message-node.html -share/gtk-doc/html/loudmouth/loudmouth-lm-message.html -share/gtk-doc/html/loudmouth/loudmouth-lm-proxy.html -share/gtk-doc/html/loudmouth/loudmouth-lm-ssl.html -share/gtk-doc/html/loudmouth/loudmouth-lm-utils.html -share/gtk-doc/html/loudmouth/loudmouth.devhelp +share/gtk-doc/html/loudmouth/loudmouth-LmConnection.html +share/gtk-doc/html/loudmouth/loudmouth-LmError.html +share/gtk-doc/html/loudmouth/loudmouth-LmMessageHandler.html +share/gtk-doc/html/loudmouth/loudmouth-LmMessageNode.html +share/gtk-doc/html/loudmouth/loudmouth-LmMessage.html +share/gtk-doc/html/loudmouth/loudmouth-LmProxy.html +share/gtk-doc/html/loudmouth/loudmouth-LmSSL.html +share/gtk-doc/html/loudmouth/loudmouth-Miscellaneous-Utility-Functions.html share/gtk-doc/html/loudmouth/loudmouth.devhelp2 share/gtk-doc/html/loudmouth/right.png share/gtk-doc/html/loudmouth/style.css
