Index: head/devel/opengrok/Makefile =================================================================== --- head/devel/opengrok/Makefile (revision 444532) +++ head/devel/opengrok/Makefile (revision 444533) @@ -1,87 +1,88 @@ # $FreeBSD$ PORTNAME= opengrok -PORTVERSION= 0.12.1.5 +PORTVERSION= 1.0 CATEGORIES= devel java -MASTER_SITES= http://java.net/projects/opengrok/downloads/download/ +MASTER_SITES= https://github.com/OpenGrok/OpenGrok/releases/download/${PORTVERSION}/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= amutu@amutu.com COMMENT= Fast and powerful code search and cross-reference engine LICENSE= CDDL APACHE20 LICENSE_COMB= multi +LICENSE_FILE= ${WRKSRC}/doc/LICENSE.txt RUN_DEPENDS= exctags:devel/ctags USE_JAVA= yes -JAVA_VERSION= 1.7+ +JAVA_VERSION= 1.8+ SHAREOWN= www SHAREGRP= www NO_BUILD= yes NO_ARCH= yes -PORTDOCS= CHANGES.txt EXAMPLE.txt LICENSE.txt +PORTDOCS= CHANGES.txt EXAMPLE.txt README.txt NOTICE.txt SUB_FILES= opengrok SUB_LIST+= LIBFILES="${LIBFILES:S,^,${DATADIR}/lib/,}" \ JARFILE="${JARFILE}" PLIST_SUB= T=${WEBAPP_HOME:S|^${LOCALBASE}/||} \ OWNER=${SHAREOWN} GROUP=${SHAREGRP} OPTIONS_DEFINE= DOCS OPTIONS_SINGLE= AS -OPTIONS_SINGLE_AS= TOMCAT7 TOMCAT6 RESIN3 -OPTIONS_DEFAULT= TOMCAT6 +OPTIONS_SINGLE_AS= TOMCAT85 TOMCAT8 TOMCAT7 TOMCAT6 RESIN3 +OPTIONS_DEFAULT= TOMCAT8 +TOMCAT8_DESC= Tomcat 8.x support +TOMCAT85_DESC= Tomcat 8.5.x support + +TOMCAT6_VARS= WEBAPP_HOME=${LOCALBASE}/apache-tomcat-6.0 +TOMCAT7_VARS= WEBAPP_HOME=${LOCALBASE}/apache-tomcat-7.0 +TOMCAT8_VARS= WEBAPP_HOME=${LOCALBASE}/apache-tomcat-8.0 +TOMCAT85_VARS= WEBAPP_HOME=${LOCALBASE}/apache-tomcat-8.5 +RESIN3_VARS= WEBAPP_HOME=${LOCALBASE}/resin3 + TOMCAT6_BUILD_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat6 TOMCAT6_RUN_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat6 TOMCAT7_BUILD_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat7 TOMCAT7_RUN_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat7 +TOMCAT8_BUILD_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat8 +TOMCAT8_RUN_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat8 +TOMCAT85_BUILD_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat85 +TOMCAT85_RUN_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat85 RESIN3_BUILD_DEPENDS= ${WEBAPP_HOME}/lib/resin.jar:www/resin3 RESIN3_RUN_DEPENDS= ${WEBAPP_HOME}/lib/resin.jar:www/resin3 JARFILE= ${DATADIR}/opengrok.jar LIBFILES= ant.jar \ - bcel-5.2.jar \ + bcel-6.0.jar \ jrcs.jar \ - lucene-analyzers-common-4.7.1.jar \ - lucene-core-4.7.1.jar \ - lucene-queryparser-4.7.1.jar \ - lucene-suggest-4.7.1.jar \ - swing-layout-0.9.jar - -.include - -.if ${PORT_OPTIONS:MTOMCAT7} -WEBAPP_HOME?= ${LOCALBASE}/apache-tomcat-7.0 -.endif - -.if ${PORT_OPTIONS:MTOMCAT6} -WEBAPP_HOME?= ${LOCALBASE}/apache-tomcat-6.0 -.endif - -.if ${PORT_OPTIONS:MRESIN3} -WEBAPP_HOME?= ${LOCALBASE}/resin3 -.endif + lucene-analyzers-common-6.5.0.jar \ + lucene-core-6.5.0.jar \ + lucene-queryparser-6.5.0.jar \ + lucene-suggest-6.5.0.jar \ + swing-layout-0.9.jar \ + json-simple-1.1.1.jar WEBAPPS_DIR= ${WEBAPP_HOME:S|^${LOCALBASE}/||}/webapps post-extract: @${MKDIR} ${WRKSRC}/lib/opengrok @${TAR} -xf ${WRKSRC}/lib/source.war -C ${WRKSRC}/lib/opengrok do-install: @${MKDIR} ${STAGEDIR}${DATADIR}/lib \ ${STAGEDIR}${PREFIX}/${WEBAPPS_DIR}/${PORTNAME} (cd ${WRKSRC}/lib/opengrok && ${COPYTREE_SHARE} . \ ${STAGEDIR}${PREFIX}/${WEBAPPS_DIR}/${PORTNAME}) (cd ${STAGEDIR}${PREFIX}/${WEBAPPS_DIR}/${PORTNAME}/WEB-INF && \ ${MV} web.xml web.xml.sample) ${INSTALL_DATA} ${LIBFILES:S,^,${WRKSRC}/lib/lib/,} \ ${STAGEDIR}${DATADIR}/lib/ ${INSTALL_DATA} ${WRKSRC}/lib/opengrok.jar ${STAGEDIR}${DATADIR}/ ${INSTALL_SCRIPT} ${WRKDIR}/opengrok ${STAGEDIR}${PREFIX}/bin do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR}/ .include Index: head/devel/opengrok/distinfo =================================================================== --- head/devel/opengrok/distinfo (revision 444532) +++ head/devel/opengrok/distinfo (revision 444533) @@ -1,2 +1,3 @@ -SHA256 (opengrok-0.12.1.5.tar.gz) = c3ce079f6ed1526c475cb4b9a7aa901f75507318c93b436d6c14eba4098e4ead -SIZE (opengrok-0.12.1.5.tar.gz) = 14527253 +TIMESTAMP = 1497689239 +SHA256 (opengrok-1.0.tar.gz) = d86dd30be7b957f57b0f65deb9a4aa56d353d5b0e47ea04fca746fe7c4073b97 +SIZE (opengrok-1.0.tar.gz) = 16487516 Index: head/devel/opengrok/pkg-plist =================================================================== --- head/devel/opengrok/pkg-plist (revision 444532) +++ head/devel/opengrok/pkg-plist (revision 444533) @@ -1,118 +1,160 @@ bin/opengrok %%DATADIR%%/lib/ant.jar -%%DATADIR%%/lib/bcel-5.2.jar +%%DATADIR%%/lib/bcel-6.0.jar %%DATADIR%%/lib/jrcs.jar -%%DATADIR%%/lib/lucene-analyzers-common-4.7.1.jar -%%DATADIR%%/lib/lucene-core-4.7.1.jar -%%DATADIR%%/lib/lucene-queryparser-4.7.1.jar -%%DATADIR%%/lib/lucene-suggest-4.7.1.jar +%%DATADIR%%/lib/json-simple-1.1.1.jar +%%DATADIR%%/lib/lucene-analyzers-common-6.5.0.jar +%%DATADIR%%/lib/lucene-core-6.5.0.jar +%%DATADIR%%/lib/lucene-queryparser-6.5.0.jar +%%DATADIR%%/lib/lucene-suggest-6.5.0.jar %%DATADIR%%/lib/swing-layout-0.9.jar %%DATADIR%%/opengrok.jar @group %%OWNER%% @owner %%GROUP%% %%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/bcel-6.0.jar %%T%%/webapps/opengrok/WEB-INF/lib/jrcs.jar -%%T%%/webapps/opengrok/WEB-INF/lib/lucene-analyzers-common-4.7.1.jar -%%T%%/webapps/opengrok/WEB-INF/lib/lucene-core-4.7.1.jar -%%T%%/webapps/opengrok/WEB-INF/lib/lucene-queryparser-4.7.1.jar -%%T%%/webapps/opengrok/WEB-INF/lib/lucene-suggest-4.7.1.jar +%%T%%/webapps/opengrok/WEB-INF/lib/json-simple-1.1.1.jar +%%T%%/webapps/opengrok/WEB-INF/lib/lucene-analyzers-common-6.5.0.jar +%%T%%/webapps/opengrok/WEB-INF/lib/lucene-core-6.5.0.jar +%%T%%/webapps/opengrok/WEB-INF/lib/lucene-queryparser-6.5.0.jar +%%T%%/webapps/opengrok/WEB-INF/lib/lucene-suggest-6.5.0.jar %%T%%/webapps/opengrok/WEB-INF/lib/opengrok.jar %%T%%/webapps/opengrok/WEB-INF/lib/swing-layout-0.9.jar @sample %%T%%/webapps/opengrok/WEB-INF/web.xml.sample %%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/button3.png %%T%%/webapps/opengrok/default/img/combined.png +%%T%%/webapps/opengrok/default/img/diff-jumper.png +%%T%%/webapps/opengrok/default/img/diff-jumping.png +%%T%%/webapps/opengrok/default/img/folding.png %%T%%/webapps/opengrok/default/img/icon.png %%T%%/webapps/opengrok/default/img/indicator.gif +%%T%%/webapps/opengrok/default/img/intelli-window.png %%T%%/webapps/opengrok/default/img/rss.png %%T%%/webapps/opengrok/default/img/servedby.png +%%T%%/webapps/opengrok/default/img/symbol-highlighting.png %%T%%/webapps/opengrok/default/img/transparent_pixel.gif +%%T%%/webapps/opengrok/default/img/unfolding.png +%%T%%/webapps/opengrok/default/jquery-ui-1.12.0-custom.min.css %%T%%/webapps/opengrok/default/jquery.autocomplete.css %%T%%/webapps/opengrok/default/jquery.combo.css +%%T%%/webapps/opengrok/default/jquery.tablesorter.css %%T%%/webapps/opengrok/default/jquery.tooltip.css %%T%%/webapps/opengrok/default/print.css +%%T%%/webapps/opengrok/default/searchable-option-list-2.0.2.css +%%T%%/webapps/opengrok/default/searchable-option-list-2.0.2.min.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.4.min.js -%%T%%/webapps/opengrok/jquery.autocomplete-1.1.pack.js -%%T%%/webapps/opengrok/jquery.tooltip-1.3.pack.js +%%T%%/webapps/opengrok/js/diff-0.0.1.js +%%T%%/webapps/opengrok/js/jquery-3.2.0.min.js +%%T%%/webapps/opengrok/js/jquery-ui-1.12.0-custom.min.js +%%T%%/webapps/opengrok/js/jquery-ui-1.12.0-draggable.min.js +%%T%%/webapps/opengrok/js/jquery.autocomplete-1.1.pack.js +%%T%%/webapps/opengrok/js/jquery.tablesorter-2.26.6.min.js +%%T%%/webapps/opengrok/js/repos-0.0.1.js +%%T%%/webapps/opengrok/js/searchable-option-list-2.0.3.js +%%T%%/webapps/opengrok/js/searchable-option-list-2.0.3.min.js +%%T%%/webapps/opengrok/js/showdown-1.4.2.min.js +%%T%%/webapps/opengrok/js/tablesorter.parsers-0.0.1.js +%%T%%/webapps/opengrok/js/utils-0.0.8.js +%%T%%/webapps/opengrok/js/xss-0.2.16.min.js %%T%%/webapps/opengrok/list.jsp %%T%%/webapps/opengrok/mast.jsp %%T%%/webapps/opengrok/menu.jspf +%%T%%/webapps/opengrok/minisearch.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/button3.png %%T%%/webapps/opengrok/offwhite/img/combined.png %%T%%/webapps/opengrok/offwhite/img/d.gif +%%T%%/webapps/opengrok/offwhite/img/diff-jumper.png +%%T%%/webapps/opengrok/offwhite/img/diff-jumping.png %%T%%/webapps/opengrok/offwhite/img/do.gif %%T%%/webapps/opengrok/offwhite/img/f.gif +%%T%%/webapps/opengrok/offwhite/img/folding.png %%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/intelli-window.png %%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/symbol-highlighting.png %%T%%/webapps/opengrok/offwhite/img/t.gif %%T%%/webapps/opengrok/offwhite/img/transparent_pixel.gif +%%T%%/webapps/opengrok/offwhite/img/unfolding.png %%T%%/webapps/opengrok/offwhite/img/w.gif +%%T%%/webapps/opengrok/offwhite/jquery-ui-1.12.0-custom.min.css %%T%%/webapps/opengrok/offwhite/jquery.autocomplete.css %%T%%/webapps/opengrok/offwhite/jquery.combo.css +%%T%%/webapps/opengrok/offwhite/jquery.tablesorter.css %%T%%/webapps/opengrok/offwhite/jquery.tooltip.css %%T%%/webapps/opengrok/offwhite/print.css +%%T%%/webapps/opengrok/offwhite/searchable-option-list-2.0.2.min.css %%T%%/webapps/opengrok/offwhite/style.css %%T%%/webapps/opengrok/opensearch.jsp -%%T%%/webapps/opengrok/pageconfig.jspf %%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/button3.png %%T%%/webapps/opengrok/polished/img/combined.png %%T%%/webapps/opengrok/polished/img/d.gif +%%T%%/webapps/opengrok/polished/img/diff-jumper.png +%%T%%/webapps/opengrok/polished/img/diff-jumping.png %%T%%/webapps/opengrok/polished/img/do.gif %%T%%/webapps/opengrok/polished/img/f.gif +%%T%%/webapps/opengrok/polished/img/folding.png %%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/intelli-window.png %%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/symbol-highlighting.png %%T%%/webapps/opengrok/polished/img/t.gif %%T%%/webapps/opengrok/polished/img/transparent_pixel.gif +%%T%%/webapps/opengrok/polished/img/unfolding.png %%T%%/webapps/opengrok/polished/img/w.gif +%%T%%/webapps/opengrok/polished/jquery-ui-1.12.0-custom.min.css %%T%%/webapps/opengrok/polished/jquery.autocomplete.css %%T%%/webapps/opengrok/polished/jquery.combo.css +%%T%%/webapps/opengrok/polished/jquery.tablesorter.css %%T%%/webapps/opengrok/polished/jquery.tooltip.css %%T%%/webapps/opengrok/polished/print.css +%%T%%/webapps/opengrok/polished/searchable-option-list-2.0.2.min.css %%T%%/webapps/opengrok/polished/style.css %%T%%/webapps/opengrok/projects.jspf %%T%%/webapps/opengrok/raw.jsp +%%T%%/webapps/opengrok/repos.jspf %%T%%/webapps/opengrok/rss.jsp %%T%%/webapps/opengrok/rss.xsl.xml %%T%%/webapps/opengrok/search.jsp %%T%%/webapps/opengrok/status.jsp -%%T%%/webapps/opengrok/utils.js @group @owner