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)

5 files changed, 37 insertions, 11 deletions

diff --git a/net-im/jitsi/Makefile b/net-im/jitsi/Makefile
index 22c92ee420ab..ca3500a3f78e 100644
--- a/net-im/jitsi/Makefile
+++ b/net-im/jitsi/Makefile
@@ -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>
diff --git a/net-im/jitsi/distinfo b/net-im/jitsi/distinfo
index 0366e53f32fa..55801b686a72 100644
--- a/net-im/jitsi/distinfo
+++ b/net-im/jitsi/distinfo
@@ -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 --git a/net-im/jitsi/files/jitsi.sh b/net-im/jitsi/files/jitsi.sh
index d636baa2a11f..4cf61a9eb310 100644
--- a/net-im/jitsi/files/jitsi.sh
+++ b/net-im/jitsi/files/jitsi.sh
@@ -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} $*
diff --git a/net-im/jitsi/pkg-message b/net-im/jitsi/pkg-message
new file mode 100644
index 000000000000..e3436ff211ce
--- /dev/null
+++ b/net-im/jitsi/pkg-message
@@ -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 --git a/net-im/jitsi/pkg-plist b/net-im/jitsi/pkg-plist
index 30d07a0383a2..d8ee52537432 100644
--- a/net-im/jitsi/pkg-plist
+++ b/net-im/jitsi/pkg-plist
@@ -5,12 +5,15 @@ lib/jitsi/lib/bundle/org.apache.felix.bundlerepository-1.6.4.jar
 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.jar
 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