3 files changed, 23 insertions, 8 deletions

diff --git a/net-im/openfire/Makefile b/net-im/openfire/Makefile
index c0606ec1d562..9eaef699eed7 100644
--- a/net-im/openfire/Makefile
+++ b/net-im/openfire/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openfire
 PORTVERSION=	3.3.1
+PORTREVISION=	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/files/openfire.in b/net-im/openfire/files/openfire.in
index 40d954db9e2d..eaba6fbf1fb2 100644
--- a/net-im/openfire/files/openfire.in
+++ b/net-im/openfire/files/openfire.in
@@ -10,6 +10,16 @@
 #
 # openfire_enable (bool):   Set to NO by default.
 #               Set it to YES to enable openfire.
+# openfire_user (username): Set to openfire by default.
+#               Set it to required username.
+# openfire_group (group):   Set to openfire by default.
+#               Set it to required group.
+# openfire_libdir (path):   Set to %%JAVAJARDIR%% by default.
+#               Set it to java classes directory.
+# openfire_home (path):     Set to %%DATADIR%% by default.
+#               Set it to java home directory.
+# openfire_javargs (args):  Set to -Xmx256M by default.
+#               See java -h for available arguments.
 
 . %%RC_SUBR%%
 
@@ -19,13 +29,16 @@ rcvar=${name}_enable
 : ${openfire_enable:=NO}
 : ${openfire_user:=${name}}
 : ${openfire_group:=${name}}
+: ${openfire_libdir:=%%JAVAJARDIR%%}
+: ${openfire_home:=%%DATADIR%%}
+: ${openfire_javargs:='-Xmx256M'}
 
 pidfile=/var/run/${name}.pid
 
-required_files="%%PREFIX%%/etc/openfire/openfire.xml"
-java_options=" 	-server -jar \
-		-Dopenfire.lib.dir=%%JAVAJARDIR%% \
-		-DopenfireHome=%%DATADIR%%"
+required_files="%%ETCDIR%%/openfire.xml"
+java_options=" 	-server -jar ${openfire_javargs} \
+		-Dopenfire.lib.dir=${openfire_libdir} \
+		-DopenfireHome=${openfire_home}"
 
 java_command="	%%LOCALBASE%%/bin/java ${java_options} \
 		%%JAVAJARDIR%%/startup.jar"
diff --git a/net-im/openfire/files/pkg-message.in b/net-im/openfire/files/pkg-message.in
index 150711c22291..002b1534991f 100644
--- a/net-im/openfire/files/pkg-message.in
+++ b/net-im/openfire/files/pkg-message.in
@@ -3,12 +3,13 @@ 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. (/usr/ports/net-im/wildfire)
+   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.
-   (/usr/ports/net-im/openfire)
+   (net-im/openfire)
 
 WARNING:
 ===========================================================================
@@ -16,12 +17,12 @@ 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 %%PREFIX%%/etc/openfire and copy configuration from old 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 %%PREFIX%%/etc/openfire
+      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*