Add an opengrok-source option to build the war locally instead of installing

 the one that comes with the tarball.

3 files changed, 38 insertions, 6 deletions

diff --git a/devel/opengrok/Makefile b/devel/opengrok/Makefile
index 0fbeb95d73c..16752f78df0 100644
--- a/devel/opengrok/Makefile
+++ b/devel/opengrok/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/10/24 21:26:37 adrianp Exp $
+# $NetBSD: Makefile,v 1.9 2008/10/25 18:11:16 adrianp Exp $
 #
 
 DISTNAME=	opengrok-0.7
@@ -16,9 +16,14 @@ DEPENDS+=	zip-[0-9]*:../../archivers/zip
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+.include "options.mk"
+
+.if empty(PKG_OPTIONS:Mopengrok-build)
 NO_BUILD=	YES
+.endif
+
 USE_JAVA=	run
-USE_JAVA2=	1.5 6
+USE_JAVA2=	yes
 
 CONF_FILES=	${PREFIX}/share/examples/opengrok/paths.tsv \
 		${PREFIX}/share/opengrok/paths.tsv
@@ -31,7 +36,17 @@ SUBST_SED.run+=		-e "s|java|${PKG_JAVA_HOME}/bin/java|g"
 SUBST_SED.run+=		-e "s|@PREFIX@|${PREFIX}|g"
 SUBST_MESSAGE.run=	Fixing hardcoded paths.
 
-.include "options.mk"
+pre-build:
+	${CP} ${PREFIX}/lib/java/JFlex.jar ${WRKSRC}/lib
+
+do-build:
+	cd ${WRKSRC} && ${PREFIX}/bin/ant 
+
+post-build:
+	${RM} -f ${WRKSRC}/lib/*.jar
+	${CP} ${WRKSRC}/dist/lib/*.jar ${WRKSRC}/lib
+	${CP} ${WRKSRC}/dist/opengrok.jar ${WRKSRC}
+	${CP} ${WRKSRC}/dist/source.war ${WRKSRC}
 
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/opengrok
diff --git a/devel/opengrok/distinfo b/devel/opengrok/distinfo
index 8d5b06ba230..ea14f979dda 100644
--- a/devel/opengrok/distinfo
+++ b/devel/opengrok/distinfo
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.5 2008/10/19 19:36:13 adrianp Exp $
+$NetBSD: distinfo,v 1.6 2008/10/25 18:11:16 adrianp Exp $
 
 SHA1 (opengrok-0.7.tar.gz) = 6c3be3e2abe04d0f71e6bb82e40a950240e702fc
 RMD160 (opengrok-0.7.tar.gz) = eefb072a782ca211af1d18756fa1ba2657a9513f
 Size (opengrok-0.7.tar.gz) = 5842589 bytes
+SHA1 (opengrok-0.7-src.tar.gz) = 5f32005065d1f9c0ee8cf988bef6eb4cee626943
+RMD160 (opengrok-0.7-src.tar.gz) = f1e8a5ad2a2527c052394e62f89b5f5fe8a13995
+Size (opengrok-0.7-src.tar.gz) = 1881569 bytes
 SHA1 (patch-aa) = 22c1e946fc90f7cfbc05ad97541eb3bbc2c03cfe
 SHA1 (patch-ab) = a5bb3931713207adaa6303eb533c2cddc39b8fb0
diff --git a/devel/opengrok/options.mk b/devel/opengrok/options.mk
index c6c69d5bf13..48d73fa6081 100644
--- a/devel/opengrok/options.mk
+++ b/devel/opengrok/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1.1.1 2007/04/08 16:59:41 adrianp Exp $
+# $NetBSD: options.mk,v 1.2 2008/10/25 18:11:16 adrianp Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.opengrok
 
-PKG_SUPPORTED_OPTIONS=	svn
+PKG_SUPPORTED_OPTIONS=	svn opengrok-build
 
 .include "../../mk/bsd.options.mk"
 
@@ -13,3 +13,17 @@ PKG_SUPPORTED_OPTIONS=	svn
 .  include "../../devel/subversion-base/buildlink3.mk"
 BUILDLINK_API_DEPENDS.subversion-base+= subversion-base>=1.3.0
 .endif
+
+###
+### Rebuild OpenGrok
+###
+.if !empty(PKG_OPTIONS:Mopengrok-build)
+DEPENDS+=	jflex-[0-9]*:../../devel/jflex
+DEPENDS+=	apache-ant-[0-9]*:../../devel/apache-ant
+USE_JAVA=	yes
+
+OPENGROK_SOURCES=	${PKGNAME_NOREV}-src${EXTRACT_SUFX}
+DISTFILES+=		${OPENGROK_SOURCES}
+EXTRACT_ONLY+=		${OPENGROK_SOURCES}
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}-src
+.endif