From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jan 13 08:10:02 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2DC8E1065674 for ; Tue, 13 Jan 2009 08:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 093F48FC13 for ; Tue, 13 Jan 2009 08:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n0D8A17K092030 for ; Tue, 13 Jan 2009 08:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n0D8A18R092029; Tue, 13 Jan 2009 08:10:01 GMT (envelope-from gnats) Resent-Date: Tue, 13 Jan 2009 08:10:01 GMT Resent-Message-Id: <200901130810.n0D8A18R092029@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, Doug Barton Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A6CCA1065670 for ; Tue, 13 Jan 2009 08:04:29 +0000 (UTC) (envelope-from dougb@lap.dougb.net) Received: from lap.dougb.net (unknown [IPv6:2001:470:812a:0:c02e:c3a5:6463:da96]) by mx1.freebsd.org (Postfix) with ESMTP id 741068FC08 for ; Tue, 13 Jan 2009 08:04:28 +0000 (UTC) (envelope-from dougb@lap.dougb.net) Received: from lap.dougb.net (localhost [127.0.0.1]) by lap.dougb.net (8.14.3/8.14.3) with ESMTP id n0D84R8t020689 for ; Tue, 13 Jan 2009 00:04:27 -0800 (PST) (envelope-from dougb@lap.dougb.net) Received: (from dougb@localhost) by lap.dougb.net (8.14.3/8.14.3/Submit) id n0D84Rn0020688; Tue, 13 Jan 2009 00:04:27 -0800 (PST) (envelope-from dougb) Message-Id: <200901130804.n0D84Rn0020688@lap.dougb.net> Date: Tue, 13 Jan 2009 00:04:27 -0800 (PST) From: Doug Barton To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/130488: [patch] Update libpurple/pidgin to 2.5.4, and OPTIONS'ify dynamic modules X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Doug Barton List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Jan 2009 08:10:02 -0000 >Number: 130488 >Category: ports >Synopsis: [patch] Update libpurple/pidgin to 2.5.4, and OPTIONS'ify dynamic modules >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Jan 13 08:10:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Doug Barton >Release: FreeBSD 8.0-CURRENT i386 >Organization: AAAG >Environment: DNA >Description: The included patch does the following for libpurple: 1. Update to version 2.5.4 2. Add OPTIONS for all of the dynamic chat protocol modules Sort OPTIONS so that those which default to on are first Sort chat protocols togeter 3. Add plist support for WITHOUT_GNUTLS 4. Add the myspace chat protocol 5. Install the man pages It has the following change for pidgin: Fix plist so that if the user has a 3rd party module (like OTR) they won't get an error trying to remove /usr/local/lib/pidgin >How-To-Repeat: DNA >Fix: Index: libpurple/Makefile =================================================================== RCS file: /home/pcvs/ports/net-im/libpurple/Makefile,v retrieving revision 1.55 diff -u -r1.55 Makefile --- libpurple/Makefile 22 Dec 2008 07:35:22 -0000 1.55 +++ libpurple/Makefile 13 Jan 2009 08:00:00 -0000 @@ -7,7 +7,7 @@ # PORTNAME?= libpurple -PORTVERSION= 2.5.3 +PORTVERSION= 2.5.4 PORTREVISION?= 0 CATEGORIES?= net-im MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -23,7 +23,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS?=--disable-gtkui \ --disable-consoleui \ - --with-dynamic_prpls=${PRPL_MODULES} \ + --with-dynamic_prpls=${PRPL_MODULES:S/,$//} \ --disable-nm CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ @@ -47,17 +47,28 @@ .endif -PRPL_MODULES= gg,irc,jabber,msn,novell,oscar,qq,simple,yahoo,zephyr +PRPL_MODULES= -OPTIONS= SILC "Secure Internet Live Conferencing support" off \ +OPTIONS= BONJOUR "Enable mDNS support" on \ + DBUS "Enable DBUS bindings" on \ GNUTLS "GNUTLS encryption support" on \ NSS "Mozilla NSS encryption support" off \ SASL "Cyrus SASL support (for jabberd)" off \ - DBUS "Enable DBUS bindings" on \ PERL "Perl scripting" off \ - BONJOUR "Enable mDNS support" on \ - SAMETIME "Enable Sametime client support" off \ - TCLTK "Tcl/Tk scripting" off + TCLTK "Tcl/Tk scripting" off \ + SAMETIME "The Lotus Sametime chat protocol" off \ + SILC "The Secure Internet Live Conferencing protocol" off \ + GG "The Gadu-Gadu chat protocol" on \ + IRC "The Internet Relay Chat protocol" on \ + JABBER "The Jabber/XMPP/Google Talk protocol" on \ + MSN "The MSN Messenger protocol" on \ + MYSPACE "The MySpaceIM protocol" on \ + NOVELL "The Novell GroupWise chat protocol" on \ + OSCAR "The AIM/ICQ/Oscar protocol" on \ + QQ "The Tercent QQ chat protocol" on \ + SIMPLE "The SIMPLE chat protocol" on \ + YAHOO "The Yahoo! Messenger protocol" on \ + ZEPHYR "The Zephyr chat protocol" on .if defined(WITH_GTKUI) OPTIONS+= GTKSPELL "Spell checking support" on \ @@ -107,8 +118,10 @@ .if !defined(WITHOUT_GNUTLS) LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls CONFIGURE_ARGS+= --enable-gnutls=yes +PLIST_SUB+= GNUTLS="" .else CONFIGURE_ARGS+= --enable-gnutls=no +PLIST_SUB+= GNUTLS="@comment " .endif .if defined(WITH_NSS) @@ -129,34 +142,15 @@ CONFIGURE_ARGS+= --enable-cyrus-sasl .endif -.if defined(WITH_SILC) -LIB_DEPENDS+= silcclient-1.1:${PORTSDIR}/devel/silc-toolkit -CONFIGURE_ARGS+= --with-silc-includes=${LOCALBASE}/include/silc \ - --with-silc-libs=${LOCALBASE}/lib -PLIST_SUB+= SILC="" -PRPL_MODULES:= ${PRPL_MODULES},silc -.else -PLIST_SUB+= SILC="@comment not installed: " -.endif - .if !defined(WITHOUT_BONJOUR) LIB_DEPENDS+= avahi-client.3:${PORTSDIR}/net/avahi-app PLIST_SUB+= BONJOUR="" -PRPL_MODULES:= ${PRPL_MODULES},bonjour +PRPL_MODULES:= bonjour,${PRPL_MODULES} .else CONFIGURE_ARGS+=--disable-avahi PLIST_SUB+= BONJOUR="@comment not installed: " .endif -.if defined(WITH_SAMETIME) -LIB_DEPENDS+= meanwhile.1:${PORTSDIR}/net-im/meanwhile -PLIST_SUB+= SAMETIME="" -PRPL_MODULES:= ${PRPL_MODULES},sametime -.else -PLIST_SUB+= SAMETIME="@comment not installed: " -CONFIGURE_ARGS+=--disable-meanwhile -.endif - .if defined(WITH_TCLTK) TCLTK_VER?= 8.4 # user can override it TCLTK_VER_NODOT= ${TCLTK_VER:S/.//} @@ -173,6 +167,12 @@ PLIST_SUB+= TCL:="@comment not installed: " .endif +.if defined(WITH_GTKUI) && !defined(WITHOUT_GTKSPELL) +LIB_DEPENDS+= gtkspell.0:${PORTSDIR}/textproc/gtkspell +.else +CONFIGURE_ARGS+= --disable-gtkspell +.endif + .if !defined(WITHOUT_DBUS) LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib .if !defined(PIDGIN_SLAVE) @@ -198,10 +198,100 @@ PLIST_SUB+= PERL:="@comment not installed: " .endif -.if defined(WITH_GTKUI) && !defined(WITHOUT_GTKSPELL) -LIB_DEPENDS+= gtkspell.0:${PORTSDIR}/textproc/gtkspell +.if defined(WITH_SAMETIME) +LIB_DEPENDS+= meanwhile.1:${PORTSDIR}/net-im/meanwhile +PLIST_SUB+= SAMETIME="" +PRPL_MODULES:= sametime,${PRPL_MODULES} .else -CONFIGURE_ARGS+= --disable-gtkspell +PLIST_SUB+= SAMETIME="@comment not installed: " +CONFIGURE_ARGS+=--disable-meanwhile +.endif + +.if defined(WITH_SILC) +LIB_DEPENDS+= silcclient-1.1:${PORTSDIR}/devel/silc-toolkit +CONFIGURE_ARGS+= --with-silc-includes=${LOCALBASE}/include/silc \ + --with-silc-libs=${LOCALBASE}/lib +PLIST_SUB+= SILC="" +PRPL_MODULES:= silc,${PRPL_MODULES} +.else +PLIST_SUB+= SILC="@comment not installed: " +.endif + +.if !defined(WITHOUT_GG) +PLIST_SUB+= GG="" +PRPL_MODULES:= gg,${PRPL_MODULES} +.else +PLIST_SUB+= GG="@comment not installed: " +.endif + +.if !defined(WITHOUT_IRC) +PLIST_SUB+= IRC="" +PRPL_MODULES:= irc,${PRPL_MODULES} +.else +PLIST_SUB+= IRC="@comment not installed: " +.endif + +.if !defined(WITHOUT_JABBER) +PLIST_SUB+= JABBER="" +PRPL_MODULES:= jabber,${PRPL_MODULES} +.else +PLIST_SUB+= JABBER="@comment not installed: " +.endif + +.if !defined(WITHOUT_MSN) +PLIST_SUB+= MSN="" +PRPL_MODULES:= msn,${PRPL_MODULES} +.else +PLIST_SUB+= MSN="@comment not installed: " +.endif + +.if !defined(WITHOUT_MYSPACE) +PLIST_SUB+= MYSPACE="" +PRPL_MODULES:= myspace,${PRPL_MODULES} +.else +PLIST_SUB+= MYSPACE="@comment not installed: " +.endif + +.if !defined(WITHOUT_NOVELL) +PLIST_SUB+= NOVELL="" +PRPL_MODULES:= novell,${PRPL_MODULES} +.else +PLIST_SUB+= NOVELL="@comment not installed: " +.endif + +.if !defined(WITHOUT_OSCAR) +PLIST_SUB+= OSCAR="" +PRPL_MODULES:= oscar,${PRPL_MODULES} +.else +PLIST_SUB+= OSCAR="@comment not installed: " +.endif + +.if !defined(WITHOUT_QQ) +PLIST_SUB+= QQ="" +PRPL_MODULES:= qq,${PRPL_MODULES} +.else +PLIST_SUB+= QQ="@comment not installed: " +.endif + +.if !defined(WITHOUT_SIMPLE) +PLIST_SUB+= SIMPLE="" +PRPL_MODULES:= simple,${PRPL_MODULES} +.else +PLIST_SUB+= SIMPLE="@comment not installed: " +.endif + +.if !defined(WITHOUT_YAHOO) +PLIST_SUB+= YAHOO="" +PRPL_MODULES:= yahoo,${PRPL_MODULES} +.else +PLIST_SUB+= YAHOO="@comment not installed: " +.endif + +.if !defined(WITHOUT_ZEPHYR) +PLIST_SUB+= ZEPHYR="" +PRPL_MODULES:= zephyr,${PRPL_MODULES} +.else +PLIST_SUB+= ZEPHYR="@comment not installed: " .endif pre-everything:: @@ -233,4 +323,6 @@ .endif @${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} +pre-install: + ${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${MAN1PREFIX}/man/man1 .include Index: libpurple/distinfo =================================================================== RCS file: /home/pcvs/ports/net-im/libpurple/distinfo,v retrieving revision 1.24 diff -u -r1.24 distinfo --- libpurple/distinfo 22 Dec 2008 07:35:22 -0000 1.24 +++ libpurple/distinfo 13 Jan 2009 08:00:00 -0000 @@ -1,3 +1,3 @@ -MD5 (pidgin-2.5.3.tar.bz2) = 4abc4ce9e1ad62bbf098f05f305147d7 -SHA256 (pidgin-2.5.3.tar.bz2) = 912c934425fc40535fc79eb9082f6f823808d8ea8ecdd370d0b8ceec4b97ad82 -SIZE (pidgin-2.5.3.tar.bz2) = 8393073 +MD5 (pidgin-2.5.4.tar.bz2) = 295fe533288c821342b660b6fc83bc11 +SHA256 (pidgin-2.5.4.tar.bz2) = c6bebef97b8b337cd2bc8107b3714dedf60d02db70487d0aafdd8b5b7ada1b63 +SIZE (pidgin-2.5.4.tar.bz2) = 8398610 Index: libpurple/pkg-plist =================================================================== RCS file: /home/pcvs/ports/net-im/libpurple/pkg-plist,v retrieving revision 1.23 diff -u -r1.23 pkg-plist --- libpurple/pkg-plist 22 Dec 2008 07:35:22 -0000 1.23 +++ libpurple/pkg-plist 13 Jan 2009 08:00:00 -0000 @@ -71,40 +71,42 @@ lib/purple-2/idle.so lib/purple-2/joinpart.la lib/purple-2/joinpart.so -lib/purple-2/libaim.la -lib/purple-2/libaim.so -lib/purple-2/libicq.la -lib/purple-2/libicq.so +%%OSCAR%%lib/purple-2/libaim.la +%%OSCAR%%lib/purple-2/libaim.so +%%OSCAR%%lib/purple-2/libicq.la +%%OSCAR%%lib/purple-2/libicq.so %%BONJOUR%%lib/purple-2/libbonjour.la %%BONJOUR%%lib/purple-2/libbonjour.so -lib/purple-2/libgg.la -lib/purple-2/libgg.so -lib/purple-2/libirc.la -lib/purple-2/libirc.so -lib/purple-2/libjabber.la -lib/purple-2/libjabber.so -lib/purple-2/libjabber.so.0 -lib/purple-2/libmsn.la -lib/purple-2/libmsn.so -lib/purple-2/libnovell.la -lib/purple-2/libnovell.so -lib/purple-2/liboscar.la -lib/purple-2/liboscar.so -lib/purple-2/liboscar.so.0 +%%GG%%lib/purple-2/libgg.la +%%GG%%lib/purple-2/libgg.so +%%IRC%%lib/purple-2/libirc.la +%%IRC%%lib/purple-2/libirc.so +%%JABBER%%lib/purple-2/libjabber.la +%%JABBER%%lib/purple-2/libjabber.so +%%JABBER%%lib/purple-2/libjabber.so.0 +%%MSN%%lib/purple-2/libmsn.la +%%MSN%%lib/purple-2/libmsn.so +%%MYSPACE%%lib/purple-2/libmyspace.la +%%MYSPACE%%lib/purple-2/libmyspace.so +%%NOVELL%%lib/purple-2/libnovell.la +%%NOVELL%%lib/purple-2/libnovell.so +%%OSCAR%%lib/purple-2/liboscar.la +%%OSCAR%%lib/purple-2/liboscar.so +%%OSCAR%%lib/purple-2/liboscar.so.0 %%SILC%%lib/purple-2/libsilcpurple.la %%SILC%%lib/purple-2/libsilcpurple.so -lib/purple-2/libqq.la -lib/purple-2/libqq.so +%%QQ%%lib/purple-2/libqq.la +%%QQ%%lib/purple-2/libqq.so %%SAMETIME%%lib/purple-2/libsametime.la %%SAMETIME%%lib/purple-2/libsametime.so -lib/purple-2/libsimple.la -lib/purple-2/libsimple.so -lib/purple-2/libxmpp.la -lib/purple-2/libxmpp.so -lib/purple-2/libyahoo.la -lib/purple-2/libyahoo.so -lib/purple-2/libzephyr.la -lib/purple-2/libzephyr.so +%%SIMPLE%%lib/purple-2/libsimple.la +%%SIMPLE%%lib/purple-2/libsimple.so +%%JABBER%%lib/purple-2/libxmpp.la +%%JABBER%%lib/purple-2/libxmpp.so +%%YAHOO%%lib/purple-2/libyahoo.la +%%YAHOO%%lib/purple-2/libyahoo.so +%%ZEPHYR%%lib/purple-2/libzephyr.la +%%ZEPHYR%%lib/purple-2/libzephyr.so lib/purple-2/log_reader.la lib/purple-2/log_reader.so lib/purple-2/newline.la @@ -115,8 +117,8 @@ %%PERL:%%lib/purple-2/perl.so lib/purple-2/psychic.la lib/purple-2/psychic.so -lib/purple-2/ssl-gnutls.la -lib/purple-2/ssl-gnutls.so +%%GNUTLS%%lib/purple-2/ssl-gnutls.la +%%GNUTLS%%lib/purple-2/ssl-gnutls.so %%NSS%%lib/purple-2/ssl-nss.la %%NSS%%lib/purple-2/ssl-nss.so lib/purple-2/ssl.la Index: pidgin/pkg-plist =================================================================== RCS file: /home/pcvs/ports/net-im/pidgin/pkg-plist,v retrieving revision 1.21 diff -u -r1.21 pkg-plist --- pidgin/pkg-plist 22 Dec 2008 07:35:22 -0000 1.21 +++ pidgin/pkg-plist 13 Jan 2009 08:00:00 -0000 @@ -624,5 +624,5 @@ @dirrm share/pixmaps/pidgin/animations @dirrm share/pixmaps/pidgin @dirrmtry share/applications -@dirrm lib/pidgin +@dirrmtry lib/pidgin @dirrm include/pidgin >Release-Note: >Audit-Trail: >Unformatted: