net-im/openfire: update to 4.1.1, switch to USE_GITHUB

Changelog:
http://download.igniterealtime.org/openfire/docs/4.1.1/changelog.html

PR:		215643
Submitted by:	Danilo G. Baio <dbaio@bsd.com.br>

3 files changed, 35 insertions, 11 deletions

diff --git a/net-im/openfire/Makefile b/net-im/openfire/Makefile
index c668996b4c50..39f943bc5efc 100644
--- a/net-im/openfire/Makefile
+++ b/net-im/openfire/Makefile
@@ -2,26 +2,28 @@
 # $FreeBSD$
 
 PORTNAME=	openfire
-PORTVERSION=	4.0.4
+PORTVERSION=	4.1.1
+DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	net-im java
-MASTER_SITES=	http://download.igniterealtime.org/openfire/
-DISTNAME=	${PORTNAME}_src_${PORTVERSION:S/./_/g}
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Enterprise instant messaging server
 
 LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC}/LICENSE.html
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	slf4j>=1.7.7:devel/slf4j
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	igniterealtime
+
 OPTIONS_DEFINE=	DOCS PLUGINS
 OPTIONS_DEFAULT=PLUGINS
 OPTIONS_SUB=	yes
 PLUGINS_DESC=	Install bundled plugins
 
-USES=		cpe dos2unix zip
+USES=		cpe dos2unix
 DOS2UNIX_FILES=	src/java/org/jivesoftware/openfire/server/ServerDialback.java
 USE_LDCONFIG=	yes
 USE_ANT=	yes
@@ -35,7 +37,7 @@ ALL_TARGET=	openfire
 USE_RC_SUBR=	openfire
 SUB_FILES+=	pkg-message
 
-WRKSRC=		${WRKDIR}/${PORTNAME}_src
+WRKSRC=		${WRKDIR}/Openfire-${PORTVERSION}
 BUILD_WRKSRC=	${WRKSRC}/build
 INSTALL_WRKSRC=	${WRKSRC}/target/openfire
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
@@ -86,8 +88,6 @@ do-install-PLUGINS-on:
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC} && ${INSTALL_DATA} LICENSE.html README.html changelog.html \
-	    ${STAGEDIR}${DOCSDIR})
 	(cd ${WRKSRC}/documentation/docs && ${FIND} . \! -path ./javadoc\* \
 	| ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR} > /dev/null 2>&1 )
 
diff --git a/net-im/openfire/distinfo b/net-im/openfire/distinfo
index ec83e59b0494..811c8c4fbf5b 100644
--- a/net-im/openfire/distinfo
+++ b/net-im/openfire/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481108226
-SHA256 (openfire_src_4_0_4.zip) = b97e492de79d8733f484f7575343df6eb108a26b3117dbca2666aba31319d39a
-SIZE (openfire_src_4_0_4.zip) = 103408213
+TIMESTAMP = 1483374593
+SHA256 (igniterealtime-openfire-v4.1.1_GH0.tar.gz) = b597756f7edf41384e6875d638af30dce7fcb726b04812abc4f93703b6ddf6c9
+SIZE (igniterealtime-openfire-v4.1.1_GH0.tar.gz) = 100915344
diff --git a/net-im/openfire/pkg-plist b/net-im/openfire/pkg-plist
index ce336d9aba7b..8d62e0730abe 100644
--- a/net-im/openfire/pkg-plist
+++ b/net-im/openfire/pkg-plist
@@ -192,6 +192,9 @@
 %%DATADIR%%/plugins/admin/webapp/style/lightbox.css
 %%DATADIR%%/plugins/admin/webapp/style/login.css
 %%DATADIR%%/plugins/admin/webapp/style/setup.css
+%%DATADIR%%/plugins/avatarResizer.jar
+%%DATADIR%%/plugins/bookmarks.jar
+%%DATADIR%%/plugins/nonSaslAuthentication.jar
 %%DATADIR%%/resources/database/openfire_db2.sql
 %%DATADIR%%/resources/database/openfire_hsqldb.sql
 %%DATADIR%%/resources/database/openfire_mysql.sql
@@ -302,6 +305,27 @@
 %%DATADIR%%/resources/database/upgrade/22/openfire_postgresql.sql
 %%DATADIR%%/resources/database/upgrade/22/openfire_sqlserver.sql
 %%DATADIR%%/resources/database/upgrade/22/openfire_sybase.sql
+%%DATADIR%%/resources/database/upgrade/23/openfire_db2.sql
+%%DATADIR%%/resources/database/upgrade/23/openfire_hsqldb.sql
+%%DATADIR%%/resources/database/upgrade/23/openfire_mysql.sql
+%%DATADIR%%/resources/database/upgrade/23/openfire_oracle.sql
+%%DATADIR%%/resources/database/upgrade/23/openfire_postgresql.sql
+%%DATADIR%%/resources/database/upgrade/23/openfire_sqlserver.sql
+%%DATADIR%%/resources/database/upgrade/23/openfire_sybase.sql
+%%DATADIR%%/resources/database/upgrade/24/openfire_db2.sql
+%%DATADIR%%/resources/database/upgrade/24/openfire_hsqldb.sql
+%%DATADIR%%/resources/database/upgrade/24/openfire_mysql.sql
+%%DATADIR%%/resources/database/upgrade/24/openfire_oracle.sql
+%%DATADIR%%/resources/database/upgrade/24/openfire_postgresql.sql
+%%DATADIR%%/resources/database/upgrade/24/openfire_sqlserver.sql
+%%DATADIR%%/resources/database/upgrade/24/openfire_sybase.sql
+%%DATADIR%%/resources/database/upgrade/25/openfire_db2.sql
+%%DATADIR%%/resources/database/upgrade/25/openfire_hsqldb.sql
+%%DATADIR%%/resources/database/upgrade/25/openfire_mysql.sql
+%%DATADIR%%/resources/database/upgrade/25/openfire_oracle.sql
+%%DATADIR%%/resources/database/upgrade/25/openfire_postgresql.sql
+%%DATADIR%%/resources/database/upgrade/25/openfire_sqlserver.sql
+%%DATADIR%%/resources/database/upgrade/25/openfire_sybase.sql
 %%DATADIR%%/resources/database/upgrade/4/openfire_db2.sql
 %%DATADIR%%/resources/database/upgrade/4/openfire_hsqldb.sql
 %%DATADIR%%/resources/database/upgrade/4/openfire_mysql.sql