Differential D11355
devel/opengrok: update to 1.0 and takeover maintainership Authored by ultima on Jun 25 2017, 5:37 PM. Tags None Referenced Files
Subscribers
Details
Changelog: https://github.com/OpenGrok/OpenGrok/releases/tag/1.0 PR\: 220082
Diff Detail
Event Timeline
Comment Actions Nowadays, any time you see: .if ${PORT_OPTIONS:MFOO}you can 99% of the time replace it with one of the constructs documented in ${PORTSDIR}/MK/bas.options.mk Comment Actions You can still fetch it from GitHub and build it. This should be preferable to fetching precompiled jar files. Comment Actions I just added these and it will no longer build. First guess, OPT_VARS must be parsed after OPT_BUILD_DEPENDS/RUN_DEPENDS. Unless i'm doing something obviously wrong that I'm not seeing. [103amd64-test-job-01] Extracting tomcat8-8.0.43: .......... done ===> opengrok-1.0 depends on file: /bin/bootstrap.jar - not found *** Error code 1 svn diff devel/opengrok/Makefile Index: devel/opengrok/Makefile =================================================================== --- devel/opengrok/Makefile (revision 444305) +++ devel/opengrok/Makefile (working copy) @@ -1,25 +1,26 @@ # $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}" @@ -28,40 +29,39 @@ 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 TOMCAT6_BUILD_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat6 TOMCAT6_RUN_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat6 +TOMCAT7_VARS= WEBAPP_HOME?=${LOCALBASE}/apache-tomcat-7.0 TOMCAT7_BUILD_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat7 TOMCAT7_RUN_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat7 +TOMCAT8_VARS= WEBAPP_HOME?=${LOCALBASE}/apache-tomcat-8.0 +TOMCAT8_BUILD_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat8 +TOMCAT8_RUN_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat8 +TOMCAT85_VARS= WEBAPP_HOME?=${LOCALBASE}/apache-tomcat-8.5 +TOMCAT85_BUILD_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat85 +TOMCAT85_RUN_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat85 +RESIN3_VARS= WEBAPP_HOME?=${LOCALBASE}/resin3 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 + 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 -.include <bsd.port.options.mk> - -.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 - WEBAPPS_DIR= ${WEBAPP_HOME:S|^${LOCALBASE}/||}/webapps post-extract: Comment Actions I agree, I'll ask the new maintainer to make this move as it is definitely prefered! I think it would be best to leave it out of the update commit though. I suspect it to be a small challenge due to port not being created in this way, but as I have not made a deep dive, I have no real clue. Comment Actions You can triple-backquote (`) text block to paste it into Phabricator, like so: pre formatted text * goes here Comment Actions Also, it's an ordering issue. This works: .include <bsd.port.options.mk>
TOMCAT85_VARS= WEBAPP_HOME?= ${LOCALBASE}/apache-tomcat-8.5
TOMCAT8_VARS= WEBAPP_HOME?= ${LOCALBASE}/apache-tomcat-8.0
TOMCAT7_VARS= WEBAPP_HOME?= ${LOCALBASE}/apache-tomcat-7.0
TOMCAT6_VARS= WEBAPP_HOME?= ${LOCALBASE}/apache-tomcat-6.0
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/resin3Comment Actions I thought that include wasnt necessary in the modern format which is why I left it out. This fixes the parsing issue, however a new issue arises, the WEBAPPS_DIR= ${WEBAPP_HOME:S|^${LOCALBASE}/||}/webapps is being parsed before OPT_VARS is set. Actually, this is incorrect, the BUILD_DEPEND/RUN_DEPEND isn't even being added now. I'm going to try and move some stuff around. Comment Actions Umm, you're right! The options include is not necessary when using helpers. TOMCAT85_VARS= WEBAPP_HOME=${LOCALBASE}/apache-tomcat-8.5
TOMCAT8_VARS= WEBAPP_HOME=${LOCALBASE}/apache-tomcat-8.0
TOMCAT7_VARS= WEBAPP_HOME=${LOCALBASE}/apache-tomcat-7.0
TOMCAT6_VARS= WEBAPP_HOME=${LOCALBASE}/apache-tomcat-6.0
RESIN3_VARS= WEBAPP_HOME=${LOCALBASE}/resin3The helper just doesn't parse "?=" correctly. $ make BATCH=y -VPLIST_SUB T=apache-tomcat-8.0 OWNER=www GROUP=www JAVASHAREDIR="share/java" JAVAJARDIR="share/java/classes" OSREL=12.0 PREFIX=%D LOCALBASE=/usr/local RESETPREFIX=/usr/local PORTDOCS="" PORTEXAMPLES="" LIB32DIR=lib DOCSDIR="share/doc/opengrok" EXAMPLESDIR="share/examples/opengrok" DATADIR="share/opengrok" WWWDIR="www/opengrok" ETCDIR="etc/opengrok" Comment Actions Ah ha! so thats the culprit. Would it be acceptable to remove the ability to export WEBAPP_HOME? I will say yes as the tomcat8 port as no similar option. Comment Actions I don't believe this port would even work if the user overrides WEBAPP_HOME to something other than the one from OPTIONS. Comment Actions OK, It looks good to me as-is. Make sure that the maintainer is still fine with it and you can commit it. | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||