? work
? files/eclipse-build-generatedScripts.tar.bz2
? files/patch-generatedScripts
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/java/eclipse-devel/Makefile,v
retrieving revision 1.37
diff -u -r1.37 Makefile
--- Makefile 6 Jun 2011 15:00:50 -0000 1.37
+++ Makefile 6 Jul 2011 13:03:23 -0000
@@ -6,11 +6,10 @@
#
PORTNAME= eclipse-devel
-PORTVERSION= 3.6.1
-#PORTREVISION= 3
+PORTVERSION= 3.7.0
CATEGORIES= java devel
-MASTER_SITES= http://download.eclipse.org/technology/linuxtools/eclipse-build/3.6.x_Helios/:1 \
- http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/bundles/:2 \
+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_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
@@ -20,7 +19,7 @@
${JUNIT3_SRCFILE}:5 \
${JUNIT4_SRCFILE}:6
DIST_SUBDIR= eclipse
-EXTRACT_ONLY= ${ECLIPSE_BUILD_SRCFILE} ${ANT_SRCFILE}
+EXTRACT_ONLY= ${ECLIPSE_BUILD_SRCFILE}
MAINTAINER= freebsd-eclipse@FreeBSD.org
COMMENT= An open extensible IDE for anything and nothing in particular
@@ -31,13 +30,11 @@
zip:${PORTSDIR}/archivers/zip \
${DEPEND_JAVA}
BUILD_DEPENDS= gpatch:${PORTSDIR}/devel/patch \
+ rsync:${PORTSDIR}/net/rsync \
unzip:${PORTSDIR}/archivers/unzip \
zip:${PORTSDIR}/archivers/zip
LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo
-BROKEN= unfetchable
-IGNORE= is currently older than java/eclipse
-
OPTIONS= TESTS "Build SDK test suite" off
ONLY_FOR_ARCHS= i386 amd64
@@ -48,7 +45,8 @@
USE_GMAKE= yes
USE_GNOME= desktopfileutils gconf2 gtk20 gnomevfs2 libgnome libgnomeui pkgconfig
USE_JAVA= yes
-USE_BZIP2= yes
+USE_XZ= yes
+BZIP2_SUFX= .tar.bz2
JAVA_BUILD= yes
JAVA_OS= native
@@ -56,29 +54,29 @@
JAVA_VERSION= 1.6
JAVA_VENDOR= openjdk
-ECLIPSE_BUILD_SRCFILE= eclipse-build-0.6.1${EXTRACT_SUFX}
-ECLIPSE_SRCFILE= eclipse-${PORTVERSION}-src${EXTRACT_SUFX}
-ECLIPSE_TEST_SRCFILE= eclipse-sdktests-${PORTVERSION}-src${EXTRACT_SUFX}
-ECLIPSE_TEST_SCRIPTFILE=eclipse-sdktests-${PORTVERSION}-scripts${EXTRACT_SUFX}
-ECLIPSE_JAR_BUNDLES= com.ibm.icu_4.2.1.v20100412.jar \
- com.jcraft.jsch_0.1.41.v200903070017.jar \
- javax.servlet_2.5.0.v200910301333.jar \
- javax.servlet.jsp_2.0.0.v200806031607.jar \
- org.apache.commons.codec_1.3.0.v20080530-1600.jar \
- org.apache.commons.el_1.0.0.v200806031608.jar \
- org.apache.commons.httpclient_3.1.0.v201005080502.jar \
- org.apache.commons.logging_1.0.4.v201005080501.jar \
- org.apache.jasper_5.5.17.v200903231320.jar \
- org.apache.lucene_1.9.1.v20100518-1140.jar \
- org.apache.lucene.analysis_1.9.1.v20100518-1140.jar \
- org.mortbay.jetty.util_6.1.23.v201004211559.jar \
- org.mortbay.jetty.server_6.1.23.v201004211559.jar \
+ECLIPSE_BUILD_SRCFILE= eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5${EXTRACT_SUFX}
+ECLIPSE_SRCFILE= eclipse-${PORTVERSION}-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 \
+ javax.servlet.jsp_2.0.0.v201101211617.jar \
+ javax.servlet_2.5.0.v201103041518.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 \
+ org.apache.commons.logging_1.0.4.v201101211617.jar \
+ org.apache.jasper_5.5.17.v201101211617.jar \
+ org.apache.lucene.core_2.9.1.v201101211721.jar \
+ org.apache.lucene.analysis_2.9.1.v201101211721.jar \
org.hamcrest.core_1.1.0.v20090501071000.jar \
- org.objectweb.asm_3.2.0.v200909071300.jar
-ECLIPSE_SAT4J_BUNDLES= org.sat4j.core_2.2.0.v20100429.jar \
- org.sat4j.pb_2.2.0.v20100429.jar
-ANT_VERSION= 1.7.1
-ANT_SRCFILE= apache-ant-${ANT_VERSION}-bin${EXTRACT_SUFX}
+ 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
+ECLIPSE_SAT4J_BUNDLES= org.sat4j.core_2.3.0.v20110329.jar \
+ org.sat4j.pb_2.3.0.v20110329.jar
+ANT_VERSION= 1.8.2
+ANT_SRCFILE= apache-ant-${ANT_VERSION}-bin${BZIP2_SUFX}
ANT_BUNDLES= ant-antlr.jar \
ant-apache-bcel.jar \
ant-apache-bsf.jar \
@@ -86,22 +84,25 @@
ant-apache-oro.jar \
ant-apache-regexp.jar \
ant-apache-resolver.jar \
+ ant-apache-xalan2.jar \
ant-commons-logging.jar \
ant-commons-net.jar \
ant.jar \
ant-javamail.jar \
ant-jdepend.jar \
+ ant-jmf.jar \
ant-jsch.jar \
ant-junit.jar \
+ ant-junit4.jar \
ant-launcher.jar \
- ant-nodeps.jar \
ant-swing.jar \
- ant-trax.jar
+ ant-testutil.jar
JUNIT3_VERSION= 3.8.2
JUNIT3_SRCFILE= junit${JUNIT3_VERSION}.zip
JUNIT4_VERSION= 4.8.2
JUNIT4_SRCFILE= junit-${JUNIT4_VERSION}.jar
FBSD_SUPPORT_SRCFILE= freebsd-support.patch
+ECLIPSE_GENERATED_BUILDSCRIPTS= eclipse-build-generatedScripts.tar.bz2
MAKE_ARGS= -DbuildOs=freebsd -DbuildArch=${ARCH:C/amd64/x86_64/:C/i386/x86/} -Dprefix=${PREFIX} -Dlocalbase=${LOCALBASE} -Dlabel=${PORTVERSION}
MAKE_ENV+= GRE_HOME=${PREFIX}/lib/${GECKO} _JAVA_OPTIONS="-Xmx1024m" JAVA_VENDOR=${JAVA_VENDOR}
@@ -137,6 +138,8 @@
# Copy the eclipse source file to the work area
post-extract:
+ @(cd ${WRKDIR} && ${BZIP2_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${ANT_SRCFILE} ${EXTRACT_AFTER_ARGS})
+
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${ECLIPSE_SRCFILE} ${BUILD_WRKSRC}
@${CP} ${FILESDIR}/${FBSD_SUPPORT_SRCFILE} ${BUILD_WRKSRC}/patches/
@${MKDIR} ${BUILD_WRKSRC}/bundles
@@ -162,6 +165,8 @@
# Fixup boot classes path
post-patch:
+ @(cd ${BUILD_WRKSRC}/generatedScripts; tar cjf ${BUILD_WRKSRC}/eclipse-build-generatedScripts.tar.bz2 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
@@ -181,6 +186,15 @@
@${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
+
+ @${MV} ${BUILD_WRKSRC}/dependencyManifests/com.jcraft.jsch_0.1.41.v200903070017.jar ${BUILD_WRKSRC}/dependencyManifests/com.jcraft.jsch_0.1.41.v201101211617.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
+ @${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.apache.jasper_5.5.17.v200903231320.jar ${BUILD_WRKSRC}/dependencyManifests/org.apache.jasper_5.5.17.v201101211617.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
+
.if defined(WITH_TESTS)
@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} applyTestPatches)
.endif
@@ -210,6 +224,7 @@
-@update-desktop-database
@(cd ${PREFIX}; ${FIND} -s lib/${PORTNAME} -not -type d) >> ${TMPPLIST}
@(cd ${PREFIX}; ${FIND} -s -d lib/${PORTNAME} -type d) | ${SED} -ne "s,^,@dirrm ,p" >> ${TMPPLIST}
+ @${ECHO_CMD} "@exec ${MKDIR} %D/share/${PORTNAME}/dropins 2>/dev/null || true " >> ${TMPPLIST}
@${ECHO_CMD} "@unexec ${RMDIR} %D/share/${PORTNAME}/dropins 2>/dev/null || true " >> ${TMPPLIST}
@${ECHO_CMD} "@unexec ${RMDIR} %D/share/${PORTNAME} 2>/dev/null || true " >> ${TMPPLIST}
@${ECHO_CMD} "@exec ${PREFIX}/bin/update-desktop-database > /dev/null || /usr/bin/true" >> ${TMPPLIST}
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/java/eclipse-devel/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- distinfo 20 Mar 2011 12:49:41 -0000 1.12
+++ distinfo 6 Jul 2011 13:03:23 -0000
@@ -1,44 +1,44 @@
-SHA256 (eclipse/eclipse-build-0.6.1.tar.bz2) = 66b6344fe55523b1e2243bd37f9ad14aeff0fd7f0f44669a89cada9146e5b46e
-SIZE (eclipse/eclipse-build-0.6.1.tar.bz2) = 295425
-SHA256 (eclipse/eclipse-3.6.1-src.tar.bz2) = 588f90209a75c8359e86deed5a48f5b3bff69e5d7e1856119e8a740c17646250
-SIZE (eclipse/eclipse-3.6.1-src.tar.bz2) = 62707872
-SHA256 (eclipse/apache-ant-1.7.1-bin.tar.bz2) = 24e54c9d90b81d1b7342695a8285a969393fd883e99ffbbc04203c106d9c2f97
-SIZE (eclipse/apache-ant-1.7.1-bin.tar.bz2) = 7641928
+SHA256 (eclipse/eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5.tar.xz) = 1703ae2b9062e8692a2ab8aa589c91dc42fe90f6e3ba09ea2f69caf91d9b4865
+SIZE (eclipse/eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5.tar.xz) = 276668
+SHA256 (eclipse/eclipse-3.7.0-src.tar.bz2) = a068bab6f06b7939e557be7432b59bcde6925d86edffaa6dc2c1a6eca0fadbb2
+SIZE (eclipse/eclipse-3.7.0-src.tar.bz2) = 67181722
+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/com.ibm.icu_4.2.1.v20100412.jar) = 78150e19c1084d4ad085de156332f6985872d1da9d7b2e22b2c0360ecdc3b974
-SIZE (eclipse/com.ibm.icu_4.2.1.v20100412.jar) = 6451214
-SHA256 (eclipse/com.jcraft.jsch_0.1.41.v200903070017.jar) = ee8af42d01fbdd07a70762483b9eeda5dc8f23b386e04a6aa034b06df75c9396
-SIZE (eclipse/com.jcraft.jsch_0.1.41.v200903070017.jar) = 225576
-SHA256 (eclipse/javax.servlet_2.5.0.v200910301333.jar) = 27c684a06d3832578e2b0bfbd183d973ad5662cfee5cf116791091b74e0297ee
-SIZE (eclipse/javax.servlet_2.5.0.v200910301333.jar) = 118873
-SHA256 (eclipse/javax.servlet.jsp_2.0.0.v200806031607.jar) = 7129d8eb8759eae6169cb494d2ee031bb75a3dab68bc789d92d8a34f2f8a873e
-SIZE (eclipse/javax.servlet.jsp_2.0.0.v200806031607.jar) = 62707
-SHA256 (eclipse/org.apache.commons.codec_1.3.0.v20080530-1600.jar) = 7bab3987cad2567c9baffef27667d3c20b4f12857dba2fbf0573524902ad05b0
-SIZE (eclipse/org.apache.commons.codec_1.3.0.v20080530-1600.jar) = 53772
-SHA256 (eclipse/org.apache.commons.el_1.0.0.v200806031608.jar) = 0d8b55ca35e851ce3d1e5beeb0e4c32ab0630d4d21b3ce324ef0ac0a45e3ad37
-SIZE (eclipse/org.apache.commons.el_1.0.0.v200806031608.jar) = 127481
-SHA256 (eclipse/org.apache.commons.httpclient_3.1.0.v201005080502.jar) = 0f215df922704e121e8504d9c34e60a40729d43badd90576e4c83446203cf77e
-SIZE (eclipse/org.apache.commons.httpclient_3.1.0.v201005080502.jar) = 321329
-SHA256 (eclipse/org.apache.commons.logging_1.0.4.v201005080501.jar) = 5f0c8730284da1752cca07de023eca14bdd50e99f7262239b17db8eaf7b40a71
-SIZE (eclipse/org.apache.commons.logging_1.0.4.v201005080501.jar) = 45398
-SHA256 (eclipse/org.apache.jasper_5.5.17.v200903231320.jar) = 0e440bffabde8db6ad20dee3075ad0a7a7699867be4f5e4b755fd1e56a93fb03
-SIZE (eclipse/org.apache.jasper_5.5.17.v200903231320.jar) = 1721330
-SHA256 (eclipse/org.apache.lucene_1.9.1.v20100518-1140.jar) = 2bab6a2feaabaf8db9c04db16fec03435e37fe201294aead06096884e210ad7b
-SIZE (eclipse/org.apache.lucene_1.9.1.v20100518-1140.jar) = 445306
-SHA256 (eclipse/org.apache.lucene.analysis_1.9.1.v20100518-1140.jar) = bc55013ceb92b3f911217a9d913e89a72172af90895cec55a069bf047b0cac28
-SIZE (eclipse/org.apache.lucene.analysis_1.9.1.v20100518-1140.jar) = 71545
-SHA256 (eclipse/org.mortbay.jetty.util_6.1.23.v201004211559.jar) = 36dc0cf4e75888f9ffb0d36551a915926f247cb4b3cfdeed80479ec8a687f011
-SIZE (eclipse/org.mortbay.jetty.util_6.1.23.v201004211559.jar) = 192846
-SHA256 (eclipse/org.mortbay.jetty.server_6.1.23.v201004211559.jar) = 17bcd3edc28a4808a13558077507da6ed5fe88cc8c216d00d87da88683d3d94d
-SIZE (eclipse/org.mortbay.jetty.server_6.1.23.v201004211559.jar) = 557434
-SHA256 (eclipse/org.hamcrest.core_1.1.0.v20090501071000.jar) = 211c869941f7151fe7d3ecaae31b53d128a2d97684ed4ce455d2ca4ea3a0abeb
-SIZE (eclipse/org.hamcrest.core_1.1.0.v20090501071000.jar) = 26650
-SHA256 (eclipse/org.objectweb.asm_3.2.0.v200909071300.jar) = 3b30b0b87d9d517829eb6227c45657c767f3ec90019cb99d26638f5c4a07a15d
-SIZE (eclipse/org.objectweb.asm_3.2.0.v200909071300.jar) = 229434
-SHA256 (eclipse/org.sat4j.core_2.2.0.v20100429.jar) = 4c3c8b6c3b05576fd1adba3c1ce04e6ea88dd1d9615163411baa76f269c750aa
-SIZE (eclipse/org.sat4j.core_2.2.0.v20100429.jar) = 193845
-SHA256 (eclipse/org.sat4j.pb_2.2.0.v20100429.jar) = 4c57e12cd17a128e14d3cf093ec265e6991a74fcba096c0d284145bf2cd0d44d
-SIZE (eclipse/org.sat4j.pb_2.2.0.v20100429.jar) = 121389
+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/javax.servlet.jsp_2.0.0.v201101211617.jar) = 4cbbaeeda008d079607aaba09226d01621168accc902e70ab8c77d99bed6d089
+SIZE (eclipse/javax.servlet.jsp_2.0.0.v201101211617.jar) = 63887
+SHA256 (eclipse/javax.servlet_2.5.0.v201103041518.jar) = fbeb9035112292148b211226409ea25d8acc5b6ba2f7afe806516d79e50e10fc
+SIZE (eclipse/javax.servlet_2.5.0.v201103041518.jar) = 119303
+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
+SIZE (eclipse/org.apache.commons.el_1.0.0.v201101211617.jar) = 128684
+SHA256 (eclipse/org.apache.commons.httpclient_3.1.0.v201012070820.jar) = 606861c12a82c8336bfd38e9f1e80d105a9cdebd87e4fbd88bc4203f21441402
+SIZE (eclipse/org.apache.commons.httpclient_3.1.0.v201012070820.jar) = 321633
+SHA256 (eclipse/org.apache.commons.logging_1.0.4.v201101211617.jar) = 453d6f5e9d3f1682ed0eb86110231b6182f1d6d2a95fd2c528496818a01383ac
+SIZE (eclipse/org.apache.commons.logging_1.0.4.v201101211617.jar) = 45405
+SHA256 (eclipse/org.apache.jasper_5.5.17.v201101211617.jar) = 2d8547b864bf32c7eec62c433e774068ec8fe34a88e3ea54658712cceafc9f7d
+SIZE (eclipse/org.apache.jasper_5.5.17.v201101211617.jar) = 1722563
+SHA256 (eclipse/org.apache.lucene.core_2.9.1.v201101211721.jar) = 87215c54c69432935278f72fe5594500cc076630018dee21646131b4d678bd51
+SIZE (eclipse/org.apache.lucene.core_2.9.1.v201101211721.jar) = 1168475
+SHA256 (eclipse/org.apache.lucene.analysis_2.9.1.v201101211721.jar) = cc5dde23abac55f232543732ab2f97131c058295e4e33e60872234cef73c405a
+SIZE (eclipse/org.apache.lucene.analysis_2.9.1.v201101211721.jar) = 216089
+SHA256 (eclipse/org.hamcrest.core_1.1.0.v20090501071000.jar) = db7f2cd14b9e263d791631960a0cd5a9ff4c8257939b551a5b86dd2ac6d23345
+SIZE (eclipse/org.hamcrest.core_1.1.0.v20090501071000.jar) = 27828
+SHA256 (eclipse/org.mortbay.jetty.util_6.1.23.v201012071420.jar) = b41cf1845a7b05dbdcc57a4631367f4ba94fea2a2a7145797167533cb73edbdd
+SIZE (eclipse/org.mortbay.jetty.util_6.1.23.v201012071420.jar) = 193298
+SHA256 (eclipse/org.mortbay.jetty.server_6.1.23.v201012071420.jar) = 88fcf37ef94f63d920a1ca438cf17a79f19900da95ba27c6374440d9388ecaeb
+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.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
Index: files/eclipse-build-upstream.patch
===================================================================
RCS file: /home/ncvs/ports/java/eclipse-devel/files/eclipse-build-upstream.patch,v
retrieving revision 1.2
diff -u -r1.2 eclipse-build-upstream.patch
--- files/eclipse-build-upstream.patch 4 Nov 2010 14:55:29 -0000 1.2
+++ files/eclipse-build-upstream.patch 6 Jul 2011 13:03:23 -0000
@@ -25,8 +25,8 @@
-@@ -315,7 +316,10 @@
-
+@@ -312,7 +313,10 @@
+
-
@@ -34,9 +34,9 @@
+
+
+
-
+
+
-
@@ -399,6 +403,7 @@
@@ -139,6 +148,15 @@
+@@ -1023,7 +1027,7 @@
+
+
+
+-
++
+
+
+
Index: pdebuild.xml
===================================================================
--- pdebuild.xml (revision 23733)
@@ -310,3 +328,15 @@
h)
usage
exit 1
+--- task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkNonOSGiJars.java~ Thu Feb 25 21:14:10 2010
++++ task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkNonOSGiJars.java Fri Nov 5 11:39:46 2010
+@@ -36,8 +36,8 @@
+ for (Iterator
-@@ -292,8 +291,10 @@
-
-
-
--
--
-+
-+
-+
-+
-
-
-
-@@ -306,9 +307,15 @@
-
-
-
--
-+
-+
-+
-+
-
--
-+
-+
-+
-+
-
-
-
-@@ -321,6 +328,10 @@
-
+@@ -319,6 +318,10 @@
-
-+
-+
-+
-+
+
+
++
++
++
++
+@@ -704,7 +707,7 @@
+
+
+
+-
++
+
+
+
@@ -804,7 +815,8 @@
-
+
+
+
+
+@@ -975,16 +979,16 @@
+
+
-
-
@@ -165,21 +127,21 @@
+
+
--
-+
+-
++
-
+
--
-+
-
-
-
-@@ -938,7 +949,7 @@
-
-
+-
++
+
+
+
+@@ -992,7 +996,7 @@
+
+
-
+
@@ -206,14 +168,14 @@
-@@ -1027,9 +1038,11 @@
+@@ -1101,9 +1105,11 @@
+
@@ -237,11 +199,11 @@
-os=linux
+os=freebsd
- buildId=M20100211-1343
- buildTag=vM20100211-1343
--label=3.6.0
--bootclasspath=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
-+label=3.6.1
+ buildId=3.7.0-I20110613-1736
+ buildTag=3.7.0-I20110613-1736
+-label=3.7.0-I20110613-1736
+-bootclasspath=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
++label=3.7.0
+bootclasspath=%%BOOTCLASSPATH%%
#build.compiler=org.eclipse.jdt.core.JDTCompilerAdapter
@@ -250,25 +212,24 @@
CDC-1.1/PersonalBasis-1.1=${bootclasspath}
CDC-1.1/PersonalJava-1.1=${bootclasspath}
# Somehow bootclasspath isn't expanded when used by antRunner
--JavaSE-1.6=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--CDC-1.0/Foundation-1.0=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--CDC-1.1/Foundation-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--OSGi/Minimum-1.0=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--OSGi/Minimum-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--OSGi/Minimum-1.2=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--JRE-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--J2SE-1.2=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--J2SE-1.3=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--J2SE-1.4=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--J2SE-1.5=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--JavaSE-1.6=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--PersonalJava-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--PersonalJava-1.2=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--CDC-1.0/PersonalBasis-1.0=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--CDC-1.0/PersonalJava-1.0=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--CDC-1.1/PersonalBasis-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--CDC-1.1/PersonalJava-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
-\ No newline at end of file
+-JavaSE-1.6=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-CDC-1.0/Foundation-1.0=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-CDC-1.1/Foundation-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-OSGi/Minimum-1.0=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-OSGi/Minimum-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-OSGi/Minimum-1.2=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-JRE-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-J2SE-1.2=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-J2SE-1.3=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-J2SE-1.4=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-J2SE-1.5=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-JavaSE-1.6=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-PersonalJava-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-PersonalJava-1.2=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-CDC-1.0/PersonalBasis-1.0=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-CDC-1.0/PersonalJava-1.0=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-CDC-1.1/PersonalBasis-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-CDC-1.1/PersonalJava-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+JavaSE-1.6=%%BOOTCLASSPATH%%
+CDC-1.0/Foundation-1.0=%%BOOTCLASSPATH%%
+CDC-1.1/Foundation-1.1=%%BOOTCLASSPATH%%
@@ -289,10 +250,10 @@
+CDC-1.1/PersonalJava-1.1=%%BOOTCLASSPATH%%
--- eclipse-build-0.5.0.orig/pdebuild.xml 2009-12-23 16:22:44.090824173 -0500
+++ eclipse-build-0.5.0/pdebuild.xml 2009-12-23 16:24:47.491322864 -0500
-@@ -200,6 +200,7 @@
+@@ -206,6 +206,7 @@
-
+
+
+
+
+-
++
+
+
+
+@@ -192,9 +188,9 @@
+
+
+
+-
++
+
+-
++
+
+
+
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.core.expressions/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.core.expressions/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.core.expressions/build.xml 2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.core.expressions/build.xml 2011-07-04 15:18:29.000000000 +0200
+@@ -142,7 +140,7 @@
+
+
+
+-
++
+
+
+
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.core.runtime/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.core.runtime/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.core.runtime/build.xml 2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.core.runtime/build.xml 2011-07-04 15:18:29.000000000 +0200
+@@ -123,7 +121,7 @@
+
+
+
+-
++
+
+
+
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.core.runtime.compatibility/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.core.runtime.compatibility/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.core.runtime.compatibility/build.xml 2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.core.runtime.compatibility/build.xml 2011-07-04 15:18:29.000000000 +0200
+@@ -142,7 +140,7 @@
+
+
+
+-
++
+
+
+
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.core.variables/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.core.variables/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.core.variables/build.xml 2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.core.variables/build.xml 2011-07-04 15:18:29.000000000 +0200
+@@ -115,7 +113,7 @@
+
+
+
+-
++
+
+
+
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/build.xml 2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/build.xml 2011-07-04 15:18:29.000000000 +0200
+@@ -95,28 +95,26 @@
+
+
+
+-
++
+
+
+
+-
+-
+-
++
+
+
+
+-
+-
+-
++
++
++
+
+
+
+
++
++
+
+
+
+-
+-
+
+
+
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/build.xml 2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/build.xml 2011-07-04 15:18:29.000000000 +0200
+@@ -95,30 +95,28 @@
+
+
+
+-
++
+
+
+
+-
+-
+-
++
+
+
+
+
+
+-
+-
+-
++
++
++
+
+
+
+
++
++
+
+
+
+-
+-
+
+
+
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.app/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.app/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.app/build.xml 2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.app/build.xml 2011-07-04 15:18:29.000000000 +0200
+@@ -99,22 +99,20 @@
+
+
+
+-
+-
+-
++
+
+
+
+
+
++
++
+
+
+
+-
+-
+
+
+-
++
+
+
+
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.http.jetty_2.0.0/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.http.jetty_2.0.0/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.http.jetty_2.0.0/build.xml 2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.http.jetty_2.0.0/build.xml 2011-07-04 15:18:29.000000000 +0200
+@@ -81,30 +81,28 @@
+
+
+
+-
+-
+-
++
+
+
+
+-
++
+
+
+
+
++
++
+
+
+
+-
+-
+
+
+-
+-
+-
+-
+-
+-
++
++
++
++
++
++
+
+
+
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.http.servlet/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.http.servlet/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.http.servlet/build.xml 2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.http.servlet/build.xml 2011-07-04 15:18:29.000000000 +0200
+@@ -90,20 +90,18 @@
+
+
+
+-
+-
+-
++
+
+
+
+-
++
+
+
++
++
+
+
+
+-
+-
+
+
+
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.console/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.console/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.console/build.xml 2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.console/build.xml 2011-07-04 15:18:29.000000000 +0200
+@@ -122,12 +120,12 @@
+
+
+
+-
+-
+
+
+-
+-
++
++
++
++
+
+
+
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.director/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.director/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.director/build.xml 2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.director/build.xml 2011-07-04 15:18:29.000000000 +0200
+@@ -120,12 +118,12 @@
+
+
+
+-
+-
+
+
+-
+-
++
++
++
++
+
+
+
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.director.app/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.director.app/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.director.app/build.xml 2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.director.app/build.xml 2011-07-04 15:18:29.000000000 +0200
+@@ -89,14 +87,14 @@
+
+
+
++
++
+
+
+
+-
+-
+
+
+-
++
+
+
+
+@@ -127,12 +125,12 @@
+
+
+
+-
+-
+
+
+-
+-
++
++
++
++
+
+
+
+@@ -182,14 +178,14 @@
+
+
+
++
++
+
+
+
+-
+-
+
+
+-
++
+
+
+
+@@ -220,12 +216,12 @@
+
+
+
+-
+-
+
+
+-
+-
++
++
++
++
+
+
+
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.garbagecollector/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.garbagecollector/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.garbagecollector/build.xml 2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.garbagecollector/build.xml 2011-07-04 15:18:29.000000000 +0200
+@@ -108,7 +106,7 @@
+
+
+
+-
++
+
+
+
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.publisher/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.publisher/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.publisher/build.xml 2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.publisher/build.xml 2011-07-04 15:18:29.000000000 +0200
+@@ -118,17 +116,17 @@
+
+
+
+-
+-
+
+
++
++
+
+
+
+
+
+
+-
++
+
+
+
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.publisher.eclipse/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.publisher.eclipse/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.publisher.eclipse/build.xml 2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.publisher.eclipse/build.xml 2011-07-04 15:18:29.000000000 +0200
+@@ -83,14 +81,14 @@
+
+
+
++
++
+
+
+
+-
+-
+
+
+-
++
+
+
+
+@@ -185,14 +181,14 @@
+
+
+
++
++
+
+
+
+-
+-
+
+
+-
++
+
+
+
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.repository.tools/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.repository.tools/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.repository.tools/build.xml 2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.repository.tools/build.xml 2011-07-04 15:18:29.000000000 +0200
+@@ -89,14 +87,14 @@
+
+
+
++
++
+
+
+
+-
+-
+
+
+-
++
+
+
+
+@@ -135,8 +133,8 @@
+
+
+
+-
+-
++
++
+
+
+
+@@ -197,14 +193,14 @@
+
+
+
++
++
+
+
+
+-
+-
+
+
+-
++
+
+
+
+@@ -243,8 +239,8 @@
+
+
+
+-
+-
++
++
+
+
+
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/build.xml 2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/build.xml 2011-07-04 15:18:29.000000000 +0200
+@@ -120,17 +118,17 @@
+
+
+
+-
+-
+
+
++
++
+
+
+
+
+
+
+-
++
+
+
+
+@@ -139,8 +137,8 @@
+
+
+
+-
+-
++
++
+
+
+
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.updatesite/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.updatesite/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.updatesite/build.xml 2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.updatesite/build.xml 2011-07-04 15:18:29.000000000 +0200
+@@ -79,24 +79,22 @@
+
+
+
+-
+-
+-
++
+
+
+
+
+
++
++
+
+
+
+-
+-
+
+
+
+
+-
++
+
+
+
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.help/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.help/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.help/build.xml 2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.help/build.xml 2011-07-04 15:18:29.000000000 +0200
+@@ -99,25 +99,18 @@
+
+
+
+-
+-
+-
+-
+-
+-
+-
++
+
+
+
+-
+-
++
+
+
++
++
+
+
+
+-
+-
+
+
+
+@@ -140,7 +133,7 @@
+
+
+
+-
++
+
+
+
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.help.base/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.help.base/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.help.base/build.xml 2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.help.base/build.xml 2011-07-04 15:18:29.000000000 +0200
+@@ -77,42 +77,35 @@
+
+
+
+-
++
+
+
+
+-
+-
+-
+-
+-
+-
+-
++
+
+
+
+-
+-
++
+
+
+-
++
+
+
+
+
++
++
+
+
+
+-
+-
+
+
+-
+-
+-
+-
+-
+-
++
++
++
++
++
++
+
+
+
+@@ -137,8 +130,8 @@
+
+
+
+-
+-
++
++
+
+
+
+@@ -212,38 +205,31 @@
+
+
+
+-
+-
+-
+-
+-
+-
+-
++
+
+
+
+-
+-
++
+
+
+-
++
+
+
+
+
++
++
+
+
+
+-
+-
+
+
+-
+-
+-
+-
+-
+-
++
++
++
++
++
++
+
+
+
+@@ -268,8 +254,8 @@
+
+
+
+-
+-
++
++
+
+
+
+@@ -294,7 +280,7 @@
+
+
+
+-
++
+
+
+
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.osgi.services/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.osgi.services/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.osgi.services/build.xml 2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.osgi.services/build.xml 2011-07-04 15:18:29.000000000 +0200
+@@ -97,24 +97,22 @@
+
+
+
+-
++
+
+
+
+-
+-
+-
++
+
+
+
+
+
++
++
+
+
+
+-
+-
+-
++
+
+
+
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.pde.build/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.pde.build/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.pde.build/build.xml 2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.pde.build/build.xml 2011-07-04 15:18:29.000000000 +0200
+@@ -77,31 +77,24 @@
+
+
+
+-
++
+
+
+
+-
+-
+-
+-
+-
+-
+-
++
+
+
+
+-
+-
++
+
+
+
+
++
++
+
+
+
+-
+-
+
+
+
+@@ -144,7 +137,7 @@
+
+
+
+-
++
+
+
+
+@@ -166,8 +159,8 @@
+
+
+
+-
+-
++
++
+
+
+
+@@ -213,27 +206,20 @@
+
+
+
+-
+-
+-
+-
+-
+-
+-
++
+
+
+
+-
+-
++
+
+
+
+
++
++
+
+
+
+-
+-
+
+
+
+@@ -276,7 +262,7 @@
+
+
+
+-
++
+
+
+
+@@ -298,14 +284,14 @@
+
+
+
+-
+-
++
++
+
+
+
+-
++
+
+-
++
+
+
+
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.update.core/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.update.core/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.update.core/build.xml 2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.update.core/build.xml 2011-07-04 15:18:29.000000000 +0200
+@@ -126,22 +124,24 @@
+
+
+
+-
++
+
+
+
+
+-
+
++
+
++
++
+
+
+
+
+-
+-
+
+
++
++
+
+
+