2 files changed, 108 insertions, 108 deletions

diff --git a/java/eclipse-aptana/Makefile b/java/eclipse-aptana/Makefile
index 29cf670c452f..e47413e49c27 100644
--- a/java/eclipse-aptana/Makefile
+++ b/java/eclipse-aptana/Makefile
@@ -28,6 +28,6 @@ USE_JAVA=	yes
 USE_ZIP=	yes
 
 do-install:
-	@(cd ${WRKDIR} && ${CP} -R features ${PREFIX}/eclipse && ${CP} -R plugins ${PREFIX}/eclipse;)
+	@(cd ${WRKDIR} && ${CP} -R features ${PREFIX}/lib/eclipse && ${CP} -R plugins ${PREFIX}/lib/eclipse;)
 
 .include <bsd.port.mk>
diff --git a/java/eclipse-aptana/pkg-plist b/java/eclipse-aptana/pkg-plist
index 93f1300d8af9..b561ad6fc7a5 100644
--- a/java/eclipse-aptana/pkg-plist
+++ b/java/eclipse-aptana/pkg-plist
@@ -1,108 +1,108 @@
 @comment $FreeBSD$
-eclipse/features/com.adobe.spry.1.6_1.6.0.00003.jar
-eclipse/features/com.aptana.ide.feature.editor.css_1.2.7.024747.jar
-eclipse/features/com.aptana.ide.feature.editor.html_1.2.7.024747.jar
-eclipse/features/com.aptana.ide.feature.editor.js_1.2.7.024747.jar
-eclipse/features/com.aptana.ide.feature.editors_1.2.7.024747.jar
-eclipse/features/com.aptana.ide.feature.framework.jaxer_1.2.7.024747.jar
-eclipse/features/com.aptana.ide.feature.frameworks_1.1.7.024747.jar
-eclipse/features/com.aptana.ide.feature.professional_1.2.7.024688_200905101214.jar
-eclipse/features/com.aptana.ide.feature.rcp_1.2.7.024747.jar
-eclipse/features/com.aptana.ide.feature.server.cloud_1.2.7.024747.jar
-eclipse/features/com.aptana.ide.feature.svn_1.4.2.jar
-eclipse/features/com.aptana.ide.feature.syncing.ftp_1.2.7.024747.jar
-eclipse/features/com.aptana.ide.feature.xul_1.2.7.024747.jar
-eclipse/features/com.aptana.ide.feature_1.2.7.024747.jar
-eclipse/features/com.extjs.ext.2.2_2.2.0.0004.jar
-eclipse/features/com.jquery.1.3_1.3.2.00002.jar
-eclipse/features/com.mochikit.1.4_1.4.0.00006.jar
-eclipse/features/com.ms.ajax.3.5_3.5.21022.9.jar
-eclipse/features/com.yahoo.yui.2.7_2.7.0.00001.jar
-eclipse/features/net.mootools.1.2_1.2.1.00001.jar
-eclipse/features/org.aflax.1.0_1.0.0.00004.jar
-eclipse/features/org.dojotoolkit.dojo.1.2_1.2.0.00001.jar
-eclipse/features/org.eclipse.eclipsemonkey_1.2.7.024747.jar
-eclipse/features/org.openrico.rico.2.0_2.0.0.00002.jar
-eclipse/features/org.prototypejs.prototype.1.6_1.6.0.00003.jar
-eclipse/features/org.scriptaculous.1.8_1.8.1.00001.jar
-eclipse/plugins/com.adobe.spry.1.6_1.6.0.00003.jar
-eclipse/plugins/com.aptana.ide.branding_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.core.ui_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.core.win32_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.core_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.db.ui_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.debug.core.ie_1.1.12.024688_200905101214.jar
-eclipse/plugins/com.aptana.ide.debug.core_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.debug.ui_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.documentation_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.editor.css_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.editor.html_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.editor.js_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.editor.text_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.editor.xml_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.editors.codeassist_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.editors_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.epl_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.extras_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.framework.jaxer.server.linux_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.framework.jaxer.server.macosx_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.framework.jaxer.server.win32_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.framework.jaxer_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.internet.proxy_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.interpreters_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.intro_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.io.file_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.jface.text.source_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.js.docgen_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.lexer_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.libraries.jetty_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.libraries_1.2.3.18699.jar
-eclipse/plugins/com.aptana.ide.logging_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.parsing_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.pathtools_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.professional.licensing_1.2.7.024688_200905101214.jar
-eclipse/plugins/com.aptana.ide.rcp.main_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.rcp_1.2.6.024747.jar
-eclipse/plugins/com.aptana.ide.samples_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.scripting_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.search.epl_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.search_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.server.cloud_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.server.core_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.server.javacloud_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.server.jetty_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.server.portal_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.server.ui_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.server_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.snippets_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.ssh_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.svn_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.syncing.professional_1.2.7.024688_200905101214.jar
-eclipse/plugins/com.aptana.ide.syncing_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.update_1.2.7.024747.jar
-eclipse/plugins/com.aptana.ide.xul_1.2.7.024747.jar
-eclipse/plugins/com.extjs.ext.2.2_2.2.0.0004.jar
-eclipse/plugins/com.jquery.1.3_1.3.2.00002.jar
-eclipse/plugins/com.mochikit.1.4_1.4.0.00006.jar
-eclipse/plugins/com.ms.ajax.3.5_3.5.21022.9.jar
-eclipse/plugins/com.mysql.driver_0.5.12.jar
-eclipse/plugins/com.yahoo.yui.2.7_2.7.0.00001.jar
-eclipse/plugins/net.mootools.1.2_1.2.1.00001.jar
-eclipse/plugins/org.aflax.1.0_1.0.0.00003.jar
-eclipse/plugins/org.dojotoolkit.dojo.1.2_1.2.0.00001.jar
-eclipse/plugins/org.eclipse.atf.mozilla.ide.core_0.2.1.v200703161053.jar
-eclipse/plugins/org.eclipse.atf.mozilla.swt.browser.carbon.macosx_0.2.1.v200703161053.jar
-eclipse/plugins/org.eclipse.atf.mozilla.swt.browser.win32.win32.x86_0.2.1.v200703161053.jar
-eclipse/plugins/org.eclipse.atf.mozilla.swt.browser_0.2.1.v200703161053.jar
-eclipse/plugins/org.eclipse.eclipsemonkey.doms_1.2.7.024747.jar
-eclipse/plugins/org.eclipse.eclipsemonkey.lang.javascript_1.2.7.024747.jar
-eclipse/plugins/org.eclipse.eclipsemonkey.ui_1.2.7.024747.jar
-eclipse/plugins/org.eclipse.eclipsemonkey_1.2.7.024747.jar
-eclipse/plugins/org.mozilla.rhino_1.6.7.jar
-eclipse/plugins/org.mozilla.xpcom_1.8.1.3-20070320.jar
-eclipse/plugins/org.mozilla.xulrunner.carbon.macosx_1.8.1.3-20070404.jar
-eclipse/plugins/org.mozilla.xulrunner.win32.win32.x86_1.8.1.3-20070404.jar
-eclipse/plugins/org.openrico.rico.2.0_2.0.0.00002.jar
-eclipse/plugins/org.prototypejs.prototype.1.6_1.6.0.00001.jar
-eclipse/plugins/org.scriptaculous.1.8_1.8.0.00001.jar
-eclipse/plugins/org.sqlite.driver_0.4.5.jar
+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/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