- Update to 3.8.0

  Release notes:
  http://community.igniterealtime.org/blogs/ignite/2013/02/06/openfire-380-has-been-released

6 files changed, 37 insertions, 99 deletions

diff --git a/net-im/openfire/Makefile b/net-im/openfire/Makefile
index d5b5262e5e52..619bb2cf3034 100644
--- a/net-im/openfire/Makefile
+++ b/net-im/openfire/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openfire
-PORTVERSION=	3.7.1
-PORTREVISION=	2
+PORTVERSION=	3.8.0
 PORTEPOCH=	1
 CATEGORIES=	net-im java
 MASTER_SITES=	http://download.igniterealtime.org/openfire/
@@ -12,6 +11,8 @@ DISTNAME=	${PORTNAME}_src_${PORTVERSION:S/./_/g}
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Enterprise instant messaging server
 
+LICENSE=	AL2
+
 RUN_DEPENDS=	classpath:${PORTSDIR}/java/javavmwrapper \
    		${JAVAJARDIR}/slf4j-api.jar:${PORTSDIR}/devel/slf4j
 
@@ -30,32 +31,34 @@ WRKSRC=		${WRKDIR}/${PORTNAME}_src
 BUILD_WRKSRC=	${WRKSRC}/build
 INSTALL_WRKSRC=	${WRKSRC}/target/openfire
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
+PORTDOCS=	*
 VARLOG=		/var/log/openfire
 VARDB=		/var/db/openfire
 USERS=		openfire
 GROUPS=		${USERS}
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	(cd ${WRKSRC} && ${MV} \
 	    ./src/plugins/jingleNodes/src/i18n/jingleNodes_i18n.properties \
 	    ./src/plugins/jingleNodes/src/i18n/jinglenodes_i18n.properties)
 
 do-install:
-
-	(cd ${INSTALL_WRKSRC}/lib && ${INSTALL} -m 744 *.jar  ${JAVAJARDIR})
-	(cd ${INSTALL_WRKSRC}/lib && ${INSTALL} -m 744 log4j.xml  ${JAVAJARDIR})
-
-	${MKDIR} ${DATADIR}
+	${MKDIR} ${DATADIR}/lib
 	${MKDIR} ${VARLOG}
 	${MKDIR} ${VARDB}
 
+	(cd ${INSTALL_WRKSRC}/lib && ${INSTALL} -m 744 *.jar ${DATADIR}/lib)
+	(cd ${INSTALL_WRKSRC}/lib && ${INSTALL} -m 744 log4j.xml ${DATADIR}/lib)
+
 	(cd ${INSTALL_WRKSRC}/resources && ${FIND} . \! -path ./security\* \
 	| ${CPIO} -pvdmu -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}/resources)
 
 	(cd ${INSTALL_WRKSRC}/plugins && ${FIND} . \
 	| ${CPIO} -pvdmu -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}/plugins)
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} \
 	LICENSE.html README.html changelog.html ${DOCSDIR})
@@ -65,7 +68,6 @@ do-install:
 .endif
 
 post-install:
-
 	${LN} -sf ${VARLOG} ${DATADIR}/logs
 	${LN} -sf ${VARDB}  ${DATADIR}/embedded-db
 	${LN} -sf ${ETCDIR} ${DATADIR}/conf
@@ -94,8 +96,8 @@ post-install:
 	fi
 
 	${CHOWN} -Rh ${USERS}:${GROUPS} ${ETCDIR}
-	${CHOWN} -Rh ${USERS}:${GROUPS} ${VARDB}
 	${CHOWN} -Rh ${USERS}:${GROUPS} ${VARLOG}
+	${CHOWN} -Rh ${USERS}:${GROUPS} ${VARDB}
 	${CHOWN} -Rh ${USERS}:${GROUPS} ${DATADIR}
 
 	@${CAT} ${PKGMESSAGE}
diff --git a/net-im/openfire/distinfo b/net-im/openfire/distinfo
index dd888db66ff8..29394f135b2d 100644
--- a/net-im/openfire/distinfo
+++ b/net-im/openfire/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_3_7_1.zip) = 2223a45c9025f22ef0c2fabb61aef3030a2324ea65c3bf85ecda8ab90606e55c
-SIZE (openfire_src_3_7_1.zip) = 69706278
+SHA256 (openfire_src_3_8_0.zip) = 44827a55c417265383a56aec8cc34206d21f665660b719f5cda360b5d5a52505
+SIZE (openfire_src_3_8_0.zip) = 72061298
diff --git a/net-im/openfire/files/openfire.in b/net-im/openfire/files/openfire.in
index 118bb35fe4b3..463549cadcc0 100644
--- a/net-im/openfire/files/openfire.in
+++ b/net-im/openfire/files/openfire.in
@@ -14,7 +14,7 @@
 #               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.
+# openfire_libdir (path):   Set to %%DATADIR%%/lib by default.
 #               Set it to java classes directory.
 # openfire_home (path):     Set to %%DATADIR%% by default.
 #               Set it to java home directory.
@@ -31,7 +31,7 @@ load_rc_config $name
 : ${openfire_enable:=NO}
 : ${openfire_user:=${name}}
 : ${openfire_group:=${name}}
-: ${openfire_libdir:=%%JAVAJARDIR%%}
+: ${openfire_libdir:=%%DATADIR%%/lib}
 : ${openfire_home:=%%DATADIR%%}
 : ${openfire_javargs:='-Xmx256M'}
 
@@ -43,7 +43,7 @@ java_options=" 	-server -jar ${openfire_javargs} \
 		-DopenfireHome=${openfire_home}"
 
 java_command="	%%LOCALBASE%%/bin/java ${java_options} \
-		%%JAVAJARDIR%%/startup.jar"
+		%%DATADIR%%/lib/startup.jar"
 
 # Subvert the check_pid_file procname check.
 if [ -f $pidfile ]; then
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 a35c909f55fd..000000000000
--- a/net-im/openfire/files/patch-build_build.xml
+++ /dev/null
@@ -1,10 +0,0 @@
---- build/build.xml.orig	2011-09-19 13:48:53.000000000 +0200
-+++ build/build.xml	2011-09-19 13:49:04.000000000 +0200
-@@ -234,6 +234,7 @@
-                 <or>
-                     <contains string="${ant.java.version}" substring="1.5"/>
-                     <contains string="${ant.java.version}" substring="1.6"/>
-+                    <contains string="${ant.java.version}" substring="1.7"/>
-                 </or>
-             </not>
-         </condition>
diff --git a/net-im/openfire/files/patch-pre-xmpp-dialback-fix.diff b/net-im/openfire/files/patch-pre-xmpp-dialback-fix.diff
deleted file mode 100644
index 37ff1faf5c71..000000000000
--- a/net-im/openfire/files/patch-pre-xmpp-dialback-fix.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: src/java/org/jivesoftware/openfire/session/LocalIncomingServerSession.java
-===================================================================
---- src/java/org/jivesoftware/openfire/session/LocalIncomingServerSession.java	(wersja 12902)
-+++ src/java/org/jivesoftware/openfire/session/LocalIncomingServerSession.java	(kopia robocza)
-@@ -122,7 +122,11 @@
-             openingStream.append(" xmlns=\"jabber:server\"");

-             openingStream.append(" from=\"").append(serverName).append("\"");

-             openingStream.append(" id=\"").append(streamID).append("\"");

--            openingStream.append(" version=\"1.0\">");

-+            if (serverVersion[0] >= 1) {

-+                openingStream.append(" version=\"1.0\">");

-+            } else {

-+                openingStream.append(">");

-+            }

-             connection.deliverRawText(openingStream.toString());

- 

-             if (serverVersion[0] >= 1) {        	

diff --git a/net-im/openfire/pkg-plist b/net-im/openfire/pkg-plist
index 4f38c16b00ff..e303c3a8eabc 100644
--- a/net-im/openfire/pkg-plist
+++ b/net-im/openfire/pkg-plist
@@ -4,59 +4,22 @@
 %%EXAMPLESDIR%%/openfire.xml
 %%EXAMPLESDIR%%/keystore
 %%EXAMPLESDIR%%/truststore
-@exec if ! /usr/sbin/pw group show openfire > /dev/null; then /usr/sbin/pw groupadd openfire -g 342 && echo "Added group openfire."; fi
-@exec if ! /usr/sbin/pw user show openfire > /dev/null; then /usr/sbin/pw useradd openfire -u 342 -g 342 -h - -d /nonexistent -s /sbin/nologin -c "Openfire Daemon" && echo "Added user openfire."; fi
-@exec [ -d /var/log/openfire ] || mkdir -p  /var/log/openfire && chown openfire:openfire /var/log/openfire
-@exec [ -d /var/db/openfire ] || mkdir -p  /var/db/openfire && chown openfire:openfire /var/db/openfire
-@exec [ -d %D/%%ETCDIR%% ] || mkdir -p %D/%%ETCDIR%% && chown openfire:openfire %D/%%ETCDIR%%
-@exec [ -f %D/%%ETCDIR%%/openfire.xml ] || install -m 644 -o openfire -g openfire %D/%%EXAMPLESDIR%%/openfire.xml %D/%%ETCDIR%%/openfire.xml
-@exec [ -f %D/%%ETCDIR%%/keystore ] || install -m 600 -o openfire -g openfire  %D/%%EXAMPLESDIR%%/keystore %D/%%ETCDIR%%/keystore
-@exec [ -f %D/%%ETCDIR%%/truststore ] || install -m 600 -o openfire -g openfire %D/%%EXAMPLESDIR%%/truststore %D/%%ETCDIR%%/truststore
-%%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/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%%/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%%/overlay.html
-%%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
-%%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
-%%JAVAJARDIR%%/hsqldb.jar
-%%JAVAJARDIR%%/jasper-compiler.jar
-%%JAVAJARDIR%%/jasper-runtime.jar
-%%JAVAJARDIR%%/jdic.jar
-%%JAVAJARDIR%%/jtds.jar
-%%JAVAJARDIR%%/mail.jar
-%%JAVAJARDIR%%/mysql.jar
-%%JAVAJARDIR%%/openfire.jar
-%%JAVAJARDIR%%/postgres.jar
-%%JAVAJARDIR%%/servlet.jar
-%%JAVAJARDIR%%/startup.jar
-%%JAVAJARDIR%%/slf4j-log4j12.jar
-%%JAVAJARDIR%%/log4j.xml
+%%DATADIR%%/lib/activation.jar
+%%DATADIR%%/lib/bouncycastle.jar
+%%DATADIR%%/lib/commons-el.jar
+%%DATADIR%%/lib/hsqldb.jar
+%%DATADIR%%/lib/jasper-compiler.jar
+%%DATADIR%%/lib/jasper-runtime.jar
+%%DATADIR%%/lib/jdic.jar
+%%DATADIR%%/lib/jtds.jar
+%%DATADIR%%/lib/mail.jar
+%%DATADIR%%/lib/mysql.jar
+%%DATADIR%%/lib/openfire.jar
+%%DATADIR%%/lib/postgres.jar
+%%DATADIR%%/lib/servlet.jar
+%%DATADIR%%/lib/startup.jar
+%%DATADIR%%/lib/slf4j-log4j12.jar
+%%DATADIR%%/lib/log4j.xml
 %%DATADIR%%/conf
 %%DATADIR%%/embedded-db
 %%DATADIR%%/logs
@@ -225,8 +188,10 @@
 %%DATADIR%%/plugins/contentFilter.jar
 %%DATADIR%%/plugins/dbaccess.jar
 %%DATADIR%%/plugins/emailListener.jar
-%%DATADIR%%/plugins/fastpath.jar
+%%DATADIR%%/plugins/gojara.jar
+%%DATADIR%%/plugins/hazelcast.jar
 %%DATADIR%%/plugins/jingleNodes.jar
+%%DATADIR%%/plugins/justmarried.jar
 %%DATADIR%%/plugins/kraken.jar
 %%DATADIR%%/plugins/loadStats.jar
 %%DATADIR%%/plugins/monitoring.jar
@@ -236,6 +201,7 @@
 %%DATADIR%%/plugins/registration.jar
 %%DATADIR%%/plugins/search.jar
 %%DATADIR%%/plugins/sip.jar
+%%DATADIR%%/plugins/stunserver.jar
 %%DATADIR%%/plugins/subscription.jar
 %%DATADIR%%/plugins/userCreation.jar
 %%DATADIR%%/plugins/userImportExport.jar
@@ -434,9 +400,6 @@
 @dirrm %%DATADIR%%/plugins/admin/webapp
 @dirrm %%DATADIR%%/plugins/admin
 @dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/licenses
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @unexec rmdir %D/%%DATADIR%%/plugins 2> /dev/null || echo "If permanently deleting this package, %D/%%DATADIR%%/plugins must be removed manually"
 @unexec rmdir %D/%%DATADIR%% 2> /dev/null
 @unexec rmdir %D/%%ETCDIR%% 2> /dev/null || echo "If permanently deleting this package, %D/%%ETCDIR%% must be removed manually"