- Upgrade the repocopied port to new version (2.0.5.1278522500)

4 files changed, 96 insertions, 116 deletions

diff --git a/java/eclipse-aptana2/Makefile b/java/eclipse-aptana2/Makefile
index e47413e49c27..5765d67c031a 100644
--- a/java/eclipse-aptana2/Makefile
+++ b/java/eclipse-aptana2/Makefile
@@ -6,21 +6,24 @@
 #
 
 PORTNAME=	aptana
-PORTVERSION=	1.2.2.024747
-PORTREVISION=	2
-PORTEPOCH=	1
+PORTVERSION=	2.0.5.1278522500
+#PORTREVISION=	0
 CATEGORIES=	java devel
-MASTER_SITES=	http://update1.aptana.org/studio/3.2/024747/
+MASTER_SITES=	http://nivi.interfree.it/distfiles/eclipse-aptana2/
 PKGNAMEPREFIX=	eclipse-
-DISTNAME=	aptana_update_${PORTVERSION:E}
+DISTNAME=	com.aptana.ide.feature.studio-${PORTVERSION}-5-7857HJ97CFF61HN1HZHtem5tN7
 
 MAINTAINER=	nivit@FreeBSD.org
-COMMENT=	Aptana Web Development Tools (Eclipse plugin)
+COMMENT=	Aptana Studio 2 Web Development Tools (Eclipse plugin)
 
 RUN_DEPENDS=	${LOCALBASE}/bin/eclipse:${PORTSDIR}/java/eclipse
 
+CONFLICTS_INSTALL=	eclipse-aptana-1*
+
 JAVA_VERSION=	1.5+
 
+LATEST_LINK?=	${PKGNAMEPREFIX}aptana2
+
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/java/eclipse-aptana2/distinfo b/java/eclipse-aptana2/distinfo
index af4a4e0828cb..9c3a523a5066 100644
--- a/java/eclipse-aptana2/distinfo
+++ b/java/eclipse-aptana2/distinfo
@@ -1,3 +1,2 @@
-MD5 (aptana_update_024747.zip) = c01709c63291a376bc0f4c5731d9228a
-SHA256 (aptana_update_024747.zip) = f6d80f1050e5b481f0393345259bf017920701439de2b51b5d1581a3a4ef7618
-SIZE (aptana_update_024747.zip) = 136170061
+SHA256 (com.aptana.ide.feature.studio-2.0.5.1278522500-5-7857HJ97CFF61HN1HZHtem5tN7.zip) = d40b56b5dabeb4e2e6080c4e66f5a2709be2d57b5f10f5eb1bc364b80da809de
+SIZE (com.aptana.ide.feature.studio-2.0.5.1278522500-5-7857HJ97CFF61HN1HZHtem5tN7.zip) = 36320102
diff --git a/java/eclipse-aptana2/pkg-descr b/java/eclipse-aptana2/pkg-descr
index 8dd2e85b0220..22fcfb80b0ba 100644
--- a/java/eclipse-aptana2/pkg-descr
+++ b/java/eclipse-aptana2/pkg-descr
@@ -1,4 +1,4 @@
-Aptana Studio is an IDE, designed for web developers and provides
+Aptana Studio 2 is an IDE, designed for web developers and provides
 robust support for HTML, CSS and Javascript (bundled libraries:
 ExtJS, jQuery, Mochikit, Scriptaculous, Adobe Spry, YUI, Prototype,
 and Dojo). This is the plug-in for Eclipse.
diff --git a/java/eclipse-aptana2/pkg-plist b/java/eclipse-aptana2/pkg-plist
index b561ad6fc7a5..4c1b43239cbf 100644
--- a/java/eclipse-aptana2/pkg-plist
+++ b/java/eclipse-aptana2/pkg-plist
@@ -1,108 +1,86 @@
 @comment $FreeBSD$
-lib/eclipse/features/com.adobe.spry.1.6_1.6.0.00003.jar
-lib/eclipse/features/com.aptana.ide.feature.editor.css_1.2.7.024747.jar
-lib/eclipse/features/com.aptana.ide.feature.editor.html_1.2.7.024747.jar
-lib/eclipse/features/com.aptana.ide.feature.editor.js_1.2.7.024747.jar
-lib/eclipse/features/com.aptana.ide.feature.editors_1.2.7.024747.jar
-lib/eclipse/features/com.aptana.ide.feature.framework.jaxer_1.2.7.024747.jar
-lib/eclipse/features/com.aptana.ide.feature.frameworks_1.1.7.024747.jar
-lib/eclipse/features/com.aptana.ide.feature.professional_1.2.7.024688_200905101214.jar
-lib/eclipse/features/com.aptana.ide.feature.rcp_1.2.7.024747.jar
-lib/eclipse/features/com.aptana.ide.feature.server.cloud_1.2.7.024747.jar
-lib/eclipse/features/com.aptana.ide.feature.svn_1.4.2.jar
-lib/eclipse/features/com.aptana.ide.feature.syncing.ftp_1.2.7.024747.jar
-lib/eclipse/features/com.aptana.ide.feature.xul_1.2.7.024747.jar
-lib/eclipse/features/com.aptana.ide.feature_1.2.7.024747.jar
-lib/eclipse/features/com.extjs.ext.2.2_2.2.0.0004.jar
-lib/eclipse/features/com.jquery.1.3_1.3.2.00002.jar
-lib/eclipse/features/com.mochikit.1.4_1.4.0.00006.jar
-lib/eclipse/features/com.ms.ajax.3.5_3.5.21022.9.jar
-lib/eclipse/features/com.yahoo.yui.2.7_2.7.0.00001.jar
-lib/eclipse/features/net.mootools.1.2_1.2.1.00001.jar
-lib/eclipse/features/org.aflax.1.0_1.0.0.00004.jar
-lib/eclipse/features/org.dojotoolkit.dojo.1.2_1.2.0.00001.jar
-lib/eclipse/features/org.eclipse.eclipsemonkey_1.2.7.024747.jar
-lib/eclipse/features/org.openrico.rico.2.0_2.0.0.00002.jar
-lib/eclipse/features/org.prototypejs.prototype.1.6_1.6.0.00003.jar
-lib/eclipse/features/org.scriptaculous.1.8_1.8.1.00001.jar
-lib/eclipse/plugins/com.adobe.spry.1.6_1.6.0.00003.jar
-lib/eclipse/plugins/com.aptana.ide.branding_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.core.ui_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.core.win32_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.core_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.db.ui_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.debug.core.ie_1.1.12.024688_200905101214.jar
-lib/eclipse/plugins/com.aptana.ide.debug.core_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.debug.ui_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.documentation_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.editor.css_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.editor.html_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.editor.js_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.editor.text_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.editor.xml_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.editors.codeassist_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.editors_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.epl_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.extras_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.framework.jaxer.server.linux_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.framework.jaxer.server.macosx_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.framework.jaxer.server.win32_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.framework.jaxer_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.internet.proxy_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.interpreters_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.intro_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.io.file_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.jface.text.source_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.js.docgen_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.lexer_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.libraries.jetty_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.libraries_1.2.3.18699.jar
-lib/eclipse/plugins/com.aptana.ide.logging_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.parsing_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.pathtools_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.professional.licensing_1.2.7.024688_200905101214.jar
-lib/eclipse/plugins/com.aptana.ide.rcp.main_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.rcp_1.2.6.024747.jar
-lib/eclipse/plugins/com.aptana.ide.samples_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.scripting_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.search.epl_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.search_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.server.cloud_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.server.core_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.server.javacloud_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.server.jetty_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.server.portal_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.server.ui_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.server_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.snippets_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.ssh_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.svn_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.syncing.professional_1.2.7.024688_200905101214.jar
-lib/eclipse/plugins/com.aptana.ide.syncing_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.update_1.2.7.024747.jar
-lib/eclipse/plugins/com.aptana.ide.xul_1.2.7.024747.jar
-lib/eclipse/plugins/com.extjs.ext.2.2_2.2.0.0004.jar
-lib/eclipse/plugins/com.jquery.1.3_1.3.2.00002.jar
-lib/eclipse/plugins/com.mochikit.1.4_1.4.0.00006.jar
-lib/eclipse/plugins/com.ms.ajax.3.5_3.5.21022.9.jar
-lib/eclipse/plugins/com.mysql.driver_0.5.12.jar
-lib/eclipse/plugins/com.yahoo.yui.2.7_2.7.0.00001.jar
-lib/eclipse/plugins/net.mootools.1.2_1.2.1.00001.jar
-lib/eclipse/plugins/org.aflax.1.0_1.0.0.00003.jar
-lib/eclipse/plugins/org.dojotoolkit.dojo.1.2_1.2.0.00001.jar
-lib/eclipse/plugins/org.eclipse.atf.mozilla.ide.core_0.2.1.v200703161053.jar
-lib/eclipse/plugins/org.eclipse.atf.mozilla.swt.browser.carbon.macosx_0.2.1.v200703161053.jar
-lib/eclipse/plugins/org.eclipse.atf.mozilla.swt.browser.win32.win32.x86_0.2.1.v200703161053.jar
-lib/eclipse/plugins/org.eclipse.atf.mozilla.swt.browser_0.2.1.v200703161053.jar
-lib/eclipse/plugins/org.eclipse.eclipsemonkey.doms_1.2.7.024747.jar
-lib/eclipse/plugins/org.eclipse.eclipsemonkey.lang.javascript_1.2.7.024747.jar
-lib/eclipse/plugins/org.eclipse.eclipsemonkey.ui_1.2.7.024747.jar
-lib/eclipse/plugins/org.eclipse.eclipsemonkey_1.2.7.024747.jar
+lib/eclipse/features/com.aptana.ide.feature.desktop.integration_2.0.5.1278523018-3--2364A24678.jar
+lib/eclipse/features/com.aptana.ide.feature.doc_2.0.5.1278523018-79--7BFZbUGQIET.jar
+lib/eclipse/features/com.aptana.ide.feature.editors_2.0.5.1278523018-8o57z9icbz-hWlJZG.jar
+lib/eclipse/features/com.aptana.ide.feature.libraries.subscription_2.0.2.1277398033-3-123884A9144.jar
+lib/eclipse/features/com.aptana.ide.feature.secureftp_2.0.4.1278035782-77-7878BQS8KNJOC040234995BA2.jar
+lib/eclipse/features/com.aptana.ide.feature.studio_2.0.5.1278522500-5-7857HJ97CFF61HN1HZHtem5tN7.jar
+lib/eclipse/features/com.aptana.ide.feature.syncing.ftp_2.0.5.1278523018-77-7E78BQTN8HKH8.jar
+lib/eclipse/features/com.aptana.ide.feature_2.0.5.1278614541-7D-7O7iRJci-jVhz-KFyoijH.jar
+lib/eclipse/features/org.eclipse.eclipsemonkey_2.0.5.1278523018-7D-47HNqtkUneQb.jar
+lib/eclipse/plugins/com.aptana.ide.branding_2.0.0.1278523018.jar
+lib/eclipse/plugins/com.aptana.ide.core.epl_2.0.0.1278614541.jar
+lib/eclipse/plugins/com.aptana.ide.core.io_2.0.5.1278614541.jar
+lib/eclipse/plugins/com.aptana.ide.core.spellcheck_2.0.0.1278523018.jar
+lib/eclipse/plugins/com.aptana.ide.core.ui_2.0.5.1278523018.jar
+lib/eclipse/plugins/com.aptana.ide.core.win32_2.0.0.1253913567.jar
+lib/eclipse/plugins/com.aptana.ide.core_2.0.5.1278523018.jar
+lib/eclipse/plugins/com.aptana.ide.debug.core.ie_2.0.0.1253913934.jar
+lib/eclipse/plugins/com.aptana.ide.debug.core_2.0.0.1278523018.jar
+lib/eclipse/plugins/com.aptana.ide.debug.ui_2.0.0.1254164293.jar
+lib/eclipse/plugins/com.aptana.ide.desktop.integration.protocolhandler_2.0.0.1278523018.jar
+lib/eclipse/plugins/com.aptana.ide.desktop.integration.server_2.0.0.1278523018.jar
+lib/eclipse/plugins/com.aptana.ide.desktop.integration_2.0.0.1253913567.jar
+lib/eclipse/plugins/com.aptana.ide.documentation_2.0.0.1278523018.jar
+lib/eclipse/plugins/com.aptana.ide.editor.css_2.0.0.1257380403.jar
+lib/eclipse/plugins/com.aptana.ide.editor.html_2.0.0.1278523018.jar
+lib/eclipse/plugins/com.aptana.ide.editor.js_2.0.0.1278523018.jar
+lib/eclipse/plugins/com.aptana.ide.editor.json_2.0.0.1278614541.jar
+lib/eclipse/plugins/com.aptana.ide.editor.text_2.0.0.1253913567.jar
+lib/eclipse/plugins/com.aptana.ide.editor.xml_2.0.0.1253913567.jar
+lib/eclipse/plugins/com.aptana.ide.editor.yaml_2.0.0.1255038335.jar
+lib/eclipse/plugins/com.aptana.ide.editors.codeassist_2.0.0.1278523018.jar
+lib/eclipse/plugins/com.aptana.ide.editors.ui_2.0.0.1278614541.jar
+lib/eclipse/plugins/com.aptana.ide.editors_2.0.5.1278523018.jar
+lib/eclipse/plugins/com.aptana.ide.epl_2.0.0.1278523018.jar
+lib/eclipse/plugins/com.aptana.ide.filesystem.ftp_2.0.5.1278614541.jar
+lib/eclipse/plugins/com.aptana.ide.filesystem.secureftp_2.0.4.1278035782.jar
+lib/eclipse/plugins/com.aptana.ide.index.core_2.0.0.1278614541.jar
+lib/eclipse/plugins/com.aptana.ide.installer_2.0.5.1278523018.jar
+lib/eclipse/plugins/com.aptana.ide.interpreters_2.0.0.1253913567.jar
+lib/eclipse/plugins/com.aptana.ide.intro_2.0.0.1278523018.jar
+lib/eclipse/plugins/com.aptana.ide.io.file_2.0.2.1278614541.jar
+lib/eclipse/plugins/com.aptana.ide.jface.text.source_2.0.0.1253913567.jar
+lib/eclipse/plugins/com.aptana.ide.js.docgen_2.0.0.1278523018.jar
+lib/eclipse/plugins/com.aptana.ide.libraries.jetty_2.0.0.1253913567.jar
+lib/eclipse/plugins/com.aptana.ide.libraries.subscription_2.0.2.1277398033.jar
+lib/eclipse/plugins/com.aptana.ide.libraries_2.0.0.1253913567.jar
+lib/eclipse/plugins/com.aptana.ide.logging_2.0.0.1278523018.jar
+lib/eclipse/plugins/com.aptana.ide.parsing.eclipse_2.0.0.1277153545.jar
+lib/eclipse/plugins/com.aptana.ide.parsing_2.0.0.1277153545.jar
+lib/eclipse/plugins/com.aptana.ide.pathtools_2.0.1.1278614541.jar
+lib/eclipse/plugins/com.aptana.ide.projects_2.0.0.1278523018.jar
+lib/eclipse/plugins/com.aptana.ide.reporting_2.0.0.1278614541.jar
+lib/eclipse/plugins/com.aptana.ide.samples.ui_2.0.0.1278614541.jar
+lib/eclipse/plugins/com.aptana.ide.samples_2.0.0.1278523018.jar
+lib/eclipse/plugins/com.aptana.ide.scripting_2.0.0.1278523018.jar
+lib/eclipse/plugins/com.aptana.ide.search.epl_2.0.0.1278523018.jar
+lib/eclipse/plugins/com.aptana.ide.search_2.0.0.1278523018.jar
+lib/eclipse/plugins/com.aptana.ide.security.linux_2.0.0.1254335860.jar
+lib/eclipse/plugins/com.aptana.ide.server.core_2.0.0.1278523018.jar
+lib/eclipse/plugins/com.aptana.ide.server.jetty.ui_2.0.0.1278614541.jar
+lib/eclipse/plugins/com.aptana.ide.server.jetty_2.0.0.1278523018.jar
+lib/eclipse/plugins/com.aptana.ide.server.portal_2.0.0.1278523018.jar
+lib/eclipse/plugins/com.aptana.ide.server.ui_2.0.0.1278523018.jar
+lib/eclipse/plugins/com.aptana.ide.server_2.0.0.1278523018.jar
+lib/eclipse/plugins/com.aptana.ide.snippets_2.0.0.1277749615.jar
+lib/eclipse/plugins/com.aptana.ide.ssh_2.0.0.1254960199.jar
+lib/eclipse/plugins/com.aptana.ide.syncing.core_2.0.5.1278614541.jar
+lib/eclipse/plugins/com.aptana.ide.syncing.doms_2.0.5.1278614541.jar
+lib/eclipse/plugins/com.aptana.ide.syncing.ui_2.0.5.1278614541.jar
+lib/eclipse/plugins/com.aptana.ide.ui.ftp_2.0.3.1278614541.jar
+lib/eclipse/plugins/com.aptana.ide.ui.io.epl_2.0.0.1278614541.jar
+lib/eclipse/plugins/com.aptana.ide.ui.io_2.0.5.1278614541.jar
+lib/eclipse/plugins/com.aptana.ide.ui.secureftp_2.0.3.1278035782.jar
+lib/eclipse/plugins/com.aptana.ide.ui_2.0.0.1278614541.jar
+lib/eclipse/plugins/com.aptana.ide.update.eclipse34_2.0.5.1278614541.jar
+lib/eclipse/plugins/com.aptana.ide.update.eclipse35_2.0.5.1278614541.jar
+lib/eclipse/plugins/com.aptana.ide.update.eclipse36_1.0.0.1278614541.jar
+lib/eclipse/plugins/com.aptana.ide.update.portal_2.0.0.1278614541.jar
+lib/eclipse/plugins/com.aptana.ide.update.ui_2.0.0.1278614541.jar
+lib/eclipse/plugins/com.aptana.ide.update_2.0.5.1278523018.jar
+lib/eclipse/plugins/org.eclipse.eclipsemonkey.doms_2.0.0.1277749615.jar
+lib/eclipse/plugins/org.eclipse.eclipsemonkey.lang.javascript_2.0.0.1277749615.jar
+lib/eclipse/plugins/org.eclipse.eclipsemonkey.ui_2.0.0.1277749615.jar
+lib/eclipse/plugins/org.eclipse.eclipsemonkey_2.0.5.1278445773.jar
 lib/eclipse/plugins/org.mozilla.rhino_1.6.7.jar
-lib/eclipse/plugins/org.mozilla.xpcom_1.8.1.3-20070320.jar
-lib/eclipse/plugins/org.mozilla.xulrunner.carbon.macosx_1.8.1.3-20070404.jar
-lib/eclipse/plugins/org.mozilla.xulrunner.win32.win32.x86_1.8.1.3-20070404.jar
-lib/eclipse/plugins/org.openrico.rico.2.0_2.0.0.00002.jar
-lib/eclipse/plugins/org.prototypejs.prototype.1.6_1.6.0.00001.jar
-lib/eclipse/plugins/org.scriptaculous.1.8_1.8.0.00001.jar
-lib/eclipse/plugins/org.sqlite.driver_0.4.5.jar