Attachment #207947 for bug #240925

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




# $FreeBSD$

PORTNAME=	centerim
PORTVERSION=	5.0.1
PORTREVISION=	6
CATEGORIES=	net-im
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

LICENSE=	GPLv2+
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libgpg-error.so:security/libgpg-error \
		libpurple.so:net-im/libpurple \
		libsigc-2.0.so:devel/libsigc++20

USES=		iconv gmake ncurses:port pkgconfig python libtool 

USE_GNOME=	glib20
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]*
INSTALL_TARGET=	install-strip

OPTIONS_DEFINE=	NLS GPGME DOCS
SHEBANG_LANG=	gawk
gawk_OLD_CMD=	/bin/gawk
gawk_CMD=	/usr/bin/awk

OPTIONS_DEFAULT=	GPGME 

FRIBIDI_DESC=	Fribidi Support
IRC_DESC=	IRC Protocol
GPGME_DESC=	PGP encrypted Jabber messages
RSS_DESC=	RSS Support
LJ_DESC=	LiveJournal Support
GG_DESC=	Gadu-Gadu Protocol Support

OPTIONS_DEFAULT=	MULTIBYTE FRIBIDI IRC JABBER GPGME RSS LJ GG

OPTIONS_SUB=	yes

PORTDOCS=	README

NLS_USES=		gettext
NLS_CONFIGURE_ENABLE=	nls
MULTIBYTE_CONFIGURE_ENABLE=locales-fix
FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
FRIBIDI_CONFIGURE_WITH=	fribidi
IRC_CONFIGURE_ENABLE=	irc
JABBER_CONFIGURE_ENABLE=jabber
RSS_CONFIGURE_ENABLE=	rss
LJ_CONFIGURE_ENABLE=	lj
GG_LIB_DEPENDS=		libgadu.so:polish/libgadu
GG_CONFIGURE_ENABLE=	gg
GPGME_LIB_DEPENDS=	libgpgme.so:security/gpgme
GPGME_CONFIGURE_OFF=	--with-gpgme-prefix=/nonexistent


Lines 1-2 Link Here

(-)centerim/distinfo (-2 / +3 lines)
1	SHA256 (centerim-4.22.10.tar.gz) = 93ce15eb9c834a4939b5aa0846d5c6023ec2953214daf8dc26c85ceaa4413f6e	1	TIMESTAMP = 1566628127
2	SIZE (centerim-4.22.10.tar.gz) = 2287832	2	SHA256 (centerim5-5.0.1.tar.gz) = b80b999e0174b81206255556cf00de6548ea29fa6f3ea9deb1f9ab59d8318313
		3	SIZE (centerim5-5.0.1.tar.gz) = 764152

Lines 1-11 Link Here

(-)centerim/files/patch-libicq2000-src-ContactTree.cpp (-11 lines)
1	--- libicq2000/src/ContactTree.cpp.orig 2010-10-26 21:19:06.000000000 +0400
2	+++ libicq2000/src/ContactTree.cpp 2014-01-21 07:26:17.940860269 +0400
3	@@ -19,6 +19,8 @@
4	*
5	*/
6
7	+#include <cstdlib>
8	+
9	#include "ContactTree.h"
10	#include "events.h"
11

Lines 1-10 Link Here

(-)centerim/files/patch-libicq2000_libicq2000_sigslot.h (-10 lines)
1	--- libicq2000/libicq2000/sigslot.h.orig 2010-10-26 17:19:06.000000000 +0000
2	+++ libicq2000/libicq2000/sigslot.h
3	@@ -84,6 +84,7 @@
4
5	#include <set>
6	#include <list>
7	+#include <cstddef>
8
9	#if defined(SIGSLOT_PURE_ISO) \|\| (!defined(WIN32) && !defined(SIGSLOT_USE_POSIX_THREADS))
10	# define _SIGSLOT_SINGLE_THREADED




--- 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;
 }




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




bin/centerim5
man/man1/centerim5.1.gz
lib/centerim5/extaction.so
lib/libcppconsui.so
lib/libcppconsui.so.0
lib/libcppconsui.so.0.0.0
%%NLS%%share/locale/cs/LC_MESSAGES/centerim5.mo
%%NLS%%share/locale/nl/LC_MESSAGES/centerim5.mo
%%NLS%%share/locale/ru/LC_MESSAGES/centerim5.mo
%%DATADIR%%/offline.wav
%%DATADIR%%/online.wav
%%DATADIR%%/sms.wav
%%DATADIR%%/url.wav
%%NLS%%share/locale/bg/LC_MESSAGES/centerim.mo
%%NLS%%share/locale/cs/LC_MESSAGES/centerim.mo
%%NLS%%share/locale/de/LC_MESSAGES/centerim.mo
%%NLS%%share/locale/es/LC_MESSAGES/centerim.mo
%%NLS%%share/locale/fr/LC_MESSAGES/centerim.mo
%%NLS%%share/locale/hu/LC_MESSAGES/centerim.mo
%%NLS%%share/locale/it/LC_MESSAGES/centerim.mo
%%NLS%%share/locale/ms/LC_MESSAGES/centerim.mo
%%NLS%%share/locale/nl/LC_MESSAGES/centerim.mo
%%NLS%%share/locale/pl/LC_MESSAGES/centerim.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/centerim.mo
%%NLS%%share/locale/ro/LC_MESSAGES/centerim.mo
%%NLS%%share/locale/ru/LC_MESSAGES/centerim.mo
%%NLS%%share/locale/sv/LC_MESSAGES/centerim.mo
%%NLS%%share/locale/uk/LC_MESSAGES/centerim.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/centerim.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/centerim.mo

Return to bug 240925

Lines 2-12 Link Here

(-)centerim/Makefile (-36 / +14 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= centerim	4	PORTNAME= centerim
5	PORTVERSION= 4.22.10	5	PORTVERSION= 5.0.1
6	PORTREVISION= 6
7	CATEGORIES= net-im	6	CATEGORIES= net-im
8	MASTER_SITES= http://www.centerim.org/download/releases/ \	7	MASTER_SITES= http://www.centerim.org/download/cim5/ \
9	ftp://ftp.centerim.org/releases/	8	ftp://ftp.centerim.org/download/cim5/
		9	DISTNAME= ${PORTNAME}5-${PORTVERSION}
10		10
11	MAINTAINER= frank@altpeter.de	11	MAINTAINER= frank@altpeter.de
12	COMMENT= Text mode menu- and window-driven IM interface	12	COMMENT= Text mode menu- and window-driven IM interface
Lines 14-62 Link Here
14	LICENSE= GPLv2+	14	LICENSE= GPLv2+
15	LICENSE_FILE= ${WRKSRC}/COPYING	15	LICENSE_FILE= ${WRKSRC}/COPYING
16		16
17	LIB_DEPENDS= libassuan.so:security/libassuan \	17	LIB_DEPENDS= libgpg-error.so:security/libgpg-error \
18	libcurl.so:ftp/curl \	18	libpurple.so:net-im/libpurple \
19	libgpg-error.so:security/libgpg-error	19	libsigc-2.0.so:devel/libsigc++20
20		20
21	USES= iconv gmake ncurses pkgconfig python shebangfix ssl	21	USES= iconv gmake ncurses:port pkgconfig python libtool
22	USE_CXXSTD= gnu++98	22
		23	USE_GNOME= glib20
23	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
24	CPPFLAGS+= -I${LOCALBASE}/include
25	CXXFLAGS+= -I${LOCALBASE}/include
26	CONFIGURE_ARGS= --with-ssl --with-openssl --disable-yahoo --disable-msn
27	CONFLICTS= centericq-[0-9]* centerim-devel-[0-9]*	25	CONFLICTS= centericq-[0-9]* centerim-devel-[0-9]*
		26	INSTALL_TARGET= install-strip
28		27
29	SHEBANG_FILES= misc/CenterIMLog2HTML.py misc/cimformathistory misc/cimextracthistory.pl	28	OPTIONS_DEFINE= NLS GPGME DOCS
30	SHEBANG_LANG= gawk
31	gawk_OLD_CMD= /bin/gawk
32	gawk_CMD= /usr/bin/awk
33		29
34	OPTIONS_DEFINE= NLS MULTIBYTE FRIBIDI IRC JABBER GPGME RSS LJ GG DOCS	30	OPTIONS_DEFAULT= GPGME
35		31
36	FRIBIDI_DESC= Fribidi Support
37	IRC_DESC= IRC Protocol
38	GPGME_DESC= PGP encrypted Jabber messages
39	RSS_DESC= RSS Support
40	LJ_DESC= LiveJournal Support
41	GG_DESC= Gadu-Gadu Protocol Support
42
43	OPTIONS_DEFAULT= MULTIBYTE FRIBIDI IRC JABBER GPGME RSS LJ GG
44
45	OPTIONS_SUB= yes	32	OPTIONS_SUB= yes
46		33
47	PORTDOCS= FAQ README	34	PORTDOCS= README
48		35
49	NLS_USES= gettext	36	NLS_USES= gettext
50	NLS_CONFIGURE_ENABLE= nls	37	NLS_CONFIGURE_ENABLE= nls
51	MULTIBYTE_CONFIGURE_ENABLE=locales-fix
52	FRIBIDI_LIB_DEPENDS= libfribidi.so:converters/fribidi
53	FRIBIDI_CONFIGURE_WITH= fribidi
54	IRC_CONFIGURE_ENABLE= irc
55	JABBER_CONFIGURE_ENABLE=jabber
56	RSS_CONFIGURE_ENABLE= rss
57	LJ_CONFIGURE_ENABLE= lj
58	GG_LIB_DEPENDS= libgadu.so:polish/libgadu
59	GG_CONFIGURE_ENABLE= gg
60	GPGME_LIB_DEPENDS= libgpgme.so:security/gpgme	38	GPGME_LIB_DEPENDS= libgpgme.so:security/gpgme
61	GPGME_CONFIGURE_OFF= --with-gpgme-prefix=/nonexistent	39	GPGME_CONFIGURE_OFF= --with-gpgme-prefix=/nonexistent
62		40

Lines 1-54 Link Here

(-)centerim/files/patch-libjabber-jconn.c (-54 lines)
1	--- libjabber/jconn.c.orig 2011-05-23 01:06:31.000000000 +0400
2	+++ libjabber/jconn.c 2014-01-21 07:29:07.642848274 +0400
3	@@ -824,7 +824,7 @@
4	free(hash);
5	close(sock);
6	close(fd_file);
7	- return;
8	+ return NULL;
9	}
10
11	recv( sock, buff, SEND_BUF, 0 );
12	@@ -833,7 +833,7 @@
13	free(hash);
14	close(sock);
15	close(fd_file);
16	- return;
17	+ return NULL;
18	}
19
20	//socks5 bytestream packet
21	@@ -851,7 +851,7 @@
22	free(hash);
23	close(sock);
24	close(fd_file);
25	- return;
26	+ return NULL;
27	}
28	recv( sock, buff, 47, 0 );
29	if( buff[0] != 0x05 \|\| buff[3] != 0x03 )
30	@@ -859,7 +859,7 @@
31	free(hash);
32	close(sock);
33	close(fd_file);
34	- return;
35	+ return NULL;
36	}
37
38
39	@@ -889,6 +889,7 @@
40
41
42	#endif
43	+ return NULL;
44	}
45
46
47	@@ -961,5 +962,6 @@
48
49	pthread_exit(0);
50	#endif
51	-
52	+
53	+ return NULL;
54	}

Lines 1-27 Link Here

(-)centerim/files/patch-src-hooks-abstracthook.h (-27 lines)
1	--- src/hooks/abstracthook.h.orig 2011-05-23 01:06:31.000000000 +0400
2	+++ src/hooks/abstracthook.h 2014-01-21 08:30:44.206593005 +0400
3	@@ -47,11 +47,7 @@
4	};
5
6	class abstracthook {
7	- protected:
8	- enum Encoding {
9	- encUTF, encKOI, encUnknown
10	- };
11	-
12	+ public:
13	enum logevent {
14	logConnecting,
15	logLogged,
16	@@ -63,6 +59,11 @@
17	logConfMembers
18	};
19
20	+ protected:
21	+ enum Encoding {
22	+ encUTF, encKOI, encUnknown
23	+ };
24	+
25	protocolname proto;
26	imstatus manualstatus;
27	verticalmenu *searchdest;

Lines 1-30 Link Here

(-)centerim/pkg-plist (-30 / +9 lines)
1	bin/CenterIMLog2HTML.py	1	bin/centerim5
2	bin/centerim	2	man/man1/centerim5.1.gz
3	bin/cimconv	3	lib/centerim5/extaction.so
4	bin/cimextracthistory.pl	4	lib/libcppconsui.so
5	bin/cimformathistory	5	lib/libcppconsui.so.0
6	man/man1/cimconv.1.gz	6	lib/libcppconsui.so.0.0.0
7	man/man1/centerim.1.gz	7	%%NLS%%share/locale/cs/LC_MESSAGES/centerim5.mo
8	%%DATADIR%%/email.wav	8	%%NLS%%share/locale/nl/LC_MESSAGES/centerim5.mo
9	%%DATADIR%%/msg.wav	9	%%NLS%%share/locale/ru/LC_MESSAGES/centerim5.mo
10	%%DATADIR%%/offline.wav
11	%%DATADIR%%/online.wav
12	%%DATADIR%%/sms.wav
13	%%DATADIR%%/url.wav
14	%%NLS%%share/locale/bg/LC_MESSAGES/centerim.mo
15	%%NLS%%share/locale/cs/LC_MESSAGES/centerim.mo
16	%%NLS%%share/locale/de/LC_MESSAGES/centerim.mo
17	%%NLS%%share/locale/es/LC_MESSAGES/centerim.mo
18	%%NLS%%share/locale/fr/LC_MESSAGES/centerim.mo
19	%%NLS%%share/locale/hu/LC_MESSAGES/centerim.mo
20	%%NLS%%share/locale/it/LC_MESSAGES/centerim.mo
21	%%NLS%%share/locale/ms/LC_MESSAGES/centerim.mo
22	%%NLS%%share/locale/nl/LC_MESSAGES/centerim.mo
23	%%NLS%%share/locale/pl/LC_MESSAGES/centerim.mo
24	%%NLS%%share/locale/pt_BR/LC_MESSAGES/centerim.mo
25	%%NLS%%share/locale/ro/LC_MESSAGES/centerim.mo
26	%%NLS%%share/locale/ru/LC_MESSAGES/centerim.mo
27	%%NLS%%share/locale/sv/LC_MESSAGES/centerim.mo
28	%%NLS%%share/locale/uk/LC_MESSAGES/centerim.mo
29	%%NLS%%share/locale/zh_TW/LC_MESSAGES/centerim.mo
30	%%NLS%%share/locale/zh_CN/LC_MESSAGES/centerim.mo