From 8df24cfa4361c7f1062844dc51f9884d12fbc6ee Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Sun, 6 May 2012 03:27:22 +0000 Subject: . Update to 3.7.1. --- java/eclipse/Makefile | 127 +++++-- java/eclipse/distinfo | 78 ++-- .../files/eclipse-build-config-upstream.patch | 2 + java/eclipse/files/eclipse-build-upstream.patch | 79 ++++- java/eclipse/files/freebsd-support.patch | 393 +++++++++------------ java/eclipse/files/patch-dependencyManifests | 90 +++++ java/eclipse/files/patch-eclipse-build | 359 ++++++++++++------- java/eclipse/files/patch-generatedScripts | 80 +++++ 8 files changed, 751 insertions(+), 457 deletions(-) create mode 100644 java/eclipse/files/patch-dependencyManifests create mode 100644 java/eclipse/files/patch-generatedScripts (limited to 'java') diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile index df1bb7579d47..0e17655ed50a 100644 --- a/java/eclipse/Makefile +++ b/java/eclipse/Makefile @@ -6,20 +6,23 @@ # PORTNAME= eclipse -PORTVERSION= 3.6.2 +PORTVERSION= 3.7.1 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 + 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,} DISTFILES= ${ECLIPSE_BUILD_SRCFILE}:1 \ ${ECLIPSE_SRCFILE}:1 \ ${ANT_SRCFILE}:4 \ ${JUNIT3_SRCFILE}:5 \ - ${JUNIT4_SRCFILE}:6 + ${JUNIT4_SRCFILE}:6 \ + ${TOMCAT_SRCFILES:C,(.*),\\1:7,} 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 @@ -30,6 +33,7 @@ PATCH_DEPENDS= ant:${PORTSDIR}/devel/apache-ant \ 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 @@ -44,7 +48,9 @@ USE_GL= glu 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 +ZIP_CMD?= ${LOCALBASE}/bin/zip JAVA_BUILD= yes JAVA_OS= native @@ -52,29 +58,26 @@ JAVA_RUN= yes 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.v20100518-1140.jar \ - org.apache.commons.el_1.0.0.v201004212143.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.v201004212143.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-914dc6de2bfc5ee5819a229cf4877f7043040a92${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 \ + 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.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 \ @@ -82,23 +85,37 @@ ANT_BUNDLES= ant-antlr.jar \ 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 +TOMCAT_VERSION= 7.0.25 +TOMCAT_SRCFILES= apache-tomcat-${TOMCAT_VERSION}.tar.gz tomcat-juli.jar +TOMCAT_BUNDLES= el-api.jar \ + jasper-el.jar \ + jasper.jar \ + jsp-api.jar \ + servlet-api.jar \ + tomcat-api.jar \ + tomcat-juli.jar FBSD_SUPPORT_SRCFILE= freebsd-support.patch +ECLIPSE_GENERATED_BUILDSCRIPTS= eclipse-build-generatedScripts.tar.bz2 +ALL_TARGET= provision.cvs +INSTALL_TARGET= installSDKinDropins 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} @@ -128,28 +145,35 @@ DISTFILES+= ${ECLIPSE_TEST_SRCFILE}:1 ${ECLIPSE_TEST_SCRIPTFILE}:1 BUILD_DEPENDS+= bash:${PORTSDIR}/shells/bash \ Xvnc:${PORTSDIR}/net/tightvnc -ALL_TARGET= provision.tests +ALL_TARGET= runTests .endif -# Copy the eclipse source file to the work area +# Prepare Eclipse source, Ant, JUnit and Tomcat bundles post-extract: + @${MKDIR} ${BUILD_WRKSRC}/bundles + @${CP} ${DISTDIR}/${DIST_SUBDIR}/${ECLIPSE_SRCFILE} ${BUILD_WRKSRC} @${CP} ${FILESDIR}/${FBSD_SUPPORT_SRCFILE} ${BUILD_WRKSRC}/patches/ - @${MKDIR} ${BUILD_WRKSRC}/bundles .for f in ${ECLIPSE_JAR_BUNDLES} ${ECLIPSE_SAT4J_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 - @${MV} ${BUILD_WRKSRC}/dependencyManifests/org.apache.commons.codec_1.3.0.v20080530-1600.jar ${BUILD_WRKSRC}/dependencyManifests/org.apache.commons.codec_1.3.0.v20100518-1140.jar - @${MV} ${BUILD_WRKSRC}/dependencyManifests/org.apache.commons.el_1.0.0.v200806031608.jar ${BUILD_WRKSRC}/dependencyManifests/org.apache.commons.el_1.0.0.v201004212143.jar - @${MV} ${BUILD_WRKSRC}/dependencyManifests/org.apache.jasper_5.5.17.v200903231320.jar ${BUILD_WRKSRC}/dependencyManifests/org.apache.jasper_5.5.17.v201004212143.jar + @(cd ${WRKDIR} && ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${TOMCAT_SRCFILES:Mapache-tomcat*.tar.gz} ${EXTRACT_AFTER_ARGS}) + @${CP} ${DISTDIR}/${DIST_SUBDIR}/${TOMCAT_SRCFILES:M*.jar} ${WRKDIR}/apache-tomcat-${TOMCAT_VERSION}/lib/ +.for f in ${TOMCAT_BUNDLES} + @${CP} ${WRKDIR}/apache-tomcat-${TOMCAT_VERSION}/lib/${f} ${BUILD_WRKSRC}/bundles/ +.endfor .if defined(WITH_TESTS) @${CP} ${DISTDIR}/${DIST_SUBDIR}/${ECLIPSE_TEST_SRCFILE} ${BUILD_WRKSRC} @@ -163,11 +187,15 @@ 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 @${REINPLACE_CMD} -e "s+%%PORTNAME%%+${PORTNAME}+g" ${BUILD_WRKSRC}/eclipse.desktop + @(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 @@ -182,6 +210,31 @@ post-patch: @${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 + @${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 + @${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 + @${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 + @${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 + @${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 + .if defined(WITH_TESTS) @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} applyTestPatches) .endif diff --git a/java/eclipse/distinfo b/java/eclipse/distinfo index 9e64f28ea10b..8de808cd22b5 100644 --- a/java/eclipse/distinfo +++ b/java/eclipse/distinfo @@ -1,48 +1,42 @@ -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.2-src.tar.bz2) = b72951cc75eba57c7d849210de38f69858ac4699eb3a69d4261a80d125f70d45 -SIZE (eclipse/eclipse-3.6.2-src.tar.bz2) = 62525869 -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-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/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) = c326b74ab30b83138daba0baf0565e22da842199c43d80ec448a3db5d2af411b -SIZE (eclipse/com.jcraft.jsch_0.1.41.v200903070017.jar) = 226756 -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) = e04390c80f329ac8f751eefb4d086ee829bf4d5dd2533bc4b3fa1dcf993b21d3 -SIZE (eclipse/javax.servlet.jsp_2.0.0.v200806031607.jar) = 63889 -SHA256 (eclipse/org.apache.commons.codec_1.3.0.v20100518-1140.jar) = 8bc57d43356859ed740132e0e70cc302ca8a43a972109ef50130822e9eea10ce -SIZE (eclipse/org.apache.commons.codec_1.3.0.v20100518-1140.jar) = 55003 -SHA256 (eclipse/org.apache.commons.el_1.0.0.v201004212143.jar) = 48a48228121cb80af2bb569342ffd5658b1fe12b6fba9cc0201b5173d59b5b3a -SIZE (eclipse/org.apache.commons.el_1.0.0.v201004212143.jar) = 128694 -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.v201004212143.jar) = 0ef32286ae64b938013bf1fbd60b227284b296fbe9543344d928a11a4d4c6bfb -SIZE (eclipse/org.apache.jasper_5.5.17.v201004212143.jar) = 1722559 -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/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/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.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) = 3990293a31c98e079be5c24410fcaefb06f2770547879b27796651f8df092a0e SIZE (eclipse/org.hamcrest.core_1.1.0.v20090501071000.jar) = 27827 -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/eclipse-sdktests-3.6.2-src.tar.bz2) = d23ad060f949a5eac8b3f965c0a617f98e57ef8302e7d05824b599befa6adc5f -SIZE (eclipse/eclipse-sdktests-3.6.2-src.tar.bz2) = 108186287 -SHA256 (eclipse/eclipse-sdktests-3.6.2-scripts.tar.bz2) = 073d1ad08dc50a63deea7f883dae599bd530b90f9e11d788349d419a30a29e0d -SIZE (eclipse/eclipse-sdktests-3.6.2-scripts.tar.bz2) = 5548 +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 diff --git a/java/eclipse/files/eclipse-build-config-upstream.patch b/java/eclipse/files/eclipse-build-config-upstream.patch index 1395c355997f..711d267b7dd0 100644 --- a/java/eclipse/files/eclipse-build-config-upstream.patch +++ b/java/eclipse/files/eclipse-build-config-upstream.patch @@ -1,3 +1,5 @@ +$FreeBSD$ + ### Eclipse Workspace Patch 1.0 #P eclipse-build-config Index: build.properties.in diff --git a/java/eclipse/files/eclipse-build-upstream.patch b/java/eclipse/files/eclipse-build-upstream.patch index d393f7447deb..d4c5991762b7 100644 --- a/java/eclipse/files/eclipse-build-upstream.patch +++ b/java/eclipse/files/eclipse-build-upstream.patch @@ -17,16 +17,18 @@ Index: build.xml =================================================================== --- build.xml (revision 23733) +++ build.xml (working copy) -@@ -130,6 +130,7 @@ +@@ -131,7 +131,8 @@ +- + ++ -@@ -315,7 +316,10 @@ - +@@ -312,7 +313,10 @@ + - @@ -34,9 +36,9 @@ Index: build.xml + + + - + + - @@ -399,6 +403,7 @@ -+ ++ + -+ ++ ++ ++ ++ ++ + --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86/fragment.properties 1969-12-31 19:00:00.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86/fragment.properties 2009-12-23 15:14:12.583575548 -0500 @@ -5113,7 +4947,7 @@ $FreeBSD$ +Bundle-Name: %fragmentName +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.x86_64; singleton:=true -+Bundle-Version: 3.6.2.qualifier ++Bundle-Version: 3.7.1.qualifier +Bundle-ManifestVersion: 2 +Bundle-Localization: fragment +Export-Package: @@ -6927,18 +6761,23 @@ $FreeBSD$ +custom = true --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86_64/build.xml 1969-12-31 19:00:00.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86_64/build.xml 2009-12-23 15:14:12.588595660 -0500 -@@ -0,0 +1,12 @@ +@@ -0,0 +1,17 @@ + + + + + + ++ + + -+ ++ + -+ ++ ++ ++ ++ ++ + --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86_64/fragment.properties 1969-12-31 19:00:00.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86_64/fragment.properties 2009-12-23 15:14:12.588595660 -0500 @@ -7505,18 +7344,118 @@ $FreeBSD$ --- build/eclipse-3.6.1-src/pluginVersions.properties~ Fri Oct 1 17:18:03 2010 +++ build/eclipse-3.6.1-src/pluginVersions.properties Wed Oct 20 20:19:42 2010 @@ -34,6 +34,7 @@ - org.eclipse.equinox.launcher.motif.hpux.ia64_32,0.0.0=R36x_v20101019_1345 - org.eclipse.equinox.http,0.0.0=v20100503 - org.eclipse.swt.gtk.linux.x86_64,0.0.0=v3659b -+org.eclipse.swt.gtk.freebsd.x86_64,0.0.0=v3659b - org.eclipse.swt.photon.qnx.x86,0.0.0=v3659b - org.eclipse.equinox.p2.ui.admin,0.0.0=v20100503 - org.eclipse.equinox.weaving.caching.j9,0.0.0=v20100503 -@@ -245,6 +246,7 @@ - org.eclipse.swt.examples,0.0.0=v3659b - org.eclipse.cvs,0.0.0=v20100414 - org.eclipse.swt.gtk.linux.x86,0.0.0=v3659b -+org.eclipse.swt.gtk.freebsd.x86,0.0.0=v3659b - org.eclipse.equinox.log,0.0.0=v20100503 + org.eclipse.equinox.launcher.motif.hpux.ia64_32,0.0.0=v20110502 + org.eclipse.equinox.http,0.0.0=v20110413 + org.eclipse.swt.gtk.linux.x86_64,0.0.0=v3738a ++org.eclipse.swt.gtk.freebsd.x86_64,0.0.0=v3738a + org.eclipse.equinox.p2.ui.admin,0.0.0=v20110502-1955 + org.eclipse.equinox.p2.publisher.eclipse,0.0.0=v20110511 + org.eclipse.equinox.weaving.caching.j9,0.0.0=v20110502 +@@ -52,6 +52,7 @@ + org.eclipse.ui.workbench.texteditor,0.0.0=v20110505-0800 + org.eclipse.ui.examples.multipageeditor,0.0.0=I20110413-1600 + org.eclipse.core.filesystem.linux.x86,0.0.0=v20110423-0524 ++org.eclipse.core.filesystem.freebsd.x86,0.0.0=v20110423-0524 + org.eclipse.equinox.p2.ui.discovery,0.0.0=v20110502-1955 + org.eclipse.ui.examples.javaeditor,0.0.0=v20110524-0800 + org.eclipse.ant.core,0.0.0=v20110511 +@@ -93,6 +94,7 @@ + org.eclipse.core.runtime,0.0.0=v20110110 + org.eclipse.core.resources.win32.x86,0.0.0=v20110423-0524 + org.eclipse.equinox.launcher.gtk.linux.x86_64,0.0.0=v20110505 ++org.eclipse.equinox.launcher.gtk.freebsd.x86_64,0.0.0=v20110505 + org.eclipse.help,0.0.0=v20110426 + org.eclipse.pde.api.tools.ee.j2se15,0.0.0=v20110401-1030 + org.junit4,0.0.0=v20100525 +@@ -135,6 +137,7 @@ + org.eclipse.equinox.p2.ui.importexport,0.0.0=v20110511 + org.eclipse.pde.api.tools.ee.jre11,0.0.0=v20110401-1030 + org.eclipse.core.net.linux.x86_64,0.0.0=I20110331-0827 ++org.eclipse.core.net.freebsd.x86_64,0.0.0=I20110331-0827 + org.eclipse.equinox.jsp.jasper,0.0.0=v20110502 + org.eclipse.pde.api.tools.ee.j2se14,0.0.0=v20110401-1030 + org.eclipse.equinox.p2.ui,0.0.0=v20110601 +@@ -158,6 +161,7 @@ + org.eclipse.swt.gtk.solaris.x86,0.0.0=v3738a + org.eclipse.pde.ds.ui,0.0.0=v20110516 + org.eclipse.core.net.linux.x86,0.0.0=I20110419-0800 ++org.eclipse.core.net.freebsd.x86,0.0.0=I20110419-0800 + org.eclipse.equinox.p2.console,0.0.0=v20110502-1955 + org.eclipse.equinox.http.jetty,0.0.0=v20110502 + org.eclipse.swt.examples.browser.demos,0.0.0=v3738a +@@ -175,6 +179,7 @@ + org.eclipse.equinox.launcher.win32.win32.ia64,0.0.0=v20110502 + org.eclipse.swt.examples.browser,0.0.0=v3738a + org.eclipse.core.filesystem.linux.x86_64,0.0.0=v20110423-0524 ++org.eclipse.core.filesystem.freebsd.x86_64,0.0.0=v20110423-0524 + org.eclipse.equinox.event,0.0.0=v20110502 + org.eclipse.ui.ide,0.0.0=v20110809-1737 + org.eclipse.ui.views.log,0.0.0=v20110404 +@@ -185,6 +190,7 @@ + org.eclipse.equinox.ds,0.0.0=R37x_v20110701 + org.eclipse.equinox.launcher.win32.win32.x86_64,0.0.0=v20110502 + org.eclipse.equinox.launcher.gtk.linux.x86,0.0.0=v20110505 ++org.eclipse.equinox.launcher.gtk.freebsd.x86,0.0.0=v20110505 + org.eclipse.update.core.linux,0.0.0=v20100512 + org.eclipse.core.databinding.property,0.0.0=I20110222-0800 + org.eclipse.ui.examples.propertysheet,0.0.0=I20110413-1600 +@@ -246,6 +247,7 @@ + org.eclipse.swt.examples,0.0.0=v3738a + org.eclipse.cvs,0.0.0=v20110505-0800 + org.eclipse.swt.gtk.linux.x86,0.0.0=v3738a ++org.eclipse.swt.gtk.freebsd.x86,0.0.0=v3738a + org.eclipse.equinox.log,0.0.0=v20110502 org.eclipse.equinox.jmx.client,0.0.0=v20100503 org.eclipse.ui.win32,0.0.0=I20100509-0800 +--- build/eclipse-3.7.0-src/features/org.eclipse.equinox.executable/feature.xml~ Fri Feb 18 17:56:16 2011 ++++ build/eclipse-3.7.0-src/features/org.eclipse.equinox.executable/feature.xml Thu Sep 15 11:03:18 2011 +@@ -131,6 +131,26 @@ + fragment="true"/> + + ++ ++ ++ ++ -- -- * pdebuild/eclipse-pdebuild.sh: Do not escape $orbitDepsDir. -- - 2009-11-05 Alexander Kurtakov - Fix for bug #294264. - * build.xml: Use ${buildWorkspace} instead of $HOME/workspace. --- eclipse-build-0.5.0.orig/build.properties 2009-09-30 14:07:21.000000000 -0400 +++ eclipse-build-0.5.0/build.properties 2009-12-23 16:23:06.355139641 -0500 -@@ -26,7 +26,7 @@ +@@ -28,7 +28,7 @@ collectingFolder=eclipse archivePrefix=eclipse generateFeatureVersionSuffix=true --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 +-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 +bootclasspath=%%BOOTCLASSPATH%% build.compiler=org.eclipse.jdt.core.JDTCompilerAdapter JavaSE-1.6=${bootclasspath} CDC-1.0/Foundation-1.0=${bootclasspath} -@@ -47,21 +47,21 @@ +@@ -49,21 +49,21 @@ 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 +-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%% @@ -63,7 +53,7 @@ $FreeBSD$ +CDC-1.1/PersonalJava-1.1=%%BOOTCLASSPATH%% --- eclipse-build-0.5.0.orig/build.xml 2009-12-23 16:22:44.090824173 -0500 +++ eclipse-build-0.5.0/build.xml 2009-12-23 16:23:06.357147407 -0500 -@@ -117,11 +117,11 @@ +@@ -118,11 +118,11 @@ @@ -77,7 +67,7 @@ $FreeBSD$ -@@ -166,8 +166,7 @@ +@@ -167,8 +167,7 @@ @@ -87,49 +77,70 @@ $FreeBSD$ -@@ -292,8 +291,10 @@ - - - -- +@@ -309,12 +308,18 @@ + - + + -+ ++ + -@@ -306,9 +307,15 @@ - - - -- -+ -+ -+ -+ - -- -+ -+ -+ -+ - - - -@@ -321,6 +328,10 @@ - + +- ++ ++ ++ ++ + + + +@@ -337,20 +342,30 @@ - -+ -+ -+ -+ + + +- ++ ++ ++ ++ + + + + + + ++ ++ ++ ++ -@@ -804,7 +815,8 @@ + + + +- ++ ++ ++ ++ + + + +@@ -725,7 +729,7 @@ + + + +- ++ + + + +@@ -850,7 +854,8 @@ @@ -139,24 +150,28 @@ $FreeBSD$ -@@ -906,26 +918,25 @@ - +@@ -1014,33 +1030,29 @@ -- -- -- -- -- -+ -+ -+ -+ - + +- ++ + + + + - -+ +- +- +- ++ + + + + +- - - @@ -165,28 +180,37 @@ $FreeBSD$ + + -- -+ +- ++ - + -- -+ - - - -@@ -938,7 +949,7 @@ - - +- ++ + + + +@@ -1013,7 +1015,7 @@ + + - + -@@ -990,8 +1001,8 @@ +@@ -1039,7 +1041,7 @@ + + + +- ++ + + + +@@ -1072,8 +1074,8 @@ @@ -197,7 +221,7 @@ $FreeBSD$ -@@ -1012,7 +1023,7 @@ +@@ -1094,7 +1096,7 @@ @@ -206,18 +230,57 @@ $FreeBSD$ -@@ -1027,9 +1038,11 @@ +@@ -1109,9 +1111,11 @@ + +@@ -1156,8 +1164,7 @@ + + + +- +- ++ + + + +@@ -1173,16 +1180,14 @@ + tofile="${jdtInstallation}"/> + + +- +- ++ + + + + + + +- +- ++ + + + +@@ -1199,8 +1204,7 @@ + + + +- +- ++ + + + --- eclipse-build-0.5.0.orig/pdebuild/eclipse-pdebuild.sh 2009-11-11 07:59:07.000000000 -0500 +++ eclipse-build-0.5.0/pdebuild/eclipse-pdebuild.sh 2009-12-23 16:23:06.357147407 -0500 @@ -230,7 +230,7 @@ @@ -237,11 +300,10 @@ $FreeBSD$ -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.2 + buildId=R3_7_1 + buildTag=R3_7_1 + label=3.7.1 +-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 +bootclasspath=%%BOOTCLASSPATH%% #build.compiler=org.eclipse.jdt.core.JDTCompilerAdapter @@ -250,25 +312,24 @@ $FreeBSD$ 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 +350,10 @@ $FreeBSD$ +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 @@ - + + + + +- ++ + + + +diff -urN eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts.orig/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/build.xml eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/build.xml +--- eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts.orig/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/build.xml 2011-09-09 09:31:10.000000000 +0200 ++++ eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/build.xml 2012-01-19 16:07:59.000000000 +0100 +@@ -107,7 +107,7 @@ + + + +- ++ + + + +diff -urN eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts.orig/plugins/org.eclipse.equinox.http.jetty_2.0.0/build.xml eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts/plugins/org.eclipse.equinox.http.jetty_2.0.0/build.xml +--- eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts.orig/plugins/org.eclipse.equinox.http.jetty_2.0.0/build.xml 2011-09-09 09:31:10.000000000 +0200 ++++ eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts/plugins/org.eclipse.equinox.http.jetty_2.0.0/build.xml 2012-01-19 16:11:35.000000000 +0100 +@@ -99,11 +99,11 @@ + + + +- +- +- ++ ++ ++ + +- ++ + + + +diff -urN eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts.orig/plugins/org.eclipse.help.base/build.xml eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts/plugins/org.eclipse.help.base/build.xml +--- eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts.orig/plugins/org.eclipse.help.base/build.xml 2011-09-09 09:31:10.000000000 +0200 ++++ eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts/plugins/org.eclipse.help.base/build.xml 2012-01-19 16:12:03.000000000 +0100 +@@ -107,11 +107,11 @@ + + + +- +- +- ++ ++ ++ + +- ++ + + + +@@ -238,11 +238,11 @@ + + + +- +- +- ++ ++ ++ + +- ++ + + + -- cgit v1.2.3