Update to 7.0.0 release.

7 files changed, 16 insertions, 12 deletions

diff --git a/java/proguard/Makefile b/java/proguard/Makefile
index 873aeb20f215..95bea2916d91 100644
--- a/java/proguard/Makefile
+++ b/java/proguard/Makefile
@@ -2,17 +2,16 @@
 # $FreeBSD$
 
 PORTNAME=	proguard
-PORTVERSION=	6.2.0
+PORTVERSION=	7.0.0
 CATEGORIES=	java devel
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:C/.[0-9]$//}
-DISTNAME=	${PORTNAME}${PORTVERSION}
+MASTER_SITES=	https://github.com/Guardsquare/proguard/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Java class file shrinker, optimizer, and obfuscator
 
 LICENSE=	GPLv2
 
-OPTIONS_DEFINE=	EXAMPLES
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 USE_JAVA=	yes
 NO_BUILD=	yes
@@ -20,14 +19,20 @@ NO_ARCH=	yes
 
 SUB_FILES=	proguard.sh proguard-gui.sh retrace.sh
 
+PORTDOCS=	*
 PORTEXAMPLES=	*
 
+post-extract:
+	@${RMDIR} ${WRKSRC}/examples/android/.gradle/6.4/vcsMetadata-1
+
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/lib/*.jar ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/proguard.sh ${STAGEDIR}${PREFIX}/bin/proguard
 	${INSTALL_SCRIPT} ${WRKDIR}/proguard-gui.sh ${STAGEDIR}${PREFIX}/bin/proguard-gui
 	${INSTALL_SCRIPT} ${WRKDIR}/retrace.sh ${STAGEDIR}${PREFIX}/bin/retrace
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/
 
diff --git a/java/proguard/distinfo b/java/proguard/distinfo
index 4a3dc6c9ece7..c1197c617576 100644
--- a/java/proguard/distinfo
+++ b/java/proguard/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1570436588
-SHA256 (proguard6.2.0.tar.gz) = 7f64bd1db37c3b2eae69803135e0e59f438b759bd00a5ef18ee7319657916575
-SIZE (proguard6.2.0.tar.gz) = 2180476
+TIMESTAMP = 1604497867
+SHA256 (proguard-7.0.0.tar.gz) = 699f16644024000e90c2555083fa6f78a9cdf1d71f384535e82bf987d764f9fb
+SIZE (proguard-7.0.0.tar.gz) = 13209610
diff --git a/java/proguard/files/proguard-gui.sh.in b/java/proguard/files/proguard-gui.sh.in
index df4b935f8803..2ccd5e326039 100644
--- a/java/proguard/files/proguard-gui.sh.in
+++ b/java/proguard/files/proguard-gui.sh.in
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-exec "%%LOCALBASE%%/bin/java" -DsuppressSwingDropSupport=true -Xmx256m -jar "%%DATADIR%%/proguardgui.jar" "$@"
+exec "%%LOCALBASE%%/bin/java" -DsuppressSwingDropSupport=true -jar "%%DATADIR%%/proguardgui.jar" "$@"
diff --git a/java/proguard/files/proguard.sh.in b/java/proguard/files/proguard.sh.in
index aaa38fdb3518..264bde60dd1d 100644
--- a/java/proguard/files/proguard.sh.in
+++ b/java/proguard/files/proguard.sh.in
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-exec "%%LOCALBASE%%/bin/java" -Xmx256m -jar "%%DATADIR%%/proguard.jar" "$@"
+exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/proguard.jar" "$@"
diff --git a/java/proguard/files/retrace.sh.in b/java/proguard/files/retrace.sh.in
index 7c3dbe3bac66..e46b1726a082 100644
--- a/java/proguard/files/retrace.sh.in
+++ b/java/proguard/files/retrace.sh.in
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-exec "%%LOCALBASE%%/bin/java" -Xmx256m  -jar "%%DATADIR%%/retrace.jar" "$@"
+exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/retrace.jar" "$@"
diff --git a/java/proguard/pkg-descr b/java/proguard/pkg-descr
index c15a8ac37144..7e8875efd10a 100644
--- a/java/proguard/pkg-descr
+++ b/java/proguard/pkg-descr
@@ -6,4 +6,4 @@ remaining classes, fields, and methods using short
 meaningless names. The resulting jars are smaller and harder
 to reverse-engineer.
 
-WWW: https://www.guardsquare.com/proguard
+WWW: https://www.guardsquare.com/en/products/proguard
diff --git a/java/proguard/pkg-plist b/java/proguard/pkg-plist
index 22a39ef8ebb4..e3bf9a11813c 100644
--- a/java/proguard/pkg-plist
+++ b/java/proguard/pkg-plist
@@ -1,7 +1,6 @@
 bin/proguard
 bin/proguard-gui
 bin/retrace
-%%DATADIR%%/annotations.jar
 %%DATADIR%%/proguard.jar
 %%DATADIR%%/proguardgui.jar
 %%DATADIR%%/retrace.jar