Attachment 43462 Details for Bug 67483 – file.diff

[patch] file.diff

file.diff (text/plain), 2.30 KB, created by Evgueni V. Gavrilov on 2004-06-02 09:00:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Evgueni V. Gavrilov

Created: 2004-06-02 09:00:49 UTC

Size: 2.30 KB

patch

obsolete

>diff -ruN gaim.ORIG/Makefile gaim/Makefile
>--- gaim.ORIG/Makefile	Wed Jun  2 11:30:40 2004
>+++ gaim/Makefile	Wed Jun  2 14:44:51 2004
>@@ -44,6 +44,14 @@
> CONFIGURE_ARGS+=	--disable-gnutls
> .endif
> 
>+.if defined(WITH_SILC)
>+LIB_DEPENDS+=		silcclient-1.0.3:${PORTSDIR}/devel/silc-toolkit
>+CONFIGURE_ARGS+=	--with-silc-includes=${LOCALBASE}/include/silc
>+PLIST_SUB+=		SILC=""
>+.else
>+PLIST_SUB+=		SILC="@comment "
>+.endif
>+
> .if !defined(WITHOUT_NSS)
> LIB_DEPENDS+=		nss3:${PORTSDIR}/security/nss
> CONFIGURE_ARGS+=	--with-nspr-includes=${LOCALBASE}/include/nspr \
>@@ -93,6 +101,7 @@
> pre-everything::
> 	@${ECHO_MSG} ""
> 	@${ECHO_MSG} "Gaim has the following tunable option(s):"
>+	@${ECHO_MSG} "	WITH_SILC		Build with Secure Internet Live Conferencing (SILC)"
> 	@${ECHO_MSG} "	WITHOUT_GTKSPELL	Turns off spell checking"
> 	@${ECHO_MSG} "	WITHOUT_AUDIO		Disable audio support"
> 	@${ECHO_MSG} "	WITH_GNUTLS		Enable GNUTLS encryption support"
>@@ -109,6 +118,7 @@
> 	@${REINPLACE_CMD} -e 's|-lpthreads|${PTHREAD_LIBS:S/"//g}|g' \
> 		-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
> 		-e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g' \
>+		-e 's|-lsilc -lsilcclient ${PTHREAD_LIBS} -ldl|-lsilc -lsilcclient ${PTHREAD_LIBS} -liconv|' \
> 		-e 's|TCL_VERSION found but 8.3 required|TCL_VERSION found but ${_TCL_VER} required|g' \
> 		-e 's|TCL_MINOR_VERSION" -ne 3|TCL_MINOR_VERSION" -ne ${_TCL_VER:E}|' \
> 			${WRKSRC}/configure
>diff -ruN gaim.ORIG/files/patch-src_protocols_silc_chat.c gaim/files/patch-src_protocols_silc_chat.c
>--- gaim.ORIG/files/patch-src_protocols_silc_chat.c	Thu Jan  1 06:00:00 1970
>+++ gaim/files/patch-src_protocols_silc_chat.c	Wed Jun  2 14:37:29 2004
>@@ -0,0 +1,11 @@
>+--- src/protocols/silc/chat.c.orig	Wed Jun  2 14:36:55 2004
>++++ src/protocols/silc/chat.c	Wed Jun  2 14:37:03 2004
>+@@ -1081,7 +1081,7 @@
>+ 	   do both 1 and 2 with default keys. */
>+ 
>+ 	/* Call JOIN */
>+-	if (passphrase)
>++	if (strlen(passphrase))
>+ 		silc_client_command_call(client, conn, NULL, "JOIN",
>+ 					 channel, passphrase, "-auth", "-founder", NULL);
>+ 	else
>diff -ruN gaim.ORIG/pkg-plist gaim/pkg-plist
>--- gaim.ORIG/pkg-plist	Wed Jun  2 11:30:40 2004
>+++ gaim/pkg-plist	Wed Jun  2 14:18:17 2004
>@@ -16,6 +16,7 @@
> lib/gaim/libnapster.so
> lib/gaim/libnovell.so
> lib/gaim/liboscar.so
>+%%SILC%%lib/gaim/libsilcgaim.so
> lib/gaim/libyahoo.so
> lib/gaim/libzephyr.so
> lib/gaim/notify.so

Actions: View | Diff

Attachments on bug 67483: 43462