Update to 3.10.1 release:

- install files in correct locations
- add retrace executable
- remove dead pkg-message
- take maintainership

8 files changed, 43 insertions, 109 deletions

diff --git a/java/proguard/Makefile b/java/proguard/Makefile
index 48eb9097d561..8f26fdd98150 100644
--- a/java/proguard/Makefile
+++ b/java/proguard/Makefile
@@ -6,27 +6,37 @@
 #
 
 PORTNAME=	proguard
-PORTVERSION=	3.9
+PORTVERSION=	3.10.1
 CATEGORIES=	java devel
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Java obfuseeKata
+MAINTAINER=	ale@FreeBSD.org
+COMMENT=	A Java class file shrinker, optimizer, and obfuscator
 
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
 USE_JAVA=	yes
 NO_BUILD=	yes
 
-SUB_FILES=	proguard.sh proguard-gui.sh
+SUB_FILES=	proguard.sh proguard-gui.sh retrace.sh
+
+PORTDOCS=	*
+PORTEXAMPLES=	*
 
 do-install:
-	cd ${WRKSRC} && \
-	  ${FIND} lib docs examples -type d -exec ${MKDIR} ${DATADIR}/{} \;
-	cd ${WRKSRC} && \
-	  ${FIND} lib docs examples -type f -exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
+	@${MKDIR} ${DATADIR}
+	@${INSTALL_DATA} ${WRKSRC}/lib/*.jar ${DATADIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/proguard.sh ${PREFIX}/bin/proguard
 	${INSTALL_SCRIPT} ${WRKDIR}/proguard-gui.sh ${PREFIX}/bin/proguard-gui
+	${INSTALL_SCRIPT} ${WRKDIR}/retrace.sh ${PREFIX}/bin/retrace
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	@(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}/)
+.endif
+.if !defined(NOPORTEXAMPLES)
+	@${MKDIR} ${EXAMPLESDIR}
+	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${EXAMPLESDIR}/)
+.endif
 
 .include <bsd.port.mk>
diff --git a/java/proguard/distinfo b/java/proguard/distinfo
index c51b99ed8196..aee84922d008 100644
--- a/java/proguard/distinfo
+++ b/java/proguard/distinfo
@@ -1,3 +1,3 @@
-MD5 (proguard3.9.tar.gz) = 75b0409f60478cd58797a26dd633cdb9
-SHA256 (proguard3.9.tar.gz) = dfd99bfd6ebb7a59641d009b2b4af22e93235c0c3aad7ef4293cf6b939e55ace
-SIZE (proguard3.9.tar.gz) = 1260573
+MD5 (proguard3.10.1.tar.gz) = 84866075a9ccaf4f18caceaf2db4371a
+SHA256 (proguard3.10.1.tar.gz) = 4d2f88c2d692c422ed65bae7520590a5ebc5cf7a7b773e2af9d9dcc47b7764c5
+SIZE (proguard3.10.1.tar.gz) = 1263061
diff --git a/java/proguard/files/proguard-gui.sh.in b/java/proguard/files/proguard-gui.sh.in
index 1bece9e2512e..e6b89db692c3 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" -jar "%%DATADIR%%/lib/proguardgui.jar" "$@"
+exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/proguardgui.jar" "$@"
diff --git a/java/proguard/files/proguard.sh.in b/java/proguard/files/proguard.sh.in
index d998af903a06..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" -jar "%%DATADIR%%/lib/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
new file mode 100644
index 000000000000..e46b1726a082
--- /dev/null
+++ b/java/proguard/files/retrace.sh.in
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/retrace.jar" "$@"
diff --git a/java/proguard/pkg-descr b/java/proguard/pkg-descr
index 853e71ab643b..05e0d41677fc 100644
--- a/java/proguard/pkg-descr
+++ b/java/proguard/pkg-descr
@@ -1,5 +1,12 @@
-This package contains the main ProGuard application. ProGuard can read
-jar files, shrink and obfuscate them, and write out the resulting jar
-file.
+ProGuard is a free Java class file shrinker, optimizer, and
+obfuscator. It can detect and remove unused classes, fields,
+methods, and attributes. It can then optimize bytecode and
+remove unused instructions. Finally, it can rename the
+remaining classes, fields, and methods using short
+meaningless names. The resulting jars are smaller and harder
+to reverse-engineer.
 
-WWW: http://www.sf.net/projects/proguard
+WWW: http://proguard.sourceforge.net/
+
+- Alex Dupre
+ale@FreeBSD.org
diff --git a/java/proguard/pkg-message b/java/proguard/pkg-message
deleted file mode 100644
index 3c32c75313cc..000000000000
--- a/java/proguard/pkg-message
+++ /dev/null
@@ -1,8 +0,0 @@
-This port installs the jar-file (${PREFIX}/share/proguard1.5.1/lib/proguard.jar)
-which should be run with java:
-
-cd ${PREFIX}/share/proguard1.5.1/lib
-java -jar proguard.jar @options
-
-You should prepare the file with options before this. Read the documentation
-for the details.
diff --git a/java/proguard/pkg-plist b/java/proguard/pkg-plist
index a76a86a53e67..9d6089284df7 100644
--- a/java/proguard/pkg-plist
+++ b/java/proguard/pkg-plist
@@ -1,87 +1,7 @@
-@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/favicon.ico
-%%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%%/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
+bin/retrace
+%%DATADIR%%/proguard.jar
+%%DATADIR%%/proguardgui.jar
+%%DATADIR%%/retrace.jar
 @dirrm %%DATADIR%%