3 files changed, 174 insertions, 36 deletions

diff --git a/devel/opengrok/Makefile b/devel/opengrok/Makefile
index 02890a9468fe..b85d3d8ddee7 100644
--- a/devel/opengrok/Makefile
+++ b/devel/opengrok/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	opengrok
-PORTVERSION=	0.9
+PORTVERSION=	0.10
 CATEGORIES=	devel java
 MASTER_SITES=	http://hub.opensolaris.org/bin/download/Project+opengrok/files/
 
@@ -19,10 +19,16 @@ RUN_DEPENDS=	exctags:${PORTSDIR}/devel/ctags
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
+JAVA_VENDOR?=	freebsd
+SHAREOWN=	www
+SHAREGRP=	www
 NO_BUILD=	yes
 SUB_FILES=	opengrok
 SUB_LIST+=	LIBFILES="${LIBFILES:S,^,${DATADIR}/,}" \
 		JARFILE="${JARFILE}"
+PLIST_SUB=	T=${WEBAPP_DIRS:S|^${LOCALBASE}/||} \
+		CONF_EXT=${CONF_EXT}
+CONF_EXT=	sample
 
 OPTIONS=	TOMCAT6		"Use Jakarta Tomcat 6"		on	\
 		TOMCAT55	"Use Jakarta Tomcat 5.5"	off	\
@@ -31,47 +37,73 @@ OPTIONS=	TOMCAT6		"Use Jakarta Tomcat 6"		on	\
 .include <bsd.port.pre.mk>
 
 JARFILE=	${DATADIR}/opengrok.jar
-WARFILE=	source.war
 DOCS=		CHANGES.txt EXAMPLE.txt LICENSE.txt
-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 \
+LIBFILES=	ant.jar \
+		bcel-5.2.jar \
+		jrcs.jar \
+		lucene-core-3.0.2.jar \
+		lucene-spellchecker-3.0.2.jar \
 		swing-layout-0.9.jar
-WEBAPP_DIRS=	#empty
-
-.if defined(WITH_TOMCAT55)
-WEBAPP_DIRS+=	tomcat5.5
-RUN_DEPENDS+=	${LOCALBASE}/tomcat5.5/bin/bootstrap.jar:${PORTSDIR}/www/tomcat55
-.endif
 
 .if defined(WITH_TOMCAT6)
-WEBAPP_DIRS+=	apache-tomcat-6.0
+WEBAPP_DIRS=	apache-tomcat-6.0
+BUILD_DEPENDS+=	${LOCALBASE}/apache-tomcat-6.0/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
 RUN_DEPENDS+=	${LOCALBASE}/apache-tomcat-6.0/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
 .endif
 
+.if defined(WITH_TOMCAT55)
+WEBAPP_DIRS=	tomcat5.5
+BUILD_DEPENDS+=	${LOCALBASE}/tomcat5.5/bin/bootstrap.jar:${PORTSDIR}/www/tomcat55
+RUN_DEPENDS+=	${LOCALBASE}/tomcat5.5/bin/bootstrap.jar:${PORTSDIR}/www/tomcat55
+.endif
+
 .if defined(WITH_RESIN3)
-WEBAPP_DIRS+=	resin3
+WEBAPP_DIRS=	resin3
+BUILD_DEPENDS+=	${LOCALBASE}/resin3/lib/resin.jar:${PORTSDIR}/www/resin3
 RUN_DEPENDS+=	${LOCALBASE}/resin3/lib/resin.jar:${PORTSDIR}/www/resin3
 .endif
 
-do-install:
+.if ( defined(WITH_TOMCAT6) && ( defined(WITH_TOMCAT55) || defined(WITH_RESIN3)))
+IGNORE=	you can only define one application server
+.elif ( defined(WITH_TOMCAT55) && ( defined(WITH_TOMCAT6) || defined(WITH_RESIN3)))
+IGNORE=	you can only define one application server
+.elif ( defined(WITH_RESIN) && ( defined(WITH_TOMCAT6) || defined(WITH_TOMCAT55)))
+IGNORE=	you can only define one application server
+.elif !defined(WEBAPP_DIRS)
+IGNORE=	you need at least one application server
+.endif
+
+.if !target(check-santity)
+check-santity:
 .if ${PREFIX}!=${LOCALBASE}
-	@${ECHO_CMD} "Warning: you changed prefix to ${PREFIX}"
-	@${ECHO_CMD} "Default installation will not work if you installed"
-	@${ECHO_CMD} "application server in different prefix"
+	@${ECHO_MSG} "Warning: you changed prefix to ${PREFIX}"
+	@${ECHO_MSG} "Default installation will not work if you installed"
+	@${ECHO_MSG} "application server in different prefix"
 .endif
-.for DIR in ${WEBAPP_DIRS}
-	@${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}/lib/${WARFILE} ${PREFIX}/${DIR}/webapps
-.endfor
+.endif
+
+post-extract:
+	@${MKDIR} ${WRKSRC}/lib/${PORTNAME}
+	@${TAR} xf ${WRKSRC}/lib/source.war -C ${WRKSRC}/lib/${PORTNAME}
+
+do-install:
+	${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} ${PREFIX}/${WEBAPP_DIRS}/webapps/${PORTNAME}
+	@${MV} ${WRKSRC}/lib/${PORTNAME}/WEB-INF/web.xml ${WRKSRC}/lib/${PORTNAME}/WEB-INF/web.xml.${CONF_EXT}
+	@cd ${WRKSRC}/lib/${PORTNAME} && ${COPYTREE_SHARE} \* ${PREFIX}/${WEBAPP_DIRS}/webapps/${PORTNAME}
+
+	@if [ ! -e "${PREFIX}/${WEBAPP_DIRS}/webapps/${PORTNAME}/WEB-INF/web.xml" ]; then \
+			${ECHO_MSG} "	Installing local configuration file: ${PREFIX}/${WEBAPP_DIRS}/webapps/${PORTNAME}/WEB-INF/web.xml"; \
+			${INSTALL_DATA} ${WRKSRC}/lib/${PORTNAME}/WEB-INF/web.xml.${CONF_EXT} ${PREFIX}/${WEBAPP_DIRS}/webapps/${PORTNAME}/WEB-INF/web.xml; \
+		else \
+			${ECHO_MSG} "	Preserving local configuration file: ${PREFIX}/${WEBAPP_DIRS}/webapps/${PORTNAME}/WEB-INF/web.xml"; \
+	fi;
+	${INSTALL_DATA} ${WRKSRC}/lib/${PORTNAME}/WEB-INF/web.xml.${CONF_EXT} ${PREFIX}/${WEBAPP_DIRS}/webapps/${PORTNAME}/WEB-INF
+
 	${MKDIR} ${DATADIR}/lib
 	${INSTALL_DATA} ${LIBFILES:S,^,${WRKSRC}/lib/lib/,} ${DATADIR}/lib/
 	${INSTALL_DATA} ${WRKSRC}/lib/opengrok.jar ${DATADIR}/
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}/
+	${MKDIR} ${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 b4c3d0e705ed..8f7df931ed8f 100644
--- a/devel/opengrok/distinfo
+++ b/devel/opengrok/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opengrok-0.9.tar.gz) = 82e9d6f321ae6ba4225920a82d343ebf1d9ba434a15985292ed93223b348ccf9
-SIZE (opengrok-0.9.tar.gz) = 6979566
+SHA256 (opengrok-0.10.tar.gz) = 2538cd724782859b022c5984dd8100fec331a3ad464a40f4b4bc8c83f8673666
+SIZE (opengrok-0.10.tar.gz) = 6553370
diff --git a/devel/opengrok/pkg-plist b/devel/opengrok/pkg-plist
index 89fc8603b45b..82c8b7ec6812 100644
--- a/devel/opengrok/pkg-plist
+++ b/devel/opengrok/pkg-plist
@@ -1,17 +1,123 @@
+@unexec if cmp -s %D%/%%T%%/webapps/opengrok/WEB-INF/web.xml %D%/%%T%%/webapps/opengrok/WEB-INF/web.xml.%%CONF_EXT%%; then rm -f %D%/%%T%%/webapps/opengrok/WEB-INF/web.xml; fi
 bin/opengrok
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
 %%PORTDOCS%%%%DOCSDIR%%/EXAMPLE.txt
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
 %%DATADIR%%/lib/ant.jar
 %%DATADIR%%/lib/bcel-5.2.jar
-%%DATADIR%%/lib/jakarta-oro-2.0.8.jar
-%%DATADIR%%/lib/jmxremote_optional.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/jrcs.jar
+%%DATADIR%%/lib/lucene-core-3.0.2.jar
+%%DATADIR%%/lib/lucene-spellchecker-3.0.2.jar
 %%DATADIR%%/lib/swing-layout-0.9.jar
-@dirrm %%DATADIR%%/lib
-@dirrm %%DATADIR%%
+%%DATADIR%%/opengrok.jar
+%%T%%/webapps/opengrok/META-INF/MANIFEST.MF
+%%T%%/webapps/opengrok/WEB-INF/lib/ant.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/bcel-5.2.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/jrcs.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/lucene-core-3.0.2.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/lucene-spellchecker-3.0.2.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/opengrok.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/swing-layout-0.9.jar
+%%T%%/webapps/opengrok/WEB-INF/web.xml.%%CONF_EXT%%
+@exec if [ ! -f %D%/%%T%%/webapps/opengrok/WEB-INF/web.xml ]; then cp %D%/%%T%%/webapps/opengrok/WEB-INF/web.xml.%%CONF_EXT%% %D%/%%T%%/webapps/opengrok/WEB-INF/web.xml; fi
+%%T%%/webapps/opengrok/default/img/Logo.png
+%%T%%/webapps/opengrok/default/img/bg.png
+%%T%%/webapps/opengrok/default/img/button1.png
+%%T%%/webapps/opengrok/default/img/button2.png
+%%T%%/webapps/opengrok/default/img/icon.png
+%%T%%/webapps/opengrok/default/img/indicator.gif
+%%T%%/webapps/opengrok/default/img/rss.png
+%%T%%/webapps/opengrok/default/img/servedby.png
+%%T%%/webapps/opengrok/default/img/transparent_pixel.gif
+%%T%%/webapps/opengrok/default/jquery.autocomplete.css
+%%T%%/webapps/opengrok/default/jquery.combo.css
+%%T%%/webapps/opengrok/default/jquery.tooltip.css
+%%T%%/webapps/opengrok/default/print.css
+%%T%%/webapps/opengrok/default/style.css
+%%T%%/webapps/opengrok/diff.jsp
+%%T%%/webapps/opengrok/enoent.jsp
+%%T%%/webapps/opengrok/error.jsp
+%%T%%/webapps/opengrok/foot.jspf
+%%T%%/webapps/opengrok/help.jsp
+%%T%%/webapps/opengrok/history.jsp
+%%T%%/webapps/opengrok/httpheader.jspf
+%%T%%/webapps/opengrok/index.jsp
+%%T%%/webapps/opengrok/index_body.html
+%%T%%/webapps/opengrok/jquery-1.4.2.min.js
+%%T%%/webapps/opengrok/jquery.autocomplete-1.1.pack.js
+%%T%%/webapps/opengrok/jquery.tooltip-1.3.pack.js
+%%T%%/webapps/opengrok/list.jsp
+%%T%%/webapps/opengrok/mast.jsp
+%%T%%/webapps/opengrok/menu.jspf
+%%T%%/webapps/opengrok/more.jsp
+%%T%%/webapps/opengrok/offwhite/img/Logo.png
+%%T%%/webapps/opengrok/offwhite/img/b.gif
+%%T%%/webapps/opengrok/offwhite/img/bg.png
+%%T%%/webapps/opengrok/offwhite/img/button1.png
+%%T%%/webapps/opengrok/offwhite/img/button2.png
+%%T%%/webapps/opengrok/offwhite/img/d.gif
+%%T%%/webapps/opengrok/offwhite/img/do.gif
+%%T%%/webapps/opengrok/offwhite/img/f.gif
+%%T%%/webapps/opengrok/offwhite/img/h.gif
+%%T%%/webapps/opengrok/offwhite/img/icon.png
+%%T%%/webapps/opengrok/offwhite/img/indicator.gif
+%%T%%/webapps/opengrok/offwhite/img/l.gif
+%%T%%/webapps/opengrok/offwhite/img/p.gif
+%%T%%/webapps/opengrok/offwhite/img/q.gif
+%%T%%/webapps/opengrok/offwhite/img/r.gif
+%%T%%/webapps/opengrok/offwhite/img/rss.png
+%%T%%/webapps/opengrok/offwhite/img/servedby.png
+%%T%%/webapps/opengrok/offwhite/img/t.gif
+%%T%%/webapps/opengrok/offwhite/img/transparent_pixel.gif
+%%T%%/webapps/opengrok/offwhite/img/w.gif
+%%T%%/webapps/opengrok/offwhite/jquery.autocomplete.css
+%%T%%/webapps/opengrok/offwhite/jquery.combo.css
+%%T%%/webapps/opengrok/offwhite/jquery.tooltip.css
+%%T%%/webapps/opengrok/offwhite/print.css
+%%T%%/webapps/opengrok/offwhite/style.css
+%%T%%/webapps/opengrok/opensearch.jsp
+%%T%%/webapps/opengrok/pageheader.jspf
+%%T%%/webapps/opengrok/polished/img/Logo.png
+%%T%%/webapps/opengrok/polished/img/b.gif
+%%T%%/webapps/opengrok/polished/img/bg.png
+%%T%%/webapps/opengrok/polished/img/button1.png
+%%T%%/webapps/opengrok/polished/img/button2.png
+%%T%%/webapps/opengrok/polished/img/d.gif
+%%T%%/webapps/opengrok/polished/img/do.gif
+%%T%%/webapps/opengrok/polished/img/f.gif
+%%T%%/webapps/opengrok/polished/img/h.gif
+%%T%%/webapps/opengrok/polished/img/icon.png
+%%T%%/webapps/opengrok/polished/img/indicator.gif
+%%T%%/webapps/opengrok/polished/img/l.gif
+%%T%%/webapps/opengrok/polished/img/p.gif
+%%T%%/webapps/opengrok/polished/img/q.gif
+%%T%%/webapps/opengrok/polished/img/r.gif
+%%T%%/webapps/opengrok/polished/img/rss.png
+%%T%%/webapps/opengrok/polished/img/servedby.png
+%%T%%/webapps/opengrok/polished/img/t.gif
+%%T%%/webapps/opengrok/polished/img/transparent_pixel.gif
+%%T%%/webapps/opengrok/polished/img/w.gif
+%%T%%/webapps/opengrok/polished/jquery.autocomplete.css
+%%T%%/webapps/opengrok/polished/jquery.combo.css
+%%T%%/webapps/opengrok/polished/jquery.tooltip.css
+%%T%%/webapps/opengrok/polished/print.css
+%%T%%/webapps/opengrok/polished/style.css
+%%T%%/webapps/opengrok/projects.jspf
+%%T%%/webapps/opengrok/raw.jsp
+%%T%%/webapps/opengrok/rss.jsp
+%%T%%/webapps/opengrok/rss.xsl.xml
+%%T%%/webapps/opengrok/search.jsp
+%%T%%/webapps/opengrok/status.jsp
+@dirrmtry %%T%%/webapps/opengrok/META-INF
+@dirrmtry %%T%%/webapps/opengrok/WEB-INF/lib
+@dirrmtry %%T%%/webapps/opengrok/WEB-INF
+@dirrmtry %%T%%/webapps/opengrok/default/img
+@dirrmtry %%T%%/webapps/opengrok/default
+@dirrmtry %%T%%/webapps/opengrok/offwhite/img
+@dirrmtry %%T%%/webapps/opengrok/offwhite
+@dirrmtry %%T%%/webapps/opengrok/polished/img
+@dirrmtry %%T%%/webapps/opengrok/polished
+@dirrmtry %%T%%/webapps/opengrok
+@dirrmtry %%DATADIR%%/lib
+@dirrmtry %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%