svn commit: r304543 - in head/java/eclipse-devel: . files

Greg Lewis glewis at FreeBSD.org
Wed Sep 19 19:58:39 UTC 2012


Author: glewis
Date: Wed Sep 19 19:58:38 2012
New Revision: 304543
URL: http://svn.freebsd.org/changeset/ports/304543

Log:
  . Update to 4.2.0 and re-enable.
  
  Submitted by:	tg@

Added:
  head/java/eclipse-devel/files/MANIFEST.MF.junit4   (contents, props changed)
Deleted:
  head/java/eclipse-devel/files/patch-generatedScripts
Modified:
  head/java/eclipse-devel/Makefile   (contents, props changed)
  head/java/eclipse-devel/distinfo   (contents, props changed)
  head/java/eclipse-devel/files/eclipse-build-upstream.patch   (contents, props changed)
  head/java/eclipse-devel/files/freebsd-support.patch   (contents, props changed)
  head/java/eclipse-devel/files/patch-dependencyManifests   (contents, props changed)
  head/java/eclipse-devel/files/patch-eclipse-build   (contents, props changed)

Modified: head/java/eclipse-devel/Makefile
==============================================================================
--- head/java/eclipse-devel/Makefile	Wed Sep 19 19:46:07 2012	(r304542)
+++ head/java/eclipse-devel/Makefile	Wed Sep 19 19:58:38 2012	(r304543)
@@ -6,22 +6,24 @@
 #
 
 PORTNAME=	eclipse-devel
-PORTVERSION=	3.7.1
-PORTREVISION=	2
+PORTVERSION=	4.2.0
 CATEGORIES=	java devel
-MASTER_SITES=	http://download.eclipse.org/technology/linuxtools/eclipse-build/3.7.x_Indigo/:1 \
-		http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository/plugins/:2 \
+MASTER_SITES=	http://download.eclipse.org/technology/linuxtools/eclipse-build/4.2.x/:1 \
+		http://download.eclipse.org/tools/orbit/downloads/drops/R20120119162704/repository/plugins/:2 \
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:4,} \
-		${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%/,junit/junit/${JUNIT3_VERSION}/:5,} \
 		http://cloud.github.com/downloads/KentBeck/junit/:6 \
 		${MASTER_SITE_APACHE_TOMCAT:S,%SUBDIR%/,tomcat-7/v${TOMCAT_VERSION}/bin/:7,} \
-		${MASTER_SITE_APACHE_TOMCAT:S,%SUBDIR%/,tomcat-7/v${TOMCAT_VERSION}/bin/extras/:7,}
+		${MASTER_SITE_APACHE_TOMCAT:S,%SUBDIR%/,tomcat-7/v${TOMCAT_VERSION}/bin/extras/:7,} \
+		http://archive.eclipse.org/jetty/8.1.0.v20120127/dist/:8 \
+		http://repo2.maven.org/maven2/org/apache/geronimo/specs/geronimo-annotation_1.1_spec/1.0/:9 \
+		http://artfiles.org/apache.org/felix/:10
 DISTFILES=	${ECLIPSE_BUILD_SRCFILE}:1 \
 		${ECLIPSE_SRCFILE}:1 \
 		${ANT_SRCFILE}:4 \
-		${JUNIT3_SRCFILE}:5 \
 		${JUNIT4_SRCFILE}:6 \
-		${TOMCAT_SRCFILES:C,(.*),\\1:7,}
+		${TOMCAT_SRCFILES:C,(.*),\\1:7,} \
+		${ECLIPSE_JETTY_SRCFILE}:8 \
+		${GERONIMO_ANNOTATION_BUNDLE}:9
 DIST_SUBDIR=	eclipse
 EXTRACT_ONLY=	${ECLIPSE_BUILD_SRCFILE}
 
@@ -39,9 +41,8 @@ BUILD_DEPENDS=	gpatch:${PORTSDIR}/devel/
 		zip:${PORTSDIR}/archivers/zip
 LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo
 
-IGNORE=		is currently older than java/eclipse
-
-OPTIONS=	TESTS	"Build SDK test suite"	off
+OPTIONS_DEFINE=	TESTS
+TESTS_DESC= 	"Build SDK test suite"
 
 ONLY_FOR_ARCHS=	i386 amd64
 
@@ -61,12 +62,19 @@ JAVA_RUN=	yes
 JAVA_VERSION=	1.6
 JAVA_VENDOR=	openjdk
 
-ECLIPSE_BUILD_SRCFILE=	eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92${EXTRACT_SUFX}
-ECLIPSE_SRCFILE=	eclipse-${PORTVERSION}-src${BZIP2_SUFX}
+ECLIPSE_RELEASE_VERSION=I20120608-1400
+ECLIPSE_BUILD_SRCFILE=	eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3${EXTRACT_SUFX}
+ECLIPSE_SRCFILE=	eclipse-${PORTVERSION}-${ECLIPSE_RELEASE_VERSION}-src${BZIP2_SUFX}
 ECLIPSE_TEST_SRCFILE=	eclipse-sdktests-${PORTVERSION}-src${BZIP2_SUFX}
 ECLIPSE_TEST_SCRIPTFILE=eclipse-sdktests-${PORTVERSION}-scripts${BZIP2_SUFX}
-ECLIPSE_JAR_BUNDLES=	com.ibm.icu_4.4.2.v20110208.jar \
-			com.jcraft.jsch_0.1.41.v201101211617.jar \
+ECLIPSE_JAR_BUNDLES=	com.ibm.icu_4.4.2.v20110823.jar \
+			com.ibm.icu.source_4.4.2.v20110823.jar \
+			com.jcraft.jsch_0.1.44.v201101211721.jar \
+			javax.inject_1.0.0.v20091030.jar \
+			javax.xml_1.3.4.v201005080400.jar \
+			org.apache.batik.css_1.6.0.v201011041432.jar \
+			org.apache.batik.util_1.6.0.v201011041432.jar \
+			org.apache.batik.util.gui_1.6.0.v201011041432.jar \
 			org.apache.commons.codec_1.3.0.v201101211617.jar \
 			org.apache.commons.el_1.0.0.v201101211617.jar \
 			org.apache.commons.httpclient_3.1.0.v201012070820.jar \
@@ -76,10 +84,21 @@ ECLIPSE_JAR_BUNDLES=	com.ibm.icu_4.4.2.v
 			org.hamcrest.core_1.1.0.v20090501071000.jar \
 			org.mortbay.jetty.util_6.1.23.v201012071420.jar \
 			org.mortbay.jetty.server_6.1.23.v201012071420.jar \
-			org.objectweb.asm_3.3.1.v201105211655.jar
+			org.objectweb.asm_3.3.1.v201105211655.jar \
+			org.w3c.css.sac_1.3.1.v200903091627.jar \
+			org.w3c.dom.svg_1.1.0.v201011041433.jar
 ECLIPSE_SAT4J_BUNDLES=	org.sat4j.core_2.3.0.v20110329.jar \
 			org.sat4j.pb_2.3.0.v20110329.jar
-ANT_VERSION=		1.8.2
+ECLIPSE_JETTY_VERSION=	8.1.0.v20120127
+ECLIPSE_JETTY_SRCFILE=	jetty-distribution-${ECLIPSE_JETTY_VERSION}.tar.gz
+ECLIPSE_JETTY_BUNDLES=	jetty-util-${ECLIPSE_JETTY_VERSION}.jar \
+			jetty-server-${ECLIPSE_JETTY_VERSION}.jar \
+			jetty-http-${ECLIPSE_JETTY_VERSION}.jar \
+			jetty-continuation-${ECLIPSE_JETTY_VERSION}.jar \
+			jetty-io-${ECLIPSE_JETTY_VERSION}.jar \
+			jetty-security-${ECLIPSE_JETTY_VERSION}.jar \
+			jetty-servlet-${ECLIPSE_JETTY_VERSION}.jar
+ANT_VERSION=		1.8.3
 ANT_SRCFILE=		apache-ant-${ANT_VERSION}-bin${BZIP2_SUFX}
 ANT_BUNDLES=		ant-antlr.jar \
 			ant-apache-bcel.jar \
@@ -101,9 +120,7 @@ ANT_BUNDLES=		ant-antlr.jar \
 			ant-launcher.jar \
 			ant-swing.jar \
 			ant-testutil.jar
-JUNIT3_VERSION=		3.8.2
-JUNIT3_SRCFILE=		junit${JUNIT3_VERSION}.zip
-JUNIT4_VERSION=		4.8.2
+JUNIT4_VERSION=		4.10
 JUNIT4_SRCFILE=		junit-${JUNIT4_VERSION}.jar
 TOMCAT_VERSION=		7.0.25
 TOMCAT_SRCFILES=	apache-tomcat-${TOMCAT_VERSION}.tar.gz tomcat-juli.jar
@@ -114,35 +131,42 @@ TOMCAT_BUNDLES=		el-api.jar \
 			servlet-api.jar \
 			tomcat-api.jar \
 			tomcat-juli.jar
+GERONIMO_ANNOTATION_BUNDLE=	geronimo-annotation_1.1_spec-1.0.jar
+FELIX_BUNDLES=		org.apache.felix.gogo.command-0.12.0.jar \
+			org.apache.felix.gogo.runtime-0.10.0.jar \
+			org.apache.felix.gogo.shell-0.10.0.jar
 FBSD_SUPPORT_SRCFILE=	freebsd-support.patch
-ECLIPSE_GENERATED_BUILDSCRIPTS=	eclipse-build-generatedScripts.tar.bz2
+BUILD_DEPSDIR=		${BUILD_WRKSRC}/dependencies
 
-ALL_TARGET=	provision.cvs
+ALL_TARGET=	provisionSDKinDropins
 INSTALL_TARGET=	installSDKinDropins
-MAKE_ARGS=	-DbuildOs=freebsd -DbuildArch=${ARCH:C/amd64/x86_64/:C/i386/x86/} -Dprefix=${PREFIX} -Dlocalbase=${LOCALBASE} -Dlabel=${PORTVERSION}
+MAKE_ARGS=	-DbuildOs=freebsd -DbuildArch=${ARCH:C/amd64/x86_64/:C/i386/x86/} -Dprefix=${PREFIX} -Dlocalbase=${LOCALBASE} -Dlabel=${PORTVERSION}-${ECLIPSE_RELEASE_VERSION}
 MAKE_ENV+=	GRE_HOME=${PREFIX}/lib/${GECKO:S/19//} _JAVA_OPTIONS="-Xmx1024m" JAVA_VENDOR=${JAVA_VENDOR}
 
 WRKSRC=		${WRKDIR}/${ECLIPSE_BUILD_SRCFILE:C/${EXTRACT_SUFX}//}
 PATCH_STRIP=	-p1
 
-BOOTCLASSPATH=	${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/jsse.jar
+BOOTCLASSPATH=	${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jce.jar
 PORTDESTDIR=	${PREFIX}/lib/${PORTNAME}
 DROPINS_DIR=	share/${PORTNAME}/dropins
 
 PLIST_FILES=	bin/${PORTNAME} \
 		share/applications/${PORTNAME}.desktop \
-		share/icons/hicolor/16x16/apps/${PORTNAME}.png \
 		share/icons/hicolor/32x32/apps/${PORTNAME}.png \
 		share/icons/hicolor/48x48/apps/${PORTNAME}.png \
+		share/icons/hicolor/256x256/apps/${PORTNAME}.png \
 		share/pixmaps/${PORTNAME}.png
 
 .for f in ${ECLIPSE_JAR_BUNDLES} ${ECLIPSE_SAT4J_BUNDLES}
 DISTFILES+=	${f}:2
 .endfor
+.for f in ${FELIX_BUNDLES}
+DISTFILES+=	${f}:10
+.endfor
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_TESTS)
+.if ${PORT_OPTIONS:MTESTS}
 DISTFILES+=	${ECLIPSE_TEST_SRCFILE}:1 ${ECLIPSE_TEST_SCRIPTFILE}:1
 
 BUILD_DEPENDS+=	bash:${PORTSDIR}/shells/bash \
@@ -151,25 +175,21 @@ BUILD_DEPENDS+=	bash:${PORTSDIR}/shells/
 ALL_TARGET=	runTests
 .endif
 
-# Prepare Eclipse source, Ant, JUnit and Tomcat bundles
+# Prepare Eclipse source, Ant, JUnit, Tomcat, Jetty and Geronimo bundles
 post-extract:
 	@${MKDIR} ${BUILD_WRKSRC}/bundles
 
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${ECLIPSE_SRCFILE} ${BUILD_WRKSRC}
 	@${CP} ${FILESDIR}/${FBSD_SUPPORT_SRCFILE} ${BUILD_WRKSRC}/patches/
-.for f in ${ECLIPSE_JAR_BUNDLES} ${ECLIPSE_SAT4J_BUNDLES}
+.for f in ${ECLIPSE_JAR_BUNDLES} ${ECLIPSE_SAT4J_BUNDLES} ${FELIX_BUNDLES}
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${BUILD_WRKSRC}/bundles/
 .endfor
-	@(${MKDIR} ${BUILD_WRKSRC}/generatedScripts && cd ${BUILD_WRKSRC}/generatedScripts && ${BZIP2_CMD} ${EXTRACT_BEFORE_ARGS} ${BUILD_WRKSRC}/${ECLIPSE_GENERATED_BUILDSCRIPTS} ${EXTRACT_AFTER_ARGS})
 
 	@(cd ${WRKDIR} && ${BZIP2_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${ANT_SRCFILE} ${EXTRACT_AFTER_ARGS})
 .for f in ${ANT_BUNDLES}
 	@${CP} ${WRKDIR}/apache-ant-${ANT_VERSION}/lib/${f} ${BUILD_WRKSRC}/bundles/
 .endfor
 
-	@${MKDIR} ${WRKDIR}/junit
-	@${UNZIP_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/${JUNIT3_SRCFILE} -d ${WRKDIR}/junit
-	@${CP} ${WRKDIR}/junit/junit${JUNIT3_VERSION}/junit.jar ${BUILD_WRKSRC}/bundles/
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${JUNIT4_SRCFILE} ${BUILD_WRKSRC}/bundles/junit4.jar
 
 	@(cd ${WRKDIR} && ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${TOMCAT_SRCFILES:Mapache-tomcat*.tar.gz} ${EXTRACT_AFTER_ARGS})
@@ -178,7 +198,14 @@ post-extract:
 	@${CP} ${WRKDIR}/apache-tomcat-${TOMCAT_VERSION}/lib/${f} ${BUILD_WRKSRC}/bundles/
 .endfor
 
-.if defined(WITH_TESTS)
+	@(cd ${WRKDIR} && ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${ECLIPSE_JETTY_SRCFILE} ${EXTRACT_AFTER_ARGS})
+.for f in ${ECLIPSE_JETTY_BUNDLES}
+	@${CP} ${WRKDIR}/jetty-distribution-${ECLIPSE_JETTY_VERSION}/lib/${f} ${BUILD_WRKSRC}/bundles/
+.endfor
+
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${GERONIMO_ANNOTATION_BUNDLE} ${BUILD_WRKSRC}/bundles/
+
+.if ${PORT_OPTIONS:MTESTS}
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${ECLIPSE_TEST_SRCFILE} ${BUILD_WRKSRC}
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${ECLIPSE_TEST_SCRIPTFILE} ${BUILD_WRKSRC}
 .endif
@@ -190,8 +217,6 @@ pre-patch:
 
 # Fixup boot classes path
 post-patch:
-	@(cd ${BUILD_WRKSRC}/generatedScripts; tar cjf ${BUILD_WRKSRC}/${ECLIPSE_GENERATED_BUILDSCRIPTS} plugins)
-
 	@${REINPLACE_CMD} -e "s+%%BOOTCLASSPATH%%+${BOOTCLASSPATH}+g" ${BUILD_WRKSRC}/build.properties
 	@${REINPLACE_CMD} -e "s+%%BOOTCLASSPATH%%+${BOOTCLASSPATH}+g" ${BUILD_WRKSRC}/pdebuild.properties
 	@${REINPLACE_CMD} -e "s+%%PORTNAME%%+${PORTNAME}+g" ${BUILD_WRKSRC}/build.xml
@@ -200,45 +225,54 @@ post-patch:
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} applyPatches)
 
 .for f in ${ECLIPSE_JAR_BUNDLES}
-	@${REINPLACE_CMD} -e "s+^${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_WRKSRC}/dependencies.properties
-	@${REINPLACE_CMD} -e "s+^${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_WRKSRC}/jdtdependencies.properties
-	@${REINPLACE_CMD} -e "s+^${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_WRKSRC}/sdkdependencies.properties
+	@${REINPLACE_CMD} -e "s+^${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_DEPSDIR}/dependencies.properties
+	@${REINPLACE_CMD} -e "s+^${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_DEPSDIR}/jdtdependencies.properties
+	@${REINPLACE_CMD} -e "s+^${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_DEPSDIR}/sdkdependencies.properties
 .endfor
 .for f in ${ECLIPSE_SAT4J_BUNDLES}
-	@${REINPLACE_CMD} -e "s+^${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_WRKSRC}/dependencies.properties
+	@${REINPLACE_CMD} -e "s+^${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_DEPSDIR}/dependencies.properties
+.endfor
+.for f in ${ECLIPSE_JETTY_BUNDLES}
+	@${REINPLACE_CMD} -e "s+^${f:C/(jetty)-([a-z]+)-(.*)$/org.eclipse.\\1.\\2_\\3/}=\(.*\)+${f:C/(jetty)-([a-z]+)-(.*)$/org.eclipse.\\1.\\2_\\3/}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_DEPSDIR}/dependencies.properties
 .endfor
 .for f in ${ANT_BUNDLES}
-	@${REINPLACE_CMD} -e "s+${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_WRKSRC}/nonosgidependencies.properties
+	@${REINPLACE_CMD} -e "s+${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_DEPSDIR}/nonosgidependencies.properties
 .endfor
-	@${REINPLACE_CMD} -e "s+=/usr/share/java/junit.jar+=${BUILD_WRKSRC}/bundles/junit.jar+" ${BUILD_WRKSRC}/jdtnonosgidependencies.properties
-	@${REINPLACE_CMD} -e "s+=/usr/share/java/junit4.jar+=${BUILD_WRKSRC}/bundles/junit4.jar+" ${BUILD_WRKSRC}/jdtnonosgidependencies.properties
-	@${REINPLACE_CMD} -e "s+/usr/share/java/junit4.jar+${BUILD_WRKSRC}/bundles/junit4.jar+" ${BUILD_WRKSRC}/build.xml
-
-	@${REINPLACE_CMD} -e "s+^\(javax.el_2.2.0.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/el-api.jar+" ${BUILD_WRKSRC}/dependencies.properties
-	@${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/javax.el_2.2.0.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/el-api.jar
-	@${REINPLACE_CMD} -e "s+^\(org.apache.el_7.0.21.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/jasper-el.jar+" ${BUILD_WRKSRC}/dependencies.properties
+
+	@${REINPLACE_CMD} -e "s+=/usr/share/java/junit.jar+=${BUILD_WRKSRC}/bundles/junit4.jar+" ${BUILD_DEPSDIR}/jdtnonosgidependencies.properties
+	@${JAR} umf ${FILESDIR}/MANIFEST.MF.junit4 ${BUILD_WRKSRC}/bundles/junit4.jar
+
+	@${REINPLACE_CMD} -e "s+^\(javax.el_2.2.0.v201108011116.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/el-api.jar+" ${BUILD_DEPSDIR}/dependencies.properties
+	@${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/javax.el_2.2.0.v201108011116.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/el-api.jar
+	@${REINPLACE_CMD} -e "s+^\(org.apache.el_7.0.21.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/jasper-el.jar+" ${BUILD_DEPSDIR}/dependencies.properties
 	@${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/org.apache.el_7.0.21.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/jasper-el.jar
-	@${REINPLACE_CMD} -e "s+^\(org.apache.jasper_7.0.21.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/jasper.jar+" ${BUILD_WRKSRC}/dependencies.properties
+	@${REINPLACE_CMD} -e "s+^\(org.apache.jasper_7.0.21.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/jasper.jar+" ${BUILD_DEPSDIR}/dependencies.properties
 	@${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/org.apache.jasper_7.0.21.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/jasper.jar
-	@${REINPLACE_CMD} -e "s+^\(javax.servlet.jsp_2.2.0.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/jsp-api.jar+" ${BUILD_WRKSRC}/dependencies.properties
-	@${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/javax.servlet.jsp_2.2.0.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/jsp-api.jar
-	@${REINPLACE_CMD} -e "s+^\(javax.servlet_3.0.0.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/servlet-api.jar+" ${BUILD_WRKSRC}/dependencies.properties
-	@${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/javax.servlet_3.0.0.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/servlet-api.jar
-	@${REINPLACE_CMD} -e "s+^\(org.apache.tomcat_7.0.21.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/tomcat-api.jar+" ${BUILD_WRKSRC}/dependencies.properties
+	@${REINPLACE_CMD} -e "s+^\(javax.servlet.jsp_2.2.0.v201112011158.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/jsp-api.jar+" ${BUILD_DEPSDIR}/dependencies.properties
+	@${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/javax.servlet.jsp_2.2.0.v201112011158.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/jsp-api.jar
+	@${REINPLACE_CMD} -e "s+^\(javax.servlet_3.0.0.v201112011016.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/servlet-api.jar+" ${BUILD_DEPSDIR}/dependencies.properties
+	@${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/javax.servlet_3.0.0.v201112011016.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/servlet-api.jar
+	@${REINPLACE_CMD} -e "s+^\(org.apache.tomcat_7.0.21.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/tomcat-api.jar+" ${BUILD_DEPSDIR}/dependencies.properties
 	@${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/org.apache.tomcat_7.0.21.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/tomcat-api.jar
-	@${REINPLACE_CMD} -e "s+^\(org.apache.juli_7.0.21.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/tomcat-juli.jar+" ${BUILD_WRKSRC}/dependencies.properties
+	@${REINPLACE_CMD} -e "s+^\(org.apache.juli_7.0.21.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/tomcat-juli.jar+" ${BUILD_DEPSDIR}/dependencies.properties
 	@${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/org.apache.juli_7.0.21.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/tomcat-juli.jar
 
-	@${MV} ${BUILD_WRKSRC}/dependencyManifests/com.jcraft.jsch_0.1.41.v200903070017.jar ${BUILD_WRKSRC}/dependencyManifests/com.jcraft.jsch_0.1.41.v201101211617.jar
+	@${REINPLACE_CMD} -e "s+^\(org.apache.geronimo.specs.geronimo-annotation_1.1_spec.jar\)=.*+\1=${BUILD_WRKSRC}/bundles/${GERONIMO_ANNOTATION_BUNDLE}+" ${BUILD_DEPSDIR}/dependencies.properties
+	@${REINPLACE_CMD} -e "s+^\(org.apache.felix.gogo.command\)\(_0.8.0.v201108120515.jar\)=.*+\1\2=${BUILD_WRKSRC}/bundles/\1-0.12.0.jar+" ${BUILD_DEPSDIR}/dependencies.properties
+	@${REINPLACE_CMD} -e "s+^\(org.apache.felix.gogo.runtime\)\(_0.8.0.v201108120515.jar\)=.*+\1\2=${BUILD_WRKSRC}/bundles/\1-0.10.0.jar+" ${BUILD_DEPSDIR}/dependencies.properties
+	@${REINPLACE_CMD} -e "s+^\(org.apache.felix.gogo.shell\)\(_0.8.0.v201110170705.jar\)=.*+\1\2=${BUILD_WRKSRC}/bundles/\1-0.10.0.jar+" ${BUILD_DEPSDIR}/dependencies.properties
+
+	@${MV} ${BUILD_WRKSRC}/dependencyManifests/javax.xml_1.0.1.v200903091627.jar ${BUILD_WRKSRC}/dependencyManifests/javax.xml_1.3.4.v201005080400.jar
 	@${MV} ${BUILD_WRKSRC}/dependencyManifests/org.apache.commons.el_1.0.0.v200806031608.jar ${BUILD_WRKSRC}/dependencyManifests/org.apache.commons.el_1.0.0.v201101211617.jar
 	@${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/org.apache.commons.el_1.0.0.v201101211617.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/org.apache.commons.el_1.0.0.v201101211617.jar
 	@${ZIP_CMD} -qd ${BUILD_WRKSRC}/bundles/org.apache.commons.el_1.0.0.v201101211617.jar META-INF/ECLIPSEF.SF META-INF/ECLIPSEF.RSA
-	@${MV} ${BUILD_WRKSRC}/dependencyManifests/org.apache.commons.httpclient_3.1.0.v201005080502.jar ${BUILD_WRKSRC}/dependencyManifests/org.apache.commons.httpclient_3.1.0.v201012070820.jar
 	@${MV} ${BUILD_WRKSRC}/dependencyManifests/org.mortbay.jetty.server_6.1.23.v201004211559.jar ${BUILD_WRKSRC}/dependencyManifests/org.mortbay.jetty.server_6.1.23.v201012071420.jar
 	@${MV} ${BUILD_WRKSRC}/dependencyManifests/org.mortbay.jetty.util_6.1.23.v201004211559.jar ${BUILD_WRKSRC}/dependencyManifests/org.mortbay.jetty.util_6.1.23.v201012071420.jar
 	@${MV} ${BUILD_WRKSRC}/dependencyManifests/org.objectweb.asm_3.3.1.v201101071600.jar ${BUILD_WRKSRC}/dependencyManifests/org.objectweb.asm_3.3.1.v201105211655.jar
+	@${ZIP_CMD} -qd ${BUILD_WRKSRC}/bundles/org.w3c.dom.svg_1.1.0.v201011041433.jar META-INF/ECLIPSEF.SF META-INF/ECLIPSEF.RSA META-INF/MANIFEST.MF
+	@${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/org.w3c.dom.svg_1.1.0.v201011041433.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/org.w3c.dom.svg_1.1.0.v201011041433.jar
 
-.if defined(WITH_TESTS)
+.if ${PORT_OPTIONS:MTESTS}
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} applyTestPatches)
 .endif
 
@@ -273,7 +307,7 @@ do-install:
 	@${ECHO_CMD} "@exec ${PREFIX}/bin/update-desktop-database > /dev/null || /usr/bin/true" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${PREFIX}/bin/update-desktop-database > /dev/null || /usr/bin/true" >> ${TMPPLIST}
 
-.if defined(WITH_TESTS)
+.if ${PORT_OPTIONS:MTESTS}
 tests: build
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} runTests)
 .else

Modified: head/java/eclipse-devel/distinfo
==============================================================================
--- head/java/eclipse-devel/distinfo	Wed Sep 19 19:46:07 2012	(r304542)
+++ head/java/eclipse-devel/distinfo	Wed Sep 19 19:58:38 2012	(r304543)
@@ -1,21 +1,35 @@
-SHA256 (eclipse/eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92.tar.xz) = 07f3d9c564e0c8b5ad8a9cee5645a295913059885290e4e4a77631d17b494265
-SIZE (eclipse/eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92.tar.xz) = 253596
-SHA256 (eclipse/eclipse-3.7.1-src.tar.bz2) = f3a87ff4408aeadc6823eb849330527df07d5706d6456af282170bb9bbbd31d6
-SIZE (eclipse/eclipse-3.7.1-src.tar.bz2) = 69243059
-SHA256 (eclipse/apache-ant-1.8.2-bin.tar.bz2) = ecb49f5017807c9320bf19702149328cf4779a01bddca2b6c47e3ebb0e39c9c7
-SIZE (eclipse/apache-ant-1.8.2-bin.tar.bz2) = 6740047
-SHA256 (eclipse/junit3.8.2.zip) = aae23d20e6f4dc45b4bf0b10fedcbd209c100342a0cafce1aa07d2da6da1f24a
-SIZE (eclipse/junit3.8.2.zip) = 461426
-SHA256 (eclipse/junit-4.8.2.jar) = a2aa2c3bb2b72da76c3e6a71531f1eefdc350494819baf2b1d80d7146e020f9e
-SIZE (eclipse/junit-4.8.2.jar) = 237344
+SHA256 (eclipse/eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3.tar.xz) = 182507df10f79d2bf3436aca0f6b4b4c652f76b2f117a0dfa9989dd815bcf5b9
+SIZE (eclipse/eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3.tar.xz) = 304184
+SHA256 (eclipse/eclipse-4.2.0-I20120608-1400-src.tar.bz2) = c7cf3218e8873e5f8383111c7887636c92d36a847a78ac5adc2687854a21e08d
+SIZE (eclipse/eclipse-4.2.0-I20120608-1400-src.tar.bz2) = 77996040
+SHA256 (eclipse/apache-ant-1.8.3-bin.tar.bz2) = 93238e8861acf0ca0546dc4f7c9256e0bf83effbff4afca0ba0aa024d4abd4d1
+SIZE (eclipse/apache-ant-1.8.3-bin.tar.bz2) = 4254036
+SHA256 (eclipse/junit-4.10.jar) = 5ccbfcf78fb3663d9bed8ce826934231f93ad40e9a4c6796ba4ccf8557a28d69
+SIZE (eclipse/junit-4.10.jar) = 253160
 SHA256 (eclipse/apache-tomcat-7.0.25.tar.gz) = 7ba03b6703b43da6868613fd625bfb13a791d57478b4a4e49bdb56f9fc3994b4
 SIZE (eclipse/apache-tomcat-7.0.25.tar.gz) = 7527434
 SHA256 (eclipse/tomcat-juli.jar) = cafd9cf2e73dd21d3fbe89fc83ae235a588342c11f7b8df7c55573aebc25f0d1
 SIZE (eclipse/tomcat-juli.jar) = 78801
-SHA256 (eclipse/com.ibm.icu_4.4.2.v20110208.jar) = 432cdb7d9af5f138fbfd1902c197f01a314422a7db760e291cab2c76d8d65be8
-SIZE (eclipse/com.ibm.icu_4.4.2.v20110208.jar) = 6690628
-SHA256 (eclipse/com.jcraft.jsch_0.1.41.v201101211617.jar) = 7e916b685794f33f494668f738a5aee51da67af04f0ebfb68048900032e36d1a
-SIZE (eclipse/com.jcraft.jsch_0.1.41.v201101211617.jar) = 226770
+SHA256 (eclipse/jetty-distribution-8.1.0.v20120127.tar.gz) = f3f88abb93f70061d361596c7de5051ae148b01b5897d1b40ab314d6a6e95379
+SIZE (eclipse/jetty-distribution-8.1.0.v20120127.tar.gz) = 12950131
+SHA256 (eclipse/geronimo-annotation_1.1_spec-1.0.jar) = 6d2d296d01540201bca6e7175bf900f6df0be605e29bdaf822df516f40235ff9
+SIZE (eclipse/geronimo-annotation_1.1_spec-1.0.jar) = 21584
+SHA256 (eclipse/com.ibm.icu_4.4.2.v20110823.jar) = 3b8ba468997fd9ae21cdf3972f1d512cf09c5442dd0334d49ce49328ba34f8e7
+SIZE (eclipse/com.ibm.icu_4.4.2.v20110823.jar) = 6701200
+SHA256 (eclipse/com.ibm.icu.source_4.4.2.v20110823.jar) = 6b983efbce0b4fc18de095fdb637f6ead777bf4cf53f51b244d63fb44d43b579
+SIZE (eclipse/com.ibm.icu.source_4.4.2.v20110823.jar) = 1754121
+SHA256 (eclipse/com.jcraft.jsch_0.1.44.v201101211721.jar) = e370a86fae85897c6ba8ed663f20ff9ea2901764226344babb3e93ac418ed227
+SIZE (eclipse/com.jcraft.jsch_0.1.44.v201101211721.jar) = 199127
+SHA256 (eclipse/javax.inject_1.0.0.v20091030.jar) = 42a3f56421d64fed322c66738affd5afa221caf967bbf42d96b7cecc3a598428
+SIZE (eclipse/javax.inject_1.0.0.v20091030.jar) = 12288
+SHA256 (eclipse/javax.xml_1.3.4.v201005080400.jar) = 22d52002b1bab03b51372c197411a7aee2a5d80f8a3f767eeeace71d1e0c4ad2
+SIZE (eclipse/javax.xml_1.3.4.v201005080400.jar) = 237996
+SHA256 (eclipse/org.apache.batik.css_1.6.0.v201011041432.jar) = 330230ef1445f554fef4420a3fa1209048a4896250bf82d36adfe0b6ed142d81
+SIZE (eclipse/org.apache.batik.css_1.6.0.v201011041432.jar) = 265409
+SHA256 (eclipse/org.apache.batik.util_1.6.0.v201011041432.jar) = bfef3b67286b9f9213e9cb58cec25e5549e4e3db54332951466ae07931672a03
+SIZE (eclipse/org.apache.batik.util_1.6.0.v201011041432.jar) = 101159
+SHA256 (eclipse/org.apache.batik.util.gui_1.6.0.v201011041432.jar) = 59e05961020cb2de4ea224d48bf6758e74e58af30a4c5c81d9b500f8f4ab6b30
+SIZE (eclipse/org.apache.batik.util.gui_1.6.0.v201011041432.jar) = 164253
 SHA256 (eclipse/org.apache.commons.codec_1.3.0.v201101211617.jar) = 47dc744368dc7a4cde2be1e9d9e744ec014dca27ff7a23722da12db10e67419e
 SIZE (eclipse/org.apache.commons.codec_1.3.0.v201101211617.jar) = 55011
 SHA256 (eclipse/org.apache.commons.el_1.0.0.v201101211617.jar) = 31867a6e2166e744dced07606852ef84e41db24bfd93a3da375ef4454bde13bc
@@ -36,7 +50,17 @@ SHA256 (eclipse/org.mortbay.jetty.server
 SIZE (eclipse/org.mortbay.jetty.server_6.1.23.v201012071420.jar) = 557887
 SHA256 (eclipse/org.objectweb.asm_3.3.1.v201105211655.jar) = 84920bb2d003a88e9a585b7daa2cc163aa6bc5e9efa997f8622436ca3fac3b95
 SIZE (eclipse/org.objectweb.asm_3.3.1.v201105211655.jar) = 228617
+SHA256 (eclipse/org.w3c.css.sac_1.3.1.v200903091627.jar) = e75b95da845d2b1db2787799bca3761b018dde48eb052e4c4a810086502d4dae
+SIZE (eclipse/org.w3c.css.sac_1.3.1.v200903091627.jar) = 32952
+SHA256 (eclipse/org.w3c.dom.svg_1.1.0.v201011041433.jar) = 0e23a9b5f8f92b8edff8a443fb27e79411f2474d8f352361a08a280de35dfdd2
+SIZE (eclipse/org.w3c.dom.svg_1.1.0.v201011041433.jar) = 87897
 SHA256 (eclipse/org.sat4j.core_2.3.0.v20110329.jar) = 3e6c4a633ede8c24a86559cf9fc2231840dbf032398a38a960677723906728c1
 SIZE (eclipse/org.sat4j.core_2.3.0.v20110329.jar) = 210700
 SHA256 (eclipse/org.sat4j.pb_2.3.0.v20110329.jar) = c40ca55dad3a937dc4c4005e5facf11204a61d56824c2b19eac480dfbeeaaafd
 SIZE (eclipse/org.sat4j.pb_2.3.0.v20110329.jar) = 140725
+SHA256 (eclipse/org.apache.felix.gogo.command-0.12.0.jar) = 5799c75d81dd5682ff79f3e440b9ba77c5511fe683b5b7d5a322059ce4d39800
+SIZE (eclipse/org.apache.felix.gogo.command-0.12.0.jar) = 51746
+SHA256 (eclipse/org.apache.felix.gogo.runtime-0.10.0.jar) = 15e94961ae2d0046278686965fe6a34ad43d8d18719f5bc2304e725cdb57a379
+SIZE (eclipse/org.apache.felix.gogo.runtime-0.10.0.jar) = 66965
+SHA256 (eclipse/org.apache.felix.gogo.shell-0.10.0.jar) = 5a625f772d7c03443229d9a1e9f9b851892ee363c2e88ef1d5b55ed0979431a2
+SIZE (eclipse/org.apache.felix.gogo.shell-0.10.0.jar) = 49004

Added: head/java/eclipse-devel/files/MANIFEST.MF.junit4
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/java/eclipse-devel/files/MANIFEST.MF.junit4	Wed Sep 19 19:58:38 2012	(r304543)
@@ -0,0 +1,64 @@
+Manifest-Version: 1.0
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.junit
+Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/too
+ ls:org.eclipse.orbit/org.junit;tag=v4_10_0_v20120426-0900
+Require-Bundle: org.hamcrest.core;bundle-version="1.1.0";visibility:=r
+ eexport
+Export-Package: junit.extensions;version="4.10.0",junit.framework;versi
+ on="4.10.0",junit.runner;version="4.10.0",junit.textui;version="4.10.0",
+ org.junit;version="4.10.0",org.junit.experimental;version="4.10.0",org.
+ junit.experimental.categories;version="4.10.0",org.junit.experimental.
+ max;version="4.10.0",org.junit.experimental.results;version="4.10.0",or
+ g.junit.experimental.runners;version="4.10.0",org.junit.experimental.t
+ heories;version="4.10.0",org.junit.experimental.theories.internal;vers
+ ion="4.10.0";x-internal:=true,org.junit.experimental.theories.supplier
+ s;version="4.10.0",org.junit.internal;version="4.10.0";x-internal:=true
+ ,org.junit.internal.builders;version="4.10.0";x-internal:=true,org.jun
+ it.internal.matchers;version="4.10.0";x-internal:=true,org.junit.inter
+ nal.requests;version="4.10.0";x-internal:=true,org.junit.internal.runn
+ ers;version="4.10.0";x-internal:=true,org.junit.internal.runners.model
+ ;version="4.10.0";x-internal:=true,org.junit.internal.runners.statemen
+ ts;version="4.10.0";x-internal:=true,org.junit.matchers;version="4.10.0
+ ",org.junit.rules;version="4.10.0",org.junit.runner;version="4.10.0",or
+ g.junit.runner.manipulation;version="4.10.0",org.junit.runner.notifica
+ tion;version="4.10.0",org.junit.runners;version="4.10.0",org.junit.runn
+ ers.model;version="4.10.0"
+Bundle-Version: 4.10.0.v4_10_0_v20120426-0900
+Bundle-ManifestVersion: 2
+Manifest-Version: 1.0
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.junit
+Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/too
+ ls:org.eclipse.orbit/org.junit;tag=v4_10_0_v20120426-0900
+Require-Bundle: org.hamcrest.core;bundle-version="1.1.0";visibility:=r
+ eexport
+Export-Package: junit.extensions;version="4.10.0",junit.framework;versi
+ on="4.10.0",junit.runner;version="4.10.0",junit.textui;version="4.10.0",
+ org.junit;version="4.10.0",org.junit.experimental;version="4.10.0",org.
+ junit.experimental.categories;version="4.10.0",org.junit.experimental.
+ max;version="4.10.0",org.junit.experimental.results;version="4.10.0",or
+ g.junit.experimental.runners;version="4.10.0",org.junit.experimental.t
+ heories;version="4.10.0",org.junit.experimental.theories.internal;vers
+ ion="4.10.0";x-internal:=true,org.junit.experimental.theories.supplier
+ s;version="4.10.0",org.junit.internal;version="4.10.0";x-internal:=true
+ ,org.junit.internal.builders;version="4.10.0";x-internal:=true,org.jun
+ it.internal.matchers;version="4.10.0";x-internal:=true,org.junit.inter
+ nal.requests;version="4.10.0";x-internal:=true,org.junit.internal.runn
+ ers;version="4.10.0";x-internal:=true,org.junit.internal.runners.model
+ ;version="4.10.0";x-internal:=true,org.junit.internal.runners.statemen
+ ts;version="4.10.0";x-internal:=true,org.junit.matchers;version="4.10.0
+ ",org.junit.rules;version="4.10.0",org.junit.runner;version="4.10.0",or
+ g.junit.runner.manipulation;version="4.10.0",org.junit.runner.notifica
+ tion;version="4.10.0",org.junit.runners;version="4.10.0",org.junit.runn
+ ers.model;version="4.10.0"
+Bundle-Version: 4.10.0.v4_10_0_v20120426-0900
+Bundle-ManifestVersion: 2

Modified: head/java/eclipse-devel/files/eclipse-build-upstream.patch
==============================================================================
--- head/java/eclipse-devel/files/eclipse-build-upstream.patch	Wed Sep 19 19:46:07 2012	(r304542)
+++ head/java/eclipse-devel/files/eclipse-build-upstream.patch	Wed Sep 19 19:58:38 2012	(r304543)
@@ -17,18 +17,16 @@ Index: build.xml
 ===================================================================
 --- build.xml	(revision 23733)
 +++ build.xml	(working copy)
-@@ -131,7 +131,8 @@
+@@ -137,6 +137,7 @@
  		<ant inheritall="false" antfile="pdebuild.xml">
  			<property name="buildId" value="${buildId}" />
  			<property name="buildArch" value="${buildArch}" />
--			<property name="buildDirectory" value="../../" />
 +			<property name="buildOs" value="${buildOs}" />
-+			<property name="buildDirectory" value="../../" />
+ 			<property name="buildDirectory" value="../../" />
  		</ant>
  	</target>
- 
-@@ -312,7 +313,10 @@
- 		<!-- end eclipse-build-only patches -->
+@@ -406,7 +407,10 @@
+ 		
  		<!-- Only build for one target (bug #293952) -->
  		<copy file="${buildConfigs}/eclipse-build-config/build.properties.in" tofile="${buildConfigs}/eclipse-build-config/build.properties" />
 -		<replace file="${buildConfigs}/eclipse-build-config/build.properties" token="@build_arch@" value="${buildArch}" />
@@ -36,10 +34,10 @@ Index: build.xml
 +			<replacefilter token="@build_arch@" value="${buildArch}" />
 +			<replacefilter token="@build_os@" value="${buildOs}" />
 +		</replace>
- 		<patch patchfile="${basedir}/patches/eclipse-core-resources-compilation-profile.patch" dir="${buildDirectory}" strip="0" />
- 		<patch patchfile="${basedir}/patches/eclipse-equinox-util.patch" dir="${buildDirectory}" strip="0" />
- 		<echo file="patch-stamp" />
-@@ -399,6 +403,7 @@
+ 
+ 
+ 		<!-- This one should be removed when Eclipse bug 369215 is fixed -->
+@@ -563,6 +567,7 @@
  		<!--
  		<ant antfile="build.xml" dir="${eclipse.pdebuild.scripts}">
  			<property name="arch" value="${buildArch}"/>
@@ -47,9 +45,9 @@ Index: build.xml
  			<property name="builder" value="${buildConfig}" />
  		</ant>
  -->
-@@ -462,9 +467,9 @@
+@@ -571,9 +576,9 @@
  
- 	<target name="compile.libgnomeproxy" if="build.libgnomeproxy">
+ 	<target name="compile.libgnomeproxy">
  		<!-- build libgnomeproxy -->
 -		<exec dir="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux" executable="make" failonerror="true" />
 -		<copy file="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux/libgnomeproxy-1.0.0.so" todir="${buildDirectory}/plugins/org.eclipse.core.net.linux.${buildArch}/" />
@@ -60,7 +58,7 @@ Index: build.xml
  	</target>
  
  	<target name="compilelibs" unless="compilelibs.complete">
-@@ -476,16 +481,16 @@
+@@ -585,16 +590,16 @@
  				<include name="**/*.so" />
  			</fileset>
  		</delete>
@@ -80,7 +78,7 @@ Index: build.xml
  		<copy todir="${buildDirectory}/plugins/${launcherfragment}">
  			<fileset dir="${launcherlibs}/library/gtk">
  				<include name="**/*.so" />
-@@ -493,13 +498,13 @@
+@@ -602,8 +607,8 @@
  		</copy>
  
  		<!-- build liblocalfile -->
@@ -91,13 +89,7 @@ Index: build.xml
  		</move>
  		<!-- build libgnomeproxy -->
  		<antcall target="compile.libgnomeproxy" />
- 		<!-- build libupdate -->
--		<ant dir="${buildDirectory}/plugins/org.eclipse.update.core.linux/src" antfile="build.xml" />
-+		<ant dir="${buildDirectory}/plugins/org.eclipse.update.core.${buildOs}/src" antfile="build.xml" />
- 
- 		<echo file="compilelibs-stamp" />
- 	</target>
-@@ -593,7 +598,7 @@
+@@ -699,7 +704,7 @@
  			<arg line="-application org.eclipse.ant.core.antRunner " />
  			<arg line="-buildfile buildConfiguration.xml" />
  			<arg line="-propertyfile ${basedir}/build.properties " />
@@ -106,7 +98,7 @@ Index: build.xml
  			<arg line="-Dreposource=${reposource} " />
  			<arg line="-Dbasedir=${productFiles}/rcpConfig" />
  			<arg line="-DbuildId=${buildId} " />
-@@ -631,6 +636,7 @@
+@@ -743,6 +753,7 @@
  			<arg line="-buildfile publishProduct.xml" />
  			<arg line="-propertyfile ${basedir}/build.properties " />
  			<arg line="-DbuildArch=${buildArch} " />
@@ -114,7 +106,16 @@ Index: build.xml
  			<arg line="-Dreposource=${reposource} " />
  			<arg line="-DbuildConfig=${buildConfig} " />
  			<arg line="-DproductFile=${productFile} " />
-@@ -721,7 +727,7 @@
+@@ -756,7 +761,7 @@
+ 		                 <arg line="-consoleLog" />
+ 			<arg line="-application org.eclipse.equinox.p2.publisher.ProductPublisher " />
+ 		                 <arg line="-flavor tooling" />
+-		                 <arg line="-configs gtk.linux.${buildArch}" />
++		                 <arg line="-configs gtk.${buildOs}.${buildArch}" />
+ 		                 <arg line="-productFile ${productFile}" />
+ 		                 <arg line="-metadataRepository file:${reposource}" />
+ 		                 <arg line="-artifactRepository file:${reposource}" />
+@@ -812,7 +817,7 @@
  			<param name="p2.director.profile" value="${profileName}" />
  			<param name="p2.director.install.path" value="${provisionDir}" />
  			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -123,7 +124,7 @@ Index: build.xml
  			<param name="p2.ws" value="gtk" />
  			<param name="p2.arch" value="${buildArch}" />
  			<param name="p2.repo" value="${reposource}" />
-@@ -750,7 +753,7 @@
+@@ -828,7 +833,7 @@
  			<param name="p2.director.profile" value="${profileName}" />
  			<param name="p2.director.install.path" value="${provisionDir}" />
  			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
@@ -132,33 +133,24 @@ Index: build.xml
  			<param name="p2.ws" value="gtk" />
  			<param name="p2.arch" value="${buildArch}" />
  			<param name="p2.repo" value="${reposource}" />
-@@ -800,6 +806,8 @@
- 		-->
- 		<exec executable="${basedir}/runtests.sh" dir="${basedir}">
- 			<arg value="-t${timestamp}" />
-+			<arg value="-a${buildArch}" />
-+			<arg value="-o${buildOs}" />
- 			<arg value="-b ${testsBuildDirectory}" />
- 			<arg value="-p ${provisionDir}" />
- 			<arg value="${testSwitches}" />
-@@ -924,7 +932,7 @@
- 		<property name="startupjarpath" refid="startupjar" />
- 		<symlink link="${installationDir}/startup.jar" resource="plugins/${startupjarpath}" />
+@@ -976,7 +981,7 @@
+ 		<mkdir dir="${destDir}${prefix}/bin" />
+ 		<symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" overwrite="true"/>
  		<!-- Create the "swt.jar" and friends symlinks  -->
 -		<fileset dir="${installationDir}/plugins" includes="org.eclipse.swt.gtk.linux.${buildArch}_*" id="swtjar" />
 +		<fileset dir="${installationDir}/plugins" includes="org.eclipse.swt.gtk.${buildOs}.${buildArch}_*" id="swtjar" />
  		<property name="swtjarpath" refid="swtjar" />
- 		<symlink link="${installationDir}/swt-gtk-${label}.jar" resource="plugins/${swtjarpath}" />
- 		<symlink link="${installationDir}/swt-gtk.jar" resource="plugins/${swtjarpath}" />
-@@ -1061,7 +1074,7 @@
-                         <param name="p2.director.profile" value="PlatformProfile" />
-                         <param name="p2.director.install.path" value="${installationDir}" />
-                         <param name="p2.director.extraArgs" value="-purgeHistory" />
+ 		<symlink link="${installationDir}/swt-gtk-${label}.jar" resource="plugins/${swtjarpath}" overwrite="true"/>
+ 		<symlink link="${installationDir}/swt-gtk.jar" resource="plugins/${swtjarpath}" overwrite="true"/>
+@@ -995,7 +1000,7 @@
+ 			<param name="p2.director.profile" value="PlatformProfile" />
+ 			<param name="p2.director.install.path" value="${installationDir}" />
+ 			<param name="p2.director.extraArgs" value="-purgeHistory" />
 -			<param name="p2.os" value="linux" />
 +			<param name="p2.os" value="${buildOs}" />
-                         <param name="p2.ws" value="gtk" />
-                         <param name="p2.arch" value="${buildArch}" />
-                         <param name="p2.repo" value="${installationDir}" />
+ 			<param name="p2.ws" value="gtk" />
+ 			<param name="p2.arch" value="${buildArch}" />
+ 			<param name="p2.repo" value="${installationDir}" />
 Index: pdebuild.xml
 ===================================================================
 --- pdebuild.xml	(revision 23733)
@@ -221,6 +213,19 @@ Index: publishProduct.xml
  			<advice kind="featureVersions" file="${buildDirectory}/finalFeaturesVersions.properties" />
  			<advice kind="pluginVersions" file="${buildDirectory}/finalPluginsVersions.properties" />
  		</p2.publish.product>
+Index: buildTests.xml
+===================================================================
+--- buildTests.xml~	Wed Mar 28 11:50:23 2012
++++ buildTests.xml	Fri Jun 22 10:11:05 2012
+@@ -215,6 +215,8 @@
+ 			-->
+ 			<exec executable="${basedir}/runtests.sh" dir="${basedir}">
+ 				<arg value="-t${timestamp}" />
++				<arg value="-a${buildArch}" />
++				<arg value="-o${buildOs}" />
+ 				<arg value="-b ${testsBuildDirectory}" />
+ 				<arg value="-p ${provisionWithTestsDir}" />
+ 				<arg value="${testSwitches}" />
 Index: runtests.sh
 ===================================================================
 --- runtests.sh	(revision 23733)

Modified: head/java/eclipse-devel/files/freebsd-support.patch
==============================================================================
--- head/java/eclipse-devel/files/freebsd-support.patch	Wed Sep 19 19:46:07 2012	(r304542)
+++ head/java/eclipse-devel/files/freebsd-support.patch	Wed Sep 19 19:58:38 2012	(r304543)
@@ -2,7 +2,7 @@ $FreeBSD$
 
 --- build.orig/eclipse-3.5.2-src/features/org.eclipse.equinox.executable/library/gtk/build.sh	2009-12-23 15:12:32.845944760 -0500
 +++ build/eclipse-3.5.2-src/features/org.eclipse.equinox.executable/library/gtk/build.sh	2009-12-23 15:14:12.389807302 -0500
-@@ -53,6 +53,7 @@
+@@ -54,6 +54,7 @@
  	"Linux")
  		makefile="make_linux.mak"
  		defaultOS="linux"
@@ -10,15 +10,15 @@ $FreeBSD$
  		case $MODEL in
  			"x86_64")
  				defaultOSArch="x86_64"
-@@ -112,6 +113,7 @@
+@@ -115,6 +116,7 @@
  	"SunOS")
  		makefile="make_solaris.mak"
  		defaultOS="solaris"
 +		MAKE=make
- 		[ -d /usr/jdk/jdk1.5.0_01 ] && defaultJavaHome="/usr/jdk/jdk1.5.0_01"
  		OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
  		#PATH=/usr/ccs/bin:/opt/SUNWspro/bin:$PATH
-@@ -119,6 +121,24 @@
+ 		PATH=/usr/ccs/bin:/export/home/SUNWspro/bin:$PATH
+@@ -138,6 +140,24 @@
  				;;
  		esac
  		;;
@@ -43,7 +43,7 @@ $FreeBSD$
  	*)
  	echo "Unknown OS -- build aborted"
  	;;
-@@ -164,13 +184,13 @@
+@@ -203,13 +223,13 @@
  # If the OS is supported (a makefile exists)
  if [ "$makefile" != "" ]; then
  	if [ "$extraArgs" != "" ]; then
@@ -184,7 +184,7 @@ $FreeBSD$
 +root.freebsd.gtk.x86_64=bin/gtk/freebsd/x86_64,gtk_root
 --- build.orig/eclipse-3.5.2-src/features/org.eclipse.platform/feature.xml	2009-12-23 15:12:32.396160828 -0500
 +++ build/eclipse-3.5.2-src/features/org.eclipse.platform/feature.xml	2009-12-23 15:14:12.390811604 -0500
-@@ -138,6 +138,16 @@
+@@ -167,6 +167,26 @@
           unpack="false"/>
  
     <plugin
@@ -198,10 +198,20 @@ $FreeBSD$
 +   	unpack="false"/>
 +
 +   <plugin
++   	id="org.eclipse.core.net.freebsd.x86_64"
++   	os="freebsd"
++   	arch="x86_64"
++   	download-size="0"
++   	install-size="0"
++   	version="0.0.0"
++   	fragment="true"
++   	unpack="false"/>
++
++   <plugin
           id="org.eclipse.core.resources"
           download-size="0"
           install-size="0"
-@@ -572,6 +582,26 @@
+@@ -548,6 +568,26 @@
           unpack="false"/>
  
     <plugin
@@ -228,81 +238,64 @@ $FreeBSD$
           id="org.eclipse.core.filesystem.solaris.sparc"
           os="solaris"
           arch="sparc"
-@@ -657,6 +687,16 @@
-          unpack="false"/>
- 
-    <plugin
-+         id="org.eclipse.update.core.freebsd"
-+         os="freebsd"
-+         arch="x86"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         fragment="true"
-+         unpack="false"/>
-+
-+   <plugin
-          id="org.eclipse.update.core.win32"
-          os="win32"
-          download-size="0"
---- build.orig/eclipse-3.5.2-src/features/org.eclipse.rcp/feature.xml	2009-12-23 15:12:32.485514642 -0500
-+++ build/eclipse-3.5.2-src/features/org.eclipse.rcp/feature.xml	2009-12-23 15:14:12.391816744 -0500
-@@ -371,6 +371,28 @@
-          unpack="false"/>
+--- build/eclipse-4.2.0-I20120608-1400-src/features/org.eclipse.e4.rcp/feature.xml~	Wed Jul  4 15:54:59 2012
++++ build/eclipse-4.2.0-I20120608-1400-src/features/org.eclipse.e4.rcp/feature.xml	Wed Jul  4 19:20:31 2012
+@@ -471,6 +471,26 @@
+          fragment="true"/>
  
     <plugin
-+         id="org.eclipse.swt.gtk.freebsd.x86"
++         id="org.eclipse.equinox.launcher.gtk.freebsd.x86"
 +         os="freebsd"
 +         ws="gtk"
 +         arch="x86"
 +         download-size="0"
 +         install-size="0"
 +         version="0.0.0"
-+         fragment="true"
-+         unpack="false"/>
++         fragment="true"/>
 +
 +   <plugin
-+         id="org.eclipse.swt.gtk.freebsd.x86_64"
++         id="org.eclipse.equinox.launcher.gtk.freebsd.x86_64"
 +         os="freebsd"
 +         ws="gtk"
 +         arch="x86_64"
 +         download-size="0"
 +         install-size="0"
 +         version="0.0.0"
-+         fragment="true"
-+         unpack="false"/>
++         fragment="true"/>
 +
 +   <plugin
-          id="org.eclipse.swt.gtk.solaris.sparc"
-          os="solaris"
-          ws="gtk"
-@@ -556,6 +578,26 @@
-          fragment="true"/>
+          id="org.eclipse.equinox.launcher.win32.win32.x86"
+          os="win32"
+          ws="win32"
+@@ -729,6 +749,28 @@
+          unpack="false"/>
  
     <plugin
-+         id="org.eclipse.equinox.launcher.gtk.freebsd.x86"
++         id="org.eclipse.swt.gtk.freebsd.x86"
 +         os="freebsd"
 +         ws="gtk"
 +         arch="x86"
 +         download-size="0"
 +         install-size="0"
 +         version="0.0.0"
-+         fragment="true"/>
++         fragment="true"
++         unpack="false"/>
 +
 +   <plugin
-+         id="org.eclipse.equinox.launcher.gtk.freebsd.x86_64"
++         id="org.eclipse.swt.gtk.freebsd.x86_64"
 +         os="freebsd"
 +         ws="gtk"
 +         arch="x86_64"
 +         download-size="0"
 +         install-size="0"
 +         version="0.0.0"
-+         fragment="true"/>
++         fragment="true"
++         unpack="false"/>
 +
 +   <plugin
-          id="org.eclipse.equinox.launcher.gtk.aix.ppc"
-          os="aix"
-          ws="gtk"
+          id="org.eclipse.swt.cocoa.macosx"
+          os="macosx"
+          ws="cocoa"
 --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile	1969-12-31 19:00:00.000000000 -0500
 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile	2009-12-23 15:14:12.391816744 -0500
 @@ -0,0 +1,36 @@
@@ -379,31 +372,6 @@ $FreeBSD$
  			attributes |= EFS.ATTRIBUTE_EXECUTABLE | EFS.ATTRIBUTE_SYMLINK | EFS.ATTRIBUTE_LINK_TARGET;
  		else if (os.equals(Constants.OS_MACOSX) || os.equals(Constants.OS_HPUX) || os.equals(Constants.OS_QNX))
  			attributes |= EFS.ATTRIBUTE_EXECUTABLE;
---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem.freebsd.x86/.project	1969-12-31 19:00:00.000000000 -0500
-+++ build/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem.freebsd.x86/.project	2009-12-23 15:14:12.393823113 -0500
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<projectDescription>
-+	<name>org.eclipse.core.filesystem.freebsd.x86</name>
-+	<comment></comment>
-+	<projects>
-+	</projects>
-+	<buildSpec>
-+		<buildCommand>
-+			<name>org.eclipse.pde.ManifestBuilder</name>
-+			<arguments>
-+			</arguments>
-+		</buildCommand>
-+		<buildCommand>
-+			<name>org.eclipse.pde.SchemaBuilder</name>
-+			<arguments>
-+			</arguments>
-+		</buildCommand>
-+	</buildSpec>
-+	<natures>
-+		<nature>org.eclipse.pde.PluginNature</nature>
-+	</natures>
-+</projectDescription>
 --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem.freebsd.x86/META-INF/MANIFEST.MF	1969-12-31 19:00:00.000000000 -0500
 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem.freebsd.x86/META-INF/MANIFEST.MF	2009-12-23 15:14:12.393823113 -0500
 @@ -0,0 +1,9 @@
@@ -411,11 +379,62 @@ $FreeBSD$
 +Bundle-ManifestVersion: 2
 +Bundle-Name: %fragmentName
 +Bundle-SymbolicName: org.eclipse.core.filesystem.freebsd.x86; singleton:=true
-+Bundle-Version: 1.2.0.qualifier
++Bundle-Version: 1.4.0.qualifier
 +Bundle-Vendor: %providerName
-+Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)"
++Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.3.0,2.0.0)"
 +Bundle-Localization: fragment
 +Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86))
+--- build.orig/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.core.filesystem.freebsd.x86/pom.xml	1969-12-31 19:00:00.000000000 -0500
++++ build.orig/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.core.filesystem.freebsd.x86/pom.xml	2009-12-23 15:14:12.393823113 -0500
+@@ -0,0 +1,48 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!--
++  Copyright (c) 2012 Eclipse Foundation.
++  All rights reserved. This program and the accompanying materials
++  are made available under the terms of the Eclipse Distribution License v1.0
++  which accompanies this distribution, and is available at
++  http://www.eclipse.org/org/documents/edl-v10.php
++ 
++  Contributors:
++     Igor Fedorenko - initial implementation
++-->
++
++<project
++  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
++  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
++  <modelVersion>4.0.0</modelVersion>
++  <parent>
++    <artifactId>eclipse.platform.resources</artifactId>
++    <groupId>eclipse.platform.resources</groupId>
++    <version>3.8.0-SNAPSHOT</version>
++    <relativePath>../../</relativePath>
++  </parent>
++  <groupId>eclipse.platform.resources</groupId>
++  <artifactId>org.eclipse.core.filesystem.freebsd.x86</artifactId>
++  <version>1.4.0-SNAPSHOT</version>
++  <packaging>eclipse-plugin</packaging>
++
++  <build>
++    <plugins>
++      <!-- tycho is not able to automatically determine os/ws/arch of this bundle -->
++      <plugin>
++        <groupId>org.eclipse.tycho</groupId>
++        <artifactId>target-platform-configuration</artifactId>
++        <version>${tycho.version}</version>
++        <configuration>
++          <resolver>p2</resolver>
++          <environments>
++            <environment>
++              <os>freebsd</os>
++              <ws>gtk</ws>
++              <arch>x86</arch>
++            </environment>
++          </environments>
++        </configuration>
++      </plugin>
++    </plugins>
++  </build>
++</project>
 --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem.freebsd.x86/about.html	1969-12-31 19:00:00.000000000 -0500
 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem.freebsd.x86/about.html	2009-12-23 15:14:12.393823113 -0500
 @@ -0,0 +1,28 @@
@@ -482,31 +501,6 @@ $FreeBSD$
 +###############################################################################
 +fragmentName = Core File System for FreeBSD
 +providerName = Eclipse.org
---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem.freebsd.x86_64/.project	1969-12-31 19:00:00.000000000 -0500
-+++ build/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem.freebsd.x86_64/.project	2009-12-23 15:14:12.394827136 -0500
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<projectDescription>
-+	<name>org.eclipse.core.filesystem.freebsd.x86_64</name>
-+	<comment></comment>
-+	<projects>
-+	</projects>
-+	<buildSpec>
-+		<buildCommand>
-+			<name>org.eclipse.pde.ManifestBuilder</name>
-+			<arguments>
-+			</arguments>
-+		</buildCommand>
-+		<buildCommand>
-+			<name>org.eclipse.pde.SchemaBuilder</name>
-+			<arguments>
-+			</arguments>
-+		</buildCommand>
-+	</buildSpec>
-+	<natures>
-+		<nature>org.eclipse.pde.PluginNature</nature>
-+	</natures>
-+</projectDescription>
 --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem.freebsd.x86_64/META-INF/MANIFEST.MF	1969-12-31 19:00:00.000000000 -0500
 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem.freebsd.x86_64/META-INF/MANIFEST.MF	2009-12-23 15:14:12.395831158 -0500
 @@ -0,0 +1,9 @@
@@ -514,9 +508,9 @@ $FreeBSD$
 +Bundle-ManifestVersion: 2
 +Bundle-Name: %fragmentName
 +Bundle-SymbolicName: org.eclipse.core.filesystem.freebsd.x86_64; singleton:=true
-+Bundle-Version: 1.0.100.qualifier
++Bundle-Version: 1.2.0.qualifier
 +Bundle-Vendor: %providerName
-+Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)"
++Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.3.0,2.0.0)"
 +Bundle-Localization: fragment
 +Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86_64))
 --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem.freebsd.x86_64/about.html	1969-12-31 19:00:00.000000000 -0500
@@ -585,6 +579,68 @@ $FreeBSD$
 +###############################################################################
 +fragmentName = Core File System for FreeBSD
 +providerName = Eclipse.org
+--- build.orig/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.core.filesystem.freebsd.x86_64/pom.xml	1969-12-31 19:00:00.000000000 -0500
++++ build.orig/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.core.filesystem.freebsd.x86_64/pom.xml	2009-12-23 15:14:12.393823113 -0500
+@@ -0,0 +1,48 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!--
++  Copyright (c) 2012 Eclipse Foundation.
++  All rights reserved. This program and the accompanying materials
++  are made available under the terms of the Eclipse Distribution License v1.0
++  which accompanies this distribution, and is available at
++  http://www.eclipse.org/org/documents/edl-v10.php
++ 
++  Contributors:
++     Igor Fedorenko - initial implementation
++-->
++
++<project
++  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
++  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
++  <modelVersion>4.0.0</modelVersion>
++  <parent>
++    <artifactId>eclipse.platform.resources</artifactId>
++    <groupId>eclipse.platform.resources</groupId>
++    <version>3.8.0-SNAPSHOT</version>
++    <relativePath>../../</relativePath>
++  </parent>
++  <groupId>eclipse.platform.resources</groupId>
++  <artifactId>org.eclipse.core.filesystem.freebsd.x86_64</artifactId>
++  <version>1.2.0-SNAPSHOT</version>
++  <packaging>eclipse-plugin</packaging>
++
++  <build>
++    <plugins>
++      <!-- tycho is not able to automatically determine os/ws/arch of this bundle -->
++      <plugin>
++        <groupId>org.eclipse.tycho</groupId>
++        <artifactId>target-platform-configuration</artifactId>
++        <version>${tycho.version}</version>
++        <configuration>
++          <resolver>p2</resolver>
++          <environments>
++            <environment>
++              <os>freebsd</os>
++              <ws>gtk</ws>
++              <arch>x86_64</arch>
++            </environment>
++          </environments>
++        </configuration>
++      </plugin>
++    </plugins>
++  </build>
++</project>
+--- build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.core.net/natives/unix/gnomeproxy.c.orig	Wed Jun 27 15:51:34 2012
++++ build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.core.net/natives/unix/gnomeproxy.c	Wed Jul 25 19:28:51 2012
+@@ -13,7 +13,7 @@
+ #include <gconf/gconf-value.h>
+ #include <gconf/gconf-client.h>
+ 
+-#ifdef __linux__
++#ifdef __STDC__
+ #include <string.h>
+ #else
+ #include <strings.h>
 --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.core.net/natives/unix/freebsd/makefile	1969-12-31 19:00:00.000000000 -0500

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



More information about the svn-ports-all mailing list