From owner-svn-ports-all@FreeBSD.ORG Tue May 20 09:14:03 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B74E5A08; Tue, 20 May 2014 09:14:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 97EFE2F46; Tue, 20 May 2014 09:14:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4K9E3HM086892; Tue, 20 May 2014 09:14:03 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4K9E2lO086885; Tue, 20 May 2014 09:14:02 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201405200914.s4K9E2lO086885@svn.freebsd.org> From: Pietro Cerutti Date: Tue, 20 May 2014 09:14:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354620 - in head/net-im/openfire: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 May 2014 09:14:03 -0000 Author: gahr Date: Tue May 20 09:14:02 2014 New Revision: 354620 URL: http://svnweb.freebsd.org/changeset/ports/354620 QAT: https://qat.redports.org/buildarchive/r354620/ Log: - Update to 3.9.3 Release notes: https://community.igniterealtime.org/blogs/ignite/2014/05/06/openfire-393-has-been-released Modified: head/net-im/openfire/Makefile head/net-im/openfire/distinfo head/net-im/openfire/files/pkg-message.in head/net-im/openfire/pkg-plist Modified: head/net-im/openfire/Makefile ============================================================================== --- head/net-im/openfire/Makefile Tue May 20 08:56:38 2014 (r354619) +++ head/net-im/openfire/Makefile Tue May 20 09:14:02 2014 (r354620) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= openfire -PORTVERSION= 3.9.1 +PORTVERSION= 3.9.3 PORTEPOCH= 1 CATEGORIES= net-im java MASTER_SITES= http://download.igniterealtime.org/openfire/ @@ -25,9 +25,7 @@ DOS2UNIX_FILES= src/java/org/jivesoftwar USE_LDCONFIG= yes USE_ANT= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ - -CONFLICTS= wildfire-[0-9]* +JAVA_VERSION= 1.6 1.7 ALL_TARGET= openfire USE_RC_SUBR= openfire @@ -61,9 +59,9 @@ post-patch: do-install: @${MKDIR} ${STAGEDIR}${DATADIR}/lib - @${MKDIR} ${STAGEDIR}${VARLOG} - @${MKDIR} ${STAGEDIR}${VARDB} @${MKDIR} ${STAGEDIR}${ETCDIR} + @${MKDIR} ${STAGEDIR}${VARDB} + @${MKDIR} ${STAGEDIR}${VARLOG} (cd ${INSTALL_WRKSRC}/lib && ${INSTALL} -m 744 *.jar ${STAGEDIR}${DATADIR}/lib) (cd ${INSTALL_WRKSRC}/lib && ${INSTALL} -m 744 log4j.xml ${STAGEDIR}${DATADIR}/lib) @@ -88,16 +86,17 @@ do-install: (cd ${WRKSRC}/documentation/docs && ${FIND} . \! -path ./javadoc\* \ | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR} > /dev/null 2>&1 ) .endif - ${LN} -sf ${VARLOG} ${STAGEDIR}${DATADIR}/logs - ${LN} -sf ${VARDB} ${STAGEDIR}${DATADIR}/embedded-db ${LN} -sf ${ETCDIR} ${STAGEDIR}${DATADIR}/conf ${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} -m 600 ${INSTALL_WRKSRC}/resources/security/truststore \ ${STAGEDIR}${ETCDIR}/truststore.sample ${INSTALL} -m 600 ${INSTALL_WRKSRC}/resources/security/keystore \ ${STAGEDIR}${ETCDIR}/keystore.sample + ${INSTALL_DATA} ${INSTALL_WRKSRC}/conf/security.xml \ + ${STAGEDIR}${ETCDIR}/security.xml.sample .include Modified: head/net-im/openfire/distinfo ============================================================================== --- head/net-im/openfire/distinfo Tue May 20 08:56:38 2014 (r354619) +++ head/net-im/openfire/distinfo Tue May 20 09:14:02 2014 (r354620) @@ -1,2 +1,2 @@ -SHA256 (openfire_src_3_9_1.zip) = aa027461b1b895551ffcaadd4da03797847ac8c809955af8108ec677abbefaa1 -SIZE (openfire_src_3_9_1.zip) = 126568710 +SHA256 (openfire_src_3_9_3.zip) = ae111674abd3888700f7b6abe61b8a1a9d173faac6bc334f0c4686f9b319b8a0 +SIZE (openfire_src_3_9_3.zip) = 84477282 Modified: head/net-im/openfire/files/pkg-message.in ============================================================================== --- head/net-im/openfire/files/pkg-message.in Tue May 20 08:56:38 2014 (r354619) +++ head/net-im/openfire/files/pkg-message.in Tue May 20 09:14:02 2014 (r354620) @@ -5,5 +5,6 @@ The following sample configuration files placed in %%ETCDIR%%: openfire.xml.sample +security.xml.sample keystore.sample truststore.sample Modified: head/net-im/openfire/pkg-plist ============================================================================== --- head/net-im/openfire/pkg-plist Tue May 20 08:56:38 2014 (r354619) +++ head/net-im/openfire/pkg-plist Tue May 20 09:14:02 2014 (r354620) @@ -1,8 +1,14 @@ @owner openfire @group openfire -%%ETCDIR%%/openfire.xml.sample -%%ETCDIR%%/keystore.sample -%%ETCDIR%%/truststore.sample +@mode 0600 +@sample %%ETCDIR%%/openfire.xml.sample +@sample %%ETCDIR%%/security.xml.sample +@sample %%ETCDIR%%/keystore.sample +@sample %%ETCDIR%%/truststore.sample +@mode +%%DATADIR%%/conf +%%DATADIR%%/embedded-db +%%DATADIR%%/logs %%DATADIR%%/lib/activation.jar %%DATADIR%%/lib/bcpg-jdk15on.jar %%DATADIR%%/lib/bcpkix-jdk15on.jar @@ -21,9 +27,6 @@ %%DATADIR%%/lib/servlet.jar %%DATADIR%%/lib/slf4j-log4j12.jar %%DATADIR%%/lib/startup.jar -%%DATADIR%%/conf -%%DATADIR%%/embedded-db -%%DATADIR%%/logs %%DATADIR%%/plugins/admin/plugin.xml %%DATADIR%%/plugins/admin/webapp/WEB-INF/admin.tld %%DATADIR%%/plugins/admin/webapp/WEB-INF/decorators.xml @@ -184,6 +187,8 @@ %%DATADIR%%/plugins/admin/webapp/style/lightbox.css %%DATADIR%%/plugins/admin/webapp/style/login.css %%DATADIR%%/plugins/admin/webapp/style/setup.css +%%DATADIR%%/plugins/jitsivideobridge.jar +%%DATADIR%%/plugins/rayo.jar %%PLUGINS%%%%DATADIR%%/plugins/fastpath.jar %%PLUGINS%%%%DATADIR%%/plugins/broadcast.jar %%PLUGINS%%%%DATADIR%%/plugins/clientControl.jar