Date: Thu, 18 Jul 2019 09:17:03 +0000 (UTC) From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r506844 - in head/math/jts: . files Message-ID: <201907180917.x6I9H3YO088130@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mfechner Date: Thu Jul 18 09:17:02 2019 New Revision: 506844 URL: https://svnweb.freebsd.org/changeset/ports/506844 Log: Take maintainer. Upgrade to 1.15.1 which is required for apache-solr. Reported by: Stephane Marzloff secrer at le-bar.org Reviewed by: Stephane Marzloff secrer at le-bar.org Deleted: head/math/jts/files/ Modified: head/math/jts/Makefile head/math/jts/distinfo head/math/jts/pkg-plist Modified: head/math/jts/Makefile ============================================================================== --- head/math/jts/Makefile Thu Jul 18 09:02:15 2019 (r506843) +++ head/math/jts/Makefile Thu Jul 18 09:17:02 2019 (r506844) @@ -2,49 +2,95 @@ # $FreeBSD$ PORTNAME= jts -PORTVERSION= 1.14 +DISTVERSION= 1.15.1 +DISTVERSIONPREFIX= jts- CATEGORIES= math databases java -MASTER_SITES= SF/${PORTNAME}-topo-suite/${PORTNAME}/${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= mfechner@FreeBSD.org COMMENT= JTS Topology Suite -LICENSE= LGPL21 -LICENSE_FILE= ${WRKSRC}/doc/LICENSE.txt +LICENSE= EPL +#LICENSE_COMB= dual -RUN_DEPENDS= ${JAVALIBDIR}/jdom.jar:java/jdom \ - ${JAVALIBDIR}/junit.jar:java/junit \ - ${JAVALIBDIR}/xml-apis.jar:textproc/xerces-j +BUILD_DEPENDS= mvn:devel/maven -USES= zip -NO_BUILD= yes -NO_ARCH= yes +USE_GITHUB= yes +GH_ACCOUNT= locationtech + USE_JAVA= yes -NO_WRKSUBDIR= yes +JAVA_VERSION= 1.8+ +NO_ARCH= yes VER= ${PORTVERSION:tl} -JARFILES= JTS_Test jts-${VER} jtsio-${VER} +JARFILES= core/target/jts-core app/target/jts-app io/common/target/jts-io-common lab/target/jts-lab +JARDOCFILES= io/common/target/jts-io-common core/target/jts-core lab/target/jts-lab PORTDOCS= * OPTIONS_DEFINE= DOCS +# to rebuild the deps archive: +# 1. set DEV_UPDATE_MODE=yes +# 2. make makesum build +# 3. upload the *-deps using: make pushToGH +# 4. set DEV_UPDATE_MODE=no +# 5. make clean makesum + +DEV_UPDATE_MODE= no + +.if (${DEV_UPDATE_MODE} == "yes") +pre-build: + mkdir -p ${WRKDIR}/.m2 + cd ${WRKDIR}/.m2 && rm -Rf .git + cd ${WRKDIR}/.m2 && git init + cd ${WRKDIR}/.m2 && git remote add origin git@github.com:mfechner/freebsd-math-jts-deps.git + cd ${WRKDIR}/.m2 && git fetch + cd ${WRKDIR}/.m2 && rm -Rf repository + cd ${WRKDIR}/.m2 && git checkout master + cd ${WRKDIR}/.m2 && rm -Rf repository + +post-build: + @${ECHO} "(!!!) Please upload the maven repo using: make pushToGH" +.else +GH_TUPLE= mfechner:freebsd-math-jts-deps:${VER}:m2 +MASTER_SITES+= LOCAL/mfechner/:maven +MVN_ARGS= --offline + +# Move the download deps to correct destination +post-patch: + @${MV} ${WRKDIR}/freebsd-math-jts-deps-${VER} ${WRKDIR}/.m2 +.endif + +#-Dmaven.repo.local=${WRKDIR}/freebsd-math-jts-deps-${VER}/ +do-build: + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ + ${LOCALBASE}/bin/mvn ${MVN_ARGS} \ + -fae clean install \ + -Dmaven.test.skip=true \ + -Duser.home=${WRKDIR} + do-install: .for jar in ${JARFILES} - ${INSTALL_DATA} ${WRKSRC}/lib/${jar}.jar \ - ${STAGEDIR}${JAVAJARDIR}/${jar:S|-${VER}||}.jar + @${INSTALL_DATA} ${WRKSRC}/modules/${jar}-${VER}.jar \ + ${STAGEDIR}${JAVALIBDIR}/ .endfor do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - @cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} - @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." +.for jar in ${JARDOCFILES} + @${INSTALL_DATA} ${WRKSRC}/modules/${jar}-${VER}-javadoc.jar \ + ${STAGEDIR}${JAVALIBDIR}/ +.endfor -do-test: - @${SED} -e 's|%%JAVAJARDIR%%|${JAVAJARDIR}|; \ - s|%%JAVALIBDIR%%|${JAVALIBDIR}|;\ - s|%%JAVA%%|${JAVA}|' \ - ${FILESDIR}/testJTS.sh.in > ${WRKSRC}/testJTS.sh - (cd ${WRKSRC} && ${SH} ./testJTS.sh ) +# Make sure you build the port before (not in poudriere, make build) with DEV_UPDATE_MODE=yes +# before you execute this target +pushToGH: + @cd ${WRKDIR}/.m2 + cd ${WRKDIR}/.m2 && git add . + cd ${WRKDIR}/.m2 && git status + cd ${WRKDIR}/.m2 && git commit -m "Update deps for version ${VER}." + read Continue to push new version ${VER} to GH + cd ${WRKDIR}/.m2 && git push -u origin master + cd ${WRKDIR}/.m2 && git tag -f ${VER} + cd ${WRKDIR}/.m2 && git push --tags -f .include <bsd.port.mk> Modified: head/math/jts/distinfo ============================================================================== --- head/math/jts/distinfo Thu Jul 18 09:02:15 2019 (r506843) +++ head/math/jts/distinfo Thu Jul 18 09:17:02 2019 (r506844) @@ -1,2 +1,5 @@ -SHA256 (jts-1.14.zip) = 848e7fadcdc74dbf3d5133b83103b42d925408a363ec7e54d2d8390791d6a359 -SIZE (jts-1.14.zip) = 9586532 +TIMESTAMP = 1563191416 +SHA256 (locationtech-jts-jts-1.15.1_GH0.tar.gz) = 3c52c7cc5a1b2b7cedfad0416798efd723f4e1573196519ed082cc0fd7e9cf73 +SIZE (locationtech-jts-jts-1.15.1_GH0.tar.gz) = 13594468 +SHA256 (mfechner-freebsd-math-jts-deps-1.15.1_GH0.tar.gz) = 3c15b88ec145f40b61cc8417fab028dae1cb98da5298c026e076b8269b545607 +SIZE (mfechner-freebsd-math-jts-deps-1.15.1_GH0.tar.gz) = 43953648 Modified: head/math/jts/pkg-plist ============================================================================== --- head/math/jts/pkg-plist Thu Jul 18 09:02:15 2019 (r506843) +++ head/math/jts/pkg-plist Thu Jul 18 09:17:02 2019 (r506844) @@ -1,3 +1,7 @@ -%%JAVAJARDIR%%/JTS_Test.jar -%%JAVAJARDIR%%/jts.jar -%%JAVAJARDIR%%/jtsio.jar +%%JAVAJARDIR%%/jts-app-1.15.1.jar +%%JAVAJARDIR%%/jts-core-1.15.1.jar +%%JAVAJARDIR%%/jts-io-common-1.15.1.jar +%%JAVAJARDIR%%/jts-lab-1.15.1.jar +%%PORTDOCS%%%%JAVAJARDIR%%/jts-core-1.15.1-javadoc.jar +%%PORTDOCS%%%%JAVAJARDIR%%/jts-io-common-1.15.1-javadoc.jar +%%PORTDOCS%%%%JAVAJARDIR%%/jts-lab-1.15.1-javadoc.jar
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907180917.x6I9H3YO088130>