Attachment #134533 for bug #179217

View | Details | Raw Unified | Return to bug 179217 | Differences between
Collapse All | Expand All




MAINTAINER=	ports@FreeBSD.org
COMMENT=	Google Talk's implementation of Jingle and Jingle-Audio

LICENSE=	BSD
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	speex:${PORTSDIR}/audio/speex \
		ilbc:${PORTSDIR}/net/ilbc \
		ortp:${PORTSDIR}/net/linphone-base \

		clusterit-[0-9]* pcp-[0-9]* synce-librapi2-[0-9]*

USES=		pkgconfig
USE_DOS2UNIX=	README
USE_GNOME=	glib20
USE_OPENSSL=	yes
USE_AUTOTOOLS=	libtool
USE_DOS2UNIX=	README
USE_GMAKE=	yes
USE_AUTOTOOLS=	libtool
CONFIGURE_ENV=	EXPAT_CFLAGS="-I${LOCALBASE}/include" \
		--with-speex=${LOCALBASE}
CONFIGURE_ENV=	PKG_CONFIG="${PKG_CONFIG}" \
		EXPAT_CFLAGS="-I${LOCALBASE}/include" \
		EXPAT_LIBS="-L${LOCALBASE}/lib -lexpat" \
		GLIB_CFLAGS="$$(pkg-config --cflags glib-2.0)" \
		GLIB_LIBS="$$(pkg-config --libs glib-2.0)" \
		ILBC_CFLAGS="-I${LOCALBASE}/include/ilbc" \
		ILBC_LIBS="-L${LOCALBASE}/lib -lilbc" \
		SPEEX_CFLAGS="$$(pkg-config --cflags speex)" \
		SPEEX_LIBS="$$(pkg-config --libs speex)"
CONFIGURE_ARGS=	--with-ilbc=${LOCALBASE} \
		--with-speex=${LOCALBASE}
MAKE_JOBS_SAFE=	yes

CPPFLAGS+=	-I${OPENSSLINC} -I${LOCALBASE}/include -g
LDFLAGS+=	-L${OPENSSLLIB} -L${LOCALBASE}/lib -pthread

PORTDOCS=	AUTHORS \
		ChangeLog \

		'#define ${feature} 1' >> \
		${CONFIGURE_WRKSRC}/config.h
.endfor
	@${REINPLACE_CMD} -e \
		'/^int main/s|char\* argv|char** argv|' \
		${WRKSRC}/talk/base/virtualsocket_unittest.cc
	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
		's|`pkg-config --cflags gtk+-2.0`|| ; \
		 s|-lpthread|-pthread|'

post-install:
.if ${PORT_OPTIONS:MDOCS}




--- talk/base/openssladapter.cc.orig
+++ talk/base/openssladapter.cc
@@ -641,7 +641,11 @@
     int extension_nid = OBJ_obj2nid(X509_EXTENSION_get_object(extension));
 
     if (extension_nid == NID_subject_alt_name) {
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+      const X509V3_EXT_METHOD* meth = X509V3_EXT_get(extension);
+#else
       X509V3_EXT_METHOD* meth = X509V3_EXT_get(extension);
+#endif
       if (!meth)
         break;
 




--- talk/base/stringutils.h.orig	2008-09-06 23:10:21.000000000 -0300
+++ talk/base/stringutils.h	2008-09-06 23:13:17.000000000 -0300
@@ -197,15 +197,6 @@
 }
 
 template<class CTYPE>
-size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) {
-  va_list args;
-  va_start(args, format);
-  size_t len = vsprintfn(buffer, buflen, format, args);
-  va_end(args);
-  return len;
-}
-
-template<class CTYPE>
 size_t vsprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format,
                  va_list args) {
   int len = vsnprintf(buffer, buflen, format, args);
@@ -216,6 +207,15 @@
   return len;
 }
 
+template<class CTYPE>
+size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) {
+  va_list args;
+  va_start(args, format);
+  size_t len = vsprintfn(buffer, buflen, format, args);
+  va_end(args);
+  return len;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // Allow safe comparing and copying ascii (not UTF-8) with both wide and
 // non-wide character strings.
@@ -269,7 +269,7 @@
 template<>
 struct Traits<char> {

Return to bug 179217

Lines 10-15 Link Here

(-)net-im/libjingle/Makefile (-13 / +21 lines)
10	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= ports@FreeBSD.org
11	COMMENT= Google Talk's implementation of Jingle and Jingle-Audio	11	COMMENT= Google Talk's implementation of Jingle and Jingle-Audio
12		12
		13	LICENSE= BSD
		14	LICENSE_FILE= ${WRKSRC}/COPYING
		15
13	LIB_DEPENDS= speex:${PORTSDIR}/audio/speex \	16	LIB_DEPENDS= speex:${PORTSDIR}/audio/speex \
14	ilbc:${PORTSDIR}/net/ilbc \	17	ilbc:${PORTSDIR}/net/ilbc \
15	ortp:${PORTSDIR}/net/linphone-base \	18	ortp:${PORTSDIR}/net/linphone-base \
Lines 19-44 Link Here
19	clusterit-[0-9]* pcp-[0-9]* synce-librapi2-[0-9]*	22	clusterit-[0-9]* pcp-[0-9]* synce-librapi2-[0-9]*
20		23
21	USES= pkgconfig	24	USES= pkgconfig
		25	USE_DOS2UNIX= README
22	USE_GNOME= glib20	26	USE_GNOME= glib20
23	USE_OPENSSL= yes	27	USE_OPENSSL= yes
24	USE_AUTOTOOLS= libtool
25	USE_DOS2UNIX= README
26	USE_GMAKE= yes	28	USE_GMAKE= yes
27	GNU_CONFIGURE= yes	29	USE_AUTOTOOLS= libtool
28	CONFIGURE_ARGS= --with-ilbc=${LOCALBASE} \	30	CONFIGURE_ENV= EXPAT_CFLAGS="-I${LOCALBASE}/include" \
29	--with-speex=${LOCALBASE}
30	CONFIGURE_ENV= PKG_CONFIG="${PKG_CONFIG}" \
31	EXPAT_CFLAGS="-I${LOCALBASE}/include" \
32	EXPAT_LIBS="-L${LOCALBASE}/lib -lexpat" \	31	EXPAT_LIBS="-L${LOCALBASE}/lib -lexpat" \
33	GLIB_CFLAGS="$$(${PKG_CONFIG} --cflags glib-2.0)" \	32	GLIB_CFLAGS="$$(pkg-config --cflags glib-2.0)" \
34	GLIB_LIBS="$$(${PKG_CONFIG} --libs glib-2.0)" \	33	GLIB_LIBS="$$(pkg-config --libs glib-2.0)" \
35	ILBC_CFLAGS="-I${LOCALBASE}/include/ilbc" \	34	ILBC_CFLAGS="-I${LOCALBASE}/include/ilbc" \
36	ILBC_LIBS="-L${LOCALBASE}/lib -lilbc" \	35	ILBC_LIBS="-L${LOCALBASE}/lib -lilbc" \
37	SPEEX_CFLAGS="$$(${PKG_CONFIG} --cflags speex)" \	36	SPEEX_CFLAGS="$$(pkg-config --cflags speex)" \
38	SPEEX_LIBS="$$(${PKG_CONFIG} --libs speex)"	37	SPEEX_LIBS="$$(pkg-config --libs speex)"
39	CPPFLAGS+= -I${LOCALBASE}/include -I${OPENSSLINC} ${PTHREAD_CFLAGS} -g	38	CONFIGURE_ARGS= --with-ilbc=${LOCALBASE} \
		39	--with-speex=${LOCALBASE}
40	MAKE_JOBS_SAFE= yes	40	MAKE_JOBS_SAFE= yes
41	LDFLAGS+=-L${LOCALBASE}/lib -L${OPENSSLLIB} ${PTHREAD_LIBS}	41
		42	CPPFLAGS+= -I${OPENSSLINC} -I${LOCALBASE}/include -g
		43	LDFLAGS+= -L${OPENSSLLIB} -L${LOCALBASE}/lib -pthread
42		44
43	PORTDOCS= AUTHORS \	45	PORTDOCS= AUTHORS \
44	ChangeLog \	46	ChangeLog \
Lines 72-77 Link Here
72	'#define ${feature} 1' >> \	74	'#define ${feature} 1' >> \
73	${CONFIGURE_WRKSRC}/config.h	75	${CONFIGURE_WRKSRC}/config.h
74	.endfor	76	.endfor
		77	@${REINPLACE_CMD} -e \
		78	'/^int main/s\|char\* argv\|char** argv\|' \
		79	${WRKSRC}/talk/base/virtualsocket_unittest.cc
		80	@${FIND} ${WRKSRC} -name "Makefile.in" \| ${XARGS} ${REINPLACE_CMD} -e \
		81	's\|`pkg-config --cflags gtk+-2.0`\|\| ; \
		82	s\|-lpthread\|-pthread\|'
75		83
76	post-install:	84	post-install:
77	.if ${PORT_OPTIONS:MDOCS}	85	.if ${PORT_OPTIONS:MDOCS}

Line 0 Link Here

(-)net-im/libjingle/files/patch-talk__base__openssladapter.cpp (+14 lines)
	1	--- talk/base/openssladapter.cc.orig
	2	+++ talk/base/openssladapter.cc
	3	@@ -641,7 +641,11 @@
	4	int extension_nid = OBJ_obj2nid(X509_EXTENSION_get_object(extension));
	5
	6	if (extension_nid == NID_subject_alt_name) {
	7	+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
	8	+ const X509V3_EXT_METHOD* meth = X509V3_EXT_get(extension);
	9	+#else
	10	X509V3_EXT_METHOD* meth = X509V3_EXT_get(extension);
	11	+#endif
	12	if (!meth)
	13	break;
	14

Lines 1-5 Link Here

(-)net-im/libjingle/files/patch-talk__base__stringutils.h (+32 lines)
1	--- talk/base/stringutils.h.orig 2008-09-06 23:10:21.000000000 -0300	1	--- talk/base/stringutils.h.orig 2008-09-06 23:10:21.000000000 -0300
2	+++ talk/base/stringutils.h 2008-09-06 23:13:17.000000000 -0300	2	+++ talk/base/stringutils.h 2008-09-06 23:13:17.000000000 -0300
		3	@@ -197,15 +197,6 @@
		4	}
		5
		6	template<class CTYPE>
		7	-size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) {
		8	- va_list args;
		9	- va_start(args, format);
		10	- size_t len = vsprintfn(buffer, buflen, format, args);
		11	- va_end(args);
		12	- return len;
		13	-}
		14	-
		15	-template<class CTYPE>
		16	size_t vsprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format,
		17	va_list args) {
		18	int len = vsnprintf(buffer, buflen, format, args);
		19	@@ -216,6 +207,15 @@
		20	return len;
		21	}
		22
		23	+template<class CTYPE>
		24	+size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) {
		25	+ va_list args;
		26	+ va_start(args, format);
		27	+ size_t len = vsprintfn(buffer, buflen, format, args);
		28	+ va_end(args);
		29	+ return len;
		30	+}
		31	+
		32	///////////////////////////////////////////////////////////////////////////////
		33	// Allow safe comparing and copying ascii (not UTF-8) with both wide and
		34	// non-wide character strings.
3	@@ -269,7 +269,7 @@	35	@@ -269,7 +269,7 @@
4	template<>	36	template<>
5	struct Traits<char> {	37	struct Traits<char> {