Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 24 Nov 2016 16:07:57 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r427041 - head/textproc/lucene4
Message-ID:  <201611241607.uAOG7vhU014495@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Thu Nov 24 16:07:57 2016
New Revision: 427041
URL: https://svnweb.freebsd.org/changeset/ports/427041

Log:
  - Add LICENSE_FILE
  - Add NO_ARCH
  - Pet portlint
  - Switch to options helpers
  - Cosmetic fixes

Modified:
  head/textproc/lucene4/Makefile

Modified: head/textproc/lucene4/Makefile
==============================================================================
--- head/textproc/lucene4/Makefile	Thu Nov 24 16:07:52 2016	(r427040)
+++ head/textproc/lucene4/Makefile	Thu Nov 24 16:07:57 2016	(r427041)
@@ -5,28 +5,25 @@ PORTNAME=	lucene
 PORTVERSION=	4.10.4
 CATEGORIES=	textproc java devel
 MASTER_SITES=	APACHE/${PORTNAME}/java/${PORTVERSION}
+PKGNAMESUFFIX=	4
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Full-text search engine for Java, 4.x branch
 
 LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 CONFLICTS=	lucene-[0-9].*
 
 USES=		tar:tgz
 USE_JAVA=	yes
-NO_BUILD=	yes
 JAVA_VERSION=	1.7+
-
-OPTIONS_DEFINE=	CONTRIB DOCS EXAMPLES
-CONTRIB_DESC=	Install contributed jars
-OPTIONS_DEFAULT=	CONTRIB
+NO_BUILD=	yes
+NO_ARCH=	yes
 
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}-core-${PORTVERSION}.jar
-PKGNAMESUFFIX:=	4
-LASTEST_LINK=	${PORTNAME}4
-
-.include <bsd.port.options.mk>
+PORTDOCS=	*
+PORTEXAMPLES=	*
 
 CONTRIBS=	benchmark \
 		classification \
@@ -46,7 +43,8 @@ CONTRIBS=	benchmark \
 		spatial \
 		suggest
 
-EXTRA_CONTRIBS_DIRS=	common \
+EXTRA_CONTRIBS_DIRS= \
+		common \
 		icu \
 		kuromoji \
 		morfologik \
@@ -55,33 +53,36 @@ EXTRA_CONTRIBS_DIRS=	common \
 		stempel \
 		uima
 
-.if ${PORT_OPTIONS:MCONTRIB}
+OPTIONS_DEFINE=	CONTRIB DOCS EXAMPLES
+OPTIONS_DEFAULT=CONTRIB
+CONTRIB_DESC=	Install contributed jars
+
 .for f in ${CONTRIBS}
-PLIST_FILES+=%%JAVAJARDIR%%/${PORTNAME}-${f}-${PORTVERSION}.jar
+CONTRIB_PLIST_FILES+=	%%JAVAJARDIR%%/${PORTNAME}-${f}-${PORTVERSION}.jar
 .endfor
 .for g in ${EXTRA_CONTRIBS_DIRS}
-PLIST_FILES+=%%JAVAJARDIR%%/${PORTNAME}-analyzers-${g}-${PORTVERSION}.jar
+CONTRIB_PLIST_FILES+=	%%JAVAJARDIR%%/${PORTNAME}-analyzers-${g}-${PORTVERSION}.jar
 .endfor
-.endif
-
-PORTDOCS=	*
-PORTEXAMPLES=	*
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/core/${PORTNAME}-core-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}
-.if ${PORT_OPTIONS:MCONTRIB}
-. for f in ${CONTRIBS}
+
+do-install-CONTRIB-on:
+.for f in ${CONTRIBS}
 	${INSTALL_DATA} ${WRKSRC}/${f}/${PORTNAME}-${f}-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}
-. endfor
-. for d in ${EXTRA_CONTRIBS_DIRS}
+.endfor
+.for d in ${EXTRA_CONTRIBS_DIRS}
 	${INSTALL_DATA} ${WRKSRC}/analysis/${d}/${PORTNAME}-analyzers-${d}-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}
-. endfor
-.endif
+.endfor
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in CHANGES.txt NOTICE.txt README.txt
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
+
+do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/demo/${PORTNAME}-demo-${PORTVERSION}.jar ${STAGEDIR}${EXAMPLESDIR}
 



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