various fix.

pkgsrc-devel-opengrok-0.12.1.5nb1.diff

Index: MESSAGE
===================================================================
RCS file: /cvsroot/pkgsrc/devel/opengrok/MESSAGE,v
retrieving revision 1.1
diff -u -r1.1 MESSAGE
--- MESSAGE	31 Dec 2013 22:56:12 -0000	1.1
+++ MESSAGE	4 Sep 2015 05:34:36 -0000
@@ -6,12 +6,13 @@
 
 1. Install version control software that is used for your code repository.
 
-2. Install Apache Tomcat 7 from pkgsrc/www/apache-tomcat7.
+2. Install Apache Tomcat 7 from pkgsrc/www/apache-tomcat7 or Apache Tomat 8
+   from pkgsrc/www/apache-tomcat8.
 
 3. Run ${PREFIX}/share/opengrok/bin/OpenGrok with the following options
    to install source.war to ${PREFIX}/share/tomcat/webapps.
 
-	# JAVA_HOME=/usr/pkg/java/openjdk7 \
+	# JAVA_HOME=${PKG_JAVA_HOME} \
 		OPENGROK_WAR_TARGET_TOMCAT=${PREFIX}/share/tomcat/webapps \
 		${PREFIX}/share/opengrok/bin/OpenGrok deploy
 
@@ -24,10 +25,10 @@
 5. Run ${PREFIX}/share/opengrok/bin/OpenGrok with the following options
    to index your code repository.
 
-	# JAVA_HOME=${PREFIX}/java/openjdk7 \
+	# JAVA_HOME=${PKG_JAVA_HOME} \
 		${PREFIX}/share/opengrok/bin/OpenGrok update
 
-6. Start Apache Tomcat 7 server.
+6. Start Apache Tomcat server.
 
 7. Access http://localhost:8080/source/ .
 ===========================================================================
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/opengrok/Makefile,v
retrieving revision 1.38
diff -u -r1.38 Makefile
--- Makefile	4 Sep 2015 05:28:06 -0000	1.38
+++ Makefile	4 Sep 2015 05:34:36 -0000
@@ -1,8 +1,10 @@
 # $NetBSD: Makefile,v 1.38 2015/09/04 05:28:06 wiz Exp $
 
 DISTNAME=	OpenGrok-0.12.1.5
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=OpenGrok/}
+DISTFILES=	${DEFAULT_DISTFILES}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://opengrok.github.io/OpenGrok/
@@ -12,9 +14,22 @@
 EXTRACT_USING=	bsdtar
 
 DEPENDS+=	exctags-[0-9]*:../../devel/exctags
-DEPENDS+=	jflex-[0-9]*:../../devel/jflex
 DEPENDS+=	apache-ant-[0-9]*:../../devel/apache-ant
 
+JFLEX_VER=	1.5.1
+DISTFILES+=	jflex-${JFLEX_VER}.jar
+SITES.jflex-${JFLEX_VER}.jar= http://repo1.maven.org/maven2/de/jflex/jflex/${JFLEX_VER}/
+
+LUCENE_VER=	4.7.1
+DISTFILES+=	lucene-core-${LUCENE_VER}.jar
+DISTFILES+=	lucene-analyzers-common-${LUCENE_VER}.jar
+DISTFILES+=	lucene-queryparser-${LUCENE_VER}.jar
+DISTFILES+=	lucene-suggest-${LUCENE_VER}.jar
+SITES.lucene-core-${LUCENE_VER}.jar= http://repo1.maven.org/maven2/org/apache/lucene/lucene-core/${LUCENE_VER}/
+SITES.lucene-analyzers-common-${LUCENE_VER}.jar= http://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common/${LUCENE_VER}/
+SITES.lucene-queryparser-${LUCENE_VER}.jar= http://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser/${LUCENE_VER}/
+SITES.lucene-suggest-${LUCENE_VER}.jar= http://repo1.maven.org/maven2/org/apache/lucene/lucene-suggest/${LUCENE_VER}/
+
 # XXX PREFIX should not be used here, but I would like to reduce dependencies.
 SUBST_CLASSES+=		vcs
 SUBST_FILES.vcs+=	OpenGrok
@@ -28,10 +43,12 @@
 SUBST_STAGE.conf=	pre-configure
 SUBST_VARS.conf=	PREFIX
 
+MESSAGE_SUBST+=		PKG_JAVA_HOME=${PKG_JAVA_HOME}
+
 .include "options.mk"
 
 USE_JAVA=	yes
-USE_JAVA2=	yes
+USE_JAVA2=	7
 USE_TOOLS+=	unzip:run zip:run
 
 CONF_FILES=	${PREFIX}/share/examples/opengrok/paths.tsv \
@@ -43,8 +60,11 @@
 			share/opengrok/var/opengrok
 
 do-build:
-	cd ${WRKSRC} && \
-		CLASSPATH=${PREFIX}/lib/java/JFlex.jar ${PREFIX}/bin/ant
+	cp ${WRKDIR}/jflex-${JFLEX_VER}.jar ${WRKSRC}/lib/
+	for i in core analyzers-common queryparser suggest; do \
+		cp ${WRKDIR}/lucene-$$i-${LUCENE_VER}.jar ${WRKSRC}/lib; \
+	done
+	cd ${WRKSRC} && ${PREFIX}/bin/ant
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/OpenGrok \
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/opengrok/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- distinfo	4 Sep 2015 05:28:06 -0000	1.11
+++ distinfo	4 Sep 2015 05:34:36 -0000
@@ -3,5 +3,20 @@
 SHA1 (OpenGrok-0.12.1.5.tar.gz) = a31ca03bb340a084019825de61b9ec1878662c95
 RMD160 (OpenGrok-0.12.1.5.tar.gz) = 2c4dbebe88eab498d7d4a25807cc0bd45a4a5f40
 Size (OpenGrok-0.12.1.5.tar.gz) = 1560600 bytes
+SHA1 (jflex-1.5.1.jar) = 262c62559392e63dbab50ed023cc398035c8a9cf
+RMD160 (jflex-1.5.1.jar) = 17bab7447efadde3a1bcc7f561a4baa2885bda7f
+Size (jflex-1.5.1.jar) = 940749 bytes
+SHA1 (lucene-analyzers-common-4.7.1.jar) = 5980364242d4e34d7afd5a848af49d9ce42f522e
+RMD160 (lucene-analyzers-common-4.7.1.jar) = fc1315c268573fa39d69c52313505ddff9dad811
+Size (lucene-analyzers-common-4.7.1.jar) = 1658498 bytes
+SHA1 (lucene-core-4.7.1.jar) = 91ca386b26cd6e5942616c9787131df4ab434483
+RMD160 (lucene-core-4.7.1.jar) = 455b6e12284e40357a998e596aac7acecd566056
+Size (lucene-core-4.7.1.jar) = 2357831 bytes
+SHA1 (lucene-queryparser-4.7.1.jar) = 0781aa1701302fb56ac516df4c7958c257841296
+RMD160 (lucene-queryparser-4.7.1.jar) = 35e015ae016168d10c6f7d2e5315891fae89c0ff
+Size (lucene-queryparser-4.7.1.jar) = 390053 bytes
+SHA1 (lucene-suggest-4.7.1.jar) = 85a18158a5d120f3e6f38be205e9794e8153e600
+RMD160 (lucene-suggest-4.7.1.jar) = 128c2654627e93c1b000aaefc41f83a6f56f8ef3
+Size (lucene-suggest-4.7.1.jar) = 192323 bytes
 SHA1 (patch-OpenGrok) = 3626793fca6f62a4e9da2ff23ccc20e1ec82087b
 SHA1 (patch-web_WEB-INF_web.xml) = dad7fe0aac6ba6f8cd388b89959abc129d960ac3