Date: Fri, 26 Sep 2003 16:09:40 -0400 (EDT) From: Mikhail Teterin <mi@aldan.algebra.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/57262: new features for the net/gaim port [PATCH] Message-ID: <200309262009.h8QK9egD049490@250-217.customer.cloud9.net> Resent-Message-ID: <200309262010.h8QKAIe5077639@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.post.mk>
===================================================================
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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200309262009.h8QK9egD049490>