- Update to 0.3.1.0

- STAGE-clean
- Switch to the jar-only distribution

5 files changed, 23 insertions, 222 deletions

diff --git a/net/jrdesktop/Makefile b/net/jrdesktop/Makefile
index 5d3a5ee84137..669e8950e336 100644
--- a/net/jrdesktop/Makefile
+++ b/net/jrdesktop/Makefile
@@ -2,36 +2,35 @@
 # $FreeBSD$
 
 PORTNAME=	jrdesktop
-PORTVERSION=	0.2.0030
+PORTVERSION=	0.3.1.0
 CATEGORIES=	net java
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}.src
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R:R}/
+DISTNAME=	${PORTNAME}-${PORTVERSION}.jar
+EXTRACT_SUFX=
+EXTRACT_ONLY=
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	View and/or control a remote PC
 
+LICENSE=	GPLv3
+
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
-USE_ANT=	yes
-USE_ZIP=	yes
+NO_BUILD=	yes
+
+SUB_FILES=	jrdesktop
+SUB_LIST+=	JAVA=${JAVA} \
+		PORTNAME=${PORTNAME} \
+		PORTVERSION=${PORTVERSION}
+
+PLIST_FILES=	${JAVAJARDIR:S/${PREFIX}\///}/${DISTNAME} \
+		bin/${PORTNAME}
 
-WRKSRC=	${WRKDIR}/${DISTNAME}/${PORTNAME}
-TXTFILES=	changes.txt license.txt readme.txt
+post-extract:
+	${CP} ${DISTDIR}/${DISTNAME} ${WRKDIR}
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/dist/jrdesktop.jar ${JAVAJARDIR}
-	${INSTALL_SCRIPT} ${FILESDIR}/jrdesktop.in ${PREFIX}/bin/jrdesktop
-
-post-install:
-	${REINPLACE_CMD} -i "" -e 's|%%JAVAJARDIR%%|${JAVAJARDIR}|;s|%%JAVA%%|${JAVA}|' \
-	    ${PREFIX}/bin/jrdesktop
-.if !defined(NOPORTDOCS)
-	${INSTALL} -d ${DOCSDIR}
-	(cd ${WRKSRC}/dist && ${COPYTREE_SHARE} javadoc ${DOCSDIR})
-.for txt in ${TXTFILES}
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/${txt} ${DOCSDIR}
-.endfor
-.endif
+	${INSTALL_DATA} ${WRKDIR}/${DISTNAME} ${STAGEDIR}${JAVAJARDIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/jrdesktop ${STAGEDIR}${PREFIX}/bin/jrdesktop
 
 .include <bsd.port.mk>
diff --git a/net/jrdesktop/distinfo b/net/jrdesktop/distinfo
index 8cdc1f9ecf97..b08eb6119f61 100644
--- a/net/jrdesktop/distinfo
+++ b/net/jrdesktop/distinfo
@@ -1,2 +1,2 @@
-SHA256 (jrdesktop-0.2.0030.src.zip) = fd03e250d79167808e0d18d1a372d038ffe64f5216380cd2a1132fea7c9b56c9
-SIZE (jrdesktop-0.2.0030.src.zip) = 139190
+SHA256 (jrdesktop-0.3.1.0.jar) = dba9ca3dee2b500db2dc738c98d9a5f2ea0a095919199b996e0e4ea5abd2e27a
+SIZE (jrdesktop-0.3.1.0.jar) = 382108
diff --git a/net/jrdesktop/files/jrdesktop.in b/net/jrdesktop/files/jrdesktop.in
index fc9ae0f17052..977782bc4c3e 100644
--- a/net/jrdesktop/files/jrdesktop.in
+++ b/net/jrdesktop/files/jrdesktop.in
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-JRDESKTOP_JAR=%%JAVAJARDIR%%/jrdesktop.jar
+JRDESKTOP_JAR=%%JAVAJARDIR%%/%%PORTNAME%%-%%PORTVERSION%%.jar
 
 %%JAVA%% -jar ${JRDESKTOP_JAR} display
diff --git a/net/jrdesktop/files/patch-src-jrdesktop_main.java b/net/jrdesktop/files/patch-src-jrdesktop_main.java
deleted file mode 100644
index 7d458ab04126..000000000000
--- a/net/jrdesktop/files/patch-src-jrdesktop_main.java
+++ /dev/null
@@ -1,47 +0,0 @@
---- src/jrdesktop/main.java.orig	2008-05-27 13:52:51.000000000 +0200
-+++ src/jrdesktop/main.java	2008-05-27 14:00:39.000000000 +0200
-@@ -1,5 +1,7 @@
- package jrdesktop;
- 
-+import java.io.File;
-+
- import java.net.URL;
- import java.util.jar.Attributes;
- import java.util.jar.Manifest;
-@@ -27,6 +29,8 @@
-     public static final URL NORMAL_SCREEN_ICON = main.class.getResource("images/view_nofullscreen.png");
-     public static final URL DEFAULT_SCREEN_ICON = main.class.getResource("images/default_screen.png");
-     public static final URL CUSTOM_SCREEN_ICON = main.class.getResource("images/custom_screen.png");
-+
-+    public static String CONFIG_DIR;
-     
-     public static String CONFIG_FILE;
-     public static String SERVER_CONFIG_FILE;
-@@ -37,14 +41,21 @@
-         
-     public static void main (String args[]) {          
-         if (System.getSecurityManager() == null)
--	    System.setSecurityManager(new SecurityMng());       
-+	    System.setSecurityManager(new SecurityMng());
-+
-+        CONFIG_DIR = System.getProperty("user.home") + File.separatorChar + ".jrdesktop";
-+
-+        File configDir = new File(CONFIG_DIR);
-+
-+        if(!configDir.exists())
-+            configDir.mkdir();
- 
--        CONFIG_FILE = FileUtility.getCurrentDirectory() + "config";
--        SERVER_CONFIG_FILE = FileUtility.getCurrentDirectory() + "server.config";
--        VIEWER_CONFIG_FILE = FileUtility.getCurrentDirectory() + "viewer.config";    
-+        CONFIG_FILE =  CONFIG_DIR + File.separatorChar + "config";
-+        SERVER_CONFIG_FILE = CONFIG_DIR + File.separatorChar + "server.config";
-+        VIEWER_CONFIG_FILE = CONFIG_DIR + File.separatorChar + "viewer.config";    
-     
--        KEY_STORE = FileUtility.getCurrentDirectory() + "keystore";   
--        TRUST_STORE = FileUtility.getCurrentDirectory() + "truststore";
-+        KEY_STORE = CONFIG_DIR + File.separatorChar + "keystore";   
-+        TRUST_STORE = CONFIG_DIR + File.separatorChar + "truststore";
-     
-         System.getProperties().remove("java.rmi.server.hostname");        
-                           
diff --git a/net/jrdesktop/pkg-plist b/net/jrdesktop/pkg-plist
deleted file mode 100644
index 0bc11cb84b84..000000000000
--- a/net/jrdesktop/pkg-plist
+++ /dev/null
@@ -1,151 +0,0 @@
-bin/jrdesktop
-%%JAVAJARDIR%%/jrdesktop.jar
-%%PORTDOCS%%%%DOCSDIR%%/changes.txt
-%%PORTDOCS%%%%DOCSDIR%%/license.txt
-%%PORTDOCS%%%%DOCSDIR%%/readme.txt
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/AboutGUI.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/Config.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/ConnectionInfos.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/HostProperties.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/main.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/mainFrame.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/SecurityMng.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/SysTray.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/viewer/FileMng/FileManager.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/viewer/FileMng/FilesDropTargetListener.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/viewer/FileMng/FileTransGUI.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/viewer/FileMng/package-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/viewer/FileMng/package-summary.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/viewer/FileMng/package-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/viewer/FileMng/class-use/FileManager.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/viewer/FileMng/class-use/FileTransGUI.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/viewer/FileMng/class-use/FilesDropTargetListener.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/viewer/FileMng/package-use.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/viewer/Config.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/viewer/ConnectionDialog.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/viewer/Recorder.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/viewer/ScreenPlayer.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/viewer/ViewerData.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/viewer/ViewerGUI.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/viewer/rmi/Viewer.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/viewer/rmi/package-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/viewer/rmi/package-summary.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/viewer/rmi/package-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/viewer/rmi/class-use/Viewer.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/viewer/rmi/package-use.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/viewer/package-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/viewer/package-summary.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/viewer/package-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/viewer/class-use/Config.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/viewer/class-use/ConnectionDialog.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/viewer/class-use/Recorder.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/viewer/class-use/ScreenPlayer.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/viewer/class-use/ViewerData.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/viewer/class-use/ViewerGUI.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/viewer/package-use.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/utilities/ClipbrdUtility.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/utilities/ClipbrdUtility.ImageSelection.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/utilities/FileUtility.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/utilities/ImageUtility.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/utilities/InetAdrUtility.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/utilities/ZipUtility.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/utilities/package-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/utilities/package-summary.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/utilities/package-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/utilities/class-use/ClipbrdUtility.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/utilities/class-use/ClipbrdUtility.ImageSelection.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/utilities/class-use/FileUtility.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/utilities/class-use/ImageUtility.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/utilities/class-use/InetAdrUtility.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/utilities/class-use/ZipUtility.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/utilities/package-use.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/server/rmi/MultihomeRMIClientSocketFactory.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/server/rmi/Server.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/server/rmi/ServerImpl.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/server/rmi/ServerInterface.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/server/rmi/package-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/server/rmi/package-summary.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/server/rmi/package-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/server/rmi/class-use/MultihomeRMIClientSocketFactory.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/server/rmi/class-use/Server.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/server/rmi/class-use/ServerImpl.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/server/rmi/class-use/ServerInterface.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/server/rmi/package-use.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/server/ActiveConnectionsGUI.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/server/Config.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/server/ConfigGUI.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/server/robot.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/server/package-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/server/package-summary.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/server/package-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/server/class-use/ActiveConnectionsGUI.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/server/class-use/Config.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/server/class-use/ConfigGUI.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/server/class-use/robot.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/server/package-use.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/package-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/package-summary.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/package-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/class-use/AboutGUI.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/class-use/Config.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/class-use/ConnectionInfos.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/class-use/HostProperties.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/class-use/SecurityMng.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/class-use/SysTray.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/class-use/main.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/class-use/mainFrame.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/jrdesktop/package-use.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/package-list
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/overview-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/constant-values.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/serialized-form.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/resources/inherit.gif
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/overview-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/index-files/index-1.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/index-files/index-2.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/index-files/index-3.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/index-files/index-4.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/index-files/index-5.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/index-files/index-6.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/index-files/index-7.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/index-files/index-8.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/index-files/index-9.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/index-files/index-10.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/index-files/index-11.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/index-files/index-12.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/index-files/index-13.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/index-files/index-14.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/index-files/index-15.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/index-files/index-16.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/index-files/index-17.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/index-files/index-18.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/index-files/index-19.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/index-files/index-20.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/index-files/index-21.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/index-files/index-22.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/index-files/index-23.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/deprecated-list.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/allclasses-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/allclasses-noframe.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/index.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/overview-summary.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/help-doc.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc/stylesheet.css
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/resources
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/jrdesktop/viewer/rmi/class-use
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/jrdesktop/viewer/rmi
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/jrdesktop/viewer/class-use
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/jrdesktop/viewer/FileMng/class-use
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/jrdesktop/viewer/FileMng
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/jrdesktop/viewer
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/jrdesktop/utilities/class-use
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/jrdesktop/utilities
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/jrdesktop/server/rmi/class-use
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/jrdesktop/server/rmi
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/jrdesktop/server/class-use
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/jrdesktop/server
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/jrdesktop/class-use
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/jrdesktop
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc/index-files
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%