- Update to 3.7.0.beta

  Release notes: http://community.igniterealtime.org/blogs/ignite/2010/08/26/openfire-370-beta-is-released

4 files changed, 35 insertions, 19 deletions

diff --git a/net-im/openfire/Makefile b/net-im/openfire/Makefile
index 8a3892f328a2..a068d21de8d9 100644
--- a/net-im/openfire/Makefile
+++ b/net-im/openfire/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	openfire
-PORTVERSION=	3.6.4
+DISTVERSION=	3.7.0.beta
 CATEGORIES=	net-im java
-MASTER_SITES=	http://download.igniterealtime.org/openfire/
-DISTNAME=	${PORTNAME}_src_${PORTVERSION:S/./_/g}
+MASTER_SITES=	http://www.igniterealtime.org/downloadServlet?filename=openfire/
+DISTNAME=	${PORTNAME}_src_${DISTVERSION:S/./_/g}
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Openfire (formerly Wildfire) is an enterprise instant messaging server
@@ -23,7 +23,7 @@ JAVA_VERSION=	1.5+
 
 CONFLICTS=	wildfire-[0-9]*
 
-ALL_TARGET=	openfire
+ALL_TARGET=	openfire plugins
 USE_RC_SUBR=	openfire
 SUB_FILES=	pkg-message
 
diff --git a/net-im/openfire/distinfo b/net-im/openfire/distinfo
index 8755818aa1e6..6c0a86be5820 100644
--- a/net-im/openfire/distinfo
+++ b/net-im/openfire/distinfo
@@ -1,3 +1,2 @@
-MD5 (openfire_src_3_6_4.tar.gz) = 0b5417368355045afbbfac4155efd988
-SHA256 (openfire_src_3_6_4.tar.gz) = 8f5c3334da449e2fb1bdabe2bdd46db1fd96a4dc7b3e34a870401fa90819ea99
-SIZE (openfire_src_3_6_4.tar.gz) = 51183844
+SHA256 (openfire_src_3_7_0_beta.tar.gz) = 1e2d3170413ddcbcf9e5c115ff8be6057fe35ecb068e4148a062b4f30ffdc697
+SIZE (openfire_src_3_7_0_beta.tar.gz) = 60932611
diff --git a/net-im/openfire/files/patch-build-build.xml b/net-im/openfire/files/patch-build-build.xml
deleted file mode 100644
index 341c52a77fb7..000000000000
--- a/net-im/openfire/files/patch-build-build.xml
+++ /dev/null
@@ -1,10 +0,0 @@
---- build/build.xml.orig	2010-10-27 04:53:55.000000000 -0700
-+++ build/build.xml	2010-10-27 04:54:13.000000000 -0700
-@@ -224,6 +224,7 @@
-                 <or>
-                     <contains string="${ant.version}" substring="1.6"/>
-                     <contains string="${ant.version}" substring="1.7"/>
-+                    <contains string="${ant.version}" substring="1.8"/>
-                 </or>
-             </not>
-         </condition>
diff --git a/net-im/openfire/pkg-plist b/net-im/openfire/pkg-plist
index b5b68eb107c9..0a54f284974a 100644
--- a/net-im/openfire/pkg-plist
+++ b/net-im/openfire/pkg-plist
@@ -58,6 +58,26 @@
 %%DATADIR%%/conf
 %%DATADIR%%/embedded-db
 %%DATADIR%%/logs
+%%DATADIR%%/plugins/userCreation.jar
+%%DATADIR%%/plugins/userImportExport.jar
+%%DATADIR%%/plugins/contentFilter.jar
+%%DATADIR%%/plugins/sip.jar
+%%DATADIR%%/plugins/packetFilter.jar
+%%DATADIR%%/plugins/fastpath.jar
+%%DATADIR%%/plugins/registration.jar
+%%DATADIR%%/plugins/motd.jar
+%%DATADIR%%/plugins/loadStats.jar
+%%DATADIR%%/plugins/search.jar
+%%DATADIR%%/plugins/dbaccess.jar
+%%DATADIR%%/plugins/presence.jar
+%%DATADIR%%/plugins/xmldebugger.jar
+%%DATADIR%%/plugins/jingleNodes.jar
+%%DATADIR%%/plugins/broadcast.jar
+%%DATADIR%%/plugins/emailListener.jar
+%%DATADIR%%/plugins/monitoring.jar
+%%DATADIR%%/plugins/subscription.jar
+%%DATADIR%%/plugins/userservice.jar
+%%DATADIR%%/plugins/clientControl.jar
 %%DATADIR%%/plugins/admin/plugin.xml
 %%DATADIR%%/plugins/admin/webapp/WEB-INF/admin.tld
 %%DATADIR%%/plugins/admin/webapp/WEB-INF/decorators.xml
@@ -314,6 +334,13 @@
 %%DATADIR%%/resources/database/upgrade/20/openfire_postgresql.sql
 %%DATADIR%%/resources/database/upgrade/20/openfire_sqlserver.sql
 %%DATADIR%%/resources/database/upgrade/20/openfire_sybase.sql
+%%DATADIR%%/resources/database/upgrade/21/openfire_db2.sql
+%%DATADIR%%/resources/database/upgrade/21/openfire_hsqldb.sql
+%%DATADIR%%/resources/database/upgrade/21/openfire_mysql.sql
+%%DATADIR%%/resources/database/upgrade/21/openfire_oracle.sql
+%%DATADIR%%/resources/database/upgrade/21/openfire_postgresql.sql
+%%DATADIR%%/resources/database/upgrade/21/openfire_sqlserver.sql
+%%DATADIR%%/resources/database/upgrade/21/openfire_sybase.sql
 %%DATADIR%%/resources/database/upgrade/4/openfire_db2.sql
 %%DATADIR%%/resources/database/upgrade/4/openfire_hsqldb.sql
 %%DATADIR%%/resources/database/upgrade/4/openfire_mysql.sql
@@ -363,6 +390,7 @@
 %%DATADIR%%/resources/security
 %%DATADIR%%/resources/spank/WEB-INF/web.xml
 %%DATADIR%%/resources/spank/index.html
+share/java/classes/slf4j-log4j12.jar
 @dirrm %%DATADIR%%/resources/spank/WEB-INF
 @dirrm %%DATADIR%%/resources/spank
 @dirrm %%DATADIR%%/resources/nativeAuth/win32-x86
@@ -377,6 +405,7 @@
 @dirrm %%DATADIR%%/resources/database/upgrade/5
 @dirrm %%DATADIR%%/resources/database/upgrade/4
 @dirrm %%DATADIR%%/resources/database/upgrade/20
+@dirrm %%DATADIR%%/resources/database/upgrade/21
 @dirrm %%DATADIR%%/resources/database/upgrade/2
 @dirrm %%DATADIR%%/resources/database/upgrade/19
 @dirrm %%DATADIR%%/resources/database/upgrade/18
@@ -402,8 +431,6 @@
 @dirrm %%DATADIR%%/plugins/admin/webapp/WEB-INF
 @dirrm %%DATADIR%%/plugins/admin/webapp
 @dirrm %%DATADIR%%/plugins/admin
-@dirrm %%DATADIR%%/plugins
-@dirrm share/java/openfire
 @dirrm share/examples/openfire
 @dirrm %%PORTDOCS%%%%DOCSDIR%%/licenses
 @dirrm %%PORTDOCS%%%%DOCSDIR%%/images