4 files changed, 74 insertions, 74 deletions

diff --git a/java/eclipse-findbugs/Makefile b/java/eclipse-findbugs/Makefile
index 0d494453cc01..1a061267cc46 100644
--- a/java/eclipse-findbugs/Makefile
+++ b/java/eclipse-findbugs/Makefile
@@ -73,19 +73,19 @@ PLIST_FILES=	\
 	%%ECLIPSE_PLUGINS%%/%%DISTNAME%%/welcome.xml
 #
 PLIST_SUB=	\
-	ECLIPSE_PLUGINS="eclipse/plugins" \
+	ECLIPSE_PLUGINS="lib/eclipse/plugins" \
 	DISTNAME="${DISTNAME}"
 
 post-extract:
 	@${RM} -Rf ${WRKSRC}/src
 
 do-install:
-		@${MKDIR} ${PREFIX}/eclipse/plugins
+		@${MKDIR} ${PREFIX}/lib/eclipse/plugins
 		@(cd ${WRKDIR} && \
 			${FIND} -s $$(${BASENAME} ${WRKSRC}) -type d \
-				-exec ${MKDIR} "${PREFIX}/eclipse/plugins/{}" \; && \
+				-exec ${MKDIR} "${PREFIX}/lib/eclipse/plugins/{}" \; && \
 			${FIND} -s $$(${BASENAME} ${WRKSRC}) -not -type d \
-				-exec ${INSTALL_DATA} "{}" "${PREFIX}/eclipse/plugins/{}" \; \
+				-exec ${INSTALL_DATA} "{}" "${PREFIX}/lib/eclipse/plugins/{}" \; \
 		)
 
 .include <bsd.port.mk>
diff --git a/java/eclipse-uml/Makefile b/java/eclipse-uml/Makefile
index c847077c1e83..134fc828ec74 100644
--- a/java/eclipse-uml/Makefile
+++ b/java/eclipse-uml/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	freebsd-eclipse@FreeBSD.org
 COMMENT=	A framework creating UML diagrams in Eclipse
 
 RUN_DEPENDS=	eclipse:${PORTSDIR}/java/eclipse \
-		${LOCALBASE}/eclipse/features/org.eclipse.emf_2.3.2.v200802051830/feature.xml:${PORTSDIR}/java/eclipse-emf
+		${LOCALBASE}/lib/eclipse/features/org.eclipse.emf_2.3.2.v200802051830/feature.xml:${PORTSDIR}/java/eclipse-emf
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
@@ -28,12 +28,12 @@ JAVA_VERSION=	1.4+
 JAVA_OS=	native
 
 do-install:
-		@${MKDIR} ${PREFIX}/eclipse
-		@${CP} -r ${WRKSRC}/eclipse/plugins ${PREFIX}/eclipse
-		@${CP} -r ${WRKSRC}/eclipse/features ${PREFIX}/eclipse
-		@(cd ${WRKSRC}; ${FIND} -s eclipse/features eclipse/plugins -not -type d) >> ${TMPPLIST}
+		@${MKDIR} ${PREFIX}/lib/eclipse
+		@${CP} -r ${WRKSRC}/eclipse/plugins ${PREFIX}/lib/eclipse
+		@${CP} -r ${WRKSRC}/eclipse/features ${PREFIX}/lib/eclipse
+		@(cd ${WRKSRC}; ${FIND} -s eclipse/features eclipse/plugins -not -type d) | ${SED} -e 's,^eclipse,lib/eclipse,' >> ${TMPPLIST}
 		@(cd ${WRKSRC}; ${FIND} -s -d eclipse/features eclipse/plugins -type d) \
 			| ${GREP} -vE 'eclipse/plugins$$|eclipse/features$$' \
-			| ${SED} -ne 's,^,@dirrm ,p' >> ${TMPPLIST}
+			| ${SED} -ne 's,^,@dirrm lib/,p' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/java/eclipse-vep-examples/Makefile b/java/eclipse-vep-examples/Makefile
index 4961b40084a6..328249b13861 100644
--- a/java/eclipse-vep-examples/Makefile
+++ b/java/eclipse-vep-examples/Makefile
@@ -26,8 +26,8 @@ USE_ZIP=	yes
 PLIST_SUB=	RELEASEVERSION=1.1.0.1
 
 do-install:
-		@${MKDIR} ${PREFIX}/eclipse
-		@${CP} -r ${WRKSRC}/eclipse/plugins ${PREFIX}/eclipse
-		@${CP} -r ${WRKSRC}/eclipse/features ${PREFIX}/eclipse
+		@${MKDIR} ${PREFIX}/lib/eclipse
+		@${CP} -r ${WRKSRC}/eclipse/plugins ${PREFIX}/lib/eclipse
+		@${CP} -r ${WRKSRC}/eclipse/features ${PREFIX}/lib/eclipse
 
 .include <bsd.port.mk>
diff --git a/java/eclipse-vep-examples/pkg-plist b/java/eclipse-vep-examples/pkg-plist
index 0d0119e682a9..da115fb4913a 100644
--- a/java/eclipse-vep-examples/pkg-plist
+++ b/java/eclipse-vep-examples/pkg-plist
@@ -1,61 +1,61 @@
-eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/dept.jar
-eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/vm/javaexamplebeaninfo.jar
-eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/vm/javaexamplebeans.jar
-eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/vm/wizzowidgets.jar
-eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/vm/wizzowidgets_dt.jar
-eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/javaexamples.jar
-eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/about.html
-eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/plugin.xml
-eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/icons/canvas16.gif
-eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/icons/shape.gif
-eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/icons/window16.gif
-eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/src/wizzowidgets_src.zip
-eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/images/graph.gif
-eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/overrides/org/eclipse/ve/examples/java/vm/BasicTypes.override
-eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/overrides/org/eclipse/ve/examples/java/vm/Area.override
-eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/overrides/org/eclipse/ve/examples/java/vm/Continent.override
-eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/examples/xmas.dinner
-eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/examples/ibm.cdmcmp
-eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/examples/ibmDialogData.xmi
-eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/examplecats.xmi
-eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/plugin.properties
-eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/about.properties
-eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/about.mappings
-eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/eclipse32.gif
-eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/about.ini
-eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%/plugin.xml
-eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%/META-INF/MANIFEST.MF
-eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%/src/org.eclipse.ve.examples_%%RELEASEVERSION%%/vm/javaexamplebeaninfosrc.zip
-eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%/src/org.eclipse.ve.examples_%%RELEASEVERSION%%/vm/javaexamplebeanssrc.zip
-eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%/src/org.eclipse.ve.examples_%%RELEASEVERSION%%/javaexamplessrc.zip
-eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%/src/org.eclipse.ve.examples_%%RELEASEVERSION%%/deptsrc.zip
-eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%/src/org.eclipse.ve.examples_%%RELEASEVERSION%%/proxy.jars
-eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%/about.html
-eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%/plugin.properties
-eclipse/features/org.eclipse.ve.examples_%%RELEASEVERSION%%/epl-v10.html
-eclipse/features/org.eclipse.ve.examples_%%RELEASEVERSION%%/feature.xml
-eclipse/features/org.eclipse.ve.examples_%%RELEASEVERSION%%/eclipse_update_120.jpg
-eclipse/features/org.eclipse.ve.examples_%%RELEASEVERSION%%/license.html
-eclipse/features/org.eclipse.ve.examples_%%RELEASEVERSION%%/feature.properties
-@dirrm eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/vm
-@dirrm eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/src
-@dirrm eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/overrides/org/eclipse/ve/examples/java/vm
-@dirrm eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/overrides/org/eclipse/ve/examples/java
-@dirrm eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/overrides/org/eclipse/ve/examples
-@dirrm eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/overrides/org/eclipse/ve
-@dirrm eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/overrides/org/eclipse
-@dirrm eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/overrides/org
-@dirrm eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/overrides
-@dirrm eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/images
-@dirrm eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/icons
-@dirrm eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/examples
-@dirrm eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%
-@dirrm eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%/META-INF
-@dirrm eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%/src/org.eclipse.ve.examples_%%RELEASEVERSION%%/vm
-@dirrm eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%/src/org.eclipse.ve.examples_%%RELEASEVERSION%%
-@dirrm eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%/src
-@dirrm eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%
-@dirrm eclipse/features/org.eclipse.ve.examples_%%RELEASEVERSION%%
-@dirrmtry eclipse/plugins
-@dirrmtry eclipse/features
-@dirrmtry eclipse
+lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/dept.jar
+lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/vm/javaexamplebeaninfo.jar
+lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/vm/javaexamplebeans.jar
+lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/vm/wizzowidgets.jar
+lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/vm/wizzowidgets_dt.jar
+lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/javaexamples.jar
+lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/about.html
+lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/plugin.xml
+lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/icons/canvas16.gif
+lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/icons/shape.gif
+lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/icons/window16.gif
+lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/src/wizzowidgets_src.zip
+lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/images/graph.gif
+lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/overrides/org/eclipse/ve/examples/java/vm/BasicTypes.override
+lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/overrides/org/eclipse/ve/examples/java/vm/Area.override
+lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/overrides/org/eclipse/ve/examples/java/vm/Continent.override
+lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/examples/xmas.dinner
+lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/examples/ibm.cdmcmp
+lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/examples/ibmDialogData.xmi
+lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/examplecats.xmi
+lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/plugin.properties
+lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/about.properties
+lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/about.mappings
+lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/eclipse32.gif
+lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/about.ini
+lib/eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%/plugin.xml
+lib/eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%/META-INF/MANIFEST.MF
+lib/eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%/src/org.eclipse.ve.examples_%%RELEASEVERSION%%/vm/javaexamplebeaninfosrc.zip
+lib/eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%/src/org.eclipse.ve.examples_%%RELEASEVERSION%%/vm/javaexamplebeanssrc.zip
+lib/eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%/src/org.eclipse.ve.examples_%%RELEASEVERSION%%/javaexamplessrc.zip
+lib/eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%/src/org.eclipse.ve.examples_%%RELEASEVERSION%%/deptsrc.zip
+lib/eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%/src/org.eclipse.ve.examples_%%RELEASEVERSION%%/proxy.jars
+lib/eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%/about.html
+lib/eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%/plugin.properties
+lib/eclipse/features/org.eclipse.ve.examples_%%RELEASEVERSION%%/epl-v10.html
+lib/eclipse/features/org.eclipse.ve.examples_%%RELEASEVERSION%%/feature.xml
+lib/eclipse/features/org.eclipse.ve.examples_%%RELEASEVERSION%%/eclipse_update_120.jpg
+lib/eclipse/features/org.eclipse.ve.examples_%%RELEASEVERSION%%/license.html
+lib/eclipse/features/org.eclipse.ve.examples_%%RELEASEVERSION%%/feature.properties
+@dirrm lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/vm
+@dirrm lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/src
+@dirrm lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/overrides/org/eclipse/ve/examples/java/vm
+@dirrm lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/overrides/org/eclipse/ve/examples/java
+@dirrm lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/overrides/org/eclipse/ve/examples
+@dirrm lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/overrides/org/eclipse/ve
+@dirrm lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/overrides/org/eclipse
+@dirrm lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/overrides/org
+@dirrm lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/overrides
+@dirrm lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/images
+@dirrm lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/icons
+@dirrm lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/examples
+@dirrm lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%
+@dirrm lib/eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%/META-INF
+@dirrm lib/eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%/src/org.eclipse.ve.examples_%%RELEASEVERSION%%/vm
+@dirrm lib/eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%/src/org.eclipse.ve.examples_%%RELEASEVERSION%%
+@dirrm lib/eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%/src
+@dirrm lib/eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%
+@dirrm lib/eclipse/features/org.eclipse.ve.examples_%%RELEASEVERSION%%
+@dirrmtry lib/eclipse/plugins
+@dirrmtry lib/eclipse/features
+@dirrmtry lib/eclipse