diff --git a/cad/digital/Makefile b/cad/digital/Makefile index 931bc099dc62..1ef6cc5a215c 100644 --- a/cad/digital/Makefile +++ b/cad/digital/Makefile @@ -2,7 +2,8 @@ PORTNAME= digital DISTVERSIONPREFIX= v -DISTVERSION= 0.22 +DISTVERSION= 0.22-250 +DISTVERSIONSUFFIX= -gebc913a3 CATEGORIES= cad java MAINTAINER= yuri@FreeBSD.org @@ -50,6 +51,7 @@ do-build: -fae install \ -Dmaven.test.skip=true \ -Duser.home=${WRKDIR} \ + -P no-git-rev -Dgit.commit.id.describe=${DISTVERSIONFULL} \ package do-install: ${INSTALL_DATA} ${WRKSRC}/target/Digital.jar ${STAGEDIR}${JAVAJARDIR} diff --git a/cad/digital/distinfo b/cad/digital/distinfo index 118e1e1f56c9..5617d1660297 100644 --- a/cad/digital/distinfo +++ b/cad/digital/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1563812653 -SHA256 (digital-0.22-deps.tar.gz) = 2898250162babda82352e34b36aef95010f5e973af9eb3fde78aa16745e54057 -SIZE (digital-0.22-deps.tar.gz) = 51278882 -SHA256 (hneemann-Digital-v0.22_GH0.tar.gz) = 445d2993785d1f5dd59c41aed6ea68d42ae7a83c6cb1d0c5037de44f2fc465dd -SIZE (hneemann-Digital-v0.22_GH0.tar.gz) = 3768846 +TIMESTAMP = 1563814257 +SHA256 (digital-0.22-250-deps.tar.gz) = d11bc092d516dc30095a2b007a943c375929859638f0fa104f1fb51628438896 +SIZE (digital-0.22-250-deps.tar.gz) = 53749701 +SHA256 (hneemann-Digital-v0.22-250-gebc913a3_GH0.tar.gz) = 10a03eae5e4c6175d2aec5b759eb2cb8a1fecd26e683c6c9e04766c25456e22c +SIZE (hneemann-Digital-v0.22-250-gebc913a3_GH0.tar.gz) = 4676883 diff --git a/cad/digital/files/patch-pom.xml b/cad/digital/files/patch-pom.xml deleted file mode 100644 index be51342121cc..000000000000 --- a/cad/digital/files/patch-pom.xml +++ /dev/null @@ -1,37 +0,0 @@ -Maybe this can be entirely eliminated with new maven args: -P no-git-rev -Dgit.commit.id.describe=${DISTVERSION} - ---- pom.xml.orig 2019-07-22 05:00:43 UTC -+++ pom.xml -@@ -133,25 +133,6 @@ - - - -- pl.project13.maven -- git-commit-id-plugin -- 2.2.1 -- -- -- get-the-git-infos -- -- revision -- -- -- -- -- ${project.basedir}/.git -- false -- flat -- -- -- -- - org.apache.maven.plugins - maven-checkstyle-plugin - 2.17 -@@ -330,4 +311,4 @@ - scm:git:file://localhost/${pom.basedir} - - -- -\ No newline at end of file -+