- Update to version 0.9

- Add LICENSE
- Bump minimal java version

PR:		ports/161504
Submitted by:	Pedro Giffuni <giffunip@tutopia.com>
Feature safe:	yes

3 files changed, 18 insertions, 17 deletions

diff --git a/devel/opengrok/Makefile b/devel/opengrok/Makefile
index 5bd3091ce1a8..02890a9468fe 100644
--- a/devel/opengrok/Makefile
+++ b/devel/opengrok/Makefile
@@ -6,17 +6,19 @@
 #
 
 PORTNAME=	opengrok
-PORTVERSION=	0.7
+PORTVERSION=	0.9
 CATEGORIES=	devel java
-MASTER_SITES=	http://opensolaris.org/os/project/opengrok/files/
+MASTER_SITES=	http://hub.opensolaris.org/bin/download/Project+opengrok/files/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast and powerful code search and cross-reference egine
 
+LICENSE=	CDDL
+
 RUN_DEPENDS=	exctags:${PORTSDIR}/devel/ctags
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 SUB_FILES=	opengrok
 SUB_LIST+=	LIBFILES="${LIBFILES:S,^,${DATADIR}/,}" \
@@ -31,10 +33,10 @@ OPTIONS=	TOMCAT6		"Use Jakarta Tomcat 6"		on	\
 JARFILE=	${DATADIR}/opengrok.jar
 WARFILE=	source.war
 DOCS=		CHANGES.txt EXAMPLE.txt LICENSE.txt
-LIBFILES=	ant.jar bcel-5.1.jar jakarta-oro-2.0.8.jar \
-		jmxremote_optional.jar lucene-core-2.2.0.jar \
-		lucene-spellchecker-2.2.0.jar org.apache.commons.jrcs.diff.jar \
-		org.apache.commons.jrcs.rcs.jar servlet-api.jar \
+LIBFILES=	ant.jar bcel-5.2.jar jakarta-oro-2.0.8.jar \
+		jmxremote_optional.jar lucene-core-3.0.1.jar \
+		lucene-spellchecker-3.0.1.jar org.apache.commons.jrcs.diff.jar \
+		org.apache.commons.jrcs.rcs.jar org.apache.commons.jrcs.rcs.jar \
 		swing-layout-0.9.jar
 WEBAPP_DIRS=	#empty
 
@@ -63,14 +65,14 @@ do-install:
 	@${ECHO_CMD} "${DIR}/webapps/${WARFILE}" >> ${TMPPLIST}
 	${MKDIR} ${PREFIX}/${DIR}/webapps
 	@${ECHO_CMD} "@unexec rmdir %D/${DIR}/webapps 2>/dev/null || true" >> ${TMPPLIST}
-	${INSTALL_DATA} ${WRKSRC}/${WARFILE} ${PREFIX}/${DIR}/webapps
+	${INSTALL_DATA} ${WRKSRC}/lib/${WARFILE} ${PREFIX}/${DIR}/webapps
 .endfor
 	${MKDIR} ${DATADIR}/lib
-	${INSTALL_DATA} ${LIBFILES:S,^,${WRKSRC}/lib/,} ${DATADIR}/lib/
-	${INSTALL_DATA} ${WRKSRC}/opengrok.jar ${DATADIR}/
+	${INSTALL_DATA} ${LIBFILES:S,^,${WRKSRC}/lib/lib/,} ${DATADIR}/lib/
+	${INSTALL_DATA} ${WRKSRC}/lib/opengrok.jar ${DATADIR}/
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}/
-	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
+	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/doc/,} ${DOCSDIR}/
 .endif
 	${INSTALL_SCRIPT} ${WRKDIR}/opengrok ${PREFIX}/bin
 
diff --git a/devel/opengrok/distinfo b/devel/opengrok/distinfo
index f4b2770341b1..b4c3d0e705ed 100644
--- a/devel/opengrok/distinfo
+++ b/devel/opengrok/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opengrok-0.7.tar.gz) = 1ba0bc6c2cc9e778fabf56333b926ce304c7c8eca20015032cb8391b3ee873ad
-SIZE (opengrok-0.7.tar.gz) = 5842589
+SHA256 (opengrok-0.9.tar.gz) = 82e9d6f321ae6ba4225920a82d343ebf1d9ba434a15985292ed93223b348ccf9
+SIZE (opengrok-0.9.tar.gz) = 6979566
diff --git a/devel/opengrok/pkg-plist b/devel/opengrok/pkg-plist
index 52e45c39da69..89fc8603b45b 100644
--- a/devel/opengrok/pkg-plist
+++ b/devel/opengrok/pkg-plist
@@ -3,15 +3,14 @@ bin/opengrok
 %%PORTDOCS%%%%DOCSDIR%%/EXAMPLE.txt
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
 %%DATADIR%%/lib/ant.jar
-%%DATADIR%%/lib/bcel-5.1.jar
+%%DATADIR%%/lib/bcel-5.2.jar
 %%DATADIR%%/lib/jakarta-oro-2.0.8.jar
 %%DATADIR%%/lib/jmxremote_optional.jar
-%%DATADIR%%/lib/lucene-core-2.2.0.jar
-%%DATADIR%%/lib/lucene-spellchecker-2.2.0.jar
+%%DATADIR%%/lib/lucene-core-3.0.1.jar
+%%DATADIR%%/lib/lucene-spellchecker-3.0.1.jar
 %%DATADIR%%/opengrok.jar
 %%DATADIR%%/lib/org.apache.commons.jrcs.diff.jar
 %%DATADIR%%/lib/org.apache.commons.jrcs.rcs.jar
-%%DATADIR%%/lib/servlet-api.jar
 %%DATADIR%%/lib/swing-layout-0.9.jar
 @dirrm %%DATADIR%%/lib
 @dirrm %%DATADIR%%