From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Sep 26 13:10:51 2003 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 2CE9916A4B3 for ; Fri, 26 Sep 2003 13:10:51 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 17B4B44033 for ; Fri, 26 Sep 2003 13:10:19 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h8QKAIFY077640 for ; Fri, 26 Sep 2003 13:10:18 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h8QKAIe5077639; Fri, 26 Sep 2003 13:10:18 -0700 (PDT) (envelope-from gnats) Resent-Date: Fri, 26 Sep 2003 13:10:18 -0700 (PDT) Resent-Message-Id: <200309262010.h8QKAIe5077639@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, Mikhail Teterin Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6661816A4B3 for ; Fri, 26 Sep 2003 13:08:25 -0700 (PDT) Received: from corbulon.video-collage.com (corbulon.video-collage.com [64.35.99.179]) by mx1.FreeBSD.org (Postfix) with ESMTP id 307F043FF2 for ; Fri, 26 Sep 2003 13:08:10 -0700 (PDT) (envelope-from mteterin@250-217.customer.cloud9.net) Received: from 250-217.customer.cloud9.net (250-217.customer.cloud9.net [168.100.250.217])h8QK87LP056113 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 26 Sep 2003 16:08:08 -0400 (EDT) (envelope-from mteterin@250-217.customer.cloud9.net) Received: from 250-217.customer.cloud9.net (mteterin@localhost [127.0.0.1]) h8QK9fjB049491 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 26 Sep 2003 16:09:41 -0400 (EDT) (envelope-from mteterin@250-217.customer.cloud9.net) Received: (from mteterin@localhost)h8QK9egD049490; Fri, 26 Sep 2003 16:09:40 -0400 (EDT) (envelope-from mteterin) Message-Id: <200309262009.h8QK9egD049490@250-217.customer.cloud9.net> Date: Fri, 26 Sep 2003 16:09:40 -0400 (EDT) From: Mikhail Teterin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/57262: new features for the net/gaim port [PATCH] X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Sep 2003 20:10:51 -0000 >Number: 57262 >Category: ports >Synopsis: new features for the net/gaim port [PATCH] >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Sep 26 13:10:15 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Mikhail Teterin >Release: FreeBSD 5.1-CURRENT i386 >Organization: Virtual Estates, Inc. >Environment: >Description: Gaim can optionally be expanded with Tcl/Tk. It can also offer end-to-end encryption of conversations with SSL. The included patch adds this options to the port. The patch also includes two cosmetic fixes: . replace the ugly ${ECHO_MSG} with #, which outputs the (almost) identical text without having to sh-special characters; . replace the multiple invocation of REINPLACE_CMD with one. The TCL-handling is a bit more involved, than it has to be, because currently gaim only works with 8.3, although it compiles with 8.4. >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net/gaim/Makefile,v retrieving revision 1.109 diff -U2 -r1.109 Makefile --- Makefile 25 Sep 2003 16:35:58 -0000 1.109 +++ Makefile 26 Sep 2003 19:58:19 -0000 @@ -37,4 +37,10 @@ .endif +.ifdef(WITH_GNUTLS) +LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls +.else +CONFIGURE_ARGS+= --disable-gnutls +.endif + .ifndef(WITHOUT_GTKSPELL) LIB_DEPENDS+= gtkspell.0:${PORTSDIR}/textproc/gtkspell2 @@ -50,16 +56,35 @@ .endif +.ifdef(TCL_VER) +_TCL_DVER= ${TCL_VER:S/.//} +_TCL_VER= ${_TCL_DVER:C/(.)/\1./} +.if ${_TCL_VER} != 8.3 +. error Currently GAIM can only use Tcl/Tk 8.3 +.endif +LIB_DEPENDS+= tk${_TCL_DVER}:${PORTSDIR}/x11-toolkits/tk${_TCL_DVER} +CONFIGURE_ARGS+=--with-tclconfig=${LOCALBASE}/lib/tcl${_TCL_VER} \ + --with-tkconfig=${LOCALBASE}/lib/tk${_TCL_VER} +CFLAGS+= -I${LOCALBASE}/include/tk${_TCL_VER} -I${LOCALBASE}/include/tcl${_TCL_VER} +PLIST_SUB+= TCL:="" +.else +PLIST_SUB+= TCL:="@comment " +.endif + pre-everything:: - @${ECHO_MSG} "" - @${ECHO_MSG} "Gaim has the following tunable option(s):" - @${ECHO_MSG} " WITHOUT_GTKSPELL Turns off spell checking" - @${ECHO_MSG} " WITHOUT_AUDIO Disable audio support" - @${ECHO_MSG} "" + # + # Gaim has the following tunable option(s): + # WITH_GNUTLS Enable SSL support + # WITHOUT_GTKSPELL Turns off spell checking + # WITHOUT_AUDIO Disable audio support + # TCL_VER Use Tcl/Tk (version) + # post-patch: - @${REINPLACE_CMD} -e 's|-lpthreads|${PTHREAD_LIBS:S/"//g}|g; \ - s|-lpthread|${PTHREAD_LIBS:S/"//g}|g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${WRKSRC}/configure + @${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|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 .include =================================================================== RCS file: /home/ncvs/ports/net/gaim/pkg-plist,v retrieving revision 1.50 diff -U2 -r1.50 pkg-plist --- pkg-plist 25 Sep 2003 16:35:58 -0000 1.50 +++ pkg-plist 26 Sep 2003 19:58:20 -0000 @@ -22,4 +22,5 @@ lib/gaim/spellchk.so lib/gaim/statenotify.so +%%TCL:%%lib/gaim/tcl.so lib/gaim/ticker.so lib/gaim/timestamp.so >Release-Note: >Audit-Trail: >Unformatted: