5 files changed, 111 insertions, 55 deletions

diff --git a/java/proguard/Makefile b/java/proguard/Makefile
index 62df9427f11d..b5b7b3d68201 100644
--- a/java/proguard/Makefile
+++ b/java/proguard/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	proguard
-PORTVERSION=	1.5.1
+PORTVERSION=	3.2
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,13 +15,19 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 MAINTAINER=	alexs@snark.rinet.ru
 COMMENT=	Java obfuseeKata
 
-USE_JAVA=	1.1+
+RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
+
+USE_JAVA=	yes
 NO_BUILD=	yes
 
+SUB_FILES=	proguard.sh proguard-gui.sh
+
 do-install:
-	-@${MKDIR} ${PREFIX}/share/proguard
-	@${CP} -PRpf ${WRKSRC}/lib ${PREFIX}/share/proguard
-	@${CP} -PRpf ${WRKSRC}/docs ${PREFIX}/share/proguard
-	@${CP} -PRpf ${WRKSRC}/examples ${PREFIX}/share/proguard
+	cd ${WRKSRC} && \
+	  ${FIND} lib docs examples -type d -exec ${MKDIR} ${DATADIR}/{} \;
+	cd ${WRKSRC} && \
+	  ${FIND} lib docs examples -type f -exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
+	${INSTALL_SCRIPT} ${WRKDIR}/proguard.sh ${PREFIX}/bin/proguard
+	${INSTALL_SCRIPT} ${WRKDIR}/proguard-gui.sh ${PREFIX}/bin/proguard-gui
 
 .include <bsd.port.mk>
diff --git a/java/proguard/distinfo b/java/proguard/distinfo
index 7d64d8473d4d..a56a3f83297a 100644
--- a/java/proguard/distinfo
+++ b/java/proguard/distinfo
@@ -1,2 +1,2 @@
-MD5 (proguard1.5.1.tar.gz) = e06383241285262f4ffbab942856a4ab
-SIZE (proguard1.5.1.tar.gz) = 286025
+MD5 (proguard3.2.tar.gz) = 64b3c522f07aeb87d567663e0780c146
+SIZE (proguard3.2.tar.gz) = 1158638
diff --git a/java/proguard/files/proguard-gui.sh.in b/java/proguard/files/proguard-gui.sh.in
new file mode 100644
index 000000000000..0f57a4ed5301
--- /dev/null
+++ b/java/proguard/files/proguard-gui.sh.in
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+"%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/lib/proguardgui.jar" "$@"
diff --git a/java/proguard/files/proguard.sh.in b/java/proguard/files/proguard.sh.in
new file mode 100644
index 000000000000..81232dd63637
--- /dev/null
+++ b/java/proguard/files/proguard.sh.in
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+"%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/lib/proguard.jar" "$@"
diff --git a/java/proguard/pkg-plist b/java/proguard/pkg-plist
index 941eb37b9456..df01a8cf1f94 100644
--- a/java/proguard/pkg-plist
+++ b/java/proguard/pkg-plist
@@ -1,47 +1,87 @@
-share/proguard/lib/proguard.jar
-share/proguard/docs/manual/retrace/introduction.html
-share/proguard/docs/manual/retrace/usage.html
-share/proguard/docs/manual/retrace/examples.html
-share/proguard/docs/manual/usage.html
-share/proguard/docs/manual/sections.html
-share/proguard/docs/manual/introduction.html
-share/proguard/docs/manual/limitations.html
-share/proguard/docs/manual/examples.html
-share/proguard/docs/manual/troubleshooting.html
-share/proguard/docs/manual/refcard.html
-share/proguard/docs/manual/index.html
-share/proguard/docs/alternatives.html
-share/proguard/docs/title.html
-share/proguard/docs/sections.html
-share/proguard/docs/main.html
-share/proguard/docs/FAQ.html
-share/proguard/docs/license.html
-share/proguard/docs/downloads.html
-share/proguard/docs/index.html
-share/proguard/docs/LGPL.html
-share/proguard/docs/drop1.gif
-share/proguard/docs/drop2.gif
-share/proguard/docs/testimonials.html
-share/proguard/docs/drop3.gif
-share/proguard/docs/feedback.html
-share/proguard/docs/GPL.html
-share/proguard/docs/acknowledgements.html
-share/proguard/docs/luciadlogo.png
-share/proguard/docs/quality.html
-share/proguard/docs/checkmark.gif
-share/proguard/docs/title.gif
-share/proguard/docs/results.html
-share/proguard/docs/steel.gif
-share/proguard/docs/sflogo.png
-share/proguard/examples/applets.pro
-share/proguard/examples/applications.pro
-share/proguard/examples/library.pro
-share/proguard/examples/midlets.pro
-share/proguard/examples/proguard.pro
-share/proguard/examples/servlets.pro
-@dirrm share/proguard/lib
-@dirrm share/proguard/docs/manual/retrace
-@dirrm share/proguard/docs/manual
-@dirrm share/proguard/docs
-@dirrm share/proguard/examples
-@dirrm share/proguard
+@comment $FreeBSD$
+bin/proguard
+bin/proguard-gui
+%%DATADIR%%/docs/FAQ.html
+%%DATADIR%%/docs/GPL.html
+%%DATADIR%%/docs/GPL_exception.html
+%%DATADIR%%/docs/acknowledgements.html
+%%DATADIR%%/docs/alternatives.html
+%%DATADIR%%/docs/checkmark.gif
+%%DATADIR%%/docs/downloads.html
+%%DATADIR%%/docs/drop1.gif
+%%DATADIR%%/docs/drop2.gif
+%%DATADIR%%/docs/drop3.gif
+%%DATADIR%%/docs/feedback.html
+%%DATADIR%%/docs/index.html
+%%DATADIR%%/docs/license.html
+%%DATADIR%%/docs/luciadlogo.png
+%%DATADIR%%/docs/main.html
+%%DATADIR%%/docs/manual/ant.html
+%%DATADIR%%/docs/manual/examples.html
+%%DATADIR%%/docs/manual/gui.html
+%%DATADIR%%/docs/manual/index.html
+%%DATADIR%%/docs/manual/introduction.html
+%%DATADIR%%/docs/manual/limitations.html
+%%DATADIR%%/docs/manual/refcard.html
+%%DATADIR%%/docs/manual/retrace/examples.html
+%%DATADIR%%/docs/manual/retrace/index.html
+%%DATADIR%%/docs/manual/retrace/introduction.html
+%%DATADIR%%/docs/manual/retrace/usage.html
+%%DATADIR%%/docs/manual/sections.html
+%%DATADIR%%/docs/manual/style.css
+%%DATADIR%%/docs/manual/troubleshooting.html
+%%DATADIR%%/docs/manual/usage.html
+%%DATADIR%%/docs/manual/wtk.html
+%%DATADIR%%/docs/quality.html
+%%DATADIR%%/docs/results.html
+%%DATADIR%%/docs/screenshot_console.gif
+%%DATADIR%%/docs/screenshot_console_small.gif
+%%DATADIR%%/docs/screenshot_gui1.gif
+%%DATADIR%%/docs/screenshot_gui2.gif
+%%DATADIR%%/docs/screenshot_gui3.gif
+%%DATADIR%%/docs/screenshot_gui4.gif
+%%DATADIR%%/docs/screenshot_gui5.gif
+%%DATADIR%%/docs/screenshot_gui6.gif
+%%DATADIR%%/docs/screenshot_gui7.gif
+%%DATADIR%%/docs/screenshot_gui8.gif
+%%DATADIR%%/docs/screenshots.html
+%%DATADIR%%/docs/screenshots_gui_small.gif
+%%DATADIR%%/docs/sections.html
+%%DATADIR%%/docs/sflogo.png
+%%DATADIR%%/docs/steel.gif
+%%DATADIR%%/docs/style.css
+%%DATADIR%%/docs/testimonials.html
+%%DATADIR%%/docs/title.gif
+%%DATADIR%%/docs/title.html
+%%DATADIR%%/docs/vtitle.gif
+%%DATADIR%%/examples/ant/applets.xml
+%%DATADIR%%/examples/ant/applications1.xml
+%%DATADIR%%/examples/ant/applications2.xml
+%%DATADIR%%/examples/ant/applications3.xml
+%%DATADIR%%/examples/ant/library.xml
+%%DATADIR%%/examples/ant/midlets.xml
+%%DATADIR%%/examples/ant/proguard.xml
+%%DATADIR%%/examples/ant/servlets.xml
+%%DATADIR%%/examples/applets.pro
+%%DATADIR%%/examples/applications.pro
+%%DATADIR%%/examples/dictionaries/compact.txt
+%%DATADIR%%/examples/dictionaries/keywords.txt
+%%DATADIR%%/examples/dictionaries/shakespeare.txt
+%%DATADIR%%/examples/library.pro
+%%DATADIR%%/examples/midlets.pro
+%%DATADIR%%/examples/proguard.pro
+%%DATADIR%%/examples/proguardall.pro
+%%DATADIR%%/examples/proguardgui.pro
+%%DATADIR%%/examples/retrace.pro
+%%DATADIR%%/examples/servlets.pro
+%%DATADIR%%/lib/proguard.jar
+%%DATADIR%%/lib/proguardgui.jar
+%%DATADIR%%/lib/retrace.jar
+@dirrm %%DATADIR%%/lib
+@dirrm %%DATADIR%%/examples/dictionaries
+@dirrm %%DATADIR%%/examples/ant
+@dirrm %%DATADIR%%/examples
+@dirrm %%DATADIR%%/docs/manual/retrace
+@dirrm %%DATADIR%%/docs/manual
+@dirrm %%DATADIR%%/docs
+@dirrm %%DATADIR%%