From owner-svn-ports-head@freebsd.org  Wed Feb 14 12:16:25 2018
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1D313F1D1CD;
 Wed, 14 Feb 2018 12:16:25 +0000 (UTC)
 (envelope-from gahr@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id BFBBB73FED;
 Wed, 14 Feb 2018 12:16:24 +0000 (UTC)
 (envelope-from gahr@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BAAFB7A43;
 Wed, 14 Feb 2018 12:16:24 +0000 (UTC)
 (envelope-from gahr@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1ECGO2M057603;
 Wed, 14 Feb 2018 12:16:24 GMT (envelope-from gahr@FreeBSD.org)
Received: (from gahr@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1ECGOuJ057599;
 Wed, 14 Feb 2018 12:16:24 GMT (envelope-from gahr@FreeBSD.org)
Message-Id: <201802141216.w1ECGOuJ057599@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gahr set sender to
 gahr@FreeBSD.org using -f
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Wed, 14 Feb 2018 12:16:24 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r461782 - head/net-im/openfire
X-SVN-Group: ports-head
X-SVN-Commit-Author: gahr
X-SVN-Commit-Paths: head/net-im/openfire
X-SVN-Commit-Revision: 461782
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Feb 2018 12:16:25 -0000

Author: gahr
Date: Wed Feb 14 12:16:24 2018
New Revision: 461782
URL: https://svnweb.freebsd.org/changeset/ports/461782

Log:
  net-im/openfire: update to 4.2.2
  
  Changelog:
  http://download.igniterealtime.org/openfire/docs/4.2.2/changelog.html

Modified:
  head/net-im/openfire/Makefile
  head/net-im/openfire/distinfo
  head/net-im/openfire/pkg-plist

Modified: head/net-im/openfire/Makefile
==============================================================================
--- head/net-im/openfire/Makefile	Wed Feb 14 12:15:59 2018	(r461781)
+++ head/net-im/openfire/Makefile	Wed Feb 14 12:16:24 2018	(r461782)
@@ -2,24 +2,21 @@
 # $FreeBSD$
 
 PORTNAME=	openfire
-PORTVERSION=	4.2.1
-DISTVERSIONPREFIX=	v
+PORTVERSION=	4.2.2
 PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	net-im java
+MASTER_SITES=	https://github.com/igniterealtime/${PORTNAME}/releases/download/v${PORTVERSION}/
+DISTNAME=	${PORTNAME}_src_${PORTVERSION:S/./_/g}
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Enterprise instant messaging server
 
 LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+LICENSE_FILE=	${WRKSRC}/LICENSE.html
 
 RUN_DEPENDS=	slf4j>=1.7.7:devel/slf4j
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	igniterealtime
-GH_PROJECT=	Openfire
-
 OPTIONS_DEFINE=	DOCS PLUGINS
 OPTIONS_DEFAULT=PLUGINS
 OPTIONS_SUB=	yes
@@ -35,17 +32,18 @@ NO_ARCH=	yes
 
 CPE_VENDOR=	igniterealtime
 
-ALL_TARGET=	openfire
-USE_RC_SUBR=	openfire
+ALL_TARGET=	${PORTNAME}
+USE_RC_SUBR=	${PORTNAME}
 SUB_FILES+=	pkg-message
 
+WRKSRC=		${WRKDIR}/${PORTNAME}_src
 BUILD_WRKSRC=	${WRKSRC}/build
-INSTALL_WRKSRC=	${WRKSRC}/target/openfire
+INSTALL_WRKSRC=	${WRKSRC}/target/${PORTNAME}
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 PORTDOCS=	*
-VARLOG=		/var/log/openfire
-VARDB=		/var/db/openfire
-USERS=		openfire
+VARLOG=		/var/log/${PORTNAME}
+VARDB=		/var/db/${PORTNAME}
+USERS=		${PORTNAME}
 GROUPS=		${USERS}
 PLIST_SUB+=	VARLOG=${VARLOG} \
 		VARDB=${VARDB}
@@ -74,8 +72,8 @@ do-install:
 	${LN} -sf ${ETCDIR} ${STAGEDIR}${DATADIR}/resources/security
 	${LN} -sf ${VARDB} ${STAGEDIR}${DATADIR}/embedded-db
 	${LN} -sf ${VARLOG} ${STAGEDIR}${DATADIR}/logs
-	${INSTALL_DATA} ${INSTALL_WRKSRC}/conf/openfire.xml \
-		${STAGEDIR}${ETCDIR}/openfire.xml.sample
+	${INSTALL_DATA} ${INSTALL_WRKSRC}/conf/${PORTNAME}.xml \
+		${STAGEDIR}${ETCDIR}/${PORTNAME}.xml.sample
 	${INSTALL} -m 600 ${INSTALL_WRKSRC}/resources/security/truststore \
 		${STAGEDIR}${ETCDIR}/truststore.sample
 	${INSTALL} -m 600 ${INSTALL_WRKSRC}/resources/security/keystore \

Modified: head/net-im/openfire/distinfo
==============================================================================
--- head/net-im/openfire/distinfo	Wed Feb 14 12:15:59 2018	(r461781)
+++ head/net-im/openfire/distinfo	Wed Feb 14 12:16:24 2018	(r461782)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1513075267
-SHA256 (igniterealtime-Openfire-v4.2.1_GH0.tar.gz) = 37557c598c7b46f8d0e83b8a1ff789cbb59156a651eed881b1454a300d2ad345
-SIZE (igniterealtime-Openfire-v4.2.1_GH0.tar.gz) = 108222938
+TIMESTAMP = 1518606031
+SHA256 (openfire_src_4_2_2.tar.gz) = a9fa56332cec9437c751644bf23dbbf65a332605493d4780b97b0da4a5febe7d
+SIZE (openfire_src_4_2_2.tar.gz) = 110865419

Modified: head/net-im/openfire/pkg-plist
==============================================================================
--- head/net-im/openfire/pkg-plist	Wed Feb 14 12:15:59 2018	(r461781)
+++ head/net-im/openfire/pkg-plist	Wed Feb 14 12:16:24 2018	(r461782)
@@ -409,6 +409,7 @@
 %%PLUGINS%%%%DATADIR%%/plugins/tikitoken.jar
 %%PLUGINS%%%%DATADIR%%/plugins/userCreation.jar
 %%PLUGINS%%%%DATADIR%%/plugins/userImportExport.jar
+%%PLUGINS%%%%DATADIR%%/plugins/userStatus.jar
 %%PLUGINS%%%%DATADIR%%/plugins/userservice.jar
 %%PLUGINS%%%%DATADIR%%/plugins/xmldebugger.jar
 @dir %%VARDB%%