Attachment #251317 for bug #279607




PORTNAME=	archiva
PORTVERSION=	2.2.10
CATEGORIES=	www java
MASTER_SITES=	https://archive.apache.org/dist/${PORTNAME}/${PORTVERSION}/binaries/
DISTNAME=	apache-${PORTNAME}-${PORTVERSION}-bin

MAINTAINER=	freebsd@dussan.org
COMMENT=	Extensible repository management software
WWW=		https://archiva.apache.org/

LICENSE=	APACHE20
LICENSE_FILE=	${WRKSRC}/LICENSE


USE_RC_SUBR=	${PORTNAME}

PLIST_SUB=	ARCHIVA_CONF=${PREFIX}/${PORTNAME} \
		ARCHIVA_GROUP=${GROUPS} \
		ARCHIVA_HOME=${DATADIR} \
		ARCHIVA_USER=${USERS}

NO_ARCH=	yes
NO_BUILD=	yes

WRKSRC=		${WRKDIR}/apache-${PORTNAME}-${PORTVERSION}

PLIST_SUB=	ARCHIVA_CONF=${PREFIX}/${PORTNAME} \
		ARCHIVA_GROUP=${GROUPS} \
		ARCHIVA_HOME=${DATADIR} \
		ARCHIVA_USER=${USERS}

post-patch:
	@${REINPLACE_CMD} \
		-e 's|%%BASEDIR%%|${PREFIX}/${PORTNAME}|' \

Lines 1-3 Link Here

(-)b/www/archiva/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1502079137	1	TIMESTAMP = 1717933026
2	SHA256 (apache-archiva-2.2.3-bin.tar.gz) = cf90d097e7c2763f6ff8df458b64be0348b35847de8b238c3e1e28e006da8bad	2	SHA256 (apache-archiva-2.2.10-bin.tar.gz) = 9d468f5cd3d7f6841e133e853fc24e73fb62397091f1bb3601b6f157a5eadf77
3	SIZE (apache-archiva-2.2.3-bin.tar.gz) = 69995241	3	SIZE (apache-archiva-2.2.10-bin.tar.gz) = 68419100




--- bin/archiva.orig	2023-03-15 23:27:06 UTC
+++ bin/archiva
@@ -42,6 +42,7 @@ if [ -z "$ARCHIVA_BASE" ]; then

 if [ -z "$ARCHIVA_BASE" ]; then
   # discover BASEDIR
+  BASEDIR="%%LOCALBASE%%/archiva"
   BASEDIR=`dirname "$0"`/..
   BASEDIR=`(cd "$BASEDIR"; pwd)`
   ls -l "$0" | grep -e '->' > /dev/null 2>&1
@@ -57,10 +58,9 @@ if [ $? = 0 ]; then
 fi
 
 

Lines 1-7 Link Here

(-)b/www/archiva/pkg-descr (-7 / +8 lines)
1	Apache Archiva is an extensible repository management software that helps taking	1	Apache Archiva is an extensible repository management software that helps
2	care of your own personal or enterprise-wide build artifact repository. It is	2	taking care of your own personal or enterprise-wide build artifact
3	the perfect companion for build tools such as Maven, Continuum, and ANT.	3	repository. It is the perfect companion for build tools such as Maven,
		4	Continuum, and ANT.
4		5
5	Archiva offers several capabilities, amongst which remote repository proxying,	6	Archiva offers several capabilities, amongst which remote repository
6	security access management, build artifact storage, delivery, browsing, indexing	7	proxying, security access management, build artifact storage, delivery,
7	and usage reporting, extensible scanning functionality and many more!	8	browsing, indexing and usage reporting, extensible scanning functionality
		9	and many more!
8	-

Return to bug 279607

Lines 1-12 Link Here

(-)b/www/archiva/Makefile (-8 / +8 lines)
1	PORTNAME= archiva	1	PORTNAME= archiva
2	PORTVERSION= 2.2.3	2	PORTVERSION= 2.2.10
3	CATEGORIES= www java	3	CATEGORIES= www java
4	MASTER_SITES= APACHE/${PORTNAME}/${PORTVERSION}/binaries	4	MASTER_SITES= https://archive.apache.org/dist/${PORTNAME}/${PORTVERSION}/binaries/
5	DISTNAME= apache-${PORTNAME}-${PORTVERSION}-bin	5	DISTNAME= apache-${PORTNAME}-${PORTVERSION}-bin
6		6
7	MAINTAINER= freebsd@dussan.org	7	MAINTAINER= freebsd@dussan.org
8	COMMENT= Extensible repository management software	8	COMMENT= Extensible repository management software
9	WWW= https://archiva.apache.org	9	WWW= https://archiva.apache.org/
10		10
11	LICENSE= APACHE20	11	LICENSE= APACHE20
12	LICENSE_FILE= ${WRKSRC}/LICENSE	12	LICENSE_FILE= ${WRKSRC}/LICENSE
Lines 20-35 USE_JAVA= yes Link Here
20		20
21	USE_RC_SUBR= ${PORTNAME}	21	USE_RC_SUBR= ${PORTNAME}
22		22
23	PLIST_SUB= ARCHIVA_CONF=${PREFIX}/${PORTNAME} \
24	ARCHIVA_GROUP=${GROUPS} \
25	ARCHIVA_HOME=${DATADIR} \
26	ARCHIVA_USER=${USERS}
27
28	NO_ARCH= yes	23	NO_ARCH= yes
29	NO_BUILD= yes	24	NO_BUILD= yes
30		25
31	WRKSRC= ${WRKDIR}/apache-${PORTNAME}-${PORTVERSION}	26	WRKSRC= ${WRKDIR}/apache-${PORTNAME}-${PORTVERSION}
32		27
		28	PLIST_SUB= ARCHIVA_CONF=${PREFIX}/${PORTNAME} \
		29	ARCHIVA_GROUP=${GROUPS} \
		30	ARCHIVA_HOME=${DATADIR} \
		31	ARCHIVA_USER=${USERS}
		32
33	post-patch:	33	post-patch:
34	@${REINPLACE_CMD} \	34	@${REINPLACE_CMD} \
35	-e 's\|%%BASEDIR%%\|${PREFIX}/${PORTNAME}\|' \	35	-e 's\|%%BASEDIR%%\|${PREFIX}/${PORTNAME}\|' \

Lines 1-14 Link Here

(-)b/www/archiva/files/patch-bin_archiva (-11 / +10 lines)
1	--- bin/archiva.orig 2018-06-30 21:13:59.141026000 +0200	1	--- bin/archiva.orig 2023-03-15 23:27:06 UTC
2	+++ bin/archiva 2018-06-30 21:16:04.098265000 +0200	2	+++ bin/archiva
3	@@ -41,6 +41,7 @@ APP_NAME="archiva"	3	@@ -42,6 +42,7 @@ if [ -z "$ARCHIVA_BASE" ]; then
4	APP_LONG_NAME="Apache Archiva"	4
5		5	if [ -z "$ARCHIVA_BASE" ]; then
6	# discover BASEDIR	6	# discover BASEDIR
7	+BASEDIR="%%LOCALBASE%%/archiva"	7	+ BASEDIR="%%LOCALBASE%%/archiva"
8	BASEDIR=`dirname "$0"`/..	8	BASEDIR=`dirname "$0"`/..
9	BASEDIR=`(cd "$BASEDIR"; pwd)`	9	BASEDIR=`(cd "$BASEDIR"; pwd)`
10	ls -l "$0" \| grep -e '->' > /dev/null 2>&1	10	ls -l "$0" \| grep -e '->' > /dev/null 2>&1
11	@@ -57,10 +58,9 @@ if [ $? = 0 ]; then
12	fi	11	fi
13		12
14		13