10 files changed, 118 insertions, 96 deletions

diff --git a/net-im/openfire/Makefile b/net-im/openfire/Makefile
index 5e3b5580758d..d39b45d4c1f0 100644
--- a/net-im/openfire/Makefile
+++ b/net-im/openfire/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=       wildfire
-PORTVERSION=    3.2.2
+PORTVERSION=    3.2.3
 CATEGORIES=     net-im java
 MASTER_SITES=   http://www.igniterealtime.org/downloadServlet?filename=wildfire/
 DISTNAME=	${PORTNAME}_src_${PORTVERSION:S/./_/g}
 
 MAINTAINER=     quetzal@zone3000.net
-COMMENT=        Wildfire is an enterprise instant messaging (EIM) server
+COMMENT=        Openfire (formerly Wildfire) is an enterprise instant messaging server
 
 RUN_DEPENDS=    classpath:${PORTSDIR}/java/javavmwrapper
-
 USE_JAVA=       yes
 JAVA_VERSION=   1.5+
 
@@ -55,11 +54,11 @@ do-install:
 	(cd ${INSTALL_WRKSRC}/plugins && ${FIND} . \
 	| ${CPIO} -pvdmu -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}/plugins)
 
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR};
 	(cd ${WRKSRC} && ${INSTALL_DATA} -o ${SHAREOWN} -g ${SHAREGRP} \
 	LICENSE.html README.html changelog.html ${DOCSDIR});
 
-.if !defined(NOPORTDOCS)
 	(cd ${WRKSRC}/documentation/docs && ${FIND} . \
 	| ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} > /dev/null 2>&1 )
 .endif
diff --git a/net-im/openfire/distinfo b/net-im/openfire/distinfo
index 48f100be5683..6a6ba3ff5215 100644
--- a/net-im/openfire/distinfo
+++ b/net-im/openfire/distinfo
@@ -1,3 +1,3 @@
-MD5 (wildfire_src_3_2_2.tar.gz) = ebf4df6d4fbce6aeb646ff47fdefe2d1
-SHA256 (wildfire_src_3_2_2.tar.gz) = e031800699a7038093a07db39508b2515e755b33ad1add344dc7fced1526bad1
-SIZE (wildfire_src_3_2_2.tar.gz) = 15547358
+MD5 (wildfire_src_3_2_3.tar.gz) = 497da0e5f10cf4c9160e0c65b128a00a
+SHA256 (wildfire_src_3_2_3.tar.gz) = f28f1c9f38fdfa2d1fca0d32b916da14de333834ff18a00c6282458b83fe6f57
+SIZE (wildfire_src_3_2_3.tar.gz) = 16234108
diff --git a/net-im/openfire/files/pkg-message.in b/net-im/openfire/files/pkg-message.in
index af16e703dbc5..8a01300b72be 100644
--- a/net-im/openfire/files/pkg-message.in
+++ b/net-im/openfire/files/pkg-message.in
@@ -1,9 +1,21 @@
-WARINING: 
-If you use default self-sined certificates in wildfire 3.1.1 
-version to support SSL, you need to necessarily regenerate them. 
-After the installation please go to the "Server Certificates" menu 
-and generate your certificates. After this you will be able to
-connect through SSL again.
+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.
+
+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.
+
+WARNING:
+============================================================================
+If you use default self-sined certificates in wildfire 3.1.1 version to
+support SSL, you need to necessarily regenerate them. After the installation
+please go to the "Server Certificates" menu and generate your certificates.
+Than you will be able to connect through SSL again.
+============================================================================
 
 You can find the documentation files for this package in the 
 directory %%PREFIX%%/share/doc/wildfire.
diff --git a/net-im/openfire/pkg-descr b/net-im/openfire/pkg-descr
index e4fea526fb79..6a44c86eb011 100644
--- a/net-im/openfire/pkg-descr
+++ b/net-im/openfire/pkg-descr
@@ -1,7 +1,7 @@
-Wildfire is an enterprise instant messaging (EIM) server dual-licensed under
-the Open Source GPL and commercially. It uses the leading open protocol for 
-instant messaging, XMPP  (also called Jabber). 
-Wildfire is incredibly easy to setup and administer, but offers rock-solid 
+Openfire (formerly Wildfire) is an enterprise instant messaging (EIM) server
+dual-licensed under the Open Source GPL and commercially. It uses the leading
+open protocol for instant messaging, XMPP (also called Jabber). 
+Openfire is incredibly easy to setup and administer, but offers rock-solid 
 security and performance.
 
-WWW: http://www.jivesoftware.org/wildfire/
+WWW: http://www.igniterealtime.org/projects/openfire/index.jsp
diff --git a/net-im/openfire/pkg-plist b/net-im/openfire/pkg-plist
index cbcab866c4fb..dcdb22135e78 100644
--- a/net-im/openfire/pkg-plist
+++ b/net-im/openfire/pkg-plist
@@ -1,37 +1,37 @@
 @unexec %D/etc/rc.d/wildfire stop > /dev/null 2>&1 || true
-@unexec if cmp -s %D/etc/wildfire/wildfire.xml %D/%%EXAMPLESDIR%%/wildfire.xml; then rm -f %D/etc/wildfire/wildfire.xml; else echo If permanently deleting this package, %%PREFIX%%/etc/wildfire.xml must be removed manually; fi
+@unexec if cmp -s %D/etc/wildfire/wildfire.xml %D/%%EXAMPLESDIR%%/wildfire.xml; then rm -f %D/etc/wildfire/wildfire.xml; else echo If permanently deleting this package, %%PREFIX%%/etc/wildfire/wildfire.xml must be removed manually; fi
 @unexec [ -d %D/share/doc/wildfire/javadoc ] && rm -rf %D/share/doc/wildfire/javadoc
 %%EXAMPLESDIR%%/wildfire.xml
 @exec [ -d /var/log/wildfire ] || mkdir -p  /var/log/wildfire && chown wildfire:wildfire /var/log/wildfire
 @exec [ -d /var/db/wildfire ] || mkdir -p  /var/db/wildfire && chown wildfire:wildfire /var/db/wildfire
 @exec [ -d %D/etc/wildfire ] || mkdir -p  %D/etc/wildfire && chown wildfire:wildfire %D/etc/wildfire
 @exec [ -f %D/etc/wildfire/wildfire.xml ] || cp %%EXAMPLESDIR%%/wildfire.xml %D/etc/wildfire/wildfire.xml && chown wildfire:wildfire %D/etc/wildfire/wildfire.xml
-share/doc/wildfire/LICENSE.html
-share/doc/wildfire/README.html
-share/doc/wildfire/changelog.html
-share/doc/wildfire/database-guide.html
-share/doc/wildfire/database.html
-share/doc/wildfire/db-integration-guide.html
-share/doc/wildfire/images/header_logo.gif
-share/doc/wildfire/images/launcher.png
-share/doc/wildfire/images/sitemesh.png
-share/doc/wildfire/images/windows_service.png
-share/doc/wildfire/images/setup_ldap.png
-share/doc/wildfire/images/active_directory.png
-share/doc/wildfire/index.html
-share/doc/wildfire/install-guide.html
-share/doc/wildfire/ldap-guide.html
-share/doc/wildfire/licenses/LICENSE-commons-logging.txt
-share/doc/wildfire/licenses/LICENSE-dom4j.txt
-share/doc/wildfire/licenses/LICENSE-jaxen.txt
-share/doc/wildfire/licenses/LICENSE-xpp3.txt
-share/doc/wildfire/plugin-dev-guide.html
-share/doc/wildfire/protocol-support.html
-share/doc/wildfire/source-build.html
-share/doc/wildfire/ssl-guide.html
-share/doc/wildfire/style.css
-share/doc/wildfire/translator-guide.html
-share/doc/wildfire/upgrade-guide.html
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.html
+%%PORTDOCS%%%%DOCSDIR%%/README.html
+%%PORTDOCS%%%%DOCSDIR%%/changelog.html
+%%PORTDOCS%%%%DOCSDIR%%/database-guide.html
+%%PORTDOCS%%%%DOCSDIR%%/database.html
+%%PORTDOCS%%%%DOCSDIR%%/db-integration-guide.html
+%%PORTDOCS%%%%DOCSDIR%%/images/header_logo.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/launcher.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
+%%PORTDOCS%%%%DOCSDIR%%/licenses/LICENSE-commons-logging.txt
+%%PORTDOCS%%%%DOCSDIR%%/licenses/LICENSE-dom4j.txt
+%%PORTDOCS%%%%DOCSDIR%%/licenses/LICENSE-jaxen.txt
+%%PORTDOCS%%%%DOCSDIR%%/licenses/LICENSE-xpp3.txt
+%%PORTDOCS%%%%DOCSDIR%%/plugin-dev-guide.html
+%%PORTDOCS%%%%DOCSDIR%%/protocol-support.html
+%%PORTDOCS%%%%DOCSDIR%%/source-build.html
+%%PORTDOCS%%%%DOCSDIR%%/ssl-guide.html
+%%PORTDOCS%%%%DOCSDIR%%/style.css
+%%PORTDOCS%%%%DOCSDIR%%/translator-guide.html
+%%PORTDOCS%%%%DOCSDIR%%/upgrade-guide.html
 share/java/classes/activation.jar
 share/java/classes/bouncycastle.jar
 share/java/classes/commons-el.jar
@@ -307,9 +307,9 @@ share/nls/en_US.US-ASCII
 @dirrm share/java/wildfire/plugins/admin/webapp/WEB-INF
 @dirrm share/java/wildfire/plugins/admin/webapp
 @dirrm share/java/wildfire/plugins/admin
-@dirrm share/doc/wildfire/licenses
-@dirrm share/doc/wildfire/images
-@dirrm share/doc/wildfire
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/licenses
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%EXAMPLESDIR%%
 @unexec rmdir %D/share/java/wildfire/plugins 2> /dev/null || echo "If permanently deleting this package, %D/share/jave/wildfire/plugins must be removed manually"
 @unexec rmdir %D/etc/wildfire 2> /dev/null || echo "If permanently deleting this package, %D/etc/wildfire must be removed manually"
diff --git a/net-im/wildfire/Makefile b/net-im/wildfire/Makefile
index 5e3b5580758d..d39b45d4c1f0 100644
--- a/net-im/wildfire/Makefile
+++ b/net-im/wildfire/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=       wildfire
-PORTVERSION=    3.2.2
+PORTVERSION=    3.2.3
 CATEGORIES=     net-im java
 MASTER_SITES=   http://www.igniterealtime.org/downloadServlet?filename=wildfire/
 DISTNAME=	${PORTNAME}_src_${PORTVERSION:S/./_/g}
 
 MAINTAINER=     quetzal@zone3000.net
-COMMENT=        Wildfire is an enterprise instant messaging (EIM) server
+COMMENT=        Openfire (formerly Wildfire) is an enterprise instant messaging server
 
 RUN_DEPENDS=    classpath:${PORTSDIR}/java/javavmwrapper
-
 USE_JAVA=       yes
 JAVA_VERSION=   1.5+
 
@@ -55,11 +54,11 @@ do-install:
 	(cd ${INSTALL_WRKSRC}/plugins && ${FIND} . \
 	| ${CPIO} -pvdmu -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}/plugins)
 
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR};
 	(cd ${WRKSRC} && ${INSTALL_DATA} -o ${SHAREOWN} -g ${SHAREGRP} \
 	LICENSE.html README.html changelog.html ${DOCSDIR});
 
-.if !defined(NOPORTDOCS)
 	(cd ${WRKSRC}/documentation/docs && ${FIND} . \
 	| ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} > /dev/null 2>&1 )
 .endif
diff --git a/net-im/wildfire/distinfo b/net-im/wildfire/distinfo
index 48f100be5683..6a6ba3ff5215 100644
--- a/net-im/wildfire/distinfo
+++ b/net-im/wildfire/distinfo
@@ -1,3 +1,3 @@
-MD5 (wildfire_src_3_2_2.tar.gz) = ebf4df6d4fbce6aeb646ff47fdefe2d1
-SHA256 (wildfire_src_3_2_2.tar.gz) = e031800699a7038093a07db39508b2515e755b33ad1add344dc7fced1526bad1
-SIZE (wildfire_src_3_2_2.tar.gz) = 15547358
+MD5 (wildfire_src_3_2_3.tar.gz) = 497da0e5f10cf4c9160e0c65b128a00a
+SHA256 (wildfire_src_3_2_3.tar.gz) = f28f1c9f38fdfa2d1fca0d32b916da14de333834ff18a00c6282458b83fe6f57
+SIZE (wildfire_src_3_2_3.tar.gz) = 16234108
diff --git a/net-im/wildfire/files/pkg-message.in b/net-im/wildfire/files/pkg-message.in
index af16e703dbc5..8a01300b72be 100644
--- a/net-im/wildfire/files/pkg-message.in
+++ b/net-im/wildfire/files/pkg-message.in
@@ -1,9 +1,21 @@
-WARINING: 
-If you use default self-sined certificates in wildfire 3.1.1 
-version to support SSL, you need to necessarily regenerate them. 
-After the installation please go to the "Server Certificates" menu 
-and generate your certificates. After this you will be able to
-connect through SSL again.
+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.
+
+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.
+
+WARNING:
+============================================================================
+If you use default self-sined certificates in wildfire 3.1.1 version to
+support SSL, you need to necessarily regenerate them. After the installation
+please go to the "Server Certificates" menu and generate your certificates.
+Than you will be able to connect through SSL again.
+============================================================================
 
 You can find the documentation files for this package in the 
 directory %%PREFIX%%/share/doc/wildfire.
diff --git a/net-im/wildfire/pkg-descr b/net-im/wildfire/pkg-descr
index e4fea526fb79..6a44c86eb011 100644
--- a/net-im/wildfire/pkg-descr
+++ b/net-im/wildfire/pkg-descr
@@ -1,7 +1,7 @@
-Wildfire is an enterprise instant messaging (EIM) server dual-licensed under
-the Open Source GPL and commercially. It uses the leading open protocol for 
-instant messaging, XMPP  (also called Jabber). 
-Wildfire is incredibly easy to setup and administer, but offers rock-solid 
+Openfire (formerly Wildfire) is an enterprise instant messaging (EIM) server
+dual-licensed under the Open Source GPL and commercially. It uses the leading
+open protocol for instant messaging, XMPP (also called Jabber). 
+Openfire is incredibly easy to setup and administer, but offers rock-solid 
 security and performance.
 
-WWW: http://www.jivesoftware.org/wildfire/
+WWW: http://www.igniterealtime.org/projects/openfire/index.jsp
diff --git a/net-im/wildfire/pkg-plist b/net-im/wildfire/pkg-plist
index cbcab866c4fb..dcdb22135e78 100644
--- a/net-im/wildfire/pkg-plist
+++ b/net-im/wildfire/pkg-plist
@@ -1,37 +1,37 @@
 @unexec %D/etc/rc.d/wildfire stop > /dev/null 2>&1 || true
-@unexec if cmp -s %D/etc/wildfire/wildfire.xml %D/%%EXAMPLESDIR%%/wildfire.xml; then rm -f %D/etc/wildfire/wildfire.xml; else echo If permanently deleting this package, %%PREFIX%%/etc/wildfire.xml must be removed manually; fi
+@unexec if cmp -s %D/etc/wildfire/wildfire.xml %D/%%EXAMPLESDIR%%/wildfire.xml; then rm -f %D/etc/wildfire/wildfire.xml; else echo If permanently deleting this package, %%PREFIX%%/etc/wildfire/wildfire.xml must be removed manually; fi
 @unexec [ -d %D/share/doc/wildfire/javadoc ] && rm -rf %D/share/doc/wildfire/javadoc
 %%EXAMPLESDIR%%/wildfire.xml
 @exec [ -d /var/log/wildfire ] || mkdir -p  /var/log/wildfire && chown wildfire:wildfire /var/log/wildfire
 @exec [ -d /var/db/wildfire ] || mkdir -p  /var/db/wildfire && chown wildfire:wildfire /var/db/wildfire
 @exec [ -d %D/etc/wildfire ] || mkdir -p  %D/etc/wildfire && chown wildfire:wildfire %D/etc/wildfire
 @exec [ -f %D/etc/wildfire/wildfire.xml ] || cp %%EXAMPLESDIR%%/wildfire.xml %D/etc/wildfire/wildfire.xml && chown wildfire:wildfire %D/etc/wildfire/wildfire.xml
-share/doc/wildfire/LICENSE.html
-share/doc/wildfire/README.html
-share/doc/wildfire/changelog.html
-share/doc/wildfire/database-guide.html
-share/doc/wildfire/database.html
-share/doc/wildfire/db-integration-guide.html
-share/doc/wildfire/images/header_logo.gif
-share/doc/wildfire/images/launcher.png
-share/doc/wildfire/images/sitemesh.png
-share/doc/wildfire/images/windows_service.png
-share/doc/wildfire/images/setup_ldap.png
-share/doc/wildfire/images/active_directory.png
-share/doc/wildfire/index.html
-share/doc/wildfire/install-guide.html
-share/doc/wildfire/ldap-guide.html
-share/doc/wildfire/licenses/LICENSE-commons-logging.txt
-share/doc/wildfire/licenses/LICENSE-dom4j.txt
-share/doc/wildfire/licenses/LICENSE-jaxen.txt
-share/doc/wildfire/licenses/LICENSE-xpp3.txt
-share/doc/wildfire/plugin-dev-guide.html
-share/doc/wildfire/protocol-support.html
-share/doc/wildfire/source-build.html
-share/doc/wildfire/ssl-guide.html
-share/doc/wildfire/style.css
-share/doc/wildfire/translator-guide.html
-share/doc/wildfire/upgrade-guide.html
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.html
+%%PORTDOCS%%%%DOCSDIR%%/README.html
+%%PORTDOCS%%%%DOCSDIR%%/changelog.html
+%%PORTDOCS%%%%DOCSDIR%%/database-guide.html
+%%PORTDOCS%%%%DOCSDIR%%/database.html
+%%PORTDOCS%%%%DOCSDIR%%/db-integration-guide.html
+%%PORTDOCS%%%%DOCSDIR%%/images/header_logo.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/launcher.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
+%%PORTDOCS%%%%DOCSDIR%%/licenses/LICENSE-commons-logging.txt
+%%PORTDOCS%%%%DOCSDIR%%/licenses/LICENSE-dom4j.txt
+%%PORTDOCS%%%%DOCSDIR%%/licenses/LICENSE-jaxen.txt
+%%PORTDOCS%%%%DOCSDIR%%/licenses/LICENSE-xpp3.txt
+%%PORTDOCS%%%%DOCSDIR%%/plugin-dev-guide.html
+%%PORTDOCS%%%%DOCSDIR%%/protocol-support.html
+%%PORTDOCS%%%%DOCSDIR%%/source-build.html
+%%PORTDOCS%%%%DOCSDIR%%/ssl-guide.html
+%%PORTDOCS%%%%DOCSDIR%%/style.css
+%%PORTDOCS%%%%DOCSDIR%%/translator-guide.html
+%%PORTDOCS%%%%DOCSDIR%%/upgrade-guide.html
 share/java/classes/activation.jar
 share/java/classes/bouncycastle.jar
 share/java/classes/commons-el.jar
@@ -307,9 +307,9 @@ share/nls/en_US.US-ASCII
 @dirrm share/java/wildfire/plugins/admin/webapp/WEB-INF
 @dirrm share/java/wildfire/plugins/admin/webapp
 @dirrm share/java/wildfire/plugins/admin
-@dirrm share/doc/wildfire/licenses
-@dirrm share/doc/wildfire/images
-@dirrm share/doc/wildfire
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/licenses
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%EXAMPLESDIR%%
 @unexec rmdir %D/share/java/wildfire/plugins 2> /dev/null || echo "If permanently deleting this package, %D/share/jave/wildfire/plugins must be removed manually"
 @unexec rmdir %D/etc/wildfire 2> /dev/null || echo "If permanently deleting this package, %D/etc/wildfire must be removed manually"