From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jun 6 09:30:02 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org 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 E46FE16A41C for ; Mon, 6 Jun 2005 09:30:02 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7875F43D53 for ; Mon, 6 Jun 2005 09:30:02 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j569U2gw054655 for ; Mon, 6 Jun 2005 09:30:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j569U2Ah054653; Mon, 6 Jun 2005 09:30:02 GMT (envelope-from gnats) Resent-Date: Mon, 6 Jun 2005 09:30:02 GMT Resent-Message-Id: <200506060930.j569U2Ah054653@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, Vsevolod Stakhov Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 100D716A41C for ; Mon, 6 Jun 2005 09:26:35 +0000 (GMT) (envelope-from vsevolod@highsecure.ru) Received: from waterwall.inec.ru (waterwall.inec.ru [213.148.3.225]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0801C43D4C for ; Mon, 6 Jun 2005 09:26:33 +0000 (GMT) (envelope-from vsevolod@highsecure.ru) Received: from waterwall.inec.ru (root@localhost) by waterwall.inec.ru (8.13.1/8.12.6) with SMTP id j569QM00074008 for ; Mon, 6 Jun 2005 13:26:22 +0400 (MSD) Received: from waterwall.inec.ru (localhost.inec.ru [127.0.0.1]) by localhost (8.13.1/8.12.6) with ESMTP id j569QMIx074003; Mon, 6 Jun 2005 13:26:22 +0400 (MSD) Received: from localhost (localhost.inec.ru [127.0.0.1]) by localhost (Postfix) with SMTP id 1042B5A469; Mon, 6 Jun 2005 13:26:22 +0400 (MSD) Received: from core (postbox.inec.ru [213.148.3.226]) by waterwall.inec.ru (Postfix) with ESMTP id AAPBE42A416BCEA35; Mon, 6 Jun 2005 13:26:20 +0400 (MSD) Received: from [213.219.249.64] (helo=spray.anyhost.ru) by core with esmtp (Exim 4.51 (FreeBSD)) id 1DfDrt-000H5R-28; Mon, 06 Jun 2005 13:26:01 +0400 Received: from cebka by spray.anyhost.ru with local (Exim 4.50 (FreeBSD)) id 1DfDsG-000Imv-ND; Mon, 06 Jun 2005 13:26:24 +0400 Message-Id: Date: Mon, 06 Jun 2005 13:26:24 +0400 From: Vsevolod Stakhov Sender: Vsevolod Stakhov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: sem@FreeBSD.org Subject: ports/81942: Update port: net/gajim to version 0.7.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Vsevolod Stakhov List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Jun 2005 09:30:03 -0000 >Number: 81942 >Category: ports >Synopsis: Update port: net/gajim to version 0.7.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Jun 06 09:30:01 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Vsevolod Stakhov >Release: FreeBSD 5.3-STABLE i386 >Organization: >Environment: >Description: Gajim 0.7.1 has following enchancements: * Transports icon as an option and error/mesage icon for transports * Gajim is more HIG compatible * Editing registration information on transports * Messages stanza without element are not printed * SASL bugfix * GtkSpell capabilities * Support SSL (legacy) connection * Assign gpg key to specific contact * Contacts are sortable by status * Gajim remembers last lines when reopening chat * New translations available: German, Russian, Spanish, Bulgarian >How-To-Repeat: >Fix: diff -ruPN gajim.orig/Makefile gajim/Makefile --- gajim.orig/Makefile Mon Jun 6 13:22:31 2005 +++ gajim/Makefile Mon Jun 6 13:22:46 2005 @@ -6,8 +6,7 @@ # PORTNAME= gajim -PORTVERSION= 0.7 -PORTREVISION= 1 +PORTVERSION= 0.7.1 CATEGORIES= net MASTER_SITES= http://www.gajim.org/downloads/ @@ -15,6 +14,7 @@ COMMENT= Gajim is a Jabber client based on a plugin system BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/pygtk.py:${PORTSDIR}/x11-toolkits/py-gtk2 +LIB_DEPENDS= gtkspell.0:${PORTSDIR}/textproc/gtkspell2 USE_X_PREFIX= yes USE_PYTHON= 2.3+ diff -ruPN gajim.orig/distinfo gajim/distinfo --- gajim.orig/distinfo Mon Jun 6 13:21:08 2005 +++ gajim/distinfo Mon Jun 6 13:20:20 2005 @@ -1,2 +1,2 @@ -MD5 (gajim-0.7.tar.bz2) = 70d6b882c496ea7fbacc4222da49b125 -Size (gajim-0.7.tar.bz2) = 479572 +MD5 (gajim-0.7.1.tar.bz2) = f795d550749d78839d1b6a554bbff545 +Size (gajim-0.7.1.tar.bz2) = 438166 diff -ruPN gajim.orig/files/patch-Makefile gajim/files/patch-Makefile --- gajim.orig/files/patch-Makefile Mon Jun 6 13:21:08 2005 +++ gajim/files/patch-Makefile Mon Jun 6 13:20:20 2005 @@ -1,62 +1,11 @@ ---- Makefile.orig Mon May 23 22:22:10 2005 -+++ Makefile Thu May 26 15:16:31 2005 -@@ -1,15 +1,17 @@ - VERSION ?= 0.7 - - MODULES = src src/common po --PREFIX = /usr -+PREFIX ?= /usr/local - DESTDIR = / - --FIND = find -regex '.*\.\(\(glade\)\|\(pyo\)\|\(xpm\)\|\(gif\)\|\(png\)\|\(mo\)\|\(wav\)\)' --FILES = `$(FIND)` --DIRS = `$(FIND) -exec dirname {} \; | sort -u` --FIND_LIB = find -regex '.*\.\(so\)' --FILES_LIB = `$(FIND_LIB)` --FIND_PY = find -regex '.*\.\(py\)' -+MAKE = gmake -+ -+FIND = find -E -+FINDOPTS = -regex '.*.((glade)|(py)|(xpm)|(gif)|(png)|(mo)|(wav))' -+FILES = `$(FIND) . $(FINDOPTS)` -+DIRS = `$(FIND) . $(FINDOPTS) -exec dirname {} \; | sort -u` -+FIND_LIB = $(FIND) . -regex '.*.(so)' -+FIND_PY = $(FIND) . -regex '.*.(py)' - FILES_PY = `$(FIND_PY)` - - SCRIPTS = \ -@@ -18,13 +20,13 @@ - all: translation trayicon idle pyo - - translation: -- make -C po all -+ $(MAKE) -C po all - - trayicon: -- make -C src all; -+ $(MAKE) -C src all; - - idle: -- make -C src/common all; -+ $(MAKE) -C src/common all; - - pyo: - for f in $(FILES_PY) ; do \ -@@ -32,9 +34,9 @@ +--- Makefile.orig Sun Jun 5 14:56:42 2005 ++++ Makefile Mon Jun 6 13:15:44 2005 +@@ -61,12 +61,10 @@ + cp "$$f" "$(DESTDIR)$(PREFIX)/share/gajim/$$DST/"; \ done - - clean: -- find -name *.pyc -exec rm {} \; -- find -name *.pyo -exec rm {} \; -- find -name *.mo -exec rm {} \; -+ find . -name *.pyc -exec rm {} \; -+ find . -name *.pyo -exec rm {} \; -+ find . -name *.mo -exec rm {} \; - $(foreach sdir, $(MODULES), make -C $(sdir) clean;) - - dist: -@@ -64,8 +66,8 @@ cp COPYING "$(DESTDIR)$(PREFIX)/share/gajim/"; +- mkdir -p "$(DESTDIR)$(PREFIX)/share/pixmaps"; +- cp data/pixmaps/gajim.png "$(DESTDIR)$(PREFIX)/share/pixmaps/"; mkdir -p "$(DESTDIR)$(PREFIX)/share/applications"; cp gajim.desktop "$(DESTDIR)$(PREFIX)/share/applications/"; - mkdir -p "$(DESTDIR)$(PREFIX)/share/man/man1"; diff -ruPN gajim.orig/files/patch-src_Makefile gajim/files/patch-src_Makefile --- gajim.orig/files/patch-src_Makefile Thu Jan 1 03:00:00 1970 +++ gajim/files/patch-src_Makefile Mon Jun 6 13:20:20 2005 @@ -0,0 +1,10 @@ +--- src/Makefile.orig Sun Jun 5 14:56:37 2005 ++++ src/Makefile Mon Jun 6 12:46:09 2005 +@@ -1,6 +1,6 @@ + # Set the C flags to include the GTK+ and Python libraries + PYTHONVER = `python -V 2>&1 | awk '{print $$2}' | cut -f1,2 -d.` +-CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -fPIC -I/usr/include/python$(PYTHONVER) -I. ++CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -fPIC $(PY_CFLAGS) -I. + LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0` + + all: trayicon.so gtkspell.so diff -ruPN gajim.orig/files/patch-src_common_Makefile gajim/files/patch-src_common_Makefile --- gajim.orig/files/patch-src_common_Makefile Thu Jan 1 03:00:00 1970 +++ gajim/files/patch-src_common_Makefile Mon Jun 6 13:20:20 2005 @@ -0,0 +1,10 @@ +--- src/common/Makefile.orig Mon Jun 6 12:54:27 2005 ++++ src/common/Makefile Mon Jun 6 12:55:03 2005 +@@ -1,6 +1,6 @@ + # Set the C flags to include the GTK+ and Python libraries + PYTHONVER = `python -V 2>&1 | awk '{print $$2}' | cut -f1,2 -d.` +-CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -fpic -I/usr/include/python$(PYTHONVER) -I. ++CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -fPIC $(PY_CFLAGS) -I. + LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0` + + all: idle.so diff -ruPN gajim.orig/pkg-plist gajim/pkg-plist --- gajim.orig/pkg-plist Mon Jun 6 13:21:08 2005 +++ gajim/pkg-plist Mon Jun 6 13:20:20 2005 @@ -1,6 +1,8 @@ bin/gajim +lib/gajim/gtkspell.so +lib/gajim/idle.so +lib/gajim/trayicon.so %%DATADIR%%/COPYING -%%DATADIR%%/gajim.xpm %%DATADIR%%/data/emoticons/angry.png %%DATADIR%%/data/emoticons/bat.png %%DATADIR%%/data/emoticons/beer.png @@ -86,7 +88,7 @@ %%DATADIR%%/data/iconsets/transports/aim/chat.png %%DATADIR%%/data/iconsets/transports/aim/closed.xpm %%DATADIR%%/data/iconsets/transports/aim/dnd.png -%%DATADIR%%/data/iconsets/transports/aim/error.png +%%DATADIR%%/data/iconsets/transports/aim/error.xpm %%DATADIR%%/data/iconsets/transports/aim/invisible.png %%DATADIR%%/data/iconsets/transports/aim/message.gif %%DATADIR%%/data/iconsets/transports/aim/not_in_the_roster.png @@ -99,7 +101,7 @@ %%DATADIR%%/data/iconsets/transports/gadugadu/chat.png %%DATADIR%%/data/iconsets/transports/gadugadu/closed.xpm %%DATADIR%%/data/iconsets/transports/gadugadu/dnd.png -%%DATADIR%%/data/iconsets/transports/gadugadu/error.png +%%DATADIR%%/data/iconsets/transports/gadugadu/error.xpm %%DATADIR%%/data/iconsets/transports/gadugadu/invisible.png %%DATADIR%%/data/iconsets/transports/gadugadu/message.gif %%DATADIR%%/data/iconsets/transports/gadugadu/not_in_the_roster.png @@ -112,7 +114,7 @@ %%DATADIR%%/data/iconsets/transports/icq/chat.png %%DATADIR%%/data/iconsets/transports/icq/closed.xpm %%DATADIR%%/data/iconsets/transports/icq/dnd.png -%%DATADIR%%/data/iconsets/transports/icq/error.png +%%DATADIR%%/data/iconsets/transports/icq/error.xpm %%DATADIR%%/data/iconsets/transports/icq/invisible.png %%DATADIR%%/data/iconsets/transports/icq/message.gif %%DATADIR%%/data/iconsets/transports/icq/not_in_the_roster.png @@ -121,11 +123,21 @@ %%DATADIR%%/data/iconsets/transports/icq/opened.xpm %%DATADIR%%/data/iconsets/transports/icq/requested.png %%DATADIR%%/data/iconsets/transports/icq/xa.png +%%DATADIR%%/data/iconsets/transports/irc/away.png +%%DATADIR%%/data/iconsets/transports/irc/chat.png +%%DATADIR%%/data/iconsets/transports/irc/dnd.png +%%DATADIR%%/data/iconsets/transports/irc/error.xpm +%%DATADIR%%/data/iconsets/transports/irc/invisible.png +%%DATADIR%%/data/iconsets/transports/irc/message.gif +%%DATADIR%%/data/iconsets/transports/irc/not_in_the_roster.png +%%DATADIR%%/data/iconsets/transports/irc/offline.png +%%DATADIR%%/data/iconsets/transports/irc/online.png +%%DATADIR%%/data/iconsets/transports/irc/requested.png +%%DATADIR%%/data/iconsets/transports/irc/xa.png %%DATADIR%%/data/iconsets/transports/msn/away.png %%DATADIR%%/data/iconsets/transports/msn/chat.png %%DATADIR%%/data/iconsets/transports/msn/closed.xpm %%DATADIR%%/data/iconsets/transports/msn/dnd.png -%%DATADIR%%/data/iconsets/transports/msn/error.png %%DATADIR%%/data/iconsets/transports/msn/invisible.png %%DATADIR%%/data/iconsets/transports/msn/message.gif %%DATADIR%%/data/iconsets/transports/msn/not_in_the_roster.png @@ -134,11 +146,22 @@ %%DATADIR%%/data/iconsets/transports/msn/opened.xpm %%DATADIR%%/data/iconsets/transports/msn/requested.png %%DATADIR%%/data/iconsets/transports/msn/xa.png +%%DATADIR%%/data/iconsets/transports/msn/error.xpm +%%DATADIR%%/data/iconsets/transports/sms/away.png +%%DATADIR%%/data/iconsets/transports/sms/chat.png +%%DATADIR%%/data/iconsets/transports/sms/dnd.png +%%DATADIR%%/data/iconsets/transports/sms/error.xpm +%%DATADIR%%/data/iconsets/transports/sms/invisible.png +%%DATADIR%%/data/iconsets/transports/sms/message.gif +%%DATADIR%%/data/iconsets/transports/sms/offline.png +%%DATADIR%%/data/iconsets/transports/sms/online.png +%%DATADIR%%/data/iconsets/transports/sms/requested.png +%%DATADIR%%/data/iconsets/transports/sms/xa.png %%DATADIR%%/data/iconsets/transports/yahoo/away.png %%DATADIR%%/data/iconsets/transports/yahoo/chat.png %%DATADIR%%/data/iconsets/transports/yahoo/closed.xpm %%DATADIR%%/data/iconsets/transports/yahoo/dnd.png -%%DATADIR%%/data/iconsets/transports/yahoo/error.png +%%DATADIR%%/data/iconsets/transports/yahoo/error.xpm %%DATADIR%%/data/iconsets/transports/yahoo/invisible.png %%DATADIR%%/data/iconsets/transports/yahoo/message.gif %%DATADIR%%/data/iconsets/transports/yahoo/not_in_the_roster.png @@ -147,21 +170,26 @@ %%DATADIR%%/data/iconsets/transports/yahoo/opened.xpm %%DATADIR%%/data/iconsets/transports/yahoo/requested.png %%DATADIR%%/data/iconsets/transports/yahoo/xa.png -%%DATADIR%%/data/pixmaps/logo.png +%%DATADIR%%/data/pixmaps/gajim.png %%DATADIR%%/data/sounds/connected.wav %%DATADIR%%/data/sounds/disconnected.wav %%DATADIR%%/data/sounds/message1.wav %%DATADIR%%/data/sounds/message2.wav %%DATADIR%%/data/sounds/sent.wav +%%DATADIR%%/po/bg/LC_MESSAGES/gajim.mo +%%DATADIR%%/po/de/LC_MESSAGES/gajim.mo %%DATADIR%%/po/el/LC_MESSAGES/gajim.mo +%%DATADIR%%/po/es/LC_MESSAGES/gajim.mo %%DATADIR%%/po/fr/LC_MESSAGES/gajim.mo %%DATADIR%%/po/pl/LC_MESSAGES/gajim.mo %%DATADIR%%/po/pt/LC_MESSAGES/gajim.mo +%%DATADIR%%/po/ru/LC_MESSAGES/gajim.mo %%DATADIR%%/src/advanced.py %%DATADIR%%/src/cell_renderer_image.py %%DATADIR%%/src/chat.py %%DATADIR%%/src/check_for_new_version.py %%DATADIR%%/src/common/GnuPG.py +%%DATADIR%%/src/common/GnuPGInterface.py %%DATADIR%%/src/common/__init__.py %%DATADIR%%/src/common/config.py %%DATADIR%%/src/common/connection.py @@ -208,21 +236,31 @@ @dirrm %%DATADIR%%/data/iconsets/transports/aim @dirrm %%DATADIR%%/data/iconsets/transports/gadugadu @dirrm %%DATADIR%%/data/iconsets/transports/icq +@dirrm %%DATADIR%%/data/iconsets/transports/irc @dirrm %%DATADIR%%/data/iconsets/transports/msn +@dirrm %%DATADIR%%/data/iconsets/transports/sms @dirrm %%DATADIR%%/data/iconsets/transports/yahoo @dirrm %%DATADIR%%/data/iconsets/transports @dirrm %%DATADIR%%/data/iconsets @dirrm %%DATADIR%%/data/pixmaps @dirrm %%DATADIR%%/data/sounds @dirrm %%DATADIR%%/data +@dirrm %%DATADIR%%/po/bg/LC_MESSAGES/ +@dirrm %%DATADIR%%/po/bg +@dirrm %%DATADIR%%/po/de/LC_MESSAGES/ +@dirrm %%DATADIR%%/po/de @dirrm %%DATADIR%%/po/el/LC_MESSAGES/ @dirrm %%DATADIR%%/po/el +@dirrm %%DATADIR%%/po/es/LC_MESSAGES/ +@dirrm %%DATADIR%%/po/es @dirrm %%DATADIR%%/po/fr/LC_MESSAGES @dirrm %%DATADIR%%/po/fr @dirrm %%DATADIR%%/po/pl/LC_MESSAGES @dirrm %%DATADIR%%/po/pl @dirrm %%DATADIR%%/po/pt/LC_MESSAGES @dirrm %%DATADIR%%/po/pt +@dirrm %%DATADIR%%/po/ru/LC_MESSAGES/ +@dirrm %%DATADIR%%/po/ru @dirrm %%DATADIR%%/po @dirrm %%DATADIR%% @unexec rmdir %D/share/applications > /dev/null 2>&1 | true >Release-Note: >Audit-Trail: >Unformatted: