From nobody@FreeBSD.org  Mon Sep 16 16:46:46 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 3C20EEA1
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 16 Sep 2013 16:46:46 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 28B812B5A
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 16 Sep 2013 16:46:46 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r8GGkgjC080799
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 16 Sep 2013 16:46:42 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r8GGkg4p080798;
	Mon, 16 Sep 2013 16:46:42 GMT
	(envelope-from nobody)
Message-Id: <201309161646.r8GGkg4p080798@oldred.freebsd.org>
Date: Mon, 16 Sep 2013 16:46:42 GMT
From: Tzanetos Balitsaris <tzabal@it.teithe.gr>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [maintainer update] net-im/jitsi update (2.2 -> 2.3)
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         182160
>Category:       ports
>Synopsis:       [maintainer update] net-im/jitsi update (2.2 -> 2.3)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wg
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 16 16:50:00 UTC 2013
>Closed-Date:    Mon Sep 16 23:00:47 UTC 2013
>Last-Modified:  Mon Sep 16 23:10:00 UTC 2013
>Originator:     Tzanetos Balitsaris
>Release:        9.1-RELEASE
>Organization:
>Environment:
FreeBSD free.tzabal.eu 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec  4 09:23:10 UTC 2012     root@farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
-- Fix audio
-- Fix video
-- Add pkg-message file
-- Update to 2.3 version using a recent code snapshot of master.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN jitsi.old/Makefile jitsi/Makefile
--- jitsi.old/Makefile	2013-08-14 11:22:59.000000000 +0300
+++ jitsi/Makefile	2013-09-16 19:12:27.000000000 +0300
@@ -1,21 +1,25 @@
 # Created by: Tzanetos Balitsaris <tzabal@it.teithe.gr>
-# $FreeBSD: net-im/jitsi/Makefile 324687 2013-08-14 08:22:59Z cs $
+# $FreeBSD$
 
 PORTNAME=	jitsi
-PORTVERSION=	2.2
+PORTVERSION=	2.3
 CATEGORIES=	net-im java
-MASTER_SITES=	http://www.c-s.li/ports/ \
-		https://download.jitsi.org/jitsi/src/
-DISTNAME=	jitsi-src-2.2.4603.9615
+MASTER_SITES=	http://aetos.it.teithe.gr/~tzabal/ports/jitsi/ \
+		http://www.c-s.li/ports/
+DISTNAME=	jitsi-master-084e2b42b5
 
 MAINTAINER=	tzabal@it.teithe.gr
 COMMENT=	Open source IM and VoIP application
 
 MAN1=		jitsi.1
+
 USE_ZIP=	yes
 USE_JAVA=	yes
 USE_ANT=	yes
 MAKE_ARGS=	rebuild
+USE_LDCONFIG=	${PREFIX}/lib/jitsi/lib/native
+
+ONLY_FOR_ARCHS=	i386 amd64
 
 DESKTOP_ENTRIES="Jitsi" \
 		"VoIP and Instant Messenger" \
@@ -43,8 +47,6 @@
 	@${ECHO_CMD} ">> Installing library jars..."
 	@cd ${WRKSRC}/lib/bundle && ${COPYTREE_SHARE} \* \
 		${PREFIX}/lib/jitsi/lib/bundle "! -name junit.jar"
-	@${INSTALL_DATA} ${WRKSRC}/lib/os-specific/freebsd/jdic_stub.jar \
-		${PREFIX}/lib/jitsi/lib
 	@cd ${WRKSRC}/lib && ${COPYTREE_SHARE} "felix.jar jdic-all.jar \
 		felix.client.run.properties logging.properties" \
 			${PREFIX}/lib/jitsi/lib
@@ -72,4 +74,7 @@
 	@${INSTALL_DATA} ${WRKSRC}/resources/images/logo/sc_logo_128x128.png \
 		${PREFIX}/share/pixmaps/jitsi.png
 
+post-install:
+	@${CAT} ${PKGMESSAGE}
+
 .include <bsd.port.post.mk>
diff -ruN jitsi.old/distinfo jitsi/distinfo
--- jitsi.old/distinfo	2013-08-14 11:22:59.000000000 +0300
+++ jitsi/distinfo	2013-09-16 00:08:02.000000000 +0300
@@ -1,2 +1,2 @@
-SHA256 (jitsi-src-2.2.4603.9615.zip) = abee87346f2732d1e55f383c1bddafed7aee1e63b92b9d1854cde0679fc85ecf
-SIZE (jitsi-src-2.2.4603.9615.zip) = 64168863
+SHA256 (jitsi-master-084e2b42b5.zip) = e11100ca4c19083002a3d57d3b34711e5601da2c388f4ee89f9b98862d2df01c
+SIZE (jitsi-master-084e2b42b5.zip) = 68936481
diff -ruN jitsi.old/files/jitsi.sh jitsi/files/jitsi.sh
--- jitsi.old/files/jitsi.sh	2013-03-24 21:16:45.000000000 +0200
+++ jitsi/files/jitsi.sh	2013-09-16 18:07:18.000000000 +0300
@@ -8,8 +8,10 @@
 COMMAND="${JAVA} -Dfelix.config.properties=file:${JITSI_LIB}/felix.client.run.properties \
         -Djava.util.logging.config.file=${JITSI_LIB}/logging.properties \
         -Djna.library.path=${JITSI_LIB}/native \
-        -classpath ${JITSI_LIB}/felix.jar:${JITSI_LIB}/jdic-all.jar:${JITSI_LIB}/jdic_stub.jar:${JITSI_BUNDLES}/sc-launcher.jar:${JITSI_BUNDLES}/util.jar \
+        -classpath ${JITSI_LIB}/felix.jar:${JITSI_LIB}/jdic-all.jar:${JITSI_BUNDLES}/sc-launcher.jar:${JITSI_BUNDLES}/util.jar \
         net.java.sip.communicator.launcher.SIPCommunicator"
 
+export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}${JITSI_LIB}/native"
+
 cd ${JITSI}
 exec ${COMMAND} $*
diff -ruN jitsi.old/pkg-message jitsi/pkg-message
--- jitsi.old/pkg-message	1970-01-01 02:00:00.000000000 +0200
+++ jitsi/pkg-message	2013-09-16 19:29:04.000000000 +0300
@@ -0,0 +1,9 @@
+-- Audio and Video codecs
+
+From the list of available audio codecs, please deselect all except 'opus/48000'.
+From the list of available video codecs, please deselect all except 'VP8'.
+You can make this change via the interface of Jitsi:
+-> Jitsi-Tools-Options-Audio-Encodings
+-> Jitsi-Tools-Options-Video-Encodings
+
+It is recommended that all the participants of an audio/video call to use the same codecs. 
diff -ruN jitsi.old/pkg-plist jitsi/pkg-plist
--- jitsi.old/pkg-plist	2013-08-14 11:44:19.000000000 +0300
+++ jitsi/pkg-plist	2013-09-16 19:28:36.000000000 +0300
@@ -5,12 +5,15 @@
 lib/jitsi/lib/felix.client.run.properties
 lib/jitsi/lib/felix.jar
 lib/jitsi/lib/jdic-all.jar
-lib/jitsi/lib/jdic_stub.jar
 lib/jitsi/lib/logging.properties
 lib/jitsi/lib/native/libhid.so
 lib/jitsi/lib/native/libhwaddressretriever.so
-lib/jitsi/lib/native/libjdic.so
 lib/jitsi/lib/native/libjdic_misc.so
+lib/jitsi/lib/native/libjnffmpeg.so
+lib/jitsi/lib/native/libjnopus.so
+lib/jitsi/lib/native/libjnpulseaudio.so
+lib/jitsi/lib/native/libjnvideo4linux2.so
+lib/jitsi/lib/native/libjnvpx.so
 lib/jitsi/lib/native/libtray.so
 lib/jitsi/sc-bundles/addrbook.jar
 lib/jitsi/sc-bundles/advancedconfig.jar
@@ -32,11 +35,13 @@
 lib/jitsi/sc-bundles/contactlist.jar
 lib/jitsi/sc-bundles/contactsource.jar
 lib/jitsi/sc-bundles/credentialsstorage.jar
+lib/jitsi/sc-bundles/customavatar-service.jar
 lib/jitsi/sc-bundles/customcontactactions.jar
 lib/jitsi/sc-bundles/defaultresources.jar
 lib/jitsi/sc-bundles/demuxcontactsource.jar
 lib/jitsi/sc-bundles/desktoputil.jar
 lib/jitsi/sc-bundles/dns.jar
+lib/jitsi/sc-bundles/dnsconfig.jar
 lib/jitsi/sc-bundles/dnsservice.jar
 lib/jitsi/sc-bundles/facebookaccregwizz.jar
 lib/jitsi/sc-bundles/fileaccess.jar
@@ -45,10 +50,13 @@
 lib/jitsi/sc-bundles/globaldisplaydetails.jar
 lib/jitsi/sc-bundles/globalproxyconfig.jar
 lib/jitsi/sc-bundles/globalshortcut.jar
+lib/jitsi/sc-bundles/googlecontacts-service.jar
 lib/jitsi/sc-bundles/googlecontacts.jar
 lib/jitsi/sc-bundles/googletalkaccregwizz.jar
+lib/jitsi/sc-bundles/hid-service.jar
 lib/jitsi/sc-bundles/hid.jar
 lib/jitsi/sc-bundles/history.jar
+lib/jitsi/sc-bundles/httpclient.jar
 lib/jitsi/sc-bundles/httputil.jar
 lib/jitsi/sc-bundles/icqaccregwizz.jar
 lib/jitsi/sc-bundles/ippiaccregwizz.jar
@@ -84,6 +92,7 @@
 lib/jitsi/sc-bundles/plugin-msofficecomm.jar
 lib/jitsi/sc-bundles/plugin-nimbuzzavatars.jar
 lib/jitsi/sc-bundles/pluginmanager.jar
+lib/jitsi/sc-bundles/propertieseditor.jar
 lib/jitsi/sc-bundles/protocol-icq.jar
 lib/jitsi/sc-bundles/protocol-jabber.jar
 lib/jitsi/sc-bundles/protocol-media.jar
@@ -123,6 +132,7 @@
 lib/jitsi/sc-bundles/swing-ui.jar
 lib/jitsi/sc-bundles/swingnotification.jar
 lib/jitsi/sc-bundles/sysactivitynotifications.jar
+lib/jitsi/sc-bundles/systray-service.jar
 lib/jitsi/sc-bundles/thunderbook.jar
 lib/jitsi/sc-bundles/ui-service.jar
 lib/jitsi/sc-bundles/update.jar


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->wg 
Responsible-Changed-By: wg 
Responsible-Changed-When: Mon Sep 16 21:36:01 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182160 
State-Changed-From-To: open->closed 
State-Changed-By: wg 
State-Changed-When: Mon Sep 16 23:00:43 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/182160: commit references a PR
Date: Mon, 16 Sep 2013 23:00:44 +0000 (UTC)

 Author: wg
 Date: Mon Sep 16 23:00:36 2013
 New Revision: 327446
 URL: http://svnweb.freebsd.org/changeset/ports/327446
 
 Log:
   net-im/jitsi: update to 2.3
   
   - Update to 2.3
   - Restrict to i386 amd64
   
   PR:		ports/182160
   Submitted by:	Tzanetos Balitsaris <tzabal it.teithe.gr> (maintainer)
 
 Added:
   head/net-im/jitsi/pkg-message   (contents, props changed)
 Modified:
   head/net-im/jitsi/Makefile
   head/net-im/jitsi/distinfo
   head/net-im/jitsi/files/jitsi.sh
   head/net-im/jitsi/pkg-plist
 
 Modified: head/net-im/jitsi/Makefile
 ==============================================================================
 --- head/net-im/jitsi/Makefile	Mon Sep 16 22:54:52 2013	(r327445)
 +++ head/net-im/jitsi/Makefile	Mon Sep 16 23:00:36 2013	(r327446)
 @@ -2,20 +2,24 @@
  # $FreeBSD$
  
  PORTNAME=	jitsi
 -PORTVERSION=	2.2
 +PORTVERSION=	2.3
  CATEGORIES=	net-im java
 -MASTER_SITES=	http://www.c-s.li/ports/ \
 -		https://download.jitsi.org/jitsi/src/
 -DISTNAME=	jitsi-src-2.2.4603.9615
 +MASTER_SITES=	http://aetos.it.teithe.gr/~tzabal/ports/jitsi/ \
 +		http://www.c-s.li/ports/
 +DISTNAME=	jitsi-master-084e2b42b5
  
  MAINTAINER=	tzabal@it.teithe.gr
  COMMENT=	Open source IM and VoIP application
  
  MAN1=		jitsi.1
 +
  USE_ZIP=	yes
  USE_JAVA=	yes
  USE_ANT=	yes
  MAKE_ARGS=	rebuild
 +USE_LDCONFIG=	${PREFIX}/lib/jitsi/lib/native
 +
 +ONLY_FOR_ARCHS=	i386 amd64
  
  DESKTOP_ENTRIES="Jitsi" \
  		"VoIP and Instant Messenger" \
 @@ -43,8 +47,6 @@ do-install:
  	@${ECHO_CMD} ">> Installing library jars..."
  	@cd ${WRKSRC}/lib/bundle && ${COPYTREE_SHARE} \* \
  		${PREFIX}/lib/jitsi/lib/bundle "! -name junit.jar"
 -	@${INSTALL_DATA} ${WRKSRC}/lib/os-specific/freebsd/jdic_stub.jar \
 -		${PREFIX}/lib/jitsi/lib
  	@cd ${WRKSRC}/lib && ${COPYTREE_SHARE} "felix.jar jdic-all.jar \
  		felix.client.run.properties logging.properties" \
  			${PREFIX}/lib/jitsi/lib
 @@ -72,4 +74,7 @@ do-install:
  	@${INSTALL_DATA} ${WRKSRC}/resources/images/logo/sc_logo_128x128.png \
  		${PREFIX}/share/pixmaps/jitsi.png
  
 +post-install:
 +	@${CAT} ${PKGMESSAGE}
 +
  .include <bsd.port.post.mk>
 
 Modified: head/net-im/jitsi/distinfo
 ==============================================================================
 --- head/net-im/jitsi/distinfo	Mon Sep 16 22:54:52 2013	(r327445)
 +++ head/net-im/jitsi/distinfo	Mon Sep 16 23:00:36 2013	(r327446)
 @@ -1,2 +1,2 @@
 -SHA256 (jitsi-src-2.2.4603.9615.zip) = abee87346f2732d1e55f383c1bddafed7aee1e63b92b9d1854cde0679fc85ecf
 -SIZE (jitsi-src-2.2.4603.9615.zip) = 64168863
 +SHA256 (jitsi-master-084e2b42b5.zip) = e11100ca4c19083002a3d57d3b34711e5601da2c388f4ee89f9b98862d2df01c
 +SIZE (jitsi-master-084e2b42b5.zip) = 68936481
 
 Modified: head/net-im/jitsi/files/jitsi.sh
 ==============================================================================
 --- head/net-im/jitsi/files/jitsi.sh	Mon Sep 16 22:54:52 2013	(r327445)
 +++ head/net-im/jitsi/files/jitsi.sh	Mon Sep 16 23:00:36 2013	(r327446)
 @@ -8,8 +8,10 @@ JITSI_BUNDLES="${JITSI}/sc-bundles"
  COMMAND="${JAVA} -Dfelix.config.properties=file:${JITSI_LIB}/felix.client.run.properties \
          -Djava.util.logging.config.file=${JITSI_LIB}/logging.properties \
          -Djna.library.path=${JITSI_LIB}/native \
 -        -classpath ${JITSI_LIB}/felix.jar:${JITSI_LIB}/jdic-all.jar:${JITSI_LIB}/jdic_stub.jar:${JITSI_BUNDLES}/sc-launcher.jar:${JITSI_BUNDLES}/util.jar \
 +        -classpath ${JITSI_LIB}/felix.jar:${JITSI_LIB}/jdic-all.jar:${JITSI_BUNDLES}/sc-launcher.jar:${JITSI_BUNDLES}/util.jar \
          net.java.sip.communicator.launcher.SIPCommunicator"
  
 +export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}${JITSI_LIB}/native"
 +
  cd ${JITSI}
  exec ${COMMAND} $*
 
 Added: head/net-im/jitsi/pkg-message
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/net-im/jitsi/pkg-message	Mon Sep 16 23:00:36 2013	(r327446)
 @@ -0,0 +1,9 @@
 +-- Audio and Video codecs
 +
 +From the list of available audio codecs, please deselect all except 'opus/48000'.
 +From the list of available video codecs, please deselect all except 'VP8'.
 +You can make this change via the interface of Jitsi:
 +-> Jitsi-Tools-Options-Audio-Encodings
 +-> Jitsi-Tools-Options-Video-Encodings
 +
 +It is recommended that all the participants of an audio/video call to use the same codecs. 
 
 Modified: head/net-im/jitsi/pkg-plist
 ==============================================================================
 --- head/net-im/jitsi/pkg-plist	Mon Sep 16 22:54:52 2013	(r327445)
 +++ head/net-im/jitsi/pkg-plist	Mon Sep 16 23:00:36 2013	(r327446)
 @@ -5,12 +5,15 @@ lib/jitsi/lib/bundle/org.apache.felix.bu
  lib/jitsi/lib/felix.client.run.properties
  lib/jitsi/lib/felix.jar
  lib/jitsi/lib/jdic-all.jar
 -lib/jitsi/lib/jdic_stub.jar
  lib/jitsi/lib/logging.properties
  lib/jitsi/lib/native/libhid.so
  lib/jitsi/lib/native/libhwaddressretriever.so
 -lib/jitsi/lib/native/libjdic.so
  lib/jitsi/lib/native/libjdic_misc.so
 +lib/jitsi/lib/native/libjnffmpeg.so
 +lib/jitsi/lib/native/libjnopus.so
 +lib/jitsi/lib/native/libjnpulseaudio.so
 +lib/jitsi/lib/native/libjnvideo4linux2.so
 +lib/jitsi/lib/native/libjnvpx.so
  lib/jitsi/lib/native/libtray.so
  lib/jitsi/sc-bundles/addrbook.jar
  lib/jitsi/sc-bundles/advancedconfig.jar
 @@ -32,11 +35,13 @@ lib/jitsi/sc-bundles/contactinfo.jar
  lib/jitsi/sc-bundles/contactlist.jar
  lib/jitsi/sc-bundles/contactsource.jar
  lib/jitsi/sc-bundles/credentialsstorage.jar
 +lib/jitsi/sc-bundles/customavatar-service.jar
  lib/jitsi/sc-bundles/customcontactactions.jar
  lib/jitsi/sc-bundles/defaultresources.jar
  lib/jitsi/sc-bundles/demuxcontactsource.jar
  lib/jitsi/sc-bundles/desktoputil.jar
  lib/jitsi/sc-bundles/dns.jar
 +lib/jitsi/sc-bundles/dnsconfig.jar
  lib/jitsi/sc-bundles/dnsservice.jar
  lib/jitsi/sc-bundles/facebookaccregwizz.jar
  lib/jitsi/sc-bundles/fileaccess.jar
 @@ -45,10 +50,13 @@ lib/jitsi/sc-bundles/generalconfig.jar
  lib/jitsi/sc-bundles/globaldisplaydetails.jar
  lib/jitsi/sc-bundles/globalproxyconfig.jar
  lib/jitsi/sc-bundles/globalshortcut.jar
 +lib/jitsi/sc-bundles/googlecontacts-service.jar
  lib/jitsi/sc-bundles/googlecontacts.jar
  lib/jitsi/sc-bundles/googletalkaccregwizz.jar
 +lib/jitsi/sc-bundles/hid-service.jar
  lib/jitsi/sc-bundles/hid.jar
  lib/jitsi/sc-bundles/history.jar
 +lib/jitsi/sc-bundles/httpclient.jar
  lib/jitsi/sc-bundles/httputil.jar
  lib/jitsi/sc-bundles/icqaccregwizz.jar
  lib/jitsi/sc-bundles/ippiaccregwizz.jar
 @@ -84,6 +92,7 @@ lib/jitsi/sc-bundles/plugin-loggingutils
  lib/jitsi/sc-bundles/plugin-msofficecomm.jar
  lib/jitsi/sc-bundles/plugin-nimbuzzavatars.jar
  lib/jitsi/sc-bundles/pluginmanager.jar
 +lib/jitsi/sc-bundles/propertieseditor.jar
  lib/jitsi/sc-bundles/protocol-icq.jar
  lib/jitsi/sc-bundles/protocol-jabber.jar
  lib/jitsi/sc-bundles/protocol-media.jar
 @@ -123,6 +132,7 @@ lib/jitsi/sc-bundles/spellChecker.jar
  lib/jitsi/sc-bundles/swing-ui.jar
  lib/jitsi/sc-bundles/swingnotification.jar
  lib/jitsi/sc-bundles/sysactivitynotifications.jar
 +lib/jitsi/sc-bundles/systray-service.jar
  lib/jitsi/sc-bundles/thunderbook.jar
  lib/jitsi/sc-bundles/ui-service.jar
  lib/jitsi/sc-bundles/update.jar
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
