Attachment #139699 for bug #185982

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




MAINTAINER=	frank@altpeter.de
COMMENT=	Text mode menu- and window-driven IM interface

LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl

USES=		iconv gmake pkgconfig
USE_OPENSSL=	yes
USE_GMAKE=	yes
GNU_CONFIGURE=	yes
CPPFLAGS+=	-I${LOCALBASE}/include
CXXFLAGS+=	-I${LOCALBASE}/include

CONFLICTS=	centericq-[0-9]* centerim-devel-[0-9]*

OPTIONS_DEFINE=	NLS MULTIBYTE FRIBIDI MSN YAHOO AIM IRC JABBER GPGME RSS LJ GG

FRIBIDI_DESC=	Fribidi Support
MSN_DESC=	MSN Protocol
YAHOO_DESC=	Yahoo! Messenger Protocol

LJ_DESC=	LiveJournal Support
GG_DESC=	Gadu-Gadu Protocol Support

OPTIONS_DEFAULT=        MULTIBYTE FRIBIDI MSN YAHOO AIM IRC JABBER GPGME RSS LJ GG

OPTIONS_SUB=	yes

PORTDOCS=	FAQ README

NLS_USES=		gettext
NLS_CONFIGURE_ENABLE=	nls
MULTIBYTE_CONFIGURE_ENABLE=locales-fix
FRIBIDI_LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
FRIBIDI_CONFIGURE_WITH=	fribidi
MSN_CONFIGURE_ENABLE=	msn
YAHOO_CONFIGURE_ENABLE=	yahoo
AIM_CONFIGURE_ENABLE=	aim
IRC_CONFIGURE_ENABLE=	irc
JABBER_CONFIGURE_ENABLE=jabber
RSS_CONFIGURE_ENABLE=	rss
MLJ_CONFIGURE_ENABLE=	lj
GG_LIB_DEPENDS=		libgadu.so:${PORTSDIR}/polish/ekg
GG_CONFIGURE_ENABLE=	gg
GPGME_LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme
GPGME_CONFIGURE_WITH=	ssl gpgme

.if ${PORT_OPTIONS:MNLS}
USES+=			gettext
PLIST_SUB+=		NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+=		NLS="@comment "
.endif

.if ${PORT_OPTIONS:MMULTIBYTE}
CONFIGURE_ARGS+=	--enable-locales-fix
.endif

.if ${PORT_OPTIONS:MFRIBIDI}
LIB_DEPENDS+=		fribidi.3:${PORTSDIR}/converters/fribidi
CONFIGURE_ARGS+=	--with-fribidi
.endif

.if ! ${PORT_OPTIONS:MMSN}
CONFIGURE_ARGS+=	--disable-msn
.endif

.if ! ${PORT_OPTIONS:MYAHOO}
CONFIGURE_ARGS+=	--disable-yahoo
.endif

.if ! ${PORT_OPTIONS:MAIM}
CONFIGURE_ARGS+=	--disable-aim
.endif

.if ! ${PORT_OPTIONS:MIRC}
CONFIGURE_ARGS+=	--disable-irc
.endif

.if ! ${PORT_OPTIONS:MJABBER}
CONFIGURE_ARGS+=	--disable-jabber
.else
.endif

.if ${PORT_OPTIONS:MGPGME}
LIB_DEPENDS+=		gpgme.19:${PORTSDIR}/security/gpgme
#CONFIGURE_ARGS+=	--with-gpgme=${LOCALBASE}
CONFIGURE_ARGS+=	--with-ssl
.else
CONFIGURE_ARGS+=	--without-gpgme
.endif

.if ! ${PORT_OPTIONS:MRSS}
CONFIGURE_ARGS+=	--disable-rss
.endif

.if ! ${PORT_OPTIONS:MLJ}
CONFIGURE_ARGS+=	--disable-lj
.endif

.if ! ${PORT_OPTIONS:MGG}
CONFIGURE_ARGS+=	--disable-gg
.else
LIB_DEPENDS+=		gadu.3:${PORTSDIR}/polish/ekg
LIBGADU=		-lgadu
.endif

post-patch:
	@${REINPLACE_CMD} -e '1 s|/usr/bin/python|/usr/bin/env python|' \
		${WRKSRC}/misc/CenterIMLog2HTML.py

.if ${PORT_OPTIONS:MDOCS}
post-install:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	@(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/)
.endif

.include <bsd.port.mk>

Line 0 Link Here

(-)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




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

Lines 3-8 Link Here

(-)pkg-plist (+2 lines)
3	bin/cimconv	3	bin/cimconv
4	bin/cimextracthistory.pl	4	bin/cimextracthistory.pl
5	bin/cimformathistory	5	bin/cimformathistory
		6	man/man1/cimconv.1.gz
		7	man/man1/centerim.1.gz
6	%%DATADIR%%/email.wav	8	%%DATADIR%%/email.wav
7	%%DATADIR%%/msg.wav	9	%%DATADIR%%/msg.wav
8	%%DATADIR%%/offline.wav	10	%%DATADIR%%/offline.wav

Return to bug 185982

Lines 11-21 Link Here

(-)Makefile (-71 / +24 lines)
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
13		13
14	LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl	14	LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl
15		15
16	USES= iconv	16	USES= iconv gmake pkgconfig
17	USE_OPENSSL= yes	17	USE_OPENSSL= yes
18	USE_GMAKE= yes
19	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
20	CPPFLAGS+= -I${LOCALBASE}/include	19	CPPFLAGS+= -I${LOCALBASE}/include
21	CXXFLAGS+= -I${LOCALBASE}/include	20	CXXFLAGS+= -I${LOCALBASE}/include
Lines 24-29 Link Here
24	CONFLICTS= centericq-[0-9]* centerim-devel-[0-9]*	23	CONFLICTS= centericq-[0-9]* centerim-devel-[0-9]*
25		24
26	OPTIONS_DEFINE= NLS MULTIBYTE FRIBIDI MSN YAHOO AIM IRC JABBER GPGME RSS LJ GG	25	OPTIONS_DEFINE= NLS MULTIBYTE FRIBIDI MSN YAHOO AIM IRC JABBER GPGME RSS LJ GG
		26
27	FRIBIDI_DESC= Fribidi Support	27	FRIBIDI_DESC= Fribidi Support
28	MSN_DESC= MSN Protocol	28	MSN_DESC= MSN Protocol
29	YAHOO_DESC= Yahoo! Messenger Protocol	29	YAHOO_DESC= Yahoo! Messenger Protocol
Lines 34-115 Link Here
34	LJ_DESC= LiveJournal Support	34	LJ_DESC= LiveJournal Support
35	GG_DESC= Gadu-Gadu Protocol Support	35	GG_DESC= Gadu-Gadu Protocol Support
36		36
37	MAN1= cimconv.1 centerim.1	37	OPTIONS_DEFAULT= MULTIBYTE FRIBIDI MSN YAHOO AIM IRC JABBER GPGME RSS LJ GG
38		38
		39	OPTIONS_SUB= yes
		40
39	PORTDOCS= FAQ README	41	PORTDOCS= FAQ README
40		42
41	NO_STAGE= yes	43	NLS_USES= gettext
42	.include <bsd.port.options.mk>	44	NLS_CONFIGURE_ENABLE= nls
		45	MULTIBYTE_CONFIGURE_ENABLE=locales-fix
		46	FRIBIDI_LIB_DEPENDS= libfribidi.so:${PORTSDIR}/converters/fribidi
		47	FRIBIDI_CONFIGURE_WITH= fribidi
		48	MSN_CONFIGURE_ENABLE= msn
		49	YAHOO_CONFIGURE_ENABLE= yahoo
		50	AIM_CONFIGURE_ENABLE= aim
		51	IRC_CONFIGURE_ENABLE= irc
		52	JABBER_CONFIGURE_ENABLE=jabber
		53	RSS_CONFIGURE_ENABLE= rss
		54	MLJ_CONFIGURE_ENABLE= lj
		55	GG_LIB_DEPENDS= libgadu.so:${PORTSDIR}/polish/ekg
		56	GG_CONFIGURE_ENABLE= gg
		57	GPGME_LIB_DEPENDS= libgpgme.so:${PORTSDIR}/security/gpgme
		58	GPGME_CONFIGURE_WITH= ssl gpgme
43		59
44	.if ${PORT_OPTIONS:MNLS}
45	USES+= gettext
46	PLIST_SUB+= NLS=""
47	.else
48	CONFIGURE_ARGS+=--disable-nls
49	PLIST_SUB+= NLS="@comment "
50	.endif
51
52	.if ${PORT_OPTIONS:MMULTIBYTE}
53	CONFIGURE_ARGS+= --enable-locales-fix
54	.endif
55
56	.if ${PORT_OPTIONS:MFRIBIDI}
57	LIB_DEPENDS+= fribidi.3:${PORTSDIR}/converters/fribidi
58	CONFIGURE_ARGS+= --with-fribidi
59	.endif
60
61	.if ! ${PORT_OPTIONS:MMSN}
62	CONFIGURE_ARGS+= --disable-msn
63	.endif
64
65	.if ! ${PORT_OPTIONS:MYAHOO}
66	CONFIGURE_ARGS+= --disable-yahoo
67	.endif
68
69	.if ! ${PORT_OPTIONS:MAIM}
70	CONFIGURE_ARGS+= --disable-aim
71	.endif
72
73	.if ! ${PORT_OPTIONS:MIRC}
74	CONFIGURE_ARGS+= --disable-irc
75	.endif
76
77	.if ! ${PORT_OPTIONS:MJABBER}
78	CONFIGURE_ARGS+= --disable-jabber
79	.else
80	.endif
81
82	.if ${PORT_OPTIONS:MGPGME}
83	LIB_DEPENDS+= gpgme.19:${PORTSDIR}/security/gpgme
84	#CONFIGURE_ARGS+= --with-gpgme=${LOCALBASE}
85	CONFIGURE_ARGS+= --with-ssl
86	.else
87	CONFIGURE_ARGS+= --without-gpgme
88	.endif
89
90	.if ! ${PORT_OPTIONS:MRSS}
91	CONFIGURE_ARGS+= --disable-rss
92	.endif
93
94	.if ! ${PORT_OPTIONS:MLJ}
95	CONFIGURE_ARGS+= --disable-lj
96	.endif
97
98	.if ! ${PORT_OPTIONS:MGG}
99	CONFIGURE_ARGS+= --disable-gg
100	.else
101	LIB_DEPENDS+= gadu.3:${PORTSDIR}/polish/ekg
102	LIBGADU= -lgadu
103	.endif
104
105	post-patch:	60	post-patch:
106	@${REINPLACE_CMD} -e '1 s\|/usr/bin/python\|/usr/bin/env python\|' \	61	@${REINPLACE_CMD} -e '1 s\|/usr/bin/python\|/usr/bin/env python\|' \
107	${WRKSRC}/misc/CenterIMLog2HTML.py	62	${WRKSRC}/misc/CenterIMLog2HTML.py
108		63
109	.if ${PORT_OPTIONS:MDOCS}
110	post-install:	64	post-install:
111	@${MKDIR} ${DOCSDIR}	65	@${MKDIR} ${STAGEDIR}${DOCSDIR}
112	@(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})	66	@(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/)
113	.endif
114		67
115	.include <bsd.port.mk>	68	.include <bsd.port.mk>

Line 0 Link Here

(-)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	}

Line 0 Link Here

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