Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 14 Mar 2023 21:19:54 GMT
From:      Don Lewis <truckman@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 1cd93b0423e1 - main - textproc/lucene: Openoffice requires CONTRIB
Message-ID:  <202303142119.32ELJsf9035553@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by truckman:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1cd93b0423e1a07753ad87f7357cf60cac27b9d3

commit 1cd93b0423e1a07753ad87f7357cf60cac27b9d3
Author:     Don Lewis <truckman@FreeBSD.org>
AuthorDate: 2023-03-14 21:15:14 +0000
Commit:     Don Lewis <truckman@FreeBSD.org>
CommitDate: 2023-03-14 21:19:46 +0000

    textproc/lucene: Openoffice requires CONTRIB
    
    Note that editors/openoffice-* requires the CONTRIB option,
    which is enabled by default.
    
    Pet portlint.
    
    PR:             270158
    Reported by:    Ken Gunderson <kgunders@teamcool.net>
---
 textproc/lucene/Makefile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/textproc/lucene/Makefile b/textproc/lucene/Makefile
index a3475c765428..4e5c24752f35 100644
--- a/textproc/lucene/Makefile
+++ b/textproc/lucene/Makefile
@@ -11,22 +11,22 @@ WWW=		https://lucene.apache.org/core/
 
 LICENSE=	APACHE20
 
-CONFLICTS=	lucene4-[0-9].*
-
-PORTSCOUT=	limit:^3\.
-
 USES=		cpe tar:tgz
 USE_JAVA=	yes
 NO_BUILD=	yes
 NO_ARCH=	yes
 
+CONFLICTS=	lucene4-[0-9].*
+
+PORTSCOUT=	limit:^3\.
+
 CPE_VENDOR=	apache
 
 OPTIONS_DEFINE=	CONTRIB DOCS EXAMPLES
-CONTRIB_DESC=	Install contributed jars
+CONTRIB_DESC=	Install contributed jars (required by openoffice)
 OPTIONS_DEFAULT=	CONTRIB
 
-PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}-core-${PORTVERSION}.jar
+PLIST_FILES=	${JAVAJARDIR}/${PORTNAME}-core-${PORTVERSION}.jar
 
 CONTRIBS=	benchmark \
 		demo \
@@ -54,7 +54,7 @@ EXTRA_CONTRIBS_DIRS=	kuromoji \
 		stempel
 
 .for f in ${EXTRA_CONTRIBS_BASE} ${CONTRIBS} ${EXTRA_CONTRIBS_DIRS}
-CONTRIB_PLIST_FILES+=	%%JAVAJARDIR%%/${PORTNAME}-${f}-${PORTVERSION}.jar
+CONTRIB_PLIST_FILES+=	${JAVAJARDIR}/${PORTNAME}-${f}-${PORTVERSION}.jar
 .endfor
 
 PORTDOCS=	*



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303142119.32ELJsf9035553>