Index: head/math/jts/Makefile =================================================================== --- head/math/jts/Makefile (revision 506844) +++ head/math/jts/Makefile (revision 506845) @@ -1,96 +1,97 @@ # Created by: Thierry Thomas # $FreeBSD$ PORTNAME= jts -DISTVERSION= 1.15.1 +DISTVERSION= 1.16.1 DISTVERSIONPREFIX= jts- CATEGORIES= math databases java MAINTAINER= mfechner@FreeBSD.org COMMENT= JTS Topology Suite LICENSE= EPL #LICENSE_COMB= dual BUILD_DEPENDS= mvn:devel/maven USE_GITHUB= yes GH_ACCOUNT= locationtech USE_JAVA= yes JAVA_VERSION= 1.8+ NO_ARCH= yes VER= ${PORTVERSION:tl} 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 +PLIST_SUB= VERSION=${VER} 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}/modules/${jar}-${VER}.jar \ ${STAGEDIR}${JAVALIBDIR}/ .endfor do-install-DOCS-on: .for jar in ${JARDOCFILES} @${INSTALL_DATA} ${WRKSRC}/modules/${jar}-${VER}-javadoc.jar \ ${STAGEDIR}${JAVALIBDIR}/ .endfor # 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 + read -p "Continue to push new version ${VER} to GH" dummy cd ${WRKDIR}/.m2 && git push -u origin master cd ${WRKDIR}/.m2 && git tag -f ${VER} cd ${WRKDIR}/.m2 && git push --tags -f .include Index: head/math/jts/distinfo =================================================================== --- head/math/jts/distinfo (revision 506844) +++ head/math/jts/distinfo (revision 506845) @@ -1,5 +1,5 @@ -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 +TIMESTAMP = 1563442910 +SHA256 (locationtech-jts-jts-1.16.1_GH0.tar.gz) = 899b58b18e3dc5756ffe94202a36a409a5a22f68b58295406155ace3eb5952c6 +SIZE (locationtech-jts-jts-1.16.1_GH0.tar.gz) = 13702015 +SHA256 (mfechner-freebsd-math-jts-deps-1.16.1_GH0.tar.gz) = f23ae4a882f78ecb37e3e5da49f467e62d3d92f552dd53d4146d4c4f4170193b +SIZE (mfechner-freebsd-math-jts-deps-1.16.1_GH0.tar.gz) = 49315156 Index: head/math/jts/pkg-plist =================================================================== --- head/math/jts/pkg-plist (revision 506844) +++ head/math/jts/pkg-plist (revision 506845) @@ -1,7 +1,7 @@ -%%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 +%%JAVAJARDIR%%/jts-app-%%VERSION%%.jar +%%JAVAJARDIR%%/jts-core-%%VERSION%%.jar +%%JAVAJARDIR%%/jts-io-common-%%VERSION%%.jar +%%JAVAJARDIR%%/jts-lab-%%VERSION%%.jar +%%PORTDOCS%%%%JAVAJARDIR%%/jts-core-%%VERSION%%-javadoc.jar +%%PORTDOCS%%%%JAVAJARDIR%%/jts-io-common-%%VERSION%%-javadoc.jar +%%PORTDOCS%%%%JAVAJARDIR%%/jts-lab-%%VERSION%%-javadoc.jar