Attachment #230239 for bug #260428

Lines 5-10 they are unavoidable. Link Here

(-)b/UPDATING (+6 lines)
5	You should get into the habit of checking this file for changes each time	5	You should get into the habit of checking this file for changes each time
6	you update your ports collection, before attempting any port upgrades.	6	you update your ports collection, before attempting any port upgrades.
7		7
		8	20211220:
		9	AFFECTS: users of net-im/openfire
		10	AUTHOR: nikita@druba.su
		11
		12	The config options have been renamed to be more readable, run make config to regenerate your config.
		13
8	20211213:	14	20211213:
9	AFFECTS: users of emulators/qemu-utils	15	AFFECTS: users of emulators/qemu-utils
10	AUTHOR: bofh@FreeBSD.org	16	AUTHOR: bofh@FreeBSD.org




# Created by: Nikolay Pavlov <qpadla@gmail.com>

PORTNAME=	openfire
DISTVERSIONPREFIX=	v
DISTVERSION=	4.6.5
PORTEPOCH=	1
CATEGORIES=	net-im java

MASTER_SITES=	LOCAL/pi:maven
DISTFILES=	v${PORTVERSION}.tar.gz

MAINTAINER=	nikita@druba.su
COMMENT=	Enterprise instant messaging server


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+=	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

MVN_OPTS=	-DskipTests=true
.endif

.if ${PORT_OPTIONS:MMAVEN_LOCAL}
MVN_OPTS+=	-o -Dmaven.repo.local=${WRKDIR}/m2
.endif

.if ${PORT_OPTIONS:MMAVEN_ONLINE}
MVN_OPTS+=	-U
.endif


Lines 1-5 Link Here

(-)b/net-im/openfire/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1624266366	1	1639538846
2	SHA256 (v4.6.4.tar.gz) = 7472674c2469b7fb1eb25edcb4b529eda0a49be335c146861656d766443bda23	2	SHA256 (igniterealtime-Openfire-4.6.5-v4.6.5_GH0.tar.gz) = 4857e79fc14c4d0f2ac126a1e3b63e065275eb9360e249f3dac068d3fada91fe
3	SIZE (v4.6.4.tar.gz) = 6770705	3	SIZE (igniterealtime-Openfire-4.6.5-v4.6.5_GH0.tar.gz) = 6771039
4	SHA256 (FreeBSD-openfire-4.6.4-maven-repository.tar.gz) = 82a196764301a71f70f1a23bab4628772c9bfc05088a3a0328ef47df0b8ae453	4	SHA256 (FreeBSD-openfire-4.6.5-maven-repository.tar.gz) = 45ad81374644afa5f1c72115353a060e7a0afd41eb7c88ea4c3fdc92a185862c
5	SIZE (FreeBSD-openfire-4.6.4-maven-repository.tar.gz) = 253011622	5	SIZE (FreeBSD-openfire-4.6.5-maven-repository.tar.gz) = 253194114

Lines 40-46 pidfile=/var/run/${name}.pid Link Here

(-)b/net-im/openfire/files/openfire.in (-1 / +2 lines)
40	required_files="%%ETCDIR%%/openfire.xml"	40	required_files="%%ETCDIR%%/openfire.xml"
41	java_options=" -server -jar ${openfire_javargs} \	41	java_options=" -server -jar ${openfire_javargs} \
42	-Dopenfire.lib.dir=${openfire_libdir} \	42	-Dopenfire.lib.dir=${openfire_libdir} \
43	-DopenfireHome=${openfire_home}"	43	-DopenfireHome=${openfire_home} \
		44	-Dlog4j.configurationFile=${openfire_libdir}/log4j2.xml"
44		45
45	java_command=" %%LOCALBASE%%/bin/java ${java_options} \	46	java_command=" %%LOCALBASE%%/bin/java ${java_options} \
46	%%DATADIR%%/lib/startup.jar"	47	%%DATADIR%%/lib/startup.jar"




%%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.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

%%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.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

%%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.5.jar
%%DATADIR%%/lib/xpp3-1.1.4c.jar
%%DATADIR%%/logs
%%DATADIR%%/plugins/admin/plugin.xml

Return to bug 260428

Lines 1-12 Link Here

(-)b/net-im/openfire/Makefile (-20 / +24 lines)
1	# Created by: Nikolay Pavlov <qpadla@gmail.com>	1	# Created by: Nikolay Pavlov <qpadla@gmail.com>
2		2
3	PORTNAME= openfire	3	PORTNAME= openfire
4	PORTVERSION= 4.6.4	4	DISTVERSIONPREFIX= v
		5	DISTVERSION= 4.6.5
5	PORTEPOCH= 1	6	PORTEPOCH= 1
6	CATEGORIES= net-im java	7	CATEGORIES= net-im java
7	MASTER_SITES= https://github.com/igniterealtime/${PORTNAME}/archive/refs/tags/ \	8
8	LOCAL/pi:maven	9	MASTER_SITES= LOCAL/pi:maven
9	DISTFILES= v${PORTVERSION}.tar.gz
10		10
11	MAINTAINER= nikita@druba.su	11	MAINTAINER= nikita@druba.su
12	COMMENT= Enterprise instant messaging server	12	COMMENT= Enterprise instant messaging server
Lines 16-48 LICENSE_FILE= ${WRKSRC}/LICENSE.txt Link Here
16		16
17	BUILD_DEPENDS= mvn:devel/maven	17	BUILD_DEPENDS= mvn:devel/maven
18		18
19	OPTIONS_DEFINE= DOCS TEST
20	OPTIONS_SINGLE= MAVEN
21	OPTIONS_SINGLE_MAVEN= LOCAL_M2 ONLINE_M2
22	MAVEN_DESC= Source of Maven build plugins
23	LOCAL_M2_DESC= Use prefetch plugins from FreeBSD repository
24	ONLINE_M2_DESC= Download last plugins during build process (into ~/.m2)
25	OPTIONS_DEFAULT= LOCAL_M2
26	LOCAL_M2_DISTFILES= FreeBSD-${PORTNAME}-${PORTVERSION}-maven-repository.tar.gz:maven
27
28	USES= cpe	19	USES= cpe
		20	CPE_VENDOR= igniterealtime
		21	USE_GITHUB= YES
		22	GH_ACCOUNT= igniterealtime
		23	GH_PROJECT= Openfire
29	USE_JAVA= yes	24	USE_JAVA= yes
30	JAVA_VERSION= 1.8+	25	JAVA_VERSION= 1.8+
31	NO_ARCH= yes
32	CPE_VENDOR= igniterealtime
33		26
34	USE_RC_SUBR= ${PORTNAME}	27	USE_RC_SUBR= ${PORTNAME}
		28	NO_ARCH= yes
35	SUB_FILES+= pkg-message	29	SUB_FILES+= pkg-message
36		30
37	WRKSRC= ${WRKDIR}/Openfire-${PORTVERSION}
38	INSTALL_WRKSRC= ${WRKSRC}/distribution/target/distribution-base/	31	INSTALL_WRKSRC= ${WRKSRC}/distribution/target/distribution-base/
39	DATADIR= ${JAVASHAREDIR}/${PORTNAME}	32	DATADIR= ${JAVASHAREDIR}/${PORTNAME}
40	VARLOG= /var/log/${PORTNAME}	33	VARLOG= /var/log/${PORTNAME}
41	VARDB= /var/db/${PORTNAME}	34	VARDB= /var/db/${PORTNAME}
42	USERS= ${PORTNAME}	35	USERS= ${PORTNAME}
43	GROUPS= ${USERS}	36	GROUPS= ${USERS}
44	PLIST_SUB+= VARLOG=${VARLOG} \	37	PLIST_SUB+= VARDB=${VARDB} \
45	VARDB=${VARDB}	38	VARLOG=${VARLOG}
		39
		40	OPTIONS_DEFINE= DOCS TEST
		41	OPTIONS_DEFAULT= MAVEN_LOCAL
		42	OPTIONS_SINGLE= MAVEN
		43	OPTIONS_SINGLE_MAVEN= MAVEN_LOCAL MAVEN_ONLINE
		44
		45	MAVEN_DESC= Source of Maven build plugins
		46	MAVEN_LOCAL_DESC= Use prefetch plugins from FreeBSD repository
		47	MAVEN_ONLINE_DESC= Download last plugins during build process and store them into ~/.m2
		48
		49	MAVEN_LOCAL_DISTFILES= FreeBSD-${PORTNAME}-${PORTVERSION}-maven-repository.tar.gz:maven
46		50
47	MVN= mvn	51	MVN= mvn
48	MVN_TARGET= package	52	MVN_TARGET= package
Lines 56-66 MVN_OPTS= -DskipTests=false Link Here
56	MVN_OPTS= -DskipTests=true	60	MVN_OPTS= -DskipTests=true
57	.endif	61	.endif
58		62
59	.if ${PORT_OPTIONS:MLOCAL_M2}	63	.if ${PORT_OPTIONS:MMAVEN_LOCAL}
60	MVN_OPTS+= -o -Dmaven.repo.local=${WRKDIR}/m2	64	MVN_OPTS+= -o -Dmaven.repo.local=${WRKDIR}/m2
61	.endif	65	.endif
62		66
63	.if ${PORT_OPTIONS:MONLINE_M2}	67	.if ${PORT_OPTIONS:MMAVEN_ONLINE}
64	MVN_OPTS+= -U	68	MVN_OPTS+= -U
65	.endif	69	.endif
66		70

Lines 85-91 Link Here

(-)b/net-im/openfire/pkg-plist (-5 / +5 lines)
85	%%DATADIR%%/lib/hsqldb-2.4.1.jar	85	%%DATADIR%%/lib/hsqldb-2.4.1.jar
86	%%DATADIR%%/lib/httpclient-4.5.13.jar	86	%%DATADIR%%/lib/httpclient-4.5.13.jar
87	%%DATADIR%%/lib/httpcore-4.4.13.jar	87	%%DATADIR%%/lib/httpcore-4.4.13.jar
88	%%DATADIR%%/lib/i18n-4.6.4.jar	88	%%DATADIR%%/lib/i18n-4.6.5.jar
89	%%DATADIR%%/lib/imageio-bmp-3.5.jar	89	%%DATADIR%%/lib/imageio-bmp-3.5.jar
90	%%DATADIR%%/lib/imageio-core-3.5.jar	90	%%DATADIR%%/lib/imageio-core-3.5.jar
91	%%DATADIR%%/lib/istack-commons-runtime-3.0.8.jar	91	%%DATADIR%%/lib/istack-commons-runtime-3.0.8.jar
Lines 127-135 Link Here
127	%%DATADIR%%/lib/jzlib-1.1.3.jar	127	%%DATADIR%%/lib/jzlib-1.1.3.jar
128	%%DATADIR%%/lib/libidn-1.35.jar	128	%%DATADIR%%/lib/libidn-1.35.jar
129	%%DATADIR%%/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar	129	%%DATADIR%%/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
130	%%DATADIR%%/lib/log4j-api-2.13.3.jar	130	%%DATADIR%%/lib/log4j-api-2.15.0.jar
131	%%DATADIR%%/lib/log4j-core-2.13.3.jar	131	%%DATADIR%%/lib/log4j-core-2.15.0.jar
132	%%DATADIR%%/lib/log4j-slf4j-impl-2.13.3.jar	132	%%DATADIR%%/lib/log4j-slf4j-impl-2.15.0.jar
133	%%DATADIR%%/lib/log4j2.xml	133	%%DATADIR%%/lib/log4j2.xml
134	%%DATADIR%%/lib/mina-core-2.1.3.jar	134	%%DATADIR%%/lib/mina-core-2.1.3.jar
135	%%DATADIR%%/lib/mina-filter-compression-2.1.3.jar	135	%%DATADIR%%/lib/mina-filter-compression-2.1.3.jar
Lines 157-163 Link Here
157	%%DATADIR%%/lib/websocket-common-9.4.35.v20201120.jar	157	%%DATADIR%%/lib/websocket-common-9.4.35.v20201120.jar
158	%%DATADIR%%/lib/websocket-server-9.4.35.v20201120.jar	158	%%DATADIR%%/lib/websocket-server-9.4.35.v20201120.jar
159	%%DATADIR%%/lib/websocket-servlet-9.4.35.v20201120.jar	159	%%DATADIR%%/lib/websocket-servlet-9.4.35.v20201120.jar
160	%%DATADIR%%/lib/xmppserver-4.6.4.jar	160	%%DATADIR%%/lib/xmppserver-4.6.5.jar
161	%%DATADIR%%/lib/xpp3-1.1.4c.jar	161	%%DATADIR%%/lib/xpp3-1.1.4c.jar
162	%%DATADIR%%/logs	162	%%DATADIR%%/logs
163	%%DATADIR%%/plugins/admin/plugin.xml	163	%%DATADIR%%/plugins/admin/plugin.xml