From dsh@vlink.ru  Wed Oct  3 06:37:34 2007
Return-Path: <dsh@vlink.ru>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 31DC216A46B
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  3 Oct 2007 06:37:34 +0000 (UTC)
	(envelope-from dsh@vlink.ru)
Received: from sagitta.internal.vlink.ru (alias.rigel.internal.vlink.ru [85.172.168.14])
	by mx1.freebsd.org (Postfix) with ESMTP id 6EE1613C468
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  3 Oct 2007 06:37:31 +0000 (UTC)
	(envelope-from dsh@vlink.ru)
Received: from sagitta.internal.vlink.ru (localhost [127.0.0.1])
	by sagitta.internal.vlink.ru (Postfix) with ESMTP id E02391F454C;
	Wed,  3 Oct 2007 10:37:27 +0400 (MSD)
Received: from localhost.my.domain (wizard.vlink.ru [85.172.168.67])
	by sagitta.internal.vlink.ru (Postfix) with ESMTPS id 30A941F453D;
	Wed,  3 Oct 2007 10:37:27 +0400 (MSD)
Received: from localhost.my.domain (localhost [127.0.0.1])
	by localhost.my.domain (8.14.1/8.14.1) with ESMTP id l936bPIR001383;
	Wed, 3 Oct 2007 10:37:25 +0400 (MSD)
	(envelope-from dsh@localhost.my.domain)
Received: (from dsh@localhost)
	by localhost.my.domain (8.14.1/8.14.1/Submit) id l936bObl001379;
	Wed, 3 Oct 2007 10:37:24 +0400 (MSD)
	(envelope-from dsh)
Message-Id: <200710030637.l936bObl001379@localhost.my.domain>
Date: Wed, 3 Oct 2007 10:37:24 +0400 (MSD)
From: Denis Shaposhnikov <dsh@vlink.ru>
Reply-To: Denis Shaposhnikov <dsh@vlink.ru>
To: FreeBSD-gnats-submit@freebsd.org
Subject: Update port: net-im/gajim (0.11.2 release)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         116855
>Category:       ports
>Synopsis:       Update port: net-im/gajim (0.11.2 release)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 03 06:40:01 GMT 2007
>Closed-Date:    Tue Oct 09 23:03:56 UTC 2007
>Last-Modified:  Tue Oct  9 23:10:00 UTC 2007
>Originator:     Denis Shaposhnikov
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD localhost.my.domain 6.2-STABLE FreeBSD 6.2-STABLE #1: Mon Oct 1 18:16:29 MSD 2007 dsh@localhost.my.domain:/var/FreeBSD/obj/var/FreeBSD/src/sys/MYNERIC i386


	
>Description:

This is upgrade to the latest release.

>How-To-Repeat:
	
>Fix:

diff -Nru gajim.orig/Makefile gajim/Makefile
--- gajim.orig/Makefile	2007-10-03 10:33:43.000000000 +0400
+++ gajim/Makefile	2007-10-01 21:43:45.321101000 +0400
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gajim
-PORTVERSION=	0.11.1
-PORTREVISION=	2
+PORTVERSION=	0.11.2
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.gajim.org/downloads/ \
 		http://ports.internal.vlink.ru/distfiles/
@@ -25,6 +24,7 @@
 USE_PYTHON=	2.4+
 USE_XLIB=	yes
 
+CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I ${X11BASE}/include" PYTHON=${PYTHON_CMD}
 
 .if !defined(WITHOUT_NLS)
@@ -37,7 +37,7 @@
 
 MAN1=		gajim.1 gajim-remote.1
 
-EMOTICONS=	animated static
+EMOTICONS=	animated static static-big
 ICONSETS=	crystal dcraven gnome goojim gossip gota jabberbulb nuvola \
 		simplebulb stellar sun transports
 
@@ -53,26 +53,18 @@
 post-install:
 		${MKDIR} ${DATADIR}/data/emoticons
 		(cd ${WRKSRC}/data/emoticons && \
-		${CP} -R ${EMOTICONS} ${DATADIR}/data/emoticons)
-
-		${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}/data/emoticons
-		${FIND} ${DATADIR}/data/emoticons -type d -print0 | \
-			${XARGS} -0 ${CHMOD} 755
-		${FIND} ${DATADIR}/data/emoticons -type f -print0 | \
-			${XARGS} -0 ${CHMOD} ${SHAREMODE}
+		${COPYTREE_SHARE} "${EMOTICONS}" ${DATADIR}/data/emoticons)
 
 		${MKDIR} ${DATADIR}/data/iconsets
 		(cd ${WRKSRC}/data/iconsets && \
-		${CP} -R ${ICONSETS} ${DATADIR}/data/iconsets)
-
-		${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}/data/iconsets
-		${FIND} ${DATADIR}/data/iconsets -type d -print0 | \
-			${XARGS} -0 ${CHMOD} 755
-		${FIND} ${DATADIR}/data/iconsets -type f -print0 | \
-			${XARGS} -0 ${CHMOD} ${SHAREMODE}
+		${COPYTREE_SHARE} "${ICONSETS}" ${DATADIR}/data/iconsets)
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 500000
+BROKEN=		doesn\'t install
+.endif
+
 .if ${PYTHON_REL} >= 250
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
 .else
diff -Nru gajim.orig/distinfo gajim/distinfo
--- gajim.orig/distinfo	2007-10-03 10:33:43.000000000 +0400
+++ gajim/distinfo	2007-10-01 21:43:45.321101000 +0400
@@ -1,3 +1,3 @@
-MD5 (gajim-0.11.1.tar.bz2) = cc587e7617f53ae8d5e0b30d7324e89c
-SHA256 (gajim-0.11.1.tar.bz2) = f42e6cfb7ab98224846a7e9ee97ca0aba2ea4a7943a8315a67ccf1127c2aa132
-SIZE (gajim-0.11.1.tar.bz2) = 2785799
+MD5 (gajim-0.11.2.tar.bz2) = 8cb0cd5871191a0e8dd43fcef47056dc
+SHA256 (gajim-0.11.2.tar.bz2) = a6811b7f1c35b1589771fe128ff3784fec4c08a8e4c4352370f161ab07814aa3
+SIZE (gajim-0.11.2.tar.bz2) = 2908570
diff -Nru gajim.orig/pkg-plist gajim/pkg-plist
--- gajim.orig/pkg-plist	2007-10-03 10:33:43.000000000 +0400
+++ gajim/pkg-plist	2007-10-01 21:43:45.321101000 +0400
@@ -1,4 +1,5 @@
 bin/gajim
+bin/gajim-remote
 lib/gajim/gtkspell.la
 lib/gajim/gtkspell.so
 lib/gajim/idle.la
@@ -16,17 +17,18 @@
 %%NLS%%share/locale/es/LC_MESSAGES/gajim.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/gajim.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/gajim.mo
+%%NLS%%share/locale/gl_ES/LC_MESSAGES/gajim.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/gajim.mo
 %%NLS%%share/locale/it/LC_MESSAGES/gajim.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/gajim.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/gajim.mo
 %%NLS%%share/locale/no/LC_MESSAGES/gajim.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/gajim.mo
-%%NLS%%share/locale/sr/LC_MESSAGES/gajim.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/gajim.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/gajim.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/gajim.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/gajim.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/gajim.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/gajim.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/gajim.mo
 share/applications/gajim.desktop
@@ -79,6 +81,45 @@
 %%DATADIR%%/data/emoticons/animated/tongue.png
 %%DATADIR%%/data/emoticons/animated/unhappy.png
 %%DATADIR%%/data/emoticons/animated/wink.gif
+%%DATADIR%%/data/emoticons/static-big/angry.png
+%%DATADIR%%/data/emoticons/static-big/bat.png
+%%DATADIR%%/data/emoticons/static-big/beer.png
+%%DATADIR%%/data/emoticons/static-big/biggrin.png
+%%DATADIR%%/data/emoticons/static-big/blush.png
+%%DATADIR%%/data/emoticons/static-big/boy.png
+%%DATADIR%%/data/emoticons/static-big/brflower.png
+%%DATADIR%%/data/emoticons/static-big/brheart.png
+%%DATADIR%%/data/emoticons/static-big/coffee.png
+%%DATADIR%%/data/emoticons/static-big/coolglasses.png
+%%DATADIR%%/data/emoticons/static-big/cry.png
+%%DATADIR%%/data/emoticons/static-big/cuffs.png
+%%DATADIR%%/data/emoticons/static-big/devil.png
+%%DATADIR%%/data/emoticons/static-big/drink.png
+%%DATADIR%%/data/emoticons/static-big/emoticons.py
+%%DATADIR%%/data/emoticons/static-big/flower.png
+%%DATADIR%%/data/emoticons/static-big/frowning.png
+%%DATADIR%%/data/emoticons/static-big/girl.png
+%%DATADIR%%/data/emoticons/static-big/heart.png
+%%DATADIR%%/data/emoticons/static-big/hugleft.png
+%%DATADIR%%/data/emoticons/static-big/hugright.png
+%%DATADIR%%/data/emoticons/static-big/kiss.png
+%%DATADIR%%/data/emoticons/static-big/lamp.png
+%%DATADIR%%/data/emoticons/static-big/mail.png
+%%DATADIR%%/data/emoticons/static-big/moon.png
+%%DATADIR%%/data/emoticons/static-big/music.png
+%%DATADIR%%/data/emoticons/static-big/oh.png
+%%DATADIR%%/data/emoticons/static-big/phone.png
+%%DATADIR%%/data/emoticons/static-big/photo.png
+%%DATADIR%%/data/emoticons/static-big/pussy.png
+%%DATADIR%%/data/emoticons/static-big/rainbow.png
+%%DATADIR%%/data/emoticons/static-big/smile.png
+%%DATADIR%%/data/emoticons/static-big/star.png
+%%DATADIR%%/data/emoticons/static-big/stare.png
+%%DATADIR%%/data/emoticons/static-big/thumbdown.png
+%%DATADIR%%/data/emoticons/static-big/thumbup.png
+%%DATADIR%%/data/emoticons/static-big/tongue.png
+%%DATADIR%%/data/emoticons/static-big/unhappy.png
+%%DATADIR%%/data/emoticons/static-big/wink.png
 %%DATADIR%%/data/emoticons/static/angry.png
 %%DATADIR%%/data/emoticons/static/bat.png
 %%DATADIR%%/data/emoticons/static/beer.png
@@ -822,6 +863,8 @@
 %%DOCSDIR%%/THANKS
 @dirrm lib/gajim
 @dirrmtry share/applications
+%%NLS%%@dirrm share/locale/gl_ES/LC_MESSAGES
+%%NLS%%@dirrm share/locale/gl_ES
 @dirrm %%DATADIR%%/src/common/xmpp
 @dirrm %%DATADIR%%/src/common/zeroconf
 @dirrm %%DATADIR%%/src/common
@@ -832,34 +875,53 @@
 @dirrm %%DATADIR%%/data/pixmaps
 @dirrm %%DATADIR%%/data/other
 @dirrm %%DATADIR%%/data/sounds
-@dirrm %%DATADIR%%/data/emoticons/static
 @dirrm %%DATADIR%%/data/emoticons/animated
+@dirrm %%DATADIR%%/data/emoticons/static
+@dirrm %%DATADIR%%/data/emoticons/static-big
 @dirrm %%DATADIR%%/data/emoticons
+@dirrm %%DATADIR%%/data/iconsets/crystal/16x16
+@dirrm %%DATADIR%%/data/iconsets/crystal/48x48
+@dirrm %%DATADIR%%/data/iconsets/crystal
+@dirrm %%DATADIR%%/data/iconsets/dcraven/16x16
+@dirrm %%DATADIR%%/data/iconsets/dcraven/32x32
+@dirrm %%DATADIR%%/data/iconsets/dcraven/48x48
+@dirrm %%DATADIR%%/data/iconsets/dcraven
+@dirrm %%DATADIR%%/data/iconsets/gnome/16x16
+@dirrm %%DATADIR%%/data/iconsets/gnome/32x32
+@dirrm %%DATADIR%%/data/iconsets/gnome/48x48
+@dirrm %%DATADIR%%/data/iconsets/gnome
+@dirrm %%DATADIR%%/data/iconsets/goojim/16x16
+@dirrm %%DATADIR%%/data/iconsets/goojim/32x32
+@dirrm %%DATADIR%%/data/iconsets/goojim/48x48
+@dirrm %%DATADIR%%/data/iconsets/goojim
+@dirrm %%DATADIR%%/data/iconsets/gossip/16x16
+@dirrm %%DATADIR%%/data/iconsets/gossip/48x48
+@dirrm %%DATADIR%%/data/iconsets/gossip
 @dirrm %%DATADIR%%/data/iconsets/gota/16x16
 @dirrm %%DATADIR%%/data/iconsets/gota/32x32
 @dirrm %%DATADIR%%/data/iconsets/gota/48x48
 @dirrm %%DATADIR%%/data/iconsets/gota
-@dirrm %%DATADIR%%/data/iconsets/sun/16x16
-@dirrm %%DATADIR%%/data/iconsets/sun/32x32
-@dirrm %%DATADIR%%/data/iconsets/sun/48x48
-@dirrm %%DATADIR%%/data/iconsets/sun
-@dirrm %%DATADIR%%/data/iconsets/stellar/16x16
-@dirrm %%DATADIR%%/data/iconsets/stellar/48x48
-@dirrm %%DATADIR%%/data/iconsets/stellar
-@dirrm %%DATADIR%%/data/iconsets/simplebulb/16x16
-@dirrm %%DATADIR%%/data/iconsets/simplebulb/48x48
-@dirrm %%DATADIR%%/data/iconsets/simplebulb
-@dirrm %%DATADIR%%/data/iconsets/nuvola/16x16
-@dirrm %%DATADIR%%/data/iconsets/nuvola/48x48
-@dirrm %%DATADIR%%/data/iconsets/nuvola
 @dirrm %%DATADIR%%/data/iconsets/jabberbulb/16x16
 @dirrm %%DATADIR%%/data/iconsets/jabberbulb/32x32
 @dirrm %%DATADIR%%/data/iconsets/jabberbulb/48x48
 @dirrm %%DATADIR%%/data/iconsets/jabberbulb
-@dirrm %%DATADIR%%/data/iconsets/transports/msn/16x16
-@dirrm %%DATADIR%%/data/iconsets/transports/msn/32x32
-@dirrm %%DATADIR%%/data/iconsets/transports/msn/48x48
-@dirrm %%DATADIR%%/data/iconsets/transports/msn
+@dirrm %%DATADIR%%/data/iconsets/nuvola/16x16
+@dirrm %%DATADIR%%/data/iconsets/nuvola/48x48
+@dirrm %%DATADIR%%/data/iconsets/nuvola
+@dirrm %%DATADIR%%/data/iconsets/simplebulb/16x16
+@dirrm %%DATADIR%%/data/iconsets/simplebulb/48x48
+@dirrm %%DATADIR%%/data/iconsets/simplebulb
+@dirrm %%DATADIR%%/data/iconsets/stellar/16x16
+@dirrm %%DATADIR%%/data/iconsets/stellar/48x48
+@dirrm %%DATADIR%%/data/iconsets/stellar
+@dirrm %%DATADIR%%/data/iconsets/sun/16x16
+@dirrm %%DATADIR%%/data/iconsets/sun/32x32
+@dirrm %%DATADIR%%/data/iconsets/sun/48x48
+@dirrm %%DATADIR%%/data/iconsets/sun
+@dirrm %%DATADIR%%/data/iconsets/transports/aim/16x16
+@dirrm %%DATADIR%%/data/iconsets/transports/aim/32x32
+@dirrm %%DATADIR%%/data/iconsets/transports/aim/48x48
+@dirrm %%DATADIR%%/data/iconsets/transports/aim
 @dirrm %%DATADIR%%/data/iconsets/transports/gadu-gadu/16x16
 @dirrm %%DATADIR%%/data/iconsets/transports/gadu-gadu/32x32
 @dirrm %%DATADIR%%/data/iconsets/transports/gadu-gadu/48x48
@@ -871,10 +933,10 @@
 @dirrm %%DATADIR%%/data/iconsets/transports/irc/16x16
 @dirrm %%DATADIR%%/data/iconsets/transports/irc/32x32
 @dirrm %%DATADIR%%/data/iconsets/transports/irc
-@dirrm %%DATADIR%%/data/iconsets/transports/aim/16x16
-@dirrm %%DATADIR%%/data/iconsets/transports/aim/32x32
-@dirrm %%DATADIR%%/data/iconsets/transports/aim/48x48
-@dirrm %%DATADIR%%/data/iconsets/transports/aim
+@dirrm %%DATADIR%%/data/iconsets/transports/msn/16x16
+@dirrm %%DATADIR%%/data/iconsets/transports/msn/32x32
+@dirrm %%DATADIR%%/data/iconsets/transports/msn/48x48
+@dirrm %%DATADIR%%/data/iconsets/transports/msn
 @dirrm %%DATADIR%%/data/iconsets/transports/sms/16x16
 @dirrm %%DATADIR%%/data/iconsets/transports/sms/32x32
 @dirrm %%DATADIR%%/data/iconsets/transports/sms
@@ -890,24 +952,6 @@
 @dirrm %%DATADIR%%/data/iconsets/transports/yahoo/48x48
 @dirrm %%DATADIR%%/data/iconsets/transports/yahoo
 @dirrm %%DATADIR%%/data/iconsets/transports
-@dirrm %%DATADIR%%/data/iconsets/gossip/16x16
-@dirrm %%DATADIR%%/data/iconsets/gossip/48x48
-@dirrm %%DATADIR%%/data/iconsets/gossip
-@dirrm %%DATADIR%%/data/iconsets/goojim/16x16
-@dirrm %%DATADIR%%/data/iconsets/goojim/32x32
-@dirrm %%DATADIR%%/data/iconsets/goojim/48x48
-@dirrm %%DATADIR%%/data/iconsets/goojim
-@dirrm %%DATADIR%%/data/iconsets/gnome/16x16
-@dirrm %%DATADIR%%/data/iconsets/gnome/32x32
-@dirrm %%DATADIR%%/data/iconsets/gnome/48x48
-@dirrm %%DATADIR%%/data/iconsets/gnome
-@dirrm %%DATADIR%%/data/iconsets/dcraven/16x16
-@dirrm %%DATADIR%%/data/iconsets/dcraven/32x32
-@dirrm %%DATADIR%%/data/iconsets/dcraven/48x48
-@dirrm %%DATADIR%%/data/iconsets/dcraven
-@dirrm %%DATADIR%%/data/iconsets/crystal/16x16
-@dirrm %%DATADIR%%/data/iconsets/crystal/48x48
-@dirrm %%DATADIR%%/data/iconsets/crystal
 @dirrm %%DATADIR%%/data/iconsets
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Wed Oct 3 10:12:15 UTC 2007 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=116855 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Tue Oct 9 23:03:55 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=116855 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/116855: commit references a PR
Date: Tue,  9 Oct 2007 23:03:47 +0000 (UTC)

 miwi        2007-10-09 23:03:37 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net-im/gajim         Makefile distinfo pkg-plist 
     net-im/gajim/files   patch-po-Makefile.in.in 
   Log:
   - Update to 0.11.2
   
   PR:             116855
   Submitted by:   Denis Shaposhnikov <dsh@vlink.ru> (maintainer)
   
   Revision  Changes    Path
   1.25      +9 -19     ports/net-im/gajim/Makefile
   1.12      +3 -3      ports/net-im/gajim/distinfo
   1.2       +0 -11     ports/net-im/gajim/files/patch-po-Makefile.in.in
   1.17      +90 -41    ports/net-im/gajim/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
