Date: Wed, 10 Sep 2014 13:09:03 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367829 - head/devel/opengrok Message-ID: <201409101309.s8AD93n4046937@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Wed Sep 10 13:09:02 2014 New Revision: 367829 URL: http://svnweb.freebsd.org/changeset/ports/367829 QAT: https://qat.redports.org/buildarchive/r367829/ Log: Stage devel/opengrok and upgrade version 0.11.1 => 0.12.1 The initial staging work was done by pfg@ Modified: head/devel/opengrok/Makefile head/devel/opengrok/distinfo head/devel/opengrok/pkg-descr head/devel/opengrok/pkg-plist Modified: head/devel/opengrok/Makefile ============================================================================== --- head/devel/opengrok/Makefile Wed Sep 10 13:05:31 2014 (r367828) +++ head/devel/opengrok/Makefile Wed Sep 10 13:09:02 2014 (r367829) @@ -1,12 +1,11 @@ # $FreeBSD$ PORTNAME= opengrok -PORTVERSION= 0.11.1 -PORTREVISION= 1 +PORTVERSION= 0.12.1 CATEGORIES= devel java MASTER_SITES= http://java.net/projects/opengrok/downloads/download/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Fast and powerful code search and cross-reference engine LICENSE= CDDL APACHE20 @@ -19,80 +18,65 @@ JAVA_VERSION= 1.6+ SHAREOWN= www SHAREGRP= www NO_BUILD= yes +PORTDOCS= ${DOCS} SUB_FILES= opengrok SUB_LIST+= LIBFILES="${LIBFILES:S,^,${DATADIR}/,}" \ JARFILE="${JARFILE}" PLIST_SUB= T=${WEBAPP_HOME:S|^${LOCALBASE}/||} \ - CONF_EXT=${CONF_EXT} -CONF_EXT= sample + OWNER=${SHAREOWN} GROUP=${SHAREGRP} -OPTIONS_SINGLE= AS +OPTIONS_SINGLE= AS OPTIONS_SINGLE_AS= TOMCAT7 TOMCAT6 RESIN3 OPTIONS_DEFAULT= TOMCAT6 -NO_STAGE= yes -.include <bsd.port.pre.mk> +TOMCAT6_BUILD_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6 +TOMCAT6_RUN_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6 +TOMCAT7_BUILD_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7 +TOMCAT7_RUN_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7 +RESIN3_BUILD_DEPENDS= ${WEBAPP_HOME}/lib/resin.jar:${PORTSDIR}/www/resin3 +RESIN3_RUN_DEPENDS= ${WEBAPP_HOME}/lib/resin.jar:${PORTSDIR}/www/resin3 JARFILE= ${DATADIR}/opengrok.jar DOCS= CHANGES.txt EXAMPLE.txt LICENSE.txt LIBFILES= ant.jar \ bcel-5.2.jar \ jrcs.jar \ - lucene-core-3.0.2.jar \ - lucene-spellchecker-3.0.2.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 <bsd.port.options.mk> + .if ${PORT_OPTIONS:MTOMCAT7} WEBAPP_HOME?= ${LOCALBASE}/apache-tomcat-7.0 -BUILD_DEPENDS+= ${WEBAPP_HOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7 -RUN_DEPENDS+= ${WEBAPP_HOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7 .endif .if ${PORT_OPTIONS:MTOMCAT6} WEBAPP_HOME?= ${LOCALBASE}/apache-tomcat-6.0 -BUILD_DEPENDS+= ${WEBAPP_HOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6 -RUN_DEPENDS+= ${WEBAPP_HOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6 .endif .if ${PORT_OPTIONS:MRESIN3} WEBAPP_HOME?= ${LOCALBASE}/resin3 -BUILD_DEPENDS+= ${WEBAPP_HOME}/lib/resin.jar:${PORTSDIR}/www/resin3 -RUN_DEPENDS+= ${WEBAPP_HOME}/lib/resin.jar:${PORTSDIR}/www/resin3 .endif WEBAPPS_DIR= ${WEBAPP_HOME:S|^${LOCALBASE}/||}/webapps -pre-everything:: -.if ${PREFIX}!=${LOCALBASE} - @${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 - post-extract: - @${MKDIR} ${WRKSRC}/lib/${PORTNAME} - @${TAR} xf ${WRKSRC}/lib/source.war -C ${WRKSRC}/lib/${PORTNAME} + @${MKDIR} ${WRKSRC}/lib/opengrok + @${TAR} -xf ${WRKSRC}/lib/source.war -C ${WRKSRC}/lib/opengrok do-install: - ${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} ${PREFIX}/${WEBAPPS_DIR}/${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}/${WEBAPPS_DIR}/${PORTNAME} - - @if [ ! -e "${PREFIX}/${WEBAPPS_DIR}/${PORTNAME}/WEB-INF/web.xml" ]; then \ - ${ECHO_MSG} " Installing local configuration file: ${PREFIX}/${WEBAPPS_DIR}/${PORTNAME}/WEB-INF/web.xml"; \ - ${INSTALL_DATA} ${WRKSRC}/lib/${PORTNAME}/WEB-INF/web.xml.${CONF_EXT} ${PREFIX}/${WEBAPPS_DIR}/${PORTNAME}/WEB-INF/web.xml; \ - else \ - ${ECHO_MSG} " Preserving local configuration file: ${PREFIX}/${WEBAPPS_DIR}/${PORTNAME}/WEB-INF/web.xml"; \ - fi; - ${INSTALL_DATA} ${WRKSRC}/lib/${PORTNAME}/WEB-INF/web.xml.${CONF_EXT} ${PREFIX}/${WEBAPPS_DIR}/${PORTNAME}/WEB-INF - - ${MKDIR} ${DATADIR}/lib - ${INSTALL_DATA} ${LIBFILES:S,^,${WRKSRC}/lib/lib/,} ${DATADIR}/lib/ - ${INSTALL_DATA} ${WRKSRC}/lib/opengrok.jar ${DATADIR}/ -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/doc/,} ${DOCSDIR}/ -.endif - ${INSTALL_SCRIPT} ${WRKDIR}/opengrok ${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${DATADIR}/lib ${STAGEDIR}${DOCSDIR} \ + ${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_DATA} ${DOCS:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR}/ + ${INSTALL_SCRIPT} ${WRKDIR}/opengrok ${STAGEDIR}${PREFIX}/bin -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/devel/opengrok/distinfo ============================================================================== --- head/devel/opengrok/distinfo Wed Sep 10 13:05:31 2014 (r367828) +++ head/devel/opengrok/distinfo Wed Sep 10 13:09:02 2014 (r367829) @@ -1,2 +1,2 @@ -SHA256 (opengrok-0.11.1.tar.gz) = b49e795f3421117e0e1176bf786335c3aba70ad67ad77fb2800f9f4d6ae246c5 -SIZE (opengrok-0.11.1.tar.gz) = 7057514 +SHA256 (opengrok-0.12.1.tar.gz) = e93cee4e4909ea2671f475683da448d0de768006d5242c7c95fa891fdcc30a46 +SIZE (opengrok-0.12.1.tar.gz) = 14506193 Modified: head/devel/opengrok/pkg-descr ============================================================================== --- head/devel/opengrok/pkg-descr Wed Sep 10 13:05:31 2014 (r367828) +++ head/devel/opengrok/pkg-descr Wed Sep 10 13:09:02 2014 (r367829) @@ -1,8 +1,8 @@ -OpenGrok is a fast and usable source code search and cross reference engine. +OpenGrok is a fast source code search and cross reference engine. It helps you search, cross-reference and navigate your source tree. It can understand various program file formats and version control histories like Mercurial, Git, SCCS, RCS, CVS, Subversion, Teamware, ClearCase, Perforce -and Bazaar. In other words it lets you grok (profoundly understand) the open -source, hence the name OpenGrok. It is written in Java. +and Bazaar. In other words it lets you grok (profoundly understand) the +open source, hence the name OpenGrok. It is written in Java. -WWW: http://opensolaris.org/os/project/opengrok/ +WWW: http://opengrok.github.io/OpenGrok/ Modified: head/devel/opengrok/pkg-plist ============================================================================== --- head/devel/opengrok/pkg-plist Wed Sep 10 13:05:31 2014 (r367828) +++ head/devel/opengrok/pkg-plist Wed Sep 10 13:09:02 2014 (r367829) @@ -1,25 +1,25 @@ -@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/jrcs.jar -%%DATADIR%%/lib/lucene-core-3.0.2.jar -%%DATADIR%%/lib/lucene-spellchecker-3.0.2.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/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/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/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/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 +@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 @@ -113,6 +113,8 @@ bin/opengrok %%T%%/webapps/opengrok/search.jsp %%T%%/webapps/opengrok/status.jsp %%T%%/webapps/opengrok/utils.js +@group +@owner @dirrmtry %%T%%/webapps/opengrok/META-INF @dirrmtry %%T%%/webapps/opengrok/WEB-INF/lib @dirrmtry %%T%%/webapps/opengrok/WEB-INF @@ -125,4 +127,3 @@ bin/opengrok @dirrmtry %%T%%/webapps/opengrok @dirrmtry %%DATADIR%%/lib @dirrmtry %%DATADIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409101309.s8AD93n4046937>