Index: Makefile =================================================================== --- Makefile (revision 555438) +++ Makefile (working copy) @@ -2,33 +2,43 @@ # $FreeBSD$ PORTNAME= openfire -PORTVERSION= 4.5.4 +PORTVERSION= 4.6.0 PORTREVISION= 0 PORTEPOCH= 1 CATEGORIES= net-im java MASTER_SITES= https://github.com/igniterealtime/${PORTNAME}/releases/download/v${PORTVERSION}/ \ LOCAL/pi:maven -DISTFILES= ${PORTNAME}_src_${PORTVERSION:S/./_/g}.tar.gz \ - FreeBSD-${PORTNAME}-${PORTVERSION}-maven-repository.tar.gz:maven - +DISTFILES= ${PORTNAME}_src_${PORTVERSION:S/./_/g}.tar.gz MAINTAINER= nikita@druba.su COMMENT= Enterprise instant messaging server - LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt +NO_ARCH= yes +CPE_VENDOR= igniterealtime +USE_RC_SUBR= ${PORTNAME} +SUB_FILES+= pkg-message +USE_JAVA= yes +JAVA_VERSION= 1.8+ BUILD_DEPENDS= mvn:devel/maven OPTIONS_DEFINE= DOCS +OPTIONS_SINGLE= MAVEN +OPTIONS_SINGLE_MAVEN= LOCAL_M2 ONLINE_M2 +MAVEN_DESC= Source of Maven build plugins +LOCAL_M2_DESC= Use prefetch plugins from FreeBSD repository +ONLINE_M2_DESC= Download last plugins during build process (into ~/.m2) +OPTIONS_DEFAULT= LOCAL_M2 +LOCAL_M2_DISTFILES= FreeBSD-${PORTNAME}-${PORTVERSION}-maven-repository.tar.gz:maven +############################## +.include +############################## +.if ${PORT_OPTIONS:MLOCAL_M2} +MVN_OPTS= -o -Dmaven.repo.local=${WRKDIR}/m2 +.else +MVN_OPTS= +.endif -USE_JAVA= yes -JAVA_VERSION= 1.8+ -NO_ARCH= yes -CPE_VENDOR= igniterealtime - -USE_RC_SUBR= ${PORTNAME} -SUB_FILES+= pkg-message - WRKSRC= ${WRKDIR}/Openfire-${PORTVERSION} INSTALL_WRKSRC= ${WRKSRC}/distribution/target/distribution-base/ DATADIR= ${JAVASHAREDIR}/${PORTNAME} @@ -40,7 +50,6 @@ VARDB=${VARDB} MVN= mvn -MVN_OPTS= -o -Dmaven.repo.local=${WRKDIR}/m2 MVN_TARGET= package do-build: Index: distinfo =================================================================== --- distinfo (revision 555438) +++ distinfo (working copy) @@ -1,5 +1,5 @@ -TIMESTAMP = 1602481238 -SHA256 (openfire_src_4_5_4.tar.gz) = 2036b9bec3e2f004fe109e2285a4f181590d9ba90a9cb609ed8510ef30cbac81 -SIZE (openfire_src_4_5_4.tar.gz) = 6654011 -SHA256 (FreeBSD-openfire-4.5.4-maven-repository.tar.gz) = cfc043b53d4c9719a5f9c0d1b5c72ea83ff856218cd3418c28fdcbfb026a8e9e -SIZE (FreeBSD-openfire-4.5.4-maven-repository.tar.gz) = 118391455 +TIMESTAMP = 1605483196 +SHA256 (openfire_src_4_6_0.tar.gz) = b88accbfeeb07e0e99b2055d93d1d4604ba2cf84d40b0536e7444e060b96440d +SIZE (openfire_src_4_6_0.tar.gz) = 6744193 +SHA256 (FreeBSD-openfire-4.6.0-maven-repository.tar.gz) = b8a7eb8929683f781801c931a902af70e7057f3f81e5a374464069c868cae049 +SIZE (FreeBSD-openfire-4.6.0-maven-repository.tar.gz) = 119671982 Index: pkg-plist =================================================================== --- pkg-plist (revision 555438) +++ pkg-plist (working copy) @@ -9,24 +9,65 @@ @mode @dir %%DATADIR%% @dir %%DATADIR%%/plugins +%%PORTDOCS%%%%DOCSDIR%%/database-guide.html +%%PORTDOCS%%%%DOCSDIR%%/database.html +%%PORTDOCS%%%%DOCSDIR%%/db-integration-guide.html +%%PORTDOCS%%%%DOCSDIR%%/ide-vscode-setup.html +%%PORTDOCS%%%%DOCSDIR%%/images/VSCode-1.png +%%PORTDOCS%%%%DOCSDIR%%/images/VSCode-2.png +%%PORTDOCS%%%%DOCSDIR%%/images/VSCode-3.png +%%PORTDOCS%%%%DOCSDIR%%/images/VSCode-4.png +%%PORTDOCS%%%%DOCSDIR%%/images/VSCode-5.png +%%PORTDOCS%%%%DOCSDIR%%/images/VSCode-6.png +%%PORTDOCS%%%%DOCSDIR%%/images/VSCode-7.png +%%PORTDOCS%%%%DOCSDIR%%/images/VSCode-8.png +%%PORTDOCS%%%%DOCSDIR%%/images/VSCode-9.png +%%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-dom4j.txt +%%PORTDOCS%%%%DOCSDIR%%/licenses/LICENSE-jaxen.txt +%%PORTDOCS%%%%DOCSDIR%%/licenses/LICENSE-xpp3.txt +%%PORTDOCS%%%%DOCSDIR%%/openfire.doap +%%PORTDOCS%%%%DOCSDIR%%/overlay.html +%%PORTDOCS%%%%DOCSDIR%%/pluggable-roster-support-guide.html +%%PORTDOCS%%%%DOCSDIR%%/plugin-dev-guide.html +%%PORTDOCS%%%%DOCSDIR%%/protocol-support.html +%%PORTDOCS%%%%DOCSDIR%%/separating-admin-users-guide.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 %%DATADIR%%/conf %%DATADIR%%/embedded-db %%DATADIR%%/lib/activation-1.1.jar %%DATADIR%%/lib/animal-sniffer-annotations-1.17.jar -%%DATADIR%%/lib/ant-1.10.5.jar -%%DATADIR%%/lib/ant-launcher-1.10.5.jar -%%DATADIR%%/lib/apache-el-8.5.49.jar -%%DATADIR%%/lib/apache-jsp-8.5.49.jar -%%DATADIR%%/lib/apache-jsp-9.4.28.v20200408.jar -%%DATADIR%%/lib/asm-7.2.jar -%%DATADIR%%/lib/asm-analysis-7.2.jar -%%DATADIR%%/lib/asm-commons-7.2.jar -%%DATADIR%%/lib/asm-tree-7.2.jar +%%DATADIR%%/lib/ant-1.10.8.jar +%%DATADIR%%/lib/ant-launcher-1.10.8.jar +%%DATADIR%%/lib/apache-el-8.5.54.jar +%%DATADIR%%/lib/apache-jsp-8.5.54.jar +%%DATADIR%%/lib/apache-jsp-9.4.31.v20200723.jar +%%DATADIR%%/lib/asm-7.3.1.jar +%%DATADIR%%/lib/asm-analysis-7.3.1.jar +%%DATADIR%%/lib/asm-commons-7.3.1.jar +%%DATADIR%%/lib/asm-tree-7.3.1.jar %%DATADIR%%/lib/bcpg-jdk15on-1.65.jar %%DATADIR%%/lib/bcpkix-jdk15on-1.65.jar %%DATADIR%%/lib/bcprov-jdk15on-1.65.jar %%DATADIR%%/lib/caffeine-2.7.0.jar %%DATADIR%%/lib/checker-qual-2.5.2.jar +%%DATADIR%%/lib/common-image-3.5.jar +%%DATADIR%%/lib/common-io-3.5.jar +%%DATADIR%%/lib/common-lang-3.5.jar %%DATADIR%%/lib/commons-codec-1.12.jar %%DATADIR%%/lib/commons-dbcp2-2.6.0.jar %%DATADIR%%/lib/commons-fileupload-1.4.jar @@ -44,7 +85,9 @@ %%DATADIR%%/lib/hsqldb-2.4.1.jar %%DATADIR%%/lib/httpclient-4.5.8.jar %%DATADIR%%/lib/httpcore-4.4.11.jar -%%DATADIR%%/lib/i18n-4.5.4.jar +%%DATADIR%%/lib/i18n-4.6.0.jar +%%DATADIR%%/lib/imageio-bmp-3.5.jar +%%DATADIR%%/lib/imageio-core-3.5.jar %%DATADIR%%/lib/j2objc-annotations-1.1.jar %%DATADIR%%/lib/javassist-3.24.1-GA.jar %%DATADIR%%/lib/javax.activation-api-1.2.0.jar @@ -54,24 +97,24 @@ %%DATADIR%%/lib/jaxb-api-2.3.1.jar %%DATADIR%%/lib/jaxen-1.2.0.jar %%DATADIR%%/lib/jcip-annotations-1.0.jar -%%DATADIR%%/lib/jcl-over-slf4j-1.7.26.jar +%%DATADIR%%/lib/jcl-over-slf4j-1.7.30.jar %%DATADIR%%/lib/jdom2-2.0.6.jar -%%DATADIR%%/lib/jetty-annotations-9.4.28.v20200408.jar -%%DATADIR%%/lib/jetty-client-9.4.28.v20200408.jar -%%DATADIR%%/lib/jetty-continuation-9.4.28.v20200408.jar -%%DATADIR%%/lib/jetty-http-9.4.28.v20200408.jar -%%DATADIR%%/lib/jetty-io-9.4.28.v20200408.jar -%%DATADIR%%/lib/jetty-jmx-9.4.28.v20200408.jar -%%DATADIR%%/lib/jetty-jndi-9.4.28.v20200408.jar -%%DATADIR%%/lib/jetty-plus-9.4.28.v20200408.jar +%%DATADIR%%/lib/jetty-annotations-9.4.31.v20200723.jar +%%DATADIR%%/lib/jetty-client-9.4.31.v20200723.jar +%%DATADIR%%/lib/jetty-continuation-9.4.31.v20200723.jar +%%DATADIR%%/lib/jetty-http-9.4.31.v20200723.jar +%%DATADIR%%/lib/jetty-io-9.4.31.v20200723.jar +%%DATADIR%%/lib/jetty-jmx-9.4.31.v20200723.jar +%%DATADIR%%/lib/jetty-jndi-9.4.31.v20200723.jar +%%DATADIR%%/lib/jetty-plus-9.4.31.v20200723.jar %%DATADIR%%/lib/jetty-schemas-3.1.2.jar -%%DATADIR%%/lib/jetty-security-9.4.28.v20200408.jar -%%DATADIR%%/lib/jetty-server-9.4.28.v20200408.jar -%%DATADIR%%/lib/jetty-servlet-9.4.28.v20200408.jar -%%DATADIR%%/lib/jetty-servlets-9.4.28.v20200408.jar -%%DATADIR%%/lib/jetty-util-9.4.28.v20200408.jar -%%DATADIR%%/lib/jetty-webapp-9.4.28.v20200408.jar -%%DATADIR%%/lib/jetty-xml-9.4.28.v20200408.jar +%%DATADIR%%/lib/jetty-security-9.4.31.v20200723.jar +%%DATADIR%%/lib/jetty-server-9.4.31.v20200723.jar +%%DATADIR%%/lib/jetty-servlet-9.4.31.v20200723.jar +%%DATADIR%%/lib/jetty-servlets-9.4.31.v20200723.jar +%%DATADIR%%/lib/jetty-util-9.4.31.v20200723.jar +%%DATADIR%%/lib/jetty-webapp-9.4.31.v20200723.jar +%%DATADIR%%/lib/jetty-xml-9.4.31.v20200723.jar %%DATADIR%%/lib/jmdns-1.0.jar %%DATADIR%%/lib/jsmpp-2.3.7.jar %%DATADIR%%/lib/jsr305-3.0.2.jar @@ -79,9 +122,9 @@ %%DATADIR%%/lib/jzlib-1.1.3.jar %%DATADIR%%/lib/libidn-1.35.jar %%DATADIR%%/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar -%%DATADIR%%/lib/log4j-api-2.11.2.jar -%%DATADIR%%/lib/log4j-core-2.11.2.jar -%%DATADIR%%/lib/log4j-slf4j-impl-2.11.2.jar +%%DATADIR%%/lib/log4j-api-2.13.3.jar +%%DATADIR%%/lib/log4j-core-2.13.3.jar +%%DATADIR%%/lib/log4j-slf4j-impl-2.13.3.jar %%DATADIR%%/lib/log4j2.xml %%DATADIR%%/lib/mina-core-2.1.3.jar %%DATADIR%%/lib/mina-filter-compression-2.1.3.jar @@ -89,25 +132,25 @@ %%DATADIR%%/lib/mina-integration-jmx-2.1.3.jar %%DATADIR%%/lib/mina-integration-ognl-2.1.3.jar %%DATADIR%%/lib/mssql-jdbc-7.2.2.jre8.jar -%%DATADIR%%/lib/mysql-connector-java-8.0.17.jar +%%DATADIR%%/lib/mysql-connector-java-8.0.21.jar %%DATADIR%%/lib/ognl-3.2.10.jar %%DATADIR%%/lib/postgresql-42.2.14.jar -%%DATADIR%%/lib/protobuf-java-3.6.1.jar +%%DATADIR%%/lib/protobuf-java-3.11.4.jar %%DATADIR%%/lib/rome-1.12.0.jar %%DATADIR%%/lib/rome-utils-1.12.0.jar %%DATADIR%%/lib/shaj-0.5.jar %%DATADIR%%/lib/sitemesh-2.4.2.jar -%%DATADIR%%/lib/slf4j-api-1.7.26.jar +%%DATADIR%%/lib/slf4j-api-1.7.30.jar %%DATADIR%%/lib/startup.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/websocket-api-9.4.28.v20200408.jar -%%DATADIR%%/lib/websocket-client-9.4.28.v20200408.jar -%%DATADIR%%/lib/websocket-common-9.4.28.v20200408.jar -%%DATADIR%%/lib/websocket-server-9.4.28.v20200408.jar -%%DATADIR%%/lib/websocket-servlet-9.4.28.v20200408.jar -%%DATADIR%%/lib/xmppserver-4.5.4.jar +%%DATADIR%%/lib/websocket-api-9.4.31.v20200723.jar +%%DATADIR%%/lib/websocket-client-9.4.31.v20200723.jar +%%DATADIR%%/lib/websocket-common-9.4.31.v20200723.jar +%%DATADIR%%/lib/websocket-server-9.4.31.v20200723.jar +%%DATADIR%%/lib/websocket-servlet-9.4.31.v20200723.jar +%%DATADIR%%/lib/xmppserver-4.6.0.jar %%DATADIR%%/lib/xpp3-1.1.4c.jar %%DATADIR%%/logs %%DATADIR%%/plugins/admin/plugin.xml @@ -449,6 +492,20 @@ %%DATADIR%%/resources/database/upgrade/30/openfire_postgresql.sql %%DATADIR%%/resources/database/upgrade/30/openfire_sqlserver.sql %%DATADIR%%/resources/database/upgrade/30/openfire_sybase.sql +%%DATADIR%%/resources/database/upgrade/31/openfire_db2.sql +%%DATADIR%%/resources/database/upgrade/31/openfire_hsqldb.sql +%%DATADIR%%/resources/database/upgrade/31/openfire_mysql.sql +%%DATADIR%%/resources/database/upgrade/31/openfire_oracle.sql +%%DATADIR%%/resources/database/upgrade/31/openfire_postgresql.sql +%%DATADIR%%/resources/database/upgrade/31/openfire_sqlserver.sql +%%DATADIR%%/resources/database/upgrade/31/openfire_sybase.sql +%%DATADIR%%/resources/database/upgrade/32/openfire_db2.sql +%%DATADIR%%/resources/database/upgrade/32/openfire_hsqldb.sql +%%DATADIR%%/resources/database/upgrade/32/openfire_mysql.sql +%%DATADIR%%/resources/database/upgrade/32/openfire_oracle.sql +%%DATADIR%%/resources/database/upgrade/32/openfire_postgresql.sql +%%DATADIR%%/resources/database/upgrade/32/openfire_sqlserver.sql +%%DATADIR%%/resources/database/upgrade/32/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 @@ -494,43 +551,6 @@ %%DATADIR%%/resources/security %%DATADIR%%/resources/spank/WEB-INF/web.xml %%DATADIR%%/resources/spank/index.html -%%PORTDOCS%%%%DOCSDIR%%/database-guide.html -%%PORTDOCS%%%%DOCSDIR%%/database.html -%%PORTDOCS%%%%DOCSDIR%%/db-integration-guide.html -%%PORTDOCS%%%%DOCSDIR%%/ide-vscode-setup.html -%%PORTDOCS%%%%DOCSDIR%%/images/VSCode-1.png -%%PORTDOCS%%%%DOCSDIR%%/images/VSCode-2.png -%%PORTDOCS%%%%DOCSDIR%%/images/VSCode-3.png -%%PORTDOCS%%%%DOCSDIR%%/images/VSCode-4.png -%%PORTDOCS%%%%DOCSDIR%%/images/VSCode-5.png -%%PORTDOCS%%%%DOCSDIR%%/images/VSCode-6.png -%%PORTDOCS%%%%DOCSDIR%%/images/VSCode-7.png -%%PORTDOCS%%%%DOCSDIR%%/images/VSCode-8.png -%%PORTDOCS%%%%DOCSDIR%%/images/VSCode-9.png -%%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-dom4j.txt -%%PORTDOCS%%%%DOCSDIR%%/licenses/LICENSE-jaxen.txt -%%PORTDOCS%%%%DOCSDIR%%/licenses/LICENSE-xpp3.txt -%%PORTDOCS%%%%DOCSDIR%%/overlay.html -%%PORTDOCS%%%%DOCSDIR%%/pluggable-roster-support-guide.html -%%PORTDOCS%%%%DOCSDIR%%/plugin-dev-guide.html -%%PORTDOCS%%%%DOCSDIR%%/protocol-support.html -%%PORTDOCS%%%%DOCSDIR%%/separating-admin-users-guide.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 @dir %%DATADIR%%/plugins/admin/webapp/decorators @dir %%VARDB%% @dir %%VARLOG%%