1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-18 00:10:04 +00:00

net-im/openfire: Update to 4.6.5

- Change option names to be more readable
- Pet portclippy and portfmt

Changes:		http://download.igniterealtime.org/openfire/docs/4.6.5/changelog.html
PR:			260428
Approved by:		philip (mentor)
Differential Revision:	https://reviews.freebsd.org/D33556
This commit is contained in:
Nikita Druba 2021-12-19 10:03:23 +01:00 committed by Dries Michiels
parent 307d8ce4bd
commit 7c3d90bc94
5 changed files with 47 additions and 33 deletions

View File

@ -5,6 +5,16 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
20211220:
AFFECTS: users of net-im/openfire
AUTHOR: nikita@druba.su
The port options have been renamed to be more readable.
When not using the default options, they have to be regenerated.
# cd /usr/ports/net-im/openfire
# make config
20211213:
AFFECTS: users of emulators/qemu-utils
AUTHOR: bofh@FreeBSD.org

View File

@ -1,12 +1,12 @@
# Created by: Nikolay Pavlov <qpadla@gmail.com>
PORTNAME= openfire
PORTVERSION= 4.6.4
DISTVERSIONPREFIX= v
DISTVERSION= 4.6.5
PORTEPOCH= 1
CATEGORIES= net-im java
MASTER_SITES= https://github.com/igniterealtime/${PORTNAME}/archive/refs/tags/ \
LOCAL/pi:maven
DISTFILES= v${PORTVERSION}.tar.gz
MASTER_SITES= LOCAL/driesm:maven
MAINTAINER= nikita@druba.su
COMMENT= Enterprise instant messaging server
@ -16,39 +16,42 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
BUILD_DEPENDS= mvn:devel/maven
OPTIONS_DEFINE= DOCS TEST
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
USES= cpe
CPE_VENDOR= igniterealtime
USE_GITHUB= YES
GH_ACCOUNT= igniterealtime
GH_PROJECT= Openfire
USE_JAVA= yes
JAVA_VERSION= 1.8+
NO_ARCH= yes
CPE_VENDOR= igniterealtime
USE_RC_SUBR= ${PORTNAME}
NO_ARCH= yes
SUB_FILES+= pkg-message
WRKSRC= ${WRKDIR}/Openfire-${PORTVERSION}
INSTALL_WRKSRC= ${WRKSRC}/distribution/target/distribution-base/
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
VARLOG= /var/log/${PORTNAME}
VARDB= /var/db/${PORTNAME}
USERS= ${PORTNAME}
GROUPS= ${USERS}
PLIST_SUB+= VARLOG=${VARLOG} \
VARDB=${VARDB}
PLIST_SUB+= VARDB=${VARDB} \
VARLOG=${VARLOG}
OPTIONS_DEFINE= DOCS TEST
OPTIONS_DEFAULT= MAVEN_LOCAL
OPTIONS_SINGLE= MAVEN
OPTIONS_SINGLE_MAVEN= MAVEN_LOCAL MAVEN_ONLINE
MAVEN_DESC= Source of Maven build plugins
MAVEN_LOCAL_DESC= Use prefetch plugins from FreeBSD repository
MAVEN_ONLINE_DESC= Download last plugins during build process and store them into ~/.m2
MAVEN_LOCAL_DISTFILES= FreeBSD-${PORTNAME}-${PORTVERSION}-maven-repository.tar.gz:maven
MVN= mvn
MVN_TARGET= package
##
.include <bsd.port.options.mk>
##
.if ${PORT_OPTIONS:MTEST}
MVN_OPTS= -DskipTests=false
@ -56,11 +59,11 @@ MVN_OPTS= -DskipTests=false
MVN_OPTS= -DskipTests=true
.endif
.if ${PORT_OPTIONS:MLOCAL_M2}
.if ${PORT_OPTIONS:MMAVEN_LOCAL}
MVN_OPTS+= -o -Dmaven.repo.local=${WRKDIR}/m2
.endif
.if ${PORT_OPTIONS:MONLINE_M2}
.if ${PORT_OPTIONS:MMAVEN_ONLINE}
MVN_OPTS+= -U
.endif

View File

@ -1,5 +1,5 @@
TIMESTAMP = 1624266366
SHA256 (v4.6.4.tar.gz) = 7472674c2469b7fb1eb25edcb4b529eda0a49be335c146861656d766443bda23
SIZE (v4.6.4.tar.gz) = 6770705
SHA256 (FreeBSD-openfire-4.6.4-maven-repository.tar.gz) = 82a196764301a71f70f1a23bab4628772c9bfc05088a3a0328ef47df0b8ae453
SIZE (FreeBSD-openfire-4.6.4-maven-repository.tar.gz) = 253011622
TIMESTAMP = 1639904801
SHA256 (FreeBSD-openfire-4.6.5-maven-repository.tar.gz) = 45ad81374644afa5f1c72115353a060e7a0afd41eb7c88ea4c3fdc92a185862c
SIZE (FreeBSD-openfire-4.6.5-maven-repository.tar.gz) = 253194114
SHA256 (igniterealtime-Openfire-v4.6.5_GH0.tar.gz) = 4857e79fc14c4d0f2ac126a1e3b63e065275eb9360e249f3dac068d3fada91fe
SIZE (igniterealtime-Openfire-v4.6.5_GH0.tar.gz) = 6771039

View File

@ -40,7 +40,8 @@ pidfile=/var/run/${name}.pid
required_files="%%ETCDIR%%/openfire.xml"
java_options=" -server -jar ${openfire_javargs} \
-Dopenfire.lib.dir=${openfire_libdir} \
-DopenfireHome=${openfire_home}"
-DopenfireHome=${openfire_home} \
-Dlog4j.configurationFile=${openfire_libdir}/log4j2.xml"
java_command=" %%LOCALBASE%%/bin/java ${java_options} \
%%DATADIR%%/lib/startup.jar"

View File

@ -85,7 +85,7 @@
%%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.4.jar
%%DATADIR%%/lib/i18n-4.6.5.jar
%%DATADIR%%/lib/imageio-bmp-3.5.jar
%%DATADIR%%/lib/imageio-core-3.5.jar
%%DATADIR%%/lib/istack-commons-runtime-3.0.8.jar
@ -127,9 +127,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.13.3.jar
%%DATADIR%%/lib/log4j-core-2.13.3.jar
%%DATADIR%%/lib/log4j-slf4j-impl-2.13.3.jar
%%DATADIR%%/lib/log4j-api-2.15.0.jar
%%DATADIR%%/lib/log4j-core-2.15.0.jar
%%DATADIR%%/lib/log4j-slf4j-impl-2.15.0.jar
%%DATADIR%%/lib/log4j2.xml
%%DATADIR%%/lib/mina-core-2.1.3.jar
%%DATADIR%%/lib/mina-filter-compression-2.1.3.jar
@ -157,7 +157,7 @@
%%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.4.jar
%%DATADIR%%/lib/xmppserver-4.6.5.jar
%%DATADIR%%/lib/xpp3-1.1.4c.jar
%%DATADIR%%/logs
%%DATADIR%%/plugins/admin/plugin.xml