Attachment 139699 Details for Bug 185982 – centerim-4.22.10_1.patch

[patch] centerim-4.22.10_1.patch

centerim-4.22.10_1.patch (text/plain), 6.81 KB, created by Dmitry Marakasov on 2014-01-22 04:40:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2014-01-22 04:40:04 UTC

Size: 6.81 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 340679)
>+++ Makefile	(working copy)
>@@ -11,11 +11,10 @@
> MAINTAINER=	frank@altpeter.de
> COMMENT=	Text mode menu- and window-driven IM interface
> 
>-LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
>+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
> 
>-USES=		iconv
>+USES=		iconv gmake pkgconfig
> USE_OPENSSL=	yes
>-USE_GMAKE=	yes
> GNU_CONFIGURE=	yes
> CPPFLAGS+=	-I${LOCALBASE}/include
> CXXFLAGS+=	-I${LOCALBASE}/include
>@@ -24,6 +23,7 @@
> 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
>@@ -34,82 +34,35 @@
> LJ_DESC=	LiveJournal Support
> GG_DESC=	Gadu-Gadu Protocol Support
> 
>-MAN1=	cimconv.1 centerim.1
>+OPTIONS_DEFAULT=        MULTIBYTE FRIBIDI MSN YAHOO AIM IRC JABBER GPGME RSS LJ GG
> 
>+OPTIONS_SUB=	yes
>+
> PORTDOCS=	FAQ README
> 
>-NO_STAGE=	yes
>-.include <bsd.port.options.mk>
>+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} ${DOCSDIR}
>-	@(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
>-.endif
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	@(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/)
> 
> .include <bsd.port.mk>
>Index: files/patch-libicq2000-src-ContactTree.cpp
>===================================================================
>--- files/patch-libicq2000-src-ContactTree.cpp	(revision 0)
>+++ files/patch-libicq2000-src-ContactTree.cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- 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 <cstdlib>
>++
>+ #include "ContactTree.h"
>+ #include "events.h"
>+ 
>
>Property changes on: files/patch-libicq2000-src-ContactTree.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-libjabber-jconn.c
>===================================================================
>--- files/patch-libjabber-jconn.c	(revision 0)
>+++ files/patch-libjabber-jconn.c	(working copy)
>@@ -0,0 +1,54 @@
>+--- 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;
>+ }
>
>Property changes on: files/patch-libjabber-jconn.c
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: files/patch-src-hooks-abstracthook.h
>===================================================================
>--- files/patch-src-hooks-abstracthook.h	(revision 0)
>+++ files/patch-src-hooks-abstracthook.h	(working copy)
>@@ -0,0 +1,27 @@
>+--- 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;
>
>Property changes on: files/patch-src-hooks-abstracthook.h
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 340679)
>+++ pkg-plist	(working copy)
>@@ -3,6 +3,8 @@
> bin/cimconv
> bin/cimextracthistory.pl
> bin/cimformathistory
>+man/man1/cimconv.1.gz
>+man/man1/centerim.1.gz
> %%DATADIR%%/email.wav
> %%DATADIR%%/msg.wav
> %%DATADIR%%/offline.wav

Actions: View | Diff

Attachments on bug 185982: 139699