2 files changed, 77 insertions, 77 deletions

diff --git a/java/eclipse-checkstyle/Makefile b/java/eclipse-checkstyle/Makefile
index 8bc000f134e3..93eea54824b7 100644
--- a/java/eclipse-checkstyle/Makefile
+++ b/java/eclipse-checkstyle/Makefile
@@ -26,8 +26,8 @@ JAVA_VERSION=	1.4+
 USE_ZIP=	yes
 
 do-install:
-	@${MKDIR} ${PREFIX}/eclipse
-	@${MKDIR} ${PREFIX}/eclipse/plugins
-	@${CP} -r ${WRKSRC}/com.atlassw.tools.eclipse.checkstyle_${PORTVERSION} ${PREFIX}/eclipse/plugins
+	@${MKDIR} ${PREFIX}/lib/eclipse
+	@${MKDIR} ${PREFIX}/lib/eclipse/plugins
+	@${CP} -r ${WRKSRC}/com.atlassw.tools.eclipse.checkstyle_${PORTVERSION} ${PREFIX}/lib/eclipse/plugins
 
 .include <bsd.port.mk>
diff --git a/java/eclipse-checkstyle/pkg-plist b/java/eclipse-checkstyle/pkg-plist
index b61e1d7ae087..f83feac33119 100644
--- a/java/eclipse-checkstyle/pkg-plist
+++ b/java/eclipse-checkstyle/pkg-plist
@@ -1,75 +1,75 @@
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/CheckstylePlugin.jar
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/DefaultChecks.xml
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/README.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/checkstyle-all-3.4.jar
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/checkstyle-optional-3.4.jar
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/config_file_sets.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/configuring.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/AuditListener.gif
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/Filter.gif
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/anttask.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/checkstyle_checks.xml
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/cmdline.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config_blocks.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config_coding.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config_design.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config_duplicates.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config_header.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config_import.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config_j2ee.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config_javadoc.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config_metrics.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config_misc.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config_modifiers.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config_naming.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config_reporting.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config_sizes.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config_usage.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config_whitespace.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/contributing.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/gui_screenshot.png
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/index.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/java.header
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/logo.png
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/mystyle.css
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/optional.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/property_types.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/releasenotes.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/sun_checks.xml
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/suppressions.xml
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/writingchecks.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/writingfilters.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/writinglisteners.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/xmllogger.dtd
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/getting_started.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/images/check_config_editor.jpg
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/images/file_set_editor.jpg
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/images/preferences.jpg
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/images/project.jpg
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/images/properties.jpg
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/images/rule_config_editor.jpg
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/images/tasks.jpg
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/import_export.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/index.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/introduction.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/regularexpressions.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/release_notes.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/screen_shots.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/team.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/troubleshooting.html
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/license/LICENSE.apache.txt
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/license/LICENSE.txt
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/license/RIGHTS.antlr.txt
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/plugin.xml
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/toc.xml
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/xercesImpl.jar
-eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/xmlParserAPIs.jar
-@dirrm eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/license
-@dirrm eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/images
-@dirrm eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs
-@dirrm eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc
-@dirrm eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0
-@dirrmtry eclipse/plugins
-@dirrmtry eclipse
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/CheckstylePlugin.jar
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/DefaultChecks.xml
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/README.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/checkstyle-all-3.4.jar
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/checkstyle-optional-3.4.jar
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/config_file_sets.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/configuring.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/AuditListener.gif
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/Filter.gif
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/anttask.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/checkstyle_checks.xml
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/cmdline.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config_blocks.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config_coding.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config_design.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config_duplicates.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config_header.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config_import.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config_j2ee.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config_javadoc.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config_metrics.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config_misc.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config_modifiers.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config_naming.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config_reporting.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config_sizes.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config_usage.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/config_whitespace.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/contributing.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/gui_screenshot.png
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/index.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/java.header
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/logo.png
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/mystyle.css
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/optional.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/property_types.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/releasenotes.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/sun_checks.xml
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/suppressions.xml
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/writingchecks.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/writingfilters.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/writinglisteners.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs/xmllogger.dtd
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/getting_started.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/images/check_config_editor.jpg
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/images/file_set_editor.jpg
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/images/preferences.jpg
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/images/project.jpg
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/images/properties.jpg
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/images/rule_config_editor.jpg
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/images/tasks.jpg
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/import_export.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/index.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/introduction.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/regularexpressions.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/release_notes.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/screen_shots.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/team.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/troubleshooting.html
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/license/LICENSE.apache.txt
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/license/LICENSE.txt
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/license/RIGHTS.antlr.txt
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/plugin.xml
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/toc.xml
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/xercesImpl.jar
+lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/xmlParserAPIs.jar
+@dirrm lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/license
+@dirrm lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/images
+@dirrm lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs
+@dirrm lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc
+@dirrm lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0
+@dirrmtry lib/eclipse/plugins
+@dirrmtry lib/eclipse