3 files changed, 25 insertions, 11 deletions

diff --git a/net-im/openfire/Makefile b/net-im/openfire/Makefile
index b432b964321d..0b701ea351f2 100644
--- a/net-im/openfire/Makefile
+++ b/net-im/openfire/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openfire
-PORTVERSION=	4.6.1
+PORTVERSION=	4.6.2
 PORTEPOCH=	1
 CATEGORIES=	net-im java
 MASTER_SITES=	https://github.com/igniterealtime/${PORTNAME}/releases/download/v${PORTVERSION}/ \
@@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	mvn:devel/maven
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS TEST
 OPTIONS_SINGLE=	MAVEN
 OPTIONS_SINGLE_MAVEN=	LOCAL_M2 ONLINE_M2
 MAVEN_DESC=	Source of Maven build plugins
@@ -49,12 +49,19 @@ MVN_TARGET=	package
 ##
 .include <bsd.port.options.mk>
 ##
+
+.if ${PORT_OPTIONS:MTEST}
+MVN_OPTS=	-DskipTests=false
+.else
+MVN_OPTS=	-DskipTests=true
+.endif
+
 .if ${PORT_OPTIONS:MLOCAL_M2}
-MVN_OPTS=	-o -Dmaven.repo.local=${WRKDIR}/m2
+MVN_OPTS+=	-o -Dmaven.repo.local=${WRKDIR}/m2
 .endif
 
 .if ${PORT_OPTIONS:MONLINE_M2}
-MVN_OPTS=	-U
+MVN_OPTS+=	-U
 .endif
 
 do-build:
diff --git a/net-im/openfire/distinfo b/net-im/openfire/distinfo
index 876d38af45e6..6b1f4190e529 100644
--- a/net-im/openfire/distinfo
+++ b/net-im/openfire/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1610568972
-SHA256 (openfire_src_4_6_1.tar.gz) = 055bb9d66fd7c9d11fc349847d8496f01d79a1aeca81e309839ef080310bc148
-SIZE (openfire_src_4_6_1.tar.gz) = 6758089
-SHA256 (FreeBSD-openfire-4.6.1-maven-repository.tar.gz) = 9283df04e6b0878e4c6365b035f45341de92319a96a618abcd04ce3ea9a06f32
-SIZE (FreeBSD-openfire-4.6.1-maven-repository.tar.gz) = 248996996
+TIMESTAMP = 1613504570
+SHA256 (openfire_src_4_6_2.tar.gz) = 67cd2393be0f8863390ede5df13a9d2363fa827620b4504c0aa4a4ca39a775e8
+SIZE (openfire_src_4_6_2.tar.gz) = 6758168
+SHA256 (FreeBSD-openfire-4.6.2-maven-repository.tar.gz) = a76c1a8c08db6c7caa68754a42c90bdbbbf264d0f41a2fe4b373765c9e904a12
+SIZE (FreeBSD-openfire-4.6.2-maven-repository.tar.gz) = 252917422
diff --git a/net-im/openfire/pkg-plist b/net-im/openfire/pkg-plist
index a1fa8f44c693..3d8aa7fbea43 100644
--- a/net-im/openfire/pkg-plist
+++ b/net-im/openfire/pkg-plist
@@ -49,6 +49,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/wildfire-openfire-upgrade.html
 %%DATADIR%%/conf
 %%DATADIR%%/embedded-db
+%%DATADIR%%/lib/FastInfoset-1.2.16.jar
 %%DATADIR%%/lib/activation-1.1.jar
 %%DATADIR%%/lib/ant-1.10.9.jar
 %%DATADIR%%/lib/ant-launcher-1.10.9.jar
@@ -84,16 +85,20 @@
 %%DATADIR%%/lib/hsqldb-2.4.1.jar
 %%DATADIR%%/lib/httpclient-4.5.13.jar
 %%DATADIR%%/lib/httpcore-4.4.13.jar
-%%DATADIR%%/lib/i18n-4.6.1.jar
+%%DATADIR%%/lib/i18n-4.6.2.jar
 %%DATADIR%%/lib/imageio-bmp-3.5.jar
 %%DATADIR%%/lib/imageio-core-3.5.jar
+%%DATADIR%%/lib/istack-commons-runtime-3.0.8.jar
 %%DATADIR%%/lib/j2objc-annotations-1.3.jar
+%%DATADIR%%/lib/jakarta.activation-api-1.2.1.jar
+%%DATADIR%%/lib/jakarta.xml.bind-api-2.3.2.jar
 %%DATADIR%%/lib/javassist-3.24.1-GA.jar
 %%DATADIR%%/lib/javax.activation-api-1.2.0.jar
 %%DATADIR%%/lib/javax.annotation-api-1.3.2.jar
 %%DATADIR%%/lib/javax.mail-1.6.2.jar
 %%DATADIR%%/lib/javax.servlet-api-3.1.0.jar
 %%DATADIR%%/lib/jaxb-api-2.3.1.jar
+%%DATADIR%%/lib/jaxb-runtime-2.3.2.jar
 %%DATADIR%%/lib/jaxen-1.2.0.jar
 %%DATADIR%%/lib/jcip-annotations-1.0.jar
 %%DATADIR%%/lib/jcl-over-slf4j-1.7.30.jar
@@ -142,15 +147,17 @@
 %%DATADIR%%/lib/sitemesh-2.4.2.jar
 %%DATADIR%%/lib/slf4j-api-1.7.30.jar
 %%DATADIR%%/lib/startup.jar
+%%DATADIR%%/lib/stax-ex-1.8.1.jar
 %%DATADIR%%/lib/taglibs-standard-impl-1.2.5.jar
 %%DATADIR%%/lib/taglibs-standard-spec-1.2.5.jar
 %%DATADIR%%/lib/tinder-2.0.0.jar
+%%DATADIR%%/lib/txw2-2.3.2.jar
 %%DATADIR%%/lib/websocket-api-9.4.35.v20201120.jar
 %%DATADIR%%/lib/websocket-client-9.4.35.v20201120.jar
 %%DATADIR%%/lib/websocket-common-9.4.35.v20201120.jar
 %%DATADIR%%/lib/websocket-server-9.4.35.v20201120.jar
 %%DATADIR%%/lib/websocket-servlet-9.4.35.v20201120.jar
-%%DATADIR%%/lib/xmppserver-4.6.1.jar
+%%DATADIR%%/lib/xmppserver-4.6.2.jar
 %%DATADIR%%/lib/xpp3-1.1.4c.jar
 %%DATADIR%%/logs
 %%DATADIR%%/plugins/admin/plugin.xml