From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jun 2 01:00:56 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 511AC16A4D4 for ; Wed, 2 Jun 2004 01:00:56 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3718543D4C for ; Wed, 2 Jun 2004 01:00:56 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i5280nfU094158 for ; Wed, 2 Jun 2004 01:00:49 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i5280ng6094157; Wed, 2 Jun 2004 01:00:49 -0700 (PDT) (envelope-from gnats) Resent-Date: Wed, 2 Jun 2004 01:00:49 -0700 (PDT) Resent-Message-Id: <200406020800.i5280ng6094157@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2ED3C16A4CE; Wed, 2 Jun 2004 00:50:27 -0700 (PDT) Received: from rusunix.org (rusunix.org [195.162.56.232]) by mx1.FreeBSD.org (Postfix) with ESMTP id C5C8243D1D; Wed, 2 Jun 2004 00:50:26 -0700 (PDT) (envelope-from aquatique@rusunix.org) Received: by rusunix.org (Postfix, from userid 1111) id D5C661CCB34; Wed, 2 Jun 2004 14:50:13 +0700 (OMSST) Message-Id: <20040602075013.D5C661CCB34@rusunix.org> Date: Wed, 2 Jun 2004 14:50:13 +0700 (OMSST) From: To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: marcus@FreeBSD.org Subject: ports/67483: fix SILC protocol, enable SILC X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: aquatique-ports@rambler.ru List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jun 2004 08:00:56 -0000 >Number: 67483 >Category: ports >Synopsis: fix SILC protocol, enable SILC >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Jun 02 01:00:49 PDT 2004 >Closed-Date: >Last-Modified: >Originator: Evgueni V. Gavrilov >Release: FreeBSD 4.10-RELEASE i386 >Organization: rusunix.org >Environment: System: FreeBSD rusunix.org 4.10-RELEASE FreeBSD 4.10-RELEASE #0: Thu May 27 18:47:13 OMSST 2004 root@rusunix.org:/usr/obj/usr/src/sys/NEWMONSTER i386 >Description: fix SILC protocol, enable SILC >How-To-Repeat: patch < >Fix: 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 >Release-Note: >Audit-Trail: >Unformatted: