Date: Tue, 20 Mar 2012 23:48:46 -0700 From: Jason Helfman <jgh@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: gerrit.beine@gmx.de Subject: ports/166289: [PATCH] textproc/lucene: update to 3.5.0, build from source Message-ID: <1332312526.749495.78047.nullmailer@experts-exchange.com> Resent-Message-ID: <201203210650.q2L6oDmw007056@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 166289
>Category: ports
>Synopsis: [PATCH] textproc/lucene: update to 3.5.0, build from source
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Mar 21 06:50:13 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Jason Helfman
>Release: FreeBSD 8.2-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD dormouse.experts-exchange.com 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Thu Feb 17 02:41:51 UTC 2011
>Description:
- Update to 3.5.0
- standardize MASTER_SITES
- move away from binary, and build from source distribution
Port maintainer (gerrit.beine@gmx.de) is cc'd.
Generated with FreeBSD Port Tools 0.99_4 (mode: update, diff: CVS)
>How-To-Repeat:
>Fix:
--- lucene-3.5.0.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/textproc/lucene/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile 9 Jan 2012 15:41:04 -0000 1.11
+++ Makefile 21 Mar 2012 06:47:06 -0000
@@ -7,10 +7,11 @@
# Please don't forget to bump the version in py-lucene if this changes!
PORTNAME= lucene
-PORTVERSION= 3.4.0
+PORTVERSION= 3.5.0
CATEGORIES= textproc java devel
-MASTER_SITES= ${MASTER_SITE_APACHE:S,%SUBDIR%,lucene/java/$(PORTVERSION),}
-DISTNAME= lucene-${PORTVERSION}
+MASTER_SITES= APACHE
+MASTER_SITE_SUBDIR= ${PORTNAME}/java/${PORTVERSION}/
+DISTNAME= lucene-${PORTVERSION}-src
EXTRACT_SUFX= .tgz
MAINTAINER= gerrit.beine@gmx.de
@@ -18,9 +19,10 @@
LICENSE= AL2
-NO_BUILD= yes
USE_JAVA= yes
+USE_ANT= yes
JAVA_VERSION= 1.5+
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
OPTIONS= DOCS "Install docs & examples" on \
CONTRIB "Install contribs" off
@@ -29,8 +31,8 @@
.include <bsd.port.options.mk>
-CONTRIBS= analyzers \
- benchmark \
+CONTRIBS= benchmark \
+ demo \
facet \
grouping \
highlighter \
@@ -42,14 +44,17 @@
queries \
queryparser \
remote \
- smartcn \
spatial \
spellchecker \
- stempel \
xml-query-parser
+EXTRA_CONTRIBS_BUILD= analyzers
+
+EXTRA_CONTRIBS_DIRS= smartcn \
+ stempel
+
.if defined(WITH_CONTRIB)
-.for f in ${CONTRIBS}
+.for f in ${EXTRA_CONTRIBS_BUILD} ${CONTRIBS} ${EXTRA_CONTRIBS_DIRS}
PLIST_FILES+=%%JAVAJARDIR%%/${PORTNAME}-${f}-${PORTVERSION}.jar
.endfor
.endif
@@ -65,29 +70,35 @@
DEMODIR= contrib/demo
.if defined(WITH_CONTRIB)
-post-extract:
- ${MV} ${WRKSRC}/contrib/analyzers/common/* ${WRKSRC}/contrib/analyzers/
- ${RMDIR} ${WRKSRC}/contrib/analyzers/common
- ${MV} ${WRKSRC}/contrib/analyzers/smartcn/ ${WRKSRC}/contrib/
- ${MV} ${WRKSRC}/contrib/analyzers/stempel/ ${WRKSRC}/contrib/
+post-build:
+.for i in ${EXTRA_CONTRIBS_BUILD} ${CONTRIBS}
+ cd ${WRKSRC}/contrib/${i} && ${ANT}
+.endfor
.endif
do-install:
- @${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-core-${PORTVERSION}.jar \
- ${JAVAJARDIR}
+ ${INSTALL_DATA} ${WRKSRC}/build/${PORTNAME}-core-${PORTVERSION:R}-SNAPSHOT.jar \
+ ${JAVAJARDIR}/${PORTNAME}-core-${PORTVERSION}.jar
.if defined(WITH_CONTRIB)
. for f in ${CONTRIBS}
@${INSTALL_DATA} \
- ${WRKSRC}/contrib/${f}/${PORTNAME}-${f}-${PORTVERSION}.jar \
- ${JAVAJARDIR}
+ ${WRKSRC}/build/contrib/${f}/${PORTNAME}-${f}-${PORTVERSION:R}-SNAPSHOT.jar \
+ ${JAVAJARDIR}/${PORTNAME}-${f}-${PORTVERSION}.jar
. endfor
+. for d in ${EXTRA_CONTRIBS_DIRS}
+ @${INSTALL_DATA} \
+ ${WRKSRC}/build/contrib/${EXTRA_CONTRIBS_BUILD}/${d}/${PORTNAME}-${d}-${PORTVERSION:R}-SNAPSHOT.jar \
+ ${JAVAJARDIR}/${PORTNAME}-${d}-${PORTVERSION}.jar
+. endfor
+ @${INSTALL_DATA} \
+ ${WRKSRC}/build/contrib/${EXTRA_CONTRIBS_BUILD}/common/${PORTNAME}-${EXTRA_CONTRIBS_BUILD}-${PORTVERSION:R}-SNAPSHOT.jar \
+ ${JAVAJARDIR}/${PORTNAME}-${EXTRA_CONTRIBS_BUILD}-${PORTVERSION}.jar
.endif
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
- @${INSTALL_DATA} ${WRKSRC}/CHANGES.txt ${DOCSDIR}
- @${INSTALL_DATA} ${WRKSRC}/LICENSE.txt ${DOCSDIR}
- @${INSTALL_DATA} ${WRKSRC}/NOTICE.txt ${DOCSDIR}
- @${INSTALL_DATA} ${WRKSRC}/README.txt ${DOCSDIR}
+.for i in CHANGES.txt LICENSE.txt NOTICE.txt README.txt
+ @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.endfor
@(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${DOCSDIR})
.endif
.if !defined(NOPORTEXAMPLES)
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/textproc/lucene/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo 13 Nov 2011 17:43:52 -0000 1.7
+++ distinfo 21 Mar 2012 06:47:06 -0000
@@ -1,2 +1,2 @@
-SHA256 (lucene-3.4.0.tgz) = 56fa8afd3b9cbce1b990aa10dd9af30aef434a06506f08814fb6b8c7c526af57
-SIZE (lucene-3.4.0.tgz) = 42933801
+SHA256 (lucene-3.5.0-src.tgz) = 814dbfcd91b76522ae350817c306be8c4a72dfe8c809540be4b20209acfb9a27
+SIZE (lucene-3.5.0-src.tgz) = 39564076
--- lucene-3.5.0.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1332312526.749495.78047.nullmailer>