- Update to 3.6.3

PR:		ports/130607
Submitted by:	Dylan Cochran <a134qaed gmail.com>
Approved by:	maintainer implicit
Security:	http://www.vuxml.org/freebsd/c3aba586-ea77-11dd-9d1e-000bcdc1757a.html

3 files changed, 124 insertions, 123 deletions

diff --git a/net-im/openfire/Makefile b/net-im/openfire/Makefile
index b227be728948..bac4de04b24b 100644
--- a/net-im/openfire/Makefile
+++ b/net-im/openfire/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	openfire
-PORTVERSION=	3.6.2
+PORTVERSION=	3.6.3
 CATEGORIES=	net-im java
-MASTER_SITES=	http://www.igniterealtime.org/downloadServlet?filename=openfire/
+MASTER_SITES=	http://download.igniterealtime.org/openfire/
 DISTNAME=	${PORTNAME}_src_${PORTVERSION:S/./_/g}
 
 MAINTAINER=	gahr@FreeBSD.org
diff --git a/net-im/openfire/distinfo b/net-im/openfire/distinfo
index 595021dbd7df..8f24d578b29b 100644
--- a/net-im/openfire/distinfo
+++ b/net-im/openfire/distinfo
@@ -1,3 +1,3 @@
-MD5 (openfire_src_3_6_2.tar.gz) = 9acd78e1e23f940dcba56037fcc7baad
-SHA256 (openfire_src_3_6_2.tar.gz) = 65a7f0bc46fd620405de9c5141edd8f1b798a30bbc99200ebd32391deb6c4da2
-SIZE (openfire_src_3_6_2.tar.gz) = 51131854
+MD5 (openfire_src_3_6_3.tar.gz) = 914b4af58dab8e26c873c9ae8a2d72cd
+SHA256 (openfire_src_3_6_3.tar.gz) = 44dc336d2ebecf5107124baa07da05a4e7c9a4577d37036365296e663de0b076
+SIZE (openfire_src_3_6_3.tar.gz) = 51181483
diff --git a/net-im/openfire/pkg-plist b/net-im/openfire/pkg-plist
index 571621d7b136..ccdae444bb4e 100644
--- a/net-im/openfire/pkg-plist
+++ b/net-im/openfire/pkg-plist
@@ -17,14 +17,13 @@
 %%PORTDOCS%%%%DOCSDIR%%/changelog.html
 %%PORTDOCS%%%%DOCSDIR%%/database-guide.html
 %%PORTDOCS%%%%DOCSDIR%%/database.html
-%%PORTDOCS%%%%DOCSDIR%%/overlay.html
 %%PORTDOCS%%%%DOCSDIR%%/db-integration-guide.html
+%%PORTDOCS%%%%DOCSDIR%%/images/active_directory.png
 %%PORTDOCS%%%%DOCSDIR%%/images/header_logo.gif
 %%PORTDOCS%%%%DOCSDIR%%/images/launcher.png
+%%PORTDOCS%%%%DOCSDIR%%/images/setup_ldap.png
 %%PORTDOCS%%%%DOCSDIR%%/images/sitemesh.png
 %%PORTDOCS%%%%DOCSDIR%%/images/windows_service.png
-%%PORTDOCS%%%%DOCSDIR%%/images/setup_ldap.png
-%%PORTDOCS%%%%DOCSDIR%%/images/active_directory.png
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/install-guide.html
 %%PORTDOCS%%%%DOCSDIR%%/ldap-guide.html
@@ -32,6 +31,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/licenses/LICENSE-dom4j.txt
 %%PORTDOCS%%%%DOCSDIR%%/licenses/LICENSE-jaxen.txt
 %%PORTDOCS%%%%DOCSDIR%%/licenses/LICENSE-xpp3.txt
+%%PORTDOCS%%%%DOCSDIR%%/overlay.html
 %%PORTDOCS%%%%DOCSDIR%%/plugin-dev-guide.html
 %%PORTDOCS%%%%DOCSDIR%%/protocol-support.html
 %%PORTDOCS%%%%DOCSDIR%%/source-build.html
@@ -51,21 +51,26 @@
 %%JAVAJARDIR%%/jtds.jar
 %%JAVAJARDIR%%/mail.jar
 %%JAVAJARDIR%%/mysql.jar
+%%JAVAJARDIR%%/openfire.jar
 %%JAVAJARDIR%%/postgres.jar
 %%JAVAJARDIR%%/servlet.jar
 %%JAVAJARDIR%%/startup.jar
-%%JAVAJARDIR%%/openfire.jar
+%%DATADIR%%/conf
+%%DATADIR%%/embedded-db
+%%DATADIR%%/logs
 %%DATADIR%%/plugins/admin/plugin.xml
 %%DATADIR%%/plugins/admin/webapp/WEB-INF/admin.tld
 %%DATADIR%%/plugins/admin/webapp/WEB-INF/decorators.xml
 %%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/lib/commons-io.jar
+%%DATADIR%%/plugins/admin/webapp/WEB-INF/lib/dwr.jar
 %%DATADIR%%/plugins/admin/webapp/WEB-INF/sitemesh.xml
 %%DATADIR%%/plugins/admin/webapp/WEB-INF/web.xml
+%%DATADIR%%/plugins/admin/webapp/favicon.ico
 %%DATADIR%%/plugins/admin/webapp/images/add-16x16.gif
+%%DATADIR%%/plugins/admin/webapp/images/aim-gray.gif
 %%DATADIR%%/plugins/admin/webapp/images/aim.gif
 %%DATADIR%%/plugins/admin/webapp/images/arrow_right_blue.gif
 %%DATADIR%%/plugins/admin/webapp/images/blank.gif
@@ -75,10 +80,10 @@
 %%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/certificate_warning-16x16.png
 %%DATADIR%%/plugins/admin/webapp/images/check-16x16.gif
+%%DATADIR%%/plugins/admin/webapp/images/check.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
@@ -86,6 +91,8 @@
 %%DATADIR%%/plugins/admin/webapp/images/doc-down-16x16.gif
 %%DATADIR%%/plugins/admin/webapp/images/doc-readme-16x16.gif
 %%DATADIR%%/plugins/admin/webapp/images/edit-16x16.gif
+%%DATADIR%%/plugins/admin/webapp/images/enterprise-info-btn.gif
+%%DATADIR%%/plugins/admin/webapp/images/enterprise.png
 %%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
@@ -95,28 +102,32 @@
 %%DATADIR%%/plugins/admin/webapp/images/header-title_new.gif
 %%DATADIR%%/plugins/admin/webapp/images/icon_update-16x16.gif
 %%DATADIR%%/plugins/admin/webapp/images/icon_warning-small.gif
+%%DATADIR%%/plugins/admin/webapp/images/icq-gray.gif
 %%DATADIR%%/plugins/admin/webapp/images/icq.gif
 %%DATADIR%%/plugins/admin/webapp/images/im_available.gif
 %%DATADIR%%/plugins/admin/webapp/images/im_away.gif
 %%DATADIR%%/plugins/admin/webapp/images/im_dnd.gif
 %%DATADIR%%/plugins/admin/webapp/images/im_free_chat.gif
+%%DATADIR%%/plugins/admin/webapp/images/im_unavailable.gif
 %%DATADIR%%/plugins/admin/webapp/images/incoming_32x16.gif
 %%DATADIR%%/plugins/admin/webapp/images/info-16x16.gif
-%%DATADIR%%/plugins/admin/webapp/images/jive-login-form-bg.gif
+%%DATADIR%%/plugins/admin/webapp/images/irc-gray.gif
+%%DATADIR%%/plugins/admin/webapp/images/irc.gif
+%%DATADIR%%/plugins/admin/webapp/images/jive-body-bg.gif
 %%DATADIR%%/plugins/admin/webapp/images/jive-body-contentbox-bg.gif
-%%DATADIR%%/plugins/admin/webapp/images/jive-nav-bg-over.gif
-%%DATADIR%%/plugins/admin/webapp/images/jive-nav-bg.gif
+%%DATADIR%%/plugins/admin/webapp/images/jive-login-bg.gif
+%%DATADIR%%/plugins/admin/webapp/images/jive-login-form-bg-gray.gif
+%%DATADIR%%/plugins/admin/webapp/images/jive-login-form-bg.gif
 %%DATADIR%%/plugins/admin/webapp/images/jive-nav-bg-left.gif
-%%DATADIR%%/plugins/admin/webapp/images/jive-tertnav-top.gif
+%%DATADIR%%/plugins/admin/webapp/images/jive-nav-bg-on.gif
+%%DATADIR%%/plugins/admin/webapp/images/jive-nav-bg-over.gif
 %%DATADIR%%/plugins/admin/webapp/images/jive-nav-bg-right.gif
+%%DATADIR%%/plugins/admin/webapp/images/jive-nav-bg.gif
 %%DATADIR%%/plugins/admin/webapp/images/jive-nav-div.gif
-%%DATADIR%%/plugins/admin/webapp/images/jive-nav-bg-on.gif
-%%DATADIR%%/plugins/admin/webapp/images/jive-body-bg.gif
 %%DATADIR%%/plugins/admin/webapp/images/jive-subnav-bg.gif
-%%DATADIR%%/plugins/admin/webapp/images/jive-login-bg.gif
-%%DATADIR%%/plugins/admin/webapp/images/jive-login-form-bg-gray.gif
 %%DATADIR%%/plugins/admin/webapp/images/jive-subnav-div.gif
 %%DATADIR%%/plugins/admin/webapp/images/jive-tertnav-arrow.gif
+%%DATADIR%%/plugins/admin/webapp/images/jive-tertnav-top.gif
 %%DATADIR%%/plugins/admin/webapp/images/language_zh_CN.gif
 %%DATADIR%%/plugins/admin/webapp/images/lock.gif
 %%DATADIR%%/plugins/admin/webapp/images/login_background.png
@@ -124,6 +135,7 @@
 %%DATADIR%%/plugins/admin/webapp/images/login_header.gif
 %%DATADIR%%/plugins/admin/webapp/images/login_logo.gif
 %%DATADIR%%/plugins/admin/webapp/images/mark-16x16.gif
+%%DATADIR%%/plugins/admin/webapp/images/msn-gray.gif
 %%DATADIR%%/plugins/admin/webapp/images/msn.gif
 %%DATADIR%%/plugins/admin/webapp/images/outgoing_32x16.gif
 %%DATADIR%%/plugins/admin/webapp/images/page-background_new.gif
@@ -133,61 +145,52 @@
 %%DATADIR%%/plugins/admin/webapp/images/plugin-16x16.gif
 %%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/server_16x16.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
+%%DATADIR%%/plugins/admin/webapp/images/setup_btn_bg-bigblue.gif
+%%DATADIR%%/plugins/admin/webapp/images/setup_btn_bg-grey.gif
+%%DATADIR%%/plugins/admin/webapp/images/setup_btn_bg-orange.gif
+%%DATADIR%%/plugins/admin/webapp/images/setup_btn_closetestx.gif
+%%DATADIR%%/plugins/admin/webapp/images/setup_btn_gearplay.gif
+%%DATADIR%%/plugins/admin/webapp/images/setup_contentbox_bg.gif
+%%DATADIR%%/plugins/admin/webapp/images/setup_header_bg.gif
+%%DATADIR%%/plugins/admin/webapp/images/setup_header_logo.gif
+%%DATADIR%%/plugins/admin/webapp/images/setup_helpicon.gif
+%%DATADIR%%/plugins/admin/webapp/images/setup_language_zh_CN.gif
+%%DATADIR%%/plugins/admin/webapp/images/setup_nextprofile.gif
+%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_bg-top.gif
+%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_bg.gif
+%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_check.gif
+%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_progress0.gif
+%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_progress1.gif
+%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_progress2.gif
+%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_progress3.gif
+%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_progress4.gif
+%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_progress5.gif
 %%DATADIR%%/plugins/admin/webapp/images/sidebar_top.gif
 %%DATADIR%%/plugins/admin/webapp/images/sort_ascending.gif
 %%DATADIR%%/plugins/admin/webapp/images/sort_descending.gif
+%%DATADIR%%/plugins/admin/webapp/images/star-16x16.gif
 %%DATADIR%%/plugins/admin/webapp/images/success-16x16.gif
 %%DATADIR%%/plugins/admin/webapp/images/tape.gif
+%%DATADIR%%/plugins/admin/webapp/images/twisty_closed_9x9.gif
+%%DATADIR%%/plugins/admin/webapp/images/twisty_inactive_9x9.gif
+%%DATADIR%%/plugins/admin/webapp/images/twisty_opened_9x9.gif
 %%DATADIR%%/plugins/admin/webapp/images/user-clear-16x16.gif
 %%DATADIR%%/plugins/admin/webapp/images/user-green-16x16.gif
 %%DATADIR%%/plugins/admin/webapp/images/user-red-16x16.gif
 %%DATADIR%%/plugins/admin/webapp/images/user-yellow-16x16.gif
 %%DATADIR%%/plugins/admin/webapp/images/user.gif
+%%DATADIR%%/plugins/admin/webapp/images/wait24trans.gif
 %%DATADIR%%/plugins/admin/webapp/images/warning-16x16.gif
 %%DATADIR%%/plugins/admin/webapp/images/working-16x16.gif
 %%DATADIR%%/plugins/admin/webapp/images/x.gif
-%%DATADIR%%/plugins/admin/webapp/images/yahoo.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_btn_bg-orange.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_progress0.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_progress5.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_btn_gearplay.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_header_logo.gif
-%%DATADIR%%/plugins/admin/webapp/images/aim-gray.gif
-%%DATADIR%%/plugins/admin/webapp/images/im_unavailable.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_btn_bg-grey.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_btn_closetestx.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_helpicon.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_progress4.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_nextprofile.gif
-%%DATADIR%%/plugins/admin/webapp/images/irc-gray.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_check.gif
-%%DATADIR%%/plugins/admin/webapp/images/irc.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_progress3.gif
-%%DATADIR%%/plugins/admin/webapp/images/msn-gray.gif
-%%DATADIR%%/plugins/admin/webapp/images/enterprise-info-btn.gif
-%%DATADIR%%/plugins/admin/webapp/images/wait24trans.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_btn_bg-bigblue.gif
 %%DATADIR%%/plugins/admin/webapp/images/yahoo-gray.gif
-%%DATADIR%%/plugins/admin/webapp/images/enterprise.png
-%%DATADIR%%/plugins/admin/webapp/images/star-16x16.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_bg-top.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_language_zh_CN.gif
-%%DATADIR%%/plugins/admin/webapp/images/twisty_closed_9x9.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_progress2.gif
-%%DATADIR%%/plugins/admin/webapp/images/twisty_inactive_9x9.gif
-%%DATADIR%%/plugins/admin/webapp/images/icq-gray.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_contentbox_bg.gif
-%%DATADIR%%/plugins/admin/webapp/images/twisty_opened_9x9.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_bg.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_progress1.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_header_bg.gif
+%%DATADIR%%/plugins/admin/webapp/images/yahoo.gif
 %%DATADIR%%/plugins/admin/webapp/index.html
-%%DATADIR%%/plugins/admin/webapp/favicon.ico
 %%DATADIR%%/plugins/admin/webapp/js/behaviour.js
 %%DATADIR%%/plugins/admin/webapp/js/builder.js
 %%DATADIR%%/plugins/admin/webapp/js/controls.js
@@ -198,23 +201,30 @@
 %%DATADIR%%/plugins/admin/webapp/js/jscalendar/calendar-win2k-1.css
 %%DATADIR%%/plugins/admin/webapp/js/jscalendar/calendar-win2k-cold-1.css
 %%DATADIR%%/plugins/admin/webapp/js/jscalendar/calendar.js
+%%DATADIR%%/plugins/admin/webapp/js/lightbox.js
 %%DATADIR%%/plugins/admin/webapp/js/pngfix.js
 %%DATADIR%%/plugins/admin/webapp/js/prototype.js
 %%DATADIR%%/plugins/admin/webapp/js/scriptaculous.js
-%%DATADIR%%/plugins/admin/webapp/js/slider.js
 %%DATADIR%%/plugins/admin/webapp/js/setup.js
-%%DATADIR%%/plugins/admin/webapp/js/lightbox.js
-%%DATADIR%%/plugins/admin/webapp/js/unittest.js
-%%DATADIR%%/plugins/admin/webapp/js/tooltips/domTT.js
-%%DATADIR%%/plugins/admin/webapp/js/tooltips/fadomatic.js
+%%DATADIR%%/plugins/admin/webapp/js/slider.js
 %%DATADIR%%/plugins/admin/webapp/js/tooltips/domLib.js
+%%DATADIR%%/plugins/admin/webapp/js/tooltips/domTT.js
 %%DATADIR%%/plugins/admin/webapp/js/tooltips/domTT_drag.js
+%%DATADIR%%/plugins/admin/webapp/js/tooltips/fadomatic.js
+%%DATADIR%%/plugins/admin/webapp/js/unittest.js
 %%DATADIR%%/plugins/admin/webapp/setup/setup-style.css
 %%DATADIR%%/plugins/admin/webapp/style/global.css
 %%DATADIR%%/plugins/admin/webapp/style/ldap.css
 %%DATADIR%%/plugins/admin/webapp/style/lightbox.css
-%%DATADIR%%/plugins/admin/webapp/style/setup.css
 %%DATADIR%%/plugins/admin/webapp/style/login.css
+%%DATADIR%%/plugins/admin/webapp/style/setup.css
+%%DATADIR%%/resources/database/openfire_db2.sql
+%%DATADIR%%/resources/database/openfire_hsqldb.sql
+%%DATADIR%%/resources/database/openfire_mysql.sql
+%%DATADIR%%/resources/database/openfire_oracle.sql
+%%DATADIR%%/resources/database/openfire_postgresql.sql
+%%DATADIR%%/resources/database/openfire_sqlserver.sql
+%%DATADIR%%/resources/database/openfire_sybase.sql
 %%DATADIR%%/resources/database/upgrade/1/openfire_db2.sql
 %%DATADIR%%/resources/database/upgrade/1/openfire_hsqldb.sql
 %%DATADIR%%/resources/database/upgrade/1/openfire_mysql.sql
@@ -228,69 +238,69 @@
 %%DATADIR%%/resources/database/upgrade/10/openfire_postgresql.sql
 %%DATADIR%%/resources/database/upgrade/10/openfire_sqlserver.sql
 %%DATADIR%%/resources/database/upgrade/10/openfire_sybase.sql
-%%DATADIR%%/resources/database/upgrade/11/openfire_sybase.sql
-%%DATADIR%%/resources/database/upgrade/11/openfire_mysql.sql
 %%DATADIR%%/resources/database/upgrade/11/openfire_db2.sql
-%%DATADIR%%/resources/database/upgrade/11/openfire_postgresql.sql
 %%DATADIR%%/resources/database/upgrade/11/openfire_hsqldb.sql
+%%DATADIR%%/resources/database/upgrade/11/openfire_mysql.sql
 %%DATADIR%%/resources/database/upgrade/11/openfire_oracle.sql
+%%DATADIR%%/resources/database/upgrade/11/openfire_postgresql.sql
 %%DATADIR%%/resources/database/upgrade/11/openfire_sqlserver.sql
+%%DATADIR%%/resources/database/upgrade/11/openfire_sybase.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/12/openfire_postgresql.sql
+%%DATADIR%%/resources/database/upgrade/12/openfire_sqlserver.sql
+%%DATADIR%%/resources/database/upgrade/12/openfire_sybase.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_oracle.sql
+%%DATADIR%%/resources/database/upgrade/13/openfire_postgresql.sql
+%%DATADIR%%/resources/database/upgrade/13/openfire_sqlserver.sql
 %%DATADIR%%/resources/database/upgrade/13/openfire_sybase.sql
 %%DATADIR%%/resources/database/upgrade/14/openfire_db2.sql
-%%DATADIR%%/resources/database/upgrade/14/openfire_sqlserver.sql
-%%DATADIR%%/resources/database/upgrade/14/openfire_postgresql.sql
 %%DATADIR%%/resources/database/upgrade/14/openfire_hsqldb.sql
-%%DATADIR%%/resources/database/upgrade/14/openfire_oracle.sql
 %%DATADIR%%/resources/database/upgrade/14/openfire_mysql.sql
+%%DATADIR%%/resources/database/upgrade/14/openfire_oracle.sql
+%%DATADIR%%/resources/database/upgrade/14/openfire_postgresql.sql
+%%DATADIR%%/resources/database/upgrade/14/openfire_sqlserver.sql
 %%DATADIR%%/resources/database/upgrade/14/openfire_sybase.sql
 %%DATADIR%%/resources/database/upgrade/15/openfire_db2.sql
-%%DATADIR%%/resources/database/upgrade/15/openfire_sqlserver.sql
-%%DATADIR%%/resources/database/upgrade/15/openfire_postgresql.sql
 %%DATADIR%%/resources/database/upgrade/15/openfire_hsqldb.sql
-%%DATADIR%%/resources/database/upgrade/15/openfire_oracle.sql
 %%DATADIR%%/resources/database/upgrade/15/openfire_mysql.sql
+%%DATADIR%%/resources/database/upgrade/15/openfire_oracle.sql
+%%DATADIR%%/resources/database/upgrade/15/openfire_postgresql.sql
+%%DATADIR%%/resources/database/upgrade/15/openfire_sqlserver.sql
 %%DATADIR%%/resources/database/upgrade/15/openfire_sybase.sql
 %%DATADIR%%/resources/database/upgrade/16/openfire_db2.sql
-%%DATADIR%%/resources/database/upgrade/16/openfire_sqlserver.sql
-%%DATADIR%%/resources/database/upgrade/16/openfire_postgresql.sql
 %%DATADIR%%/resources/database/upgrade/16/openfire_hsqldb.sql
-%%DATADIR%%/resources/database/upgrade/16/openfire_oracle.sql
 %%DATADIR%%/resources/database/upgrade/16/openfire_mysql.sql
+%%DATADIR%%/resources/database/upgrade/16/openfire_oracle.sql
+%%DATADIR%%/resources/database/upgrade/16/openfire_postgresql.sql
+%%DATADIR%%/resources/database/upgrade/16/openfire_sqlserver.sql
 %%DATADIR%%/resources/database/upgrade/16/openfire_sybase.sql
-%%DATADIR%%/resources/database/upgrade/17/openfire_sybase.sql
 %%DATADIR%%/resources/database/upgrade/17/openfire_db2.sql
-%%DATADIR%%/resources/database/upgrade/17/openfire_sqlserver.sql
-%%DATADIR%%/resources/database/upgrade/17/openfire_postgresql.sql
-%%DATADIR%%/resources/database/upgrade/17/openfire_mysql.sql
 %%DATADIR%%/resources/database/upgrade/17/openfire_hsqldb.sql
+%%DATADIR%%/resources/database/upgrade/17/openfire_mysql.sql
 %%DATADIR%%/resources/database/upgrade/17/openfire_oracle.sql
-%%DATADIR%%/resources/database/upgrade/18/openfire_sqlserver.sql
-%%DATADIR%%/resources/database/upgrade/18/openfire_postgresql.sql
+%%DATADIR%%/resources/database/upgrade/17/openfire_postgresql.sql
+%%DATADIR%%/resources/database/upgrade/17/openfire_sqlserver.sql
+%%DATADIR%%/resources/database/upgrade/17/openfire_sybase.sql
 %%DATADIR%%/resources/database/upgrade/18/openfire_db2.sql
-%%DATADIR%%/resources/database/upgrade/18/openfire_mysql.sql
 %%DATADIR%%/resources/database/upgrade/18/openfire_hsqldb.sql
+%%DATADIR%%/resources/database/upgrade/18/openfire_mysql.sql
 %%DATADIR%%/resources/database/upgrade/18/openfire_oracle.sql
+%%DATADIR%%/resources/database/upgrade/18/openfire_postgresql.sql
+%%DATADIR%%/resources/database/upgrade/18/openfire_sqlserver.sql
 %%DATADIR%%/resources/database/upgrade/18/openfire_sybase.sql
+%%DATADIR%%/resources/database/upgrade/19/openfire_db2.sql
 %%DATADIR%%/resources/database/upgrade/19/openfire_hsqldb.sql
-%%DATADIR%%/resources/database/upgrade/19/openfire_oracle.sql
 %%DATADIR%%/resources/database/upgrade/19/openfire_mysql.sql
-%%DATADIR%%/resources/database/upgrade/19/openfire_sybase.sql
-%%DATADIR%%/resources/database/upgrade/19/openfire_db2.sql
-%%DATADIR%%/resources/database/upgrade/19/openfire_sqlserver.sql
+%%DATADIR%%/resources/database/upgrade/19/openfire_oracle.sql
 %%DATADIR%%/resources/database/upgrade/19/openfire_postgresql.sql
+%%DATADIR%%/resources/database/upgrade/19/openfire_sqlserver.sql
+%%DATADIR%%/resources/database/upgrade/19/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
@@ -298,12 +308,12 @@
 %%DATADIR%%/resources/database/upgrade/2/openfire_postgresql.sql
 %%DATADIR%%/resources/database/upgrade/2/openfire_sqlserver.sql
 %%DATADIR%%/resources/database/upgrade/20/openfire_db2.sql
-%%DATADIR%%/resources/database/upgrade/20/openfire_sybase.sql
-%%DATADIR%%/resources/database/upgrade/20/openfire_sqlserver.sql
-%%DATADIR%%/resources/database/upgrade/20/openfire_postgresql.sql
-%%DATADIR%%/resources/database/upgrade/20/openfire_mysql.sql
 %%DATADIR%%/resources/database/upgrade/20/openfire_hsqldb.sql
+%%DATADIR%%/resources/database/upgrade/20/openfire_mysql.sql
 %%DATADIR%%/resources/database/upgrade/20/openfire_oracle.sql
+%%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/4/openfire_db2.sql
 %%DATADIR%%/resources/database/upgrade/4/openfire_hsqldb.sql
 %%DATADIR%%/resources/database/upgrade/4/openfire_mysql.sql
@@ -346,25 +356,13 @@
 %%DATADIR%%/resources/database/upgrade/9/openfire_postgresql.sql
 %%DATADIR%%/resources/database/upgrade/9/openfire_sqlserver.sql
 %%DATADIR%%/resources/database/upgrade/9/openfire_sybase.sql
-%%DATADIR%%/resources/database/openfire_db2.sql
-%%DATADIR%%/resources/database/openfire_hsqldb.sql
-%%DATADIR%%/resources/database/openfire_mysql.sql
-%%DATADIR%%/resources/database/openfire_oracle.sql
-%%DATADIR%%/resources/database/openfire_postgresql.sql
-%%DATADIR%%/resources/database/openfire_sqlserver.sql
-%%DATADIR%%/resources/database/openfire_sybase.sql
 %%DATADIR%%/resources/nativeAuth/linux-i386/libshaj.so
 %%DATADIR%%/resources/nativeAuth/osx-ppc/libshaj.jnilib
 %%DATADIR%%/resources/nativeAuth/solaris-sparc/libshaj.so
 %%DATADIR%%/resources/nativeAuth/win32-x86/shaj.dll
+%%DATADIR%%/resources/security
 %%DATADIR%%/resources/spank/WEB-INF/web.xml
 %%DATADIR%%/resources/spank/index.html
-%%DATADIR%%/resources/security
-%%DATADIR%%/logs
-%%DATADIR%%/embedded-db
-%%DATADIR%%/conf
-
-@exec [ -d %D/%%DATADIR%% ] && chown -R openfire:openfire %D/%%DATADIR%%
 @dirrm %%DATADIR%%/resources/spank/WEB-INF
 @dirrm %%DATADIR%%/resources/spank
 @dirrm %%DATADIR%%/resources/nativeAuth/win32-x86
@@ -380,34 +378,37 @@
 @dirrm %%DATADIR%%/resources/database/upgrade/4
 @dirrm %%DATADIR%%/resources/database/upgrade/20
 @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/14
-@dirrm %%DATADIR%%/resources/database/upgrade/15
-@dirrm %%DATADIR%%/resources/database/upgrade/16
-@dirrm %%DATADIR%%/resources/database/upgrade/17
-@dirrm %%DATADIR%%/resources/database/upgrade/18
 @dirrm %%DATADIR%%/resources/database/upgrade/19
+@dirrm %%DATADIR%%/resources/database/upgrade/18
+@dirrm %%DATADIR%%/resources/database/upgrade/17
+@dirrm %%DATADIR%%/resources/database/upgrade/16
+@dirrm %%DATADIR%%/resources/database/upgrade/15
+@dirrm %%DATADIR%%/resources/database/upgrade/14
+@dirrm %%DATADIR%%/resources/database/upgrade/13
+@dirrm %%DATADIR%%/resources/database/upgrade/12
+@dirrm %%DATADIR%%/resources/database/upgrade/11
+@dirrm %%DATADIR%%/resources/database/upgrade/10
 @dirrm %%DATADIR%%/resources/database/upgrade/1
 @dirrm %%DATADIR%%/resources/database/upgrade
 @dirrm %%DATADIR%%/resources/database
 @dirrm %%DATADIR%%/resources
 @dirrm %%DATADIR%%/plugins/admin/webapp/style
 @dirrm %%DATADIR%%/plugins/admin/webapp/setup
-@dirrm %%DATADIR%%/plugins/admin/webapp/js/jscalendar
 @dirrm %%DATADIR%%/plugins/admin/webapp/js/tooltips
+@dirrm %%DATADIR%%/plugins/admin/webapp/js/jscalendar
 @dirrm %%DATADIR%%/plugins/admin/webapp/js
 @dirrm %%DATADIR%%/plugins/admin/webapp/images
 @dirrm %%DATADIR%%/plugins/admin/webapp/WEB-INF/lib
 @dirrm %%DATADIR%%/plugins/admin/webapp/WEB-INF
 @dirrm %%DATADIR%%/plugins/admin/webapp
 @dirrm %%DATADIR%%/plugins/admin
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/licenses
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%EXAMPLESDIR%%
+@dirrm %%DATADIR%%/plugins
+@dirrm share/java/openfire
+@dirrm share/examples/openfire
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/licenses
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/images
+@dirrm share/doc/openfire
+@dirrm %%ETCDIR%%/openfire
 @unexec rmdir %D/%%DATADIR%%/plugins 2> /dev/null || echo "If permanently deleting this package, %D/%%DATADIR%%/plugins must be removed manually"
 @unexec rmdir %D/%%ETCDIR%% 2> /dev/null || echo "If permanently deleting this package, %D/%%ETCDIR%% must be removed manually"
 @unexec rmdir /var/db/openfire 2> /dev/null || echo "If permanently deleting this package, /var/db/openfire must be removed manually"