Index: centerim/Makefile =================================================================== --- centerim/Makefile +++ centerim/Makefile @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= centerim -PORTVERSION= 4.22.10 -PORTREVISION= 6 +PORTVERSION= 5.0.1 CATEGORIES= net-im -MASTER_SITES= http://www.centerim.org/download/releases/ \ - ftp://ftp.centerim.org/releases/ +MASTER_SITES= http://www.centerim.org/download/cim5/ \ + ftp://ftp.centerim.org/download/cim5 +DISTNAME= ${PORTNAME}5-${PORTVERSION} MAINTAINER= frank@altpeter.de COMMENT= Text mode menu- and window-driven IM interface @@ -14,23 +14,15 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libassuan.so:security/libassuan \ - libcurl.so:ftp/curl \ - libgpg-error.so:security/libgpg-error +LIB_DEPENDS= libgpg-error.so:security/libgpg-error \ + libpurple.so:net-im/libpurple \ + libsigc-2.0.so:devel/libsigc++20 -USES= iconv gmake ncurses pkgconfig python shebangfix ssl -USE_CXXSTD= gnu++98 +USES= iconv gmake ncurses:port pkgconfig python ssl GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -CXXFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS= --with-ssl --with-openssl --disable-yahoo --disable-msn CONFLICTS= centericq-[0-9]* centerim-devel-[0-9]* -SHEBANG_FILES= misc/CenterIMLog2HTML.py misc/cimformathistory misc/cimextracthistory.pl -SHEBANG_LANG= gawk -gawk_OLD_CMD= /bin/gawk -gawk_CMD= /usr/bin/awk - OPTIONS_DEFINE= NLS MULTIBYTE FRIBIDI IRC JABBER GPGME RSS LJ GG DOCS FRIBIDI_DESC= Fribidi Support @@ -44,7 +36,7 @@ OPTIONS_SUB= yes -PORTDOCS= FAQ README +PORTDOCS= README NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls Index: centerim/distinfo =================================================================== --- centerim/distinfo +++ centerim/distinfo @@ -1,2 +1,3 @@ -SHA256 (centerim-4.22.10.tar.gz) = 93ce15eb9c834a4939b5aa0846d5c6023ec2953214daf8dc26c85ceaa4413f6e -SIZE (centerim-4.22.10.tar.gz) = 2287832 +TIMESTAMP = 1566628127 +SHA256 (centerim5-5.0.1.tar.gz) = b80b999e0174b81206255556cf00de6548ea29fa6f3ea9deb1f9ab59d8318313 +SIZE (centerim5-5.0.1.tar.gz) = 764152 Index: centerim/files/patch-libicq2000-src-ContactTree.cpp =================================================================== --- centerim/files/patch-libicq2000-src-ContactTree.cpp +++ centerim/files/patch-libicq2000-src-ContactTree.cpp @@ -1,11 +0,0 @@ ---- libicq2000/src/ContactTree.cpp.orig 2010-10-26 21:19:06.000000000 +0400 -+++ libicq2000/src/ContactTree.cpp 2014-01-21 07:26:17.940860269 +0400 -@@ -19,6 +19,8 @@ - * - */ - -+#include -+ - #include "ContactTree.h" - #include "events.h" - Index: centerim/files/patch-libicq2000_libicq2000_sigslot.h =================================================================== --- centerim/files/patch-libicq2000_libicq2000_sigslot.h +++ centerim/files/patch-libicq2000_libicq2000_sigslot.h @@ -1,10 +0,0 @@ ---- libicq2000/libicq2000/sigslot.h.orig 2010-10-26 17:19:06.000000000 +0000 -+++ libicq2000/libicq2000/sigslot.h -@@ -84,6 +84,7 @@ - - #include - #include -+#include - - #if defined(SIGSLOT_PURE_ISO) || (!defined(WIN32) && !defined(SIGSLOT_USE_POSIX_THREADS)) - # define _SIGSLOT_SINGLE_THREADED Index: centerim/files/patch-libjabber-jconn.c =================================================================== --- centerim/files/patch-libjabber-jconn.c +++ centerim/files/patch-libjabber-jconn.c @@ -1,54 +0,0 @@ ---- libjabber/jconn.c.orig 2011-05-23 01:06:31.000000000 +0400 -+++ libjabber/jconn.c 2014-01-21 07:29:07.642848274 +0400 -@@ -824,7 +824,7 @@ - free(hash); - close(sock); - close(fd_file); -- return; -+ return NULL; - } - - recv( sock, buff, SEND_BUF, 0 ); -@@ -833,7 +833,7 @@ - free(hash); - close(sock); - close(fd_file); -- return; -+ return NULL; - } - - //socks5 bytestream packet -@@ -851,7 +851,7 @@ - free(hash); - close(sock); - close(fd_file); -- return; -+ return NULL; - } - recv( sock, buff, 47, 0 ); - if( buff[0] != 0x05 || buff[3] != 0x03 ) -@@ -859,7 +859,7 @@ - free(hash); - close(sock); - close(fd_file); -- return; -+ return NULL; - } - - -@@ -889,6 +889,7 @@ - - - #endif -+ return NULL; - } - - -@@ -961,5 +962,6 @@ - - pthread_exit(0); - #endif -- -+ -+ return NULL; - } Index: centerim/files/patch-src-hooks-abstracthook.h =================================================================== --- centerim/files/patch-src-hooks-abstracthook.h +++ centerim/files/patch-src-hooks-abstracthook.h @@ -1,27 +0,0 @@ ---- src/hooks/abstracthook.h.orig 2011-05-23 01:06:31.000000000 +0400 -+++ src/hooks/abstracthook.h 2014-01-21 08:30:44.206593005 +0400 -@@ -47,11 +47,7 @@ - }; - - class abstracthook { -- protected: -- enum Encoding { -- encUTF, encKOI, encUnknown -- }; -- -+ public: - enum logevent { - logConnecting, - logLogged, -@@ -63,6 +59,11 @@ - logConfMembers - }; - -+ protected: -+ enum Encoding { -+ encUTF, encKOI, encUnknown -+ }; -+ - protocolname proto; - imstatus manualstatus; - verticalmenu *searchdest;