- Update to 3.10.0

  Release announcement:
  https://community.igniterealtime.org/blogs/ignite/2015/04/22/openfire-3100-released

3 files changed, 40 insertions, 37 deletions

diff --git a/net-im/openfire/Makefile b/net-im/openfire/Makefile
index 0efd119d4cc..eb3603fdb51 100644
--- a/net-im/openfire/Makefile
+++ b/net-im/openfire/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openfire
-PORTVERSION=	3.9.3
+PORTVERSION=	3.10.0
 PORTEPOCH=	1
 CATEGORIES=	net-im java
 MASTER_SITES=	http://download.igniterealtime.org/openfire/
@@ -53,11 +53,6 @@ PLIST_SUB+=	PLUGINS=""
 PLIST_SUB+=	PLUGINS="@comment "
 .endif
 
-post-patch:
-	(cd ${WRKSRC} && ${MV} \
-	    ./src/plugins/jingleNodes/src/i18n/jingleNodes_i18n.properties \
-	    ./src/plugins/jingleNodes/src/i18n/jinglenodes_i18n.properties)
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/lib
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
diff --git a/net-im/openfire/distinfo b/net-im/openfire/distinfo
index 0ef151ba1fc..40650f1985c 100644
--- a/net-im/openfire/distinfo
+++ b/net-im/openfire/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_3_9_3.zip) = ae111674abd3888700f7b6abe61b8a1a9d173faac6bc334f0c4686f9b319b8a0
-SIZE (openfire_src_3_9_3.zip) = 84477282
+SHA256 (openfire_src_3_10_0.zip) = 4119f4f1020d7ded94e06514e8fd16c8b3fc3becac8693f55914ae92e7036398
+SIZE (openfire_src_3_10_0.zip) = 135495975
diff --git a/net-im/openfire/pkg-plist b/net-im/openfire/pkg-plist
index 17c8b0e7c12..69ea8941383 100644
--- a/net-im/openfire/pkg-plist
+++ b/net-im/openfire/pkg-plist
@@ -9,7 +9,6 @@
 %%DATADIR%%/conf
 %%DATADIR%%/embedded-db
 %%DATADIR%%/logs
-%%DATADIR%%/lib/activation.jar
 %%DATADIR%%/lib/bcpg-jdk15on.jar
 %%DATADIR%%/lib/bcpkix-jdk15on.jar
 %%DATADIR%%/lib/bcprov-jdk15on.jar
@@ -17,14 +16,17 @@
 %%DATADIR%%/lib/hsqldb.jar
 %%DATADIR%%/lib/jasper-compiler.jar
 %%DATADIR%%/lib/jasper-runtime.jar
+%%DATADIR%%/lib/javax.websocket-api.jar
 %%DATADIR%%/lib/jdic.jar
+%%DATADIR%%/lib/jetty-schemas.jar
 %%DATADIR%%/lib/jtds.jar
 %%DATADIR%%/lib/log4j.xml
 %%DATADIR%%/lib/mail.jar
 %%DATADIR%%/lib/mysql.jar
+%%DATADIR%%/lib/npn-boot.jar
 %%DATADIR%%/lib/openfire.jar
 %%DATADIR%%/lib/postgres.jar
-%%DATADIR%%/lib/servlet.jar
+%%DATADIR%%/lib/servlet-api.jar
 %%DATADIR%%/lib/slf4j-log4j12.jar
 %%DATADIR%%/lib/startup.jar
 %%DATADIR%%/plugins/admin/plugin.xml
@@ -66,6 +68,7 @@
 %%DATADIR%%/plugins/admin/webapp/images/feed-icon-16x16.gif
 %%DATADIR%%/plugins/admin/webapp/images/forbidden-16x16.gif
 %%DATADIR%%/plugins/admin/webapp/images/greenlight-24x24.gif
+%%DATADIR%%/plugins/admin/webapp/images/group.gif
 %%DATADIR%%/plugins/admin/webapp/images/header-background_new.gif
 %%DATADIR%%/plugins/admin/webapp/images/header-help_new.gif
 %%DATADIR%%/plugins/admin/webapp/images/header-title_new.gif
@@ -187,33 +190,6 @@
 %%DATADIR%%/plugins/admin/webapp/style/lightbox.css
 %%DATADIR%%/plugins/admin/webapp/style/login.css
 %%DATADIR%%/plugins/admin/webapp/style/setup.css
-%%PLUGINS%%%%DATADIR%%/plugins/jitsivideobridge.jar
-%%PLUGINS%%%%DATADIR%%/plugins/rayo.jar
-%%PLUGINS%%%%DATADIR%%/plugins/fastpath.jar
-%%PLUGINS%%%%DATADIR%%/plugins/broadcast.jar
-%%PLUGINS%%%%DATADIR%%/plugins/clientControl.jar
-%%PLUGINS%%%%DATADIR%%/plugins/contentFilter.jar
-%%PLUGINS%%%%DATADIR%%/plugins/dbaccess.jar
-%%PLUGINS%%%%DATADIR%%/plugins/emailListener.jar
-%%PLUGINS%%%%DATADIR%%/plugins/gojara.jar
-%%PLUGINS%%%%DATADIR%%/plugins/hazelcast.jar
-%%PLUGINS%%%%DATADIR%%/plugins/jingleNodes.jar
-%%PLUGINS%%%%DATADIR%%/plugins/justmarried.jar
-%%PLUGINS%%%%DATADIR%%/plugins/kraken.jar
-%%PLUGINS%%%%DATADIR%%/plugins/loadStats.jar
-%%PLUGINS%%%%DATADIR%%/plugins/monitoring.jar
-%%PLUGINS%%%%DATADIR%%/plugins/motd.jar
-%%PLUGINS%%%%DATADIR%%/plugins/packetFilter.jar
-%%PLUGINS%%%%DATADIR%%/plugins/presence.jar
-%%PLUGINS%%%%DATADIR%%/plugins/registration.jar
-%%PLUGINS%%%%DATADIR%%/plugins/search.jar
-%%PLUGINS%%%%DATADIR%%/plugins/sip.jar
-%%PLUGINS%%%%DATADIR%%/plugins/stunserver.jar
-%%PLUGINS%%%%DATADIR%%/plugins/subscription.jar
-%%PLUGINS%%%%DATADIR%%/plugins/userCreation.jar
-%%PLUGINS%%%%DATADIR%%/plugins/userImportExport.jar
-%%PLUGINS%%%%DATADIR%%/plugins/userservice.jar
-%%PLUGINS%%%%DATADIR%%/plugins/xmldebugger.jar
 %%DATADIR%%/resources/database/openfire_db2.sql
 %%DATADIR%%/resources/database/openfire_hsqldb.sql
 %%DATADIR%%/resources/database/openfire_mysql.sql
@@ -366,6 +342,38 @@
 %%DATADIR%%/resources/security
 %%DATADIR%%/resources/spank/WEB-INF/web.xml
 %%DATADIR%%/resources/spank/index.html
+%%PLUGINS%%%%DATADIR%%/plugins/broadcast.jar
+%%PLUGINS%%%%DATADIR%%/plugins/clientControl.jar
+%%PLUGINS%%%%DATADIR%%/plugins/contentFilter.jar
+%%PLUGINS%%%%DATADIR%%/plugins/dbaccess.jar
+%%PLUGINS%%%%DATADIR%%/plugins/emailListener.jar
+%%PLUGINS%%%%DATADIR%%/plugins/emailOnAway.jar
+%%PLUGINS%%%%DATADIR%%/plugins/fastpath.jar
+%%PLUGINS%%%%DATADIR%%/plugins/gojara.jar
+%%PLUGINS%%%%DATADIR%%/plugins/hazelcast.jar
+%%PLUGINS%%%%DATADIR%%/plugins/jingleNodes.jar
+%%PLUGINS%%%%DATADIR%%/plugins/jmxweb.jar
+%%PLUGINS%%%%DATADIR%%/plugins/justmarried.jar
+%%PLUGINS%%%%DATADIR%%/plugins/kraken.jar
+%%PLUGINS%%%%DATADIR%%/plugins/loadStats.jar
+%%PLUGINS%%%%DATADIR%%/plugins/monitoring.jar
+%%PLUGINS%%%%DATADIR%%/plugins/motd.jar
+%%PLUGINS%%%%DATADIR%%/plugins/mucservice.jar
+%%PLUGINS%%%%DATADIR%%/plugins/nodejs.jar
+%%PLUGINS%%%%DATADIR%%/plugins/ofmeet.jar
+%%PLUGINS%%%%DATADIR%%/plugins/packetFilter.jar
+%%PLUGINS%%%%DATADIR%%/plugins/presence.jar
+%%PLUGINS%%%%DATADIR%%/plugins/rayo.jar
+%%PLUGINS%%%%DATADIR%%/plugins/registration.jar
+%%PLUGINS%%%%DATADIR%%/plugins/restAPI.jar
+%%PLUGINS%%%%DATADIR%%/plugins/search.jar
+%%PLUGINS%%%%DATADIR%%/plugins/sip.jar
+%%PLUGINS%%%%DATADIR%%/plugins/stunserver.jar
+%%PLUGINS%%%%DATADIR%%/plugins/subscription.jar
+%%PLUGINS%%%%DATADIR%%/plugins/userCreation.jar
+%%PLUGINS%%%%DATADIR%%/plugins/userImportExport.jar
+%%PLUGINS%%%%DATADIR%%/plugins/userservice.jar
+%%PLUGINS%%%%DATADIR%%/plugins/xmldebugger.jar
 @dir %%DATADIR%%/resources/spank/WEB-INF
 @dir %%DATADIR%%/resources/spank
 @dir %%DATADIR%%/resources/nativeAuth/win32-x86