- Update to 3.4.1

PR:		117767
Submitted by:	Nikolay Pavlov <qpadla@gmail.com> (maintainer)

4 files changed, 34 insertions, 52 deletions

diff --git a/net-im/openfire/Makefile b/net-im/openfire/Makefile
index 10735307169f..383a08cc4fd5 100644
--- a/net-im/openfire/Makefile
+++ b/net-im/openfire/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	openfire
-PORTVERSION=	3.3.3
+PORTVERSION=	3.4.1
 CATEGORIES=	net-im java
 MASTER_SITES=	http://www.igniterealtime.org/downloadServlet?filename=openfire/
 DISTNAME=	${PORTNAME}_src_${PORTVERSION:S/./_/g}
diff --git a/net-im/openfire/distinfo b/net-im/openfire/distinfo
index 733b313eee42..b1c8cebc66a7 100644
--- a/net-im/openfire/distinfo
+++ b/net-im/openfire/distinfo
@@ -1,3 +1,3 @@
-MD5 (openfire_src_3_3_3.tar.gz) = e9b01da5dab0eea51f46399857322109
-SHA256 (openfire_src_3_3_3.tar.gz) = e52a60f8d9042a9e58b81701d4dead5889caa999d40f6e20bca7eb1c5fef5338
-SIZE (openfire_src_3_3_3.tar.gz) = 54051765
+MD5 (openfire_src_3_4_1.tar.gz) = 2e100e128e8cc9ddd0d32d5ec85a8527
+SHA256 (openfire_src_3_4_1.tar.gz) = ed0e914f9eb260d5be9cdd97fb2ca6d28699478e0da746f5f72b379a0f6c6a01
+SIZE (openfire_src_3_4_1.tar.gz) = 56221075
diff --git a/net-im/openfire/files/pkg-message.in b/net-im/openfire/files/pkg-message.in
index 002b1534991f..0fb1c4ea116f 100644
--- a/net-im/openfire/files/pkg-message.in
+++ b/net-im/openfire/files/pkg-message.in
@@ -1,45 +1,4 @@
-NOTE: 
-Due to the name change the product releases will work as follows:
-
-o  3.2.x series: these releases will continue to use the Wildfire name so
-   that critical bug fixes can be delivered with minimal hassle to existing
-   users. 
-   (net-im/wildfire)
-
-o  3.3.x series: starting with 3.3.0, the server is called Openfire. 
-   There will be a small amount of upgrade pain associated with this release
-   since configuration files like wildfire.xml will now be openfire.xml, etc.
-   (net-im/openfire)
-
-WARNING:
-===========================================================================
-This is an upgrade procedure from wildfire 3.2.4 to openfire 3.3.0:
-
-1) Stop the wildfire server if it still running.
-2) Back up setup.
-3) Go to %%ETCDIR%% and copy configuration from old setup
-   a) Copy wildfire.xml and rename it to openfire.xml.
-   b) Search for org.jivesoftware.wildfire. and replace with
-      org.jivesoftware.openfire. in openfire.xml
-   c) Change owner for configurations files:
-      chown -R openfire:openfire %%ETCDIR%%
-4) If using embedded database:
-   a) Copy and rename files:
-      /var/db/wildfire/wildfire* files to /var/db/openfire/openfire*
-   b) Change owner for the database files:
-      chown -R openfire:openfire /var/db/openfire
-5) Copy old certificates from resources/security directory to same 
-   location in openfire. If you are using self-signed certificates then 
-   regenerate them after start up.
-6) Start up the server using new rc script:
-   a) Add openfire_enable="YES" into rc.conf file.
-   b) %%PREFIX%%/etc/rc.d/openfire start
-7) Reinstall the plugins.
-8) If at that point you want to downgrade to wildfire 3.2.4 for some
-   reason please be sure to reinstall the wildfire port.
-===========================================================================
-
-You can find the documentation files for this package in the 
-directory %%DOCSDIR%%.
-To enable openfire startup script please add openfire_enable="YES" 
-in your rc.conf
+You can find the documentation files for this package in
+%%DOCSDIR%%.
+To enable openfire startup script please add openfire_enable="YES" in 
+your rc.conf file.
diff --git a/net-im/openfire/pkg-plist b/net-im/openfire/pkg-plist
index 625a5498d2b1..daf0df95e80b 100644
--- a/net-im/openfire/pkg-plist
+++ b/net-im/openfire/pkg-plist
@@ -37,6 +37,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/style.css
 %%PORTDOCS%%%%DOCSDIR%%/translator-guide.html
 %%PORTDOCS%%%%DOCSDIR%%/upgrade-guide.html
+%%PORTDOCS%%%%DOCSDIR%%/wildfire-ent-3_2_0-upgrade.html
+%%PORTDOCS%%%%DOCSDIR%%/wildfire-openfire-upgrade.html
 %%JAVAJARDIR%%/activation.jar
 %%JAVAJARDIR%%/bouncycastle.jar
 %%JAVAJARDIR%%/commons-el.jar
@@ -57,11 +59,10 @@
 %%DATADIR%%/plugins/admin/webapp/WEB-INF/dwr.xml
 %%DATADIR%%/plugins/admin/webapp/WEB-INF/lib/admin-jsp.jar
 %%DATADIR%%/plugins/admin/webapp/WEB-INF/lib/dwr.jar
+%%DATADIR%%/plugins/admin/webapp/WEB-INF/lib/commons-io.jar
+%%DATADIR%%/plugins/admin/webapp/WEB-INF/lib/commons-fileupload.jar
 %%DATADIR%%/plugins/admin/webapp/WEB-INF/sitemesh.xml
 %%DATADIR%%/plugins/admin/webapp/WEB-INF/web.xml
-%%DATADIR%%/plugins/admin/webapp/images/clearspace.gif
-%%DATADIR%%/plugins/admin/webapp/images/certificate_warning-16x16.png
-%%DATADIR%%/plugins/admin/webapp/images/certificate_ok-16x16.png
 %%DATADIR%%/plugins/admin/webapp/images/add-16x16.gif
 %%DATADIR%%/plugins/admin/webapp/images/aim.gif
 %%DATADIR%%/plugins/admin/webapp/images/arrow_right_blue.gif
@@ -72,7 +73,11 @@
 %%DATADIR%%/plugins/admin/webapp/images/bullet-yellow-14x14.gif
 %%DATADIR%%/plugins/admin/webapp/images/bullet.gif
 %%DATADIR%%/plugins/admin/webapp/images/cache-16x16.gif
+%%DATADIR%%/plugins/admin/webapp/images/certificate_warning-16x16.png
+%%DATADIR%%/plugins/admin/webapp/images/certificate_ok-16x16.png
 %%DATADIR%%/plugins/admin/webapp/images/check.gif
+%%DATADIR%%/plugins/admin/webapp/images/check-16x16.gif
+%%DATADIR%%/plugins/admin/webapp/images/clearspace.gif
 %%DATADIR%%/plugins/admin/webapp/images/connection-manager_16x16.gif
 %%DATADIR%%/plugins/admin/webapp/images/delete-16x16.gif
 %%DATADIR%%/plugins/admin/webapp/images/doc-changelog-16x16.gif
@@ -80,6 +85,7 @@
 %%DATADIR%%/plugins/admin/webapp/images/doc-readme-16x16.gif
 %%DATADIR%%/plugins/admin/webapp/images/edit-16x16.gif
 %%DATADIR%%/plugins/admin/webapp/images/error-16x16.gif
+%%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/header-background_new.gif
@@ -111,6 +117,7 @@
 %%DATADIR%%/plugins/admin/webapp/images/redlight-24x24.gif
 %%DATADIR%%/plugins/admin/webapp/images/refresh-16x16.gif
 %%DATADIR%%/plugins/admin/webapp/images/server_16x16.gif
+%%DATADIR%%/plugins/admin/webapp/images/server-network-24x24.gif
 %%DATADIR%%/plugins/admin/webapp/images/setup-header.png
 %%DATADIR%%/plugins/admin/webapp/images/setup-sidebar-bottom.gif
 %%DATADIR%%/plugins/admin/webapp/images/setup-sidebar-top.gif
@@ -210,6 +217,20 @@
 %%DATADIR%%/resources/database/upgrade/11/openfire_hsqldb.sql
 %%DATADIR%%/resources/database/upgrade/11/openfire_oracle.sql
 %%DATADIR%%/resources/database/upgrade/11/openfire_sqlserver.sql
+%%DATADIR%%/resources/database/upgrade/12/openfire_db2.sql
+%%DATADIR%%/resources/database/upgrade/12/openfire_sybase.sql
+%%DATADIR%%/resources/database/upgrade/12/openfire_sqlserver.sql
+%%DATADIR%%/resources/database/upgrade/12/openfire_postgresql.sql
+%%DATADIR%%/resources/database/upgrade/12/openfire_hsqldb.sql
+%%DATADIR%%/resources/database/upgrade/12/openfire_mysql.sql
+%%DATADIR%%/resources/database/upgrade/12/openfire_oracle.sql
+%%DATADIR%%/resources/database/upgrade/13/openfire_db2.sql
+%%DATADIR%%/resources/database/upgrade/13/openfire_sqlserver.sql
+%%DATADIR%%/resources/database/upgrade/13/openfire_postgresql.sql
+%%DATADIR%%/resources/database/upgrade/13/openfire_hsqldb.sql
+%%DATADIR%%/resources/database/upgrade/13/openfire_oracle.sql
+%%DATADIR%%/resources/database/upgrade/13/openfire_mysql.sql
+%%DATADIR%%/resources/database/upgrade/13/openfire_sybase.sql
 %%DATADIR%%/resources/database/upgrade/2/openfire_db2.sql
 %%DATADIR%%/resources/database/upgrade/2/openfire_hsqldb.sql
 %%DATADIR%%/resources/database/upgrade/2/openfire_mysql.sql
@@ -293,6 +314,8 @@
 @dirrm %%DATADIR%%/resources/database/upgrade/2
 @dirrm %%DATADIR%%/resources/database/upgrade/10
 @dirrm %%DATADIR%%/resources/database/upgrade/11
+@dirrm %%DATADIR%%/resources/database/upgrade/12
+@dirrm %%DATADIR%%/resources/database/upgrade/13
 @dirrm %%DATADIR%%/resources/database/upgrade/1
 @dirrm %%DATADIR%%/resources/database/upgrade
 @dirrm %%DATADIR%%/resources/database