kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

. Update to 4.2.0 and re-enable.

Browse source 
Submitted by:	tg@
This commit is contained in:
Greg Lewis 2012-09-19 19:58:38 +00:00
parent a788c7d21d
commit 8424671b18
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=304543
8 changed files with 1185 additions and 1334 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

148
java/eclipse-devel/Makefile
View file

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

52
java/eclipse-devel/distinfo
View file

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

64
java/eclipse-devel/files/MANIFEST.MF.junit4 Normal file
View file

@ -0,0 +1,64 @@
Manifest-Version: 1.0
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Name: %pluginName
Bundle-SymbolicName: org.junit
Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/too
ls:org.eclipse.orbit/org.junit;tag=v4_10_0_v20120426-0900
Require-Bundle: org.hamcrest.core;bundle-version="1.1.0";visibility:=r
eexport
Export-Package: junit.extensions;version="4.10.0",junit.framework;versi
on="4.10.0",junit.runner;version="4.10.0",junit.textui;version="4.10.0",
org.junit;version="4.10.0",org.junit.experimental;version="4.10.0",org.
junit.experimental.categories;version="4.10.0",org.junit.experimental.
max;version="4.10.0",org.junit.experimental.results;version="4.10.0",or
g.junit.experimental.runners;version="4.10.0",org.junit.experimental.t
heories;version="4.10.0",org.junit.experimental.theories.internal;vers
ion="4.10.0";x-internal:=true,org.junit.experimental.theories.supplier
s;version="4.10.0",org.junit.internal;version="4.10.0";x-internal:=true
,org.junit.internal.builders;version="4.10.0";x-internal:=true,org.jun
it.internal.matchers;version="4.10.0";x-internal:=true,org.junit.inter
nal.requests;version="4.10.0";x-internal:=true,org.junit.internal.runn
ers;version="4.10.0";x-internal:=true,org.junit.internal.runners.model
;version="4.10.0";x-internal:=true,org.junit.internal.runners.statemen
ts;version="4.10.0";x-internal:=true,org.junit.matchers;version="4.10.0
",org.junit.rules;version="4.10.0",org.junit.runner;version="4.10.0",or
g.junit.runner.manipulation;version="4.10.0",org.junit.runner.notifica
tion;version="4.10.0",org.junit.runners;version="4.10.0",org.junit.runn
ers.model;version="4.10.0"
Bundle-Version: 4.10.0.v4_10_0_v20120426-0900
Bundle-ManifestVersion: 2
Manifest-Version: 1.0
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Name: %pluginName
Bundle-SymbolicName: org.junit
Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/too
ls:org.eclipse.orbit/org.junit;tag=v4_10_0_v20120426-0900
Require-Bundle: org.hamcrest.core;bundle-version="1.1.0";visibility:=r
eexport
Export-Package: junit.extensions;version="4.10.0",junit.framework;versi
on="4.10.0",junit.runner;version="4.10.0",junit.textui;version="4.10.0",
org.junit;version="4.10.0",org.junit.experimental;version="4.10.0",org.
junit.experimental.categories;version="4.10.0",org.junit.experimental.
max;version="4.10.0",org.junit.experimental.results;version="4.10.0",or
g.junit.experimental.runners;version="4.10.0",org.junit.experimental.t
heories;version="4.10.0",org.junit.experimental.theories.internal;vers
ion="4.10.0";x-internal:=true,org.junit.experimental.theories.supplier
s;version="4.10.0",org.junit.internal;version="4.10.0";x-internal:=true
,org.junit.internal.builders;version="4.10.0";x-internal:=true,org.jun
it.internal.matchers;version="4.10.0";x-internal:=true,org.junit.inter
nal.requests;version="4.10.0";x-internal:=true,org.junit.internal.runn
ers;version="4.10.0";x-internal:=true,org.junit.internal.runners.model
;version="4.10.0";x-internal:=true,org.junit.internal.runners.statemen
ts;version="4.10.0";x-internal:=true,org.junit.matchers;version="4.10.0
",org.junit.rules;version="4.10.0",org.junit.runner;version="4.10.0",or
g.junit.runner.manipulation;version="4.10.0",org.junit.runner.notifica
tion;version="4.10.0",org.junit.runners;version="4.10.0",org.junit.runn
ers.model;version="4.10.0"
Bundle-Version: 4.10.0.v4_10_0_v20120426-0900
Bundle-ManifestVersion: 2

95
java/eclipse-devel/files/eclipse-build-upstream.patch
View file

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

1609
java/eclipse-devel/files/freebsd-support.patch
View file

File diff suppressed because it is too large Load diff

135
java/eclipse-devel/files/patch-dependencyManifests
View file

@ -1,88 +1,71 @@
--- eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/javax.servlet_3.0.0.jar/META-INF/MANIFEST.MF~ 2012-01-26 18:03:49.377369870 +0100
+++ eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/javax.servlet_3.0.0.jar/META-INF/MANIFEST.MF 2012-01-26 18:18:27.055000978 +0100
@@ -6,6 +6,6 @@
Bundle-Localization: plugin
-Bundle-Version: 2.5.0.v200806031605
+Bundle-Version: 3.0.0.v201103241727
Bundle-Vendor: %bundleProvider
-Export-Package: javax.servlet;version="2.5",javax.servlet.http;version
- ="2.5",javax.servlet.resources;version="2.5"
+Export-Package: javax.servlet;version="3.0",javax.servlet.http;version
+ ="3.0",javax.servlet.resources;version="3.0"
--- eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/javax.servlet.jsp_2.2.0.jar/META-INF/MANIFEST.MF~ 2011-12-19 16:40:57.000000000 +0100
+++ eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/javax.servlet.jsp_2.2.0.jar/META-INF/MANIFEST.MF 2012-01-26 18:43:30.749772042 +0100
@@ -4,10 +4,10 @@
Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
Bundle-Name: %bundleName
Bundle-SymbolicName: javax.servlet.jsp
-Export-Package: javax.servlet.jsp; version=2.0,javax.servlet.jsp.el; v
- ersion=2.0,javax.servlet.jsp.resources; version=2.0,javax.servlet.jsp
- .tagext; version=2.0
-Bundle-Version: 2.0.0.v200806031607
+Export-Package: javax.servlet.jsp; version=2.2,javax.servlet.jsp.el; v
+ ersion=2.2,javax.servlet.jsp.resources; version=2.2,javax.servlet.jsp
+ .tagext; version=2.2
+Bundle-Version: 2.2.0.v200806031607
Bundle-ManifestVersion: 2
-Import-Package: javax.servlet; version=2.4,javax.servlet.http; version
- =2.4,javax.servlet.resources; version=2.4
+Import-Package: javax.servlet; version=3.0,javax.servlet.http; version
+ =3.0,javax.servlet.resources; version=3.0
--- eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/org.apache.jasper_7.0.21.jar/META-INF/MANIFEST.MF~ 2011-12-19 16:40:57.000000000 +0100
+++ eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/org.apache.jasper_7.0.21.jar/META-INF/MANIFEST.MF 2012-01-26 18:36:42.891544584 +0100
@@ -6,21 +6,21 @@
2SE-1.3
Bundle-Name: %bundleName
Bundle-SymbolicName: org.apache.jasper
-Export-Package: org.apache.jasper;version="5.5.17",org.apache.jasper.c
- ompiler;version="5.5.17",org.apache.jasper.compiler.tagplugin;version
- ="5.5.17",org.apache.jasper.resources;version="5.5.17",org.apache.jas
- per.runtime;version="5.5.17",org.apache.jasper.security;version="5.5.
- 17",org.apache.jasper.servlet;version="5.5.17",org.apache.jasper.tagp
- lugins.jstl;version="5.5.17",org.apache.jasper.tagplugins.jstl.core;v
- ersion="5.5.17",org.apache.jasper.util;version="5.5.17",org.apache.ja
- sper.xmlparser;version="5.5.17"
-Bundle-Version: 5.5.17.v201004212143
+Export-Package: org.apache.jasper;version="7.0.21",org.apache.jasper.c
+ ompiler;version="7.0.21",org.apache.jasper.compiler.tagplugin;version
+ ="7.0.21",org.apache.jasper.resources;version="7.0.21",org.apache.jas
+ per.runtime;version="7.0.21",org.apache.jasper.security;version="5.5.
+ 17",org.apache.jasper.servlet;version="7.0.21",org.apache.jasper.tagp
+ lugins.jstl;version="7.0.21",org.apache.jasper.tagplugins.jstl.core;v
+ ersion="7.0.21",org.apache.jasper.util;version="7.0.21",org.apache.ja
+ sper.xmlparser;version="7.0.21"
+Bundle-Version: 7.0.21.v201004212143
Bundle-ManifestVersion: 2
-Import-Package: javax.servlet;version="[2.4, 3.0)",javax.servlet.http;
- version="[2.4, 3.0)",javax.servlet.jsp;version="[2.0, 2.1)",javax.ser
- vlet.jsp.el;version="[2.0, 2.1)",javax.servlet.jsp.resources;version=
- "[2.0, 2.1)",javax.servlet.jsp.tagext;version="[2.0, 2.1)",javax.serv
- let.resources;version="[2.4, 3.0)",javax.xml.parsers,org.apache.commo
+Import-Package: javax.servlet;version="3.0",javax.servlet.http;
+ version="3.0",javax.servlet.jsp;version="2.2",javax.ser
+ vlet.jsp.el;version="2.2",javax.servlet.jsp.resources;version=
+ "2.2",javax.servlet.jsp.tagext;version="2.2",javax.serv
+ let.resources;version="3.0",javax.xml.parsers,org.apache.commo
ns.el;version="[1.0.0,2.0.0)",org.apache.commons.logging;version="[1.
0.0,2.0.0)",org.apache.tools.ant;resolution:=optional,org.apache.tool
s.ant.taskdefs;resolution:=optional,org.apache.tools.ant.types;resolu
$FreeBSD$
--- eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/org.apache.commons.el_1.0.0.v200806031608.jar/META-INF/MANIFEST.MF~ Mon Dec 19 16:40:57 2011
+++ eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/org.apache.commons.el_1.0.0.v200806031608.jar/META-INF/MANIFEST.MF Wed Feb 29 16:33:20 2012
@@ -8,11 +8,11 @@
@@ -6,13 +6,13 @@
Bundle-SymbolicName: org.apache.commons.el
Export-Package: org.apache.commons.el;version="1.0.0",org.apache.commo
ns.el.parser;version="1.0.0"
Bundle-Version: 1.0.0.v201004212143
-Bundle-Version: 1.0.0.v201004212143
+Bundle-Version: 1.0.0.v201101211617
Bundle-ManifestVersion: 2
-Import-Package: javax.servlet;version="[2.4, 3.0)",javax.servlet.http;
- version="[2.4, 3.0)",javax.servlet.jsp;version="[2.0, 2.1)",javax.ser
- vlet.jsp.el;version="[2.0, 2.1)",javax.servlet.jsp.resources;version=
- "[2.0, 2.1)",javax.servlet.jsp.tagext;version="[2.0, 2.1)",javax.serv
- let.resources;version="[2.4, 3.0)"
+Import-Package: javax.servlet;version="[2.5, 3.0]",javax.servlet.http;
+ version="[2.5, 3.0]",javax.servlet.jsp;version="2.2",javax.ser
+ vlet.jsp.el;version="2.2",javax.servlet.jsp.resources;version=
+ "2.2",javax.servlet.jsp.tagext;version="2.2",javax.serv
+ let.resources;version="[2.5, 3.0]"
+Import-Package: javax.servlet;version="2.4",javax.servlet.http;
+ version="2.4",javax.servlet.jsp;version="2.0",javax.ser
+ vlet.jsp.el;version="2.0",javax.servlet.jsp.resources;version=
+ "2.0",javax.servlet.jsp.tagext;version="2.0",javax.serv
+ let.resources;version="2.4"
Name: org/apache/commons/el/ImplicitObjects$6.class
SHA1-Digest: yk3eN531Co8H5mcmuI/jBgzMK7M=
--- eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/dependencyManifests/javax.el_2.2.0.v201108011116.jar/META-INF/MANIFEST.MF~ Thu Jun 28 12:02:14 2012
+++ eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/dependencyManifests/javax.el_2.2.0.v201108011116.jar/META-INF/MANIFEST.MF Tue Aug 7 14:18:09 2012
@@ -9,7 +9,6 @@
Export-Package: javax.el;version="2.2.0"
Bundle-Version: 2.2.0.v201108011116
Bundle-ManifestVersion: 2
-Import-Package: javax.servlet;version="2.5.0",javax.servlet.http;versi
- on="2.5.0"
+DynamicImport-Package: org.apache.el
--- eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/dependencyManifests/javax.servlet.jsp_2.2.0.v201112011158.jar/META-INF/MANIFEST.MF~ Thu Jun 28 12:02:14 2012
+++ eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/dependencyManifests/javax.servlet.jsp_2.2.0.v201112011158.jar/META-INF/MANIFEST.MF Tue Aug 7 14:20:50 2012
@@ -11,7 +11,7 @@
rvlet.jsp.tagext;version="2.2.0"
Bundle-Version: 2.2.0.v201112011158
Bundle-ManifestVersion: 2
-Import-Package: javax.el;version="2.2.0",javax.servlet;version="2.6.0"
- ,javax.servlet.http;version="2.6.0"
+Import-Package: javax.el;version="2.2.0",javax.servlet;version="3.0"
+ ,javax.servlet.http;version="3.0",javax.servlet.resources;version="3.0"
--- eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/dependencyManifests/javax.servlet_3.0.0.v201112011016.jar/META-INF/MANIFEST.MF~ Thu Jun 28 12:02:14 2012
+++ eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/dependencyManifests/javax.servlet_3.0.0.v201112011016.jar/META-INF/MANIFEST.MF Tue Aug 7 17:18:42 2012
@@ -7,12 +7,14 @@
Bundle-SymbolicName: javax.servlet
Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/too
ls:org.eclipse.orbit/javax.servlet;tag=v201112011016
-Export-Package: javax.servlet;version="2.6.0";uses:="javax.servlet.ann
- otation,javax.servlet.descriptor",javax.servlet.annotation;version="2
- .6.0";uses:="javax.servlet",javax.servlet.descriptor;version="2.6.0",
- javax.servlet.http;version="2.6.0";uses:="javax.servlet",javax.servle
- t.resources;version="2.6.0"
Bundle-Version: 3.0.0.v201112011016
Bundle-ManifestVersion: 2
-
-
+Export-Package: javax.servlet;version="3.0",
+ javax.servlet;version="2.6",
+ javax.servlet.http;version="3.0",
+ javax.servlet.http;version="2.6",
+ javax.servlet.annotation;version="2.6",
+ javax.servlet.descriptor;version="3.0",
+ javax.servlet.descriptor;version="2.6",
+ javax.servlet.resources;version="3.0",
+ javax.servlet.resources;version="2.6"

336
java/eclipse-devel/files/patch-eclipse-build
View file

@ -2,7 +2,16 @@ $FreeBSD$
--- 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
@@ -28,7 +28,7 @@
@@ -11,7 +11,7 @@
skipFetch=true
individualSourceBundles=true
ws=gtk
-os=linux
+os=freebsd
includeLaunchers=true
runPackager=true
groupConfigurations=true
@@ -27,7 +27,7 @@
collectingFolder=eclipse
archivePrefix=eclipse
generateFeatureVersionSuffix=true
@ -53,7 +62,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
@@ -118,11 +118,11 @@
@@ -121,11 +121,11 @@
<target name="setLibDir" depends="setLib64Dir">
<property name="libDir" value="lib" />
@ -66,8 +75,8 @@ $FreeBSD$
+ <echo message="Installation directory will be ${destDir}/${prefix}/${libDir}/%%PORTNAME%%" />
</target>
<property name="doTests" value="true" />
@@ -167,8 +167,7 @@
<target name="bootstrap" unless="bootstrapped">
@@ -180,8 +180,7 @@
<target name="copySource" unless="sdkSourcePresent">
<echo message="Copy SDK source (cp -rd --not-target-directory eclipse ${buildDirectory})" />
<exec executable="cp" failonerror="true">
@ -77,111 +86,107 @@ $FreeBSD$
<arg value="eclipse" />
<arg value="${buildDirectory}" />
</exec>
@@ -309,12 +308,18 @@
<!--
<patch patchfile="${basedir}/patches/eclipse-swt-buildagainstxulrunner.patch" dir="${buildDirectory}" strip="1" />
-->
@@ -365,32 +364,38 @@
<target name="applyPatches" depends="insertBuildId" unless="patch.complete">
- <patch patchfile="${basedir}/patches/stableUserHome.patch" dir="${buildDirectory}/plugins" strip="1" backups="true"/>
- <patch patchfile="${basedir}/patches/doNotRunAsRoot.patch" dir="${buildDirectory}/plugins" strip="1" backups="true"/>
- <patch patchfile="${basedir}/patches/pickUpRenamedJars.patch" dir="${buildDirectory}/plugins" strip="1" backups="true"/>
- <patch patchfile="${basedir}/patches/populateUpdateSites.patch" dir="${buildDirectory}/plugins" strip="2" backups="true"/>
- <patch patchfile="${basedir}/patches/eclipse-p2-uninstall-removed-content.patch" dir="${buildDirectory}/plugins" strip="2" backups="true"/>
+ <patch patchfile="${basedir}/patches/stableUserHome.patch" dir="${buildDirectory}/plugins" strip="1"/>
+ <patch patchfile="${basedir}/patches/doNotRunAsRoot.patch" dir="${buildDirectory}/plugins" strip="1"/>
+ <patch patchfile="${basedir}/patches/pickUpRenamedJars.patch" dir="${buildDirectory}/plugins" strip="1"/>
+ <patch patchfile="${basedir}/patches/populateUpdateSites.patch" dir="${buildDirectory}/plugins" strip="2"/>
+ <patch patchfile="${basedir}/patches/eclipse-p2-uninstall-removed-content.patch" dir="${buildDirectory}/plugins" strip="2"/>
<!-- eclipse-build-only patches -->
<patch patchfile="${basedir}/patches/e4-remove-w3c-smil-and-use-geronimo.patch" dir="${buildDirectory}" strip="0" reverse="false"/>
- <patch patchfile="${basedir}/patches/nocoreupdate.patch" dir="${buildDirectory}" strip="0" reverse="false" backups="true" />
+ <patch patchfile="${basedir}/patches/nocoreupdate.patch" dir="${buildDirectory}" strip="0" reverse="false" />
- <patch patchfile="${basedir}/patches/eclipse-buildswtnatives.patch" dir="${buildDirectory}" strip="1" backups="true"/>
- <patch patchfile="${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch" dir="${buildDirectory}" strip="1" />
+ <patch patchfile="${basedir}/patches/eclipse-buildswtnatives.patch" dir="${buildDirectory}" strip="1"/>
+ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}">
+ <arg value="-p1" />
+ <arg value="-i${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch" />
+ </exec>
<patch patchfile="${basedir}/patches/eclipse-add-archs-filesystem.patch" dir="${buildDirectory}" strip="1" />
- <patch patchfile="${basedir}/patches/e4-add-archs-swt.patch" dir="${buildDirectory}" strip="2" backups="true"/>
+ <patch patchfile="${basedir}/patches/e4-add-archs-swt.patch" dir="${buildDirectory}" strip="2"/>
<patch patchfile="${basedir}/patches/eclipse-add-archs-executable.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/s390-correctly-build-executable.patch" dir="${buildDirectory}" strip="1"/>
<patch patchfile="${basedir}/patches/eclipse-add-archs-net.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/fix-gnomeproxy-includes.patch" dir="${buildDirectory}" strip="1" />
- <patch patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch" dir="${buildDirectory}" strip="1" />
+ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}">
+ <arg value="-p1" />
+ <arg value="-i${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch" />
+ <arg value="-i${basedir}/patches/donotstorebuildlogsinfiles.patch" />
+ </exec>
<patch patchfile="${basedir}/patches/eclipse-add-archs-filesystem.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/eclipse-add-archs-swt.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/eclipse-add-archs-executable.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch" dir="${buildDirectory}" strip="1" />
- <patch patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch" dir="${buildDirectory}" strip="1" />
+ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}">
+ <arg value="-p1" />
+ <arg value="-i${basedir}/patches/donotstorebuildlogsinfiles.patch" />
+ </exec>
<patch patchfile="${basedir}/patches/donotsetjavahomeandoptimizeliblocalfile.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/eclipse-pde.build-add-package-build.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/gnomeproxy-makefile.patch" dir="${buildDirectory}" strip="1" />
@@ -337,20 +342,30 @@
</replace>
<patch patchfile="${basedir}/patches/eclipse-core-resources-compilation-profile.patch" dir="${buildDirectory}" strip="0" />
<patch patchfile="${basedir}/patches/eclipse-equinox-util.patch" dir="${buildDirectory}" strip="0" />
- <patch patchfile="${basedir}/patches/0001-Fix-Program.launch-for-remote-uri-in-the-pure-gio-en.patch" dir="${buildDirectory}/plugins" strip="2" />
+ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}/plugins">
+ <arg value="-p2" />
+ <arg value="-i${basedir}/patches/0001-Fix-Program.launch-for-remote-uri-in-the-pure-gio-en.patch" />
+ </exec>
<patch patchfile="${basedir}/patches/remove-lucene-dependency.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/eclipse-equinox-jsp-jasper.patch" dir="${buildDirectory}" strip="0" />
<patch patchfile="${basedir}/patches/eclipse-equinox-http-jetty.patch" dir="${buildDirectory}" strip="0" />
<patch patchfile="${basedir}/patches/eclipse-equinox-http-servlet.patch" dir="${buildDirectory}" strip="0" />
<patch patchfile="${basedir}/patches/eclipse-help-feature.patch" dir="${buildDirectory}" strip="0" />
- <patch patchfile="${basedir}/patches/eclipse-nosourcebundlesfordependencies.patch" dir="${buildDirectory}" strip="2" backups="true"/>
+ <patch patchfile="${basedir}/patches/eclipse-nosourcebundlesfordependencies.patch" dir="${buildDirectory}" strip="2"/>
<patch patchfile="${basedir}/patches/eclipse-help-feature-adjust-dependencies.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/eclipse-help-fix-webapp-jsp-compilation.patch" dir="${buildDirectory}/plugins" strip="1"/>
@@ -424,11 +429,16 @@
<!-- Point (2) implies that you cannot use PDE build.xml, because there is no source folder, so nothing will be compiled -->
<!-- Point (1) implies that developers will not create a source folder, because they want to ship binaries -->
<!-- So we have to live with those two patches -->
- <patch patchfile="${basedir}/patches/osgi-util.patch" dir="${buildDirectory}" strip="0" backups="true"/>
+ <patch patchfile="${basedir}/patches/osgi-util.patch" dir="${buildDirectory}" strip="0"/>
<patch patchfile="${basedir}/patches/osgi-services-build.patch" dir="${buildDirectory}" strip="0" />
<patch patchfile="${basedir}/patches/nonRelativeLicense.patch" dir="${buildDirectory}" strip="0" />
+ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}">
+ <arg value="-p2" />
+ <arg value="-i${basedir}/patches/freebsd-support.patch" />
+ </exec>
<echo file="patch-stamp" />
</target>
<target name="applyTestPatches" depends="unpackTests" unless="testspatch.complete">
<patch patchfile="${basedir}/patches/tests-noapttests.patch" dir="${testsBuildDirectory}/features/org.eclipse.sdk.tests" strip="0" />
<patch patchfile="${basedir}/patches/tests-noequinoxregiontests.patch" dir="${testsBuildDirectory}/features/org.eclipse.sdk.tests" strip="0" />
- <patch patchfile="${basedir}/patches/tests-BZ295666.patch" dir="${testsBuildDirectory}" strip="0" />
+ <exec executable="${localbase}/bin/gpatch" dir="${testsBuildDirectory}">
+ <arg value="-p0" />
+ <arg value="-i${basedir}/patches/tests-BZ295666.patch" />
+ </exec>
<patch patchfile="${basedir}/patches/tests-org.eclipse.pde.ui.tests-LocalTargetDefinitionTests.patch" dir="${testsBuildDirectory}/plugins/org.eclipse.pde.ui.tests" strip="0" />
<patch patchfile="${basedir}/patches/tests-nop2discoverytests.patch" dir="${testsBuildDirectory}/features/org.eclipse.sdk.tests" strip="0" />
<patch patchfile="${basedir}/patches/tests-org.eclipse.ant.tests.core.patch" dir="${testsBuildDirectory}/plugins/org.eclipse.ant.tests.core" strip="0" />
@@ -725,7 +729,7 @@
<target name="provision.sdk" depends="p2prep" unless="provision.sdk.complete">
<echo message="Installing into: ${provisionDir}" />
<antcall target="provision">
- <param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
+ <param name="p2.director.installIU" value="org.eclipse.sdk.ide,org.eclipse.equinox.initializer" />
<param name="profileName" value="SDKProfile" />
</antcall>
+ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}">
+ <arg value="-p2" />
+ <arg value="-i${basedir}/patches/freebsd-support.patch" />
+ </exec>
+
<!-- jsr14 is practically unusable with java7 -->
<antcall target="jsr14To15" />
@@ -850,7 +854,8 @@
<!--
<echo message="Calling runtests with (debug, verbose) = (${testSwitches})" />
-->
- <exec executable="${basedir}/runtests.sh" dir="${basedir}">
+ <exec executable="${localbase}/bin/bash" dir="${basedir}">
+ <arg value="${basedir}/runtests.sh" />
<arg value="-t${timestamp}" />
<arg value="-a${buildArch}" />
<arg value="-o${buildOs}" />
@@ -1014,33 +1030,29 @@
@@ -952,34 +962,29 @@
<target name="installIntoDestDir">
<mkdir dir="${installationDir}" />
<exec executable="rsync" failonerror="true">
- <arg value="-vrpl" />
+ <arg value="-vrpL" />
<arg value="--exclude=dropins" />
<arg value="${provisionDir}/" />
<arg value="${installationDir}/" />
</exec>
<exec executable="rsync" failonerror="true">
- <arg value="-vrpl" />
+ <arg value="-vrpL" />
<arg value="--exclude=dropins" />
<arg value="${provisionDir}/" />
<arg value="${installationDir}/" />
</exec>
<!-- install desktop file -->
- <copy file="eclipse.desktop" todir="${destDir}${prefix}/share/applications" />
- <!-- install Eclipse Java code formatter launcher -->
- <property name="efj" value="${destDir}${prefix}/bin/efj"/>
- <copy file="efj.sh" tofile="${efj}" />
+ <copy file="eclipse.desktop" tofile="${destDir}${prefix}/share/applications/%%PORTNAME%%.desktop" />
<fileset id="equinoxLauncher" dir="${installationDir}/plugins">
<include name="org.eclipse.equinox.launcher_*.jar" />
</fileset>
<property name="launcherJar" refid="equinoxLauncher"/>
- <chmod file="${efj}" perm="ugo+rx"/>
+ <copy file="eclipse.desktop" tofile="${destDir}${prefix}/share/applications/%%PORTNAME%%.desktop" />
<fileset id="equinoxLauncher" dir="${installationDir}/plugins">
<include name="org.eclipse.equinox.launcher_*.jar" />
</fileset>
<property name="launcherJar" refid="equinoxLauncher"/>
- <replace file="${efj}" token="@LAUNCHER@" value="${prefix}/${libDir}/eclipse/plugins/${launcherJar}"/>
<!-- install icons -->
- <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse.png" tofile="${destDir}${prefix}/share/icons/hicolor/16x16/apps/eclipse.png" />
- <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse32.png" tofile="${destDir}${prefix}/share/icons/hicolor/32x32/apps/eclipse.png" />
- <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse48.png" tofile="${destDir}${prefix}/share/icons/hicolor/48x48/apps/eclipse.png" />
+ <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse.png" tofile="${destDir}${prefix}/share/icons/hicolor/16x16/apps/%%PORTNAME%%.png" />
- <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse256.png" tofile="${destDir}${prefix}/share/icons/hicolor/256x256/apps/eclipse.png" />
+ <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse32.png" tofile="${destDir}${prefix}/share/icons/hicolor/32x32/apps/%%PORTNAME%%.png" />
+ <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse48.png" tofile="${destDir}${prefix}/share/icons/hicolor/48x48/apps/%%PORTNAME%%.png" />
+ <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse256.png" tofile="${destDir}${prefix}/share/icons/hicolor/256x256/apps/%%PORTNAME%%.png" />
<mkdir dir="${destDir}${prefix}/share/pixmaps" />
- <symlink link="${destDir}${prefix}/share/pixmaps/eclipse.png" resource="../icons/hicolor/48x48/apps/eclipse.png" overwrite="true"/>
+ <symlink link="${destDir}${prefix}/share/pixmaps/%%PORTNAME%%.png" resource="../icons/hicolor/48x48/apps/%%PORTNAME%%.png" overwrite="true"/>
- <symlink link="${destDir}${prefix}/share/pixmaps/eclipse.png" resource="../icons/hicolor/256x256/apps/eclipse.png" overwrite="true"/>
+ <symlink link="${destDir}${prefix}/share/pixmaps/%%PORTNAME%%.png" resource="../icons/hicolor/256x256/apps/%%PORTNAME%%.png" overwrite="true"/>
<!--shared dropins folder for architecture-independent plugins-->
- <mkdir dir="${destDir}${prefix}/share/eclipse/dropins" />
+ <mkdir dir="${destDir}${prefix}/share/%%PORTNAME%%/dropins" />
@ -192,7 +197,7 @@ $FreeBSD$
<!-- Create the "swt.jar" and friends symlinks -->
<fileset dir="${installationDir}/plugins" includes="org.eclipse.swt.gtk.${buildOs}.${buildArch}_*" id="swtjar" />
<property name="swtjarpath" refid="swtjar" />
@@ -1013,7 +1015,7 @@
@@ -987,7 +992,7 @@
<symlink link="${installationDir}/swt-gtk.jar" resource="plugins/${swtjarpath}" overwrite="true"/>
<symlink link="${installationDir}/swt.jar" resource="plugins/${swtjarpath}" overwrite="true"/>
@ -200,17 +205,17 @@ $FreeBSD$
+ <echo append="true" file="${installationDir}/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/%%PORTNAME%%/dropins" />
<!-- Extract SWT JNI .so files -->
<java classname="org.eclipse.core.launcher.Main" fork="true" failonerror="true" dir="${destDir}">
@@ -1039,7 +1041,7 @@
<antcall target="extractSos">
@@ -1008,7 +1013,7 @@
<!-- copy PDE and JDT to dropins -->
<exec executable="rsync" failonerror="true">
- <arg value="-vrpl" />
+ <arg value="-vrpL" />
<arg value="${provisionDir}/dropins/" />
<arg value="${installationDir}/dropins/" />
</exec>
@@ -1072,8 +1074,8 @@
<exec executable="rsync" failonerror="true">
- <arg value="-vrpl" />
+ <arg value="-vrpL" />
<arg value="${provisionDir}/dropins/" />
<arg value="${installationDir}/dropins/" />
</exec>
@@ -1041,8 +1046,8 @@
<arg value="s@/@_@g" />
</exec>
<apply executable="sed" failonerror="true" verbose="true">
@ -221,7 +226,7 @@ $FreeBSD$
<srcfile />
<fileset dir="${installationDir}">
<include name="metadata/content.xml" />
@@ -1094,7 +1096,7 @@
@@ -1063,7 +1068,7 @@
</fileset>
</apply>
<apply executable="sed" failonerror="true" verbose="true">
@ -230,9 +235,9 @@ $FreeBSD$
<arg value="s@${provisionDir}@${installationDir}@g;s@${installationDir}@${prefix}/${libDir}/eclipse@g" />
<srcfile />
<fileset dir="${installationDir}/${profileDir}">
@@ -1109,9 +1111,11 @@
@@ -1078,9 +1083,11 @@
</apply>
<!-- Move config file to /etc -->
+ <!--
<mkdir dir="${destDir}/etc" />
@ -242,7 +247,7 @@ $FreeBSD$
</target>
@@ -1156,8 +1164,7 @@
@@ -1095,8 +1102,7 @@
<!-- make a copy of the clean platform+CVS installation -->
<exec executable="cp" failonerror="true">
@ -252,7 +257,7 @@ $FreeBSD$
<arg value="${provisionDir}" />
<arg value="${platformAndCVSInstallation}" />
</exec>
@@ -1173,16 +1180,14 @@
@@ -1112,16 +1118,14 @@
tofile="${jdtInstallation}"/>
<!-- make a second copy of the clean JDT installation -->
<exec executable="cp" failonerror="true">
@ -262,7 +267,7 @@ $FreeBSD$
<arg value="${jdtInstallation}" />
<arg value="${jdtInstallation}.orig" />
</exec>
<!-- restore clean platform+CVS installation -->
<exec executable="cp" failonerror="true">
- <arg value="-rd" />
@ -271,8 +276,8 @@ $FreeBSD$
<arg value="${platformAndCVSInstallation}" />
<arg value="${provisionDir}" />
</exec>
@@ -1199,8 +1204,7 @@
@@ -1138,8 +1142,7 @@
<!-- restore clean platform+CVS installation -->
<exec executable="cp" failonerror="true">
- <arg value="-rd" />
@ -294,15 +299,14 @@ $FreeBSD$
if [ "x$zipDeps" != "x" ]; then
--- eclipse-build-0.5.0.orig/pdebuild.properties 2009-10-01 08:58:04.000000000 -0400
+++ eclipse-build-0.5.0/pdebuild.properties 2009-12-23 16:23:06.358151430 -0500
@@ -1,11 +1,11 @@
@@ -1,10 +1,10 @@
buildArch=x86
ws=gtk
-os=linux
+os=freebsd
buildId=R3_7_1
buildTag=R3_7_1
label=3.7.1
buildId=I20120608-1400
label=4.2.0-I20120608-1400
-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
@ -370,35 +374,41 @@ $FreeBSD$
+Exec=%%PORTNAME%%
Terminal=false
Categories=Development;IDE;Java;
--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/dependencies.properties.orig Thu Jun 30 16:45:54 2011
+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/dependencies.properties Thu Jun 30 16:46:18 2011
@@ -1,5 +1,5 @@
com.ibm.icu_4.4.2.v20110208.jar=/usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar:/usr/lib64/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar:/usr/share/java/com.ibm.icu-4.4.jar:/usr/share/java/com.ibm.icu.jar:/usr/share/java/icu4j.jar
-com.jcraft.jsch_0.1.41.v200903070017.jar=/usr/share/java/jsch.jar
+com.jcraft.jsch_0.1.41.v201101211617.jar=/usr/share/java/jsch.jar
javax.servlet_3.0.0.jar=/usr/share/java/tomcat/tomcat-servlet-3.0-api.jar
javax.servlet.jsp_2.2.0.jar=/usr/share/java/tomcat/tomcat-jsp-2.2-api.jar
javax.el_2.2.0.jar=/usr/share/java/tomcat/tomcat-el-2.2-api.jar
@@ -7,13 +7,13 @@
--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/dependencies/dependencies.properties.orig Thu Jun 30 16:45:54 2011
+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/dependencies/dependencies.properties Thu Jun 30 16:46:18 2011
@@ -10,7 +10,7 @@
javax.servlet_3.0.0.v201112011016.jar=/usr/share/java/tomcat/tomcat-servlet-3.0-api.jar
javax.servlet.jsp_2.2.0.v201112011158.jar=/usr/share/java/tomcat/tomcat-jsp-2.2-api.jar
javax.el_2.2.0.v201108011116.jar=/usr/share/java/tomcat/tomcat-el-2.2-api.jar
-javax.xml_1.0.1.v200903091627.jar=/usr/share/java/xml-commons-apis.jar
+javax.xml_1.3.4.v201005080400.jar=/usr/share/java/xml-commons-apis.jar
org.apache.batik.css_1.6.0.v201011041432.jar=/usr/share/java/batik/batik-css.jar
org.apache.batik.util_1.6.0.v201011041432.jar=/usr/share/java/batik/batik-util.jar
org.apache.batik.util.gui_1.6.0.v201011041432.jar=/usr/share/java/batik/batik-gui-util.jar
@@ -18,7 +18,7 @@
org.apache.juli_7.0.21.jar=/usr/share/java/tomcat/tomcat-juli.jar
org.apache.el_7.0.21.jar=/usr/share/java/tomcat/jasper-el.jar
org.apache.commons.codec_1.3.0.v201101211617.jar=/usr/share/java/commons-codec.jar
-org.apache.commons.el_1.0.0.v200806031608.jar=/usr/share/java/commons-el.jar
-org.apache.commons.httpclient_3.1.0.v201005080502.jar=/usr/share/java/commons-httpclient.jar
+org.apache.commons.el_1.0.0.v201101211617.jar=/usr/share/java/commons-el.jar
+org.apache.commons.httpclient_3.1.0.v201012070820.jar=/usr/share/java/commons-httpclient.jar
org.apache.commons.httpclient_3.1.0.v201012070820.jar=/usr/share/java/commons-httpclient.jar
org.apache.commons.logging_1.0.4.v201101211617.jar=/usr/share/java/commons-logging.jar
org.apache.jasper_7.0.21.jar=/usr/share/java/tomcat/jasper.jar
org.apache.lucene.core_2.9.1.v201101211721.jar=/usr/share/java/lucene.jar:/usr/share/java/lucene-core.jar
org.apache.lucene.analysis_2.9.1.v201101211721.jar=/usr/share/java/lucene-contrib/lucene-analyzers.jar:/usr/share/java/lucene-analyzers.jar
-org.mortbay.jetty.util_6.1.23.v201004211559.jar=/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty-util.jar
-org.mortbay.jetty.server_6.1.23.v201004211559.jar=/usr/share/java/jetty/jetty.jar:/usr/share/java/jetty.jar
+org.mortbay.jetty.util_6.1.23.v201012071420.jar=/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty-util.jar
+org.mortbay.jetty.server_6.1.23.v201012071420.jar=/usr/share/java/jetty/jetty.jar:/usr/share/java/jetty.jar
org.sat4j.core_2.3.0.v20110329.jar=/usr/share/java/org.sat4j.core.jar:/usr/share/sat4j/org.sat4j.core.jar
org.sat4j.pb_2.3.0.v20110329.jar=/usr/share/java/org.sat4j.pb.jar:/usr/share/sat4j/org.sat4j.pb.jar
--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/sdkdependencies.properties.orig Fri Jul 1 20:12:45 2011
+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/sdkdependencies.properties Fri Jul 1 20:16:04 2011
org.apache.felix.gogo.command_0.8.0.v201108120515.jar=/usr/share/java/felix/org.apache.felix.gogo.command.jar
--- eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/dependencies/nonosgidependencies.properties~ Thu Jun 28 12:02:14 2012
+++ eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/dependencies/nonosgidependencies.properties Wed Jul 25 18:03:02 2012
@@ -20,10 +20,3 @@
org.apache.ant_1.8.3.v20120321-1730/lib/ant-swing.jar=/usr/share/java/ant/ant-swing.jar:/usr/share/java/ant-swing.jar
org.apache.ant_1.8.3.v20120321-1730/lib/ant-testutil.jar=/usr/share/java/ant/ant-testutil.jar:/usr/share/java/ant-testutil.jar
org.apache.ant_1.8.3.v20120321-1730/lib/ant.jar=/usr/share/java/ant.jar
-#bin folder
-org.apache.ant_1.8.3.v20120321-1730/bin/ant=/usr/bin/ant
-org.apache.ant_1.8.3.v20120321-1730/bin/antRun=/usr/bin/antRun
-org.apache.ant_1.8.3.v20120321-1730/bin/antRun.pl=/usr/bin/antRun.pl
-org.apache.ant_1.8.3.v20120321-1730/bin/runant.pl=/usr/bin/runant.pl
-org.apache.ant_1.8.3.v20120321-1730/bin/runant.py=/usr/bin/runant.py
-org.apache.ant_1.8.3.v20120321-1730/bin/complete-ant-cmd.pl=/usr/bin/complete-ant-cmd.pl
--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/dependencies/sdkdependencies.properties.orig Fri Jul 1 20:12:45 2011
+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/dependencies/sdkdependencies.properties Fri Jul 1 20:16:04 2011
@@ -1,1 +1,1 @@
-org.objectweb.asm_3.3.1.v201101071600.jar=/usr/share/java/objectweb-asm/asm-all.jar:/usr/share/java/asm3-all.jar
+org.objectweb.asm_3.3.1.v201105211655.jar=/usr/share/java/objectweb-asm/asm-all.jar:/usr/share/java/asm3-all.jar
@ -417,3 +427,67 @@ $FreeBSD$
+ sed -i .orig 's/javax\.servlet\.jsp_2\.0\.0\.v[0-9]\{12\}/javax\.servlet\.jsp_2\.2\.0/g' ${f}
+ sed -i .orig 's/org\.apache\.jasper_5\.5\.17\.v[0-9]\{12\}/org\.apache\.jasper_7\.0\.21/g' ${f}
done
--- eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/additionalArchs/rename.sh~ Thu Jun 28 12:02:14 2012
+++ eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/additionalArchs/rename.sh Fri Jun 29 15:04:36 2012
@@ -4,13 +4,13 @@
newArch=$2
moves(){
-for f in $(find -type d); do
+for f in $(find . -type d); do
tofile=$(echo $f | sed "s/$baseArch/$newArch/")
if [ $tofile != $f ]; then
cp -pfr $f $tofile
fi
done
-for f in $(find -type f); do
+for f in $(find . -type f); do
tofile=$(echo $f | sed "s/$baseArch/$newArch/")
if [ $tofile != $f ]; then
cp -pfr $f $tofile
--- eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/eclipse-build-config/productFiles/platform/p2.inf~ Thu Jun 28 12:02:14 2012
+++ eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/eclipse-build-config/productFiles/platform/p2.inf Wed Aug 8 13:48:10 2012
@@ -56,3 +56,20 @@
units.3.touchpoint.version=1.0.0
units.3.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true);
units.3.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo);
+
+requires.4.namespace=org.eclipse.equinox.p2.iu
+requires.4.name=toolingorg.eclipse.configuration.gtk.freebsd.x86_64
+requires.4.filter=(&(osgi.os=freebsd) (osgi.arch=x86_64) (osgi.ws=gtk))
+requires.4.range=[1.0.0,1.0.0]
+requires.4.greedy=true
+
+units.4.id=toolingorg.eclipse.configuration.gtk.freebsd.x86_64
+units.4.version=1.0.0
+units.4.provides.1.namespace=org.eclipse.equinox.p2.iu
+units.4.provides.1.name=toolingorg.eclipse.configuration.gtk.freebsd.x86_64
+units.4.provides.1.version=1.0.0
+units.4.filter=(&(osgi.os=freebsd) (osgi.arch=x86_64) (osgi.ws=gtk))
+units.4.touchpoint.id=org.eclipse.equinox.p2.osgi
+units.4.touchpoint.version=1.0.0
+units.4.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true);
+units.4.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo);
--- eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/eclipse-build-config/productFiles/platform.sdk/p2.inf~ Thu Jun 28 12:02:14 2012
+++ eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/eclipse-build-config/productFiles/platform.sdk/p2.inf Wed Aug 8 13:55:04 2012
@@ -56,3 +56,20 @@
units.3.touchpoint.version=1.0.0
units.3.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true);
units.3.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo);
+
+requires.4.namespace=org.eclipse.equinox.p2.iu
+requires.4.name=toolingorg.eclipse.configuration.gtk.freebsd.x86_64
+requires.4.filter=(&(osgi.os=freebsd) (osgi.arch=x86_64) (osgi.ws=gtk))
+requires.4.range=[1.0.0,1.0.0]
+requires.4.greedy=true
+
+units.4.id=toolingorg.eclipse.configuration.gtk.freebsd.x86_64
+units.4.version=1.0.0
+units.4.provides.1.namespace=org.eclipse.equinox.p2.iu
+units.4.provides.1.name=toolingorg.eclipse.configuration.gtk.freebsd.x86_64
+units.4.provides.1.version=1.0.0
+units.4.filter=(&(osgi.os=freebsd) (osgi.arch=x86_64) (osgi.ws=gtk))
+units.4.touchpoint.id=org.eclipse.equinox.p2.osgi
+units.4.touchpoint.version=1.0.0
+units.4.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true);
+units.4.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo);

80
java/eclipse-devel/files/patch-generatedScripts
View file

@ -1,80 +0,0 @@
$FreeBSD$
diff -urN eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts.orig/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/build.xml eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/build.xml
--- eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts.orig/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/build.xml 2011-09-09 09:31:10.000000000 +0200
+++ eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/build.xml 2012-01-19 16:07:46.000000000 +0100
@@ -105,7 +105,7 @@
<delete dir="${build.result.folder}/@dot"/>
<mkdir dir="${build.result.folder}/@dot"/>
<path id="@dot.classpath">
- <pathelement path="../org.apache.commons.httpclient_3.1.0.v201005080502.jar"/>
+ <pathelement path="../org.apache.commons.httpclient_3.1.0.v201012070820.jar"/>
<pathelement path="../org.apache.commons.codec_1.3.0.v201101211617.jar"/>
<pathelement path="../org.apache.commons.logging_1.0.4.v201101211617.jar"/>
<pathelement path="../org.eclipse.core.jobs/bin/"/>
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 @@
<path id="@dot.classpath">
<pathelement path="../org.eclipse.ecf.provider.filetransfer.httpclient/bin/"/>
<pathelement path="../org.eclipse.ecf.provider.filetransfer.httpclient/@dot"/>
- <pathelement path="../org.apache.commons.httpclient_3.1.0.v201005080502.jar"/>
+ <pathelement path="../org.apache.commons.httpclient_3.1.0.v201012070820.jar"/>
<pathelement path="../org.apache.commons.codec_1.3.0.v201101211617.jar"/>
<pathelement path="../org.apache.commons.logging_1.0.4.v201101211617.jar"/>
<pathelement path="../org.eclipse.core.jobs/bin/"/>
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 @@
<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
<pathelement path="../org.eclipse.osgi.services"/>
<pathelement path="../org.eclipse.osgi.services/@dot"/>
- <pathelement path="../org.mortbay.jetty.util_6.1.23.v201004211559.jar"/>
- <pathelement path="../org.mortbay.jetty.server_6.1.23.v201004211559.jar"/>
- <pathelement path="../org.apache.jasper_5.5.17.v200903231320.jar"/>
+ <pathelement path="../org.mortbay.jetty.util_6.1.23.v201012071420.jar"/>
+ <pathelement path="../org.mortbay.jetty.server_6.1.23.v201012071420.jar"/>
+ <pathelement path="../org.apache.jasper_5.5.17.v201101211617.jar"/>
<pathelement path="../javax.servlet.jsp_2.0.0.v201101211617.jar"/>
- <pathelement path="../org.apache.commons.el_1.0.0.v200806031608.jar"/>
+ <pathelement path="../org.apache.commons.el_1.0.0.v201101211617.jar"/>
<pathelement path="../org.apache.commons.logging_1.0.4.v201101211617.jar"/>
<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-antlr.jar"/>
<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-bcel.jar"/>
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 @@
<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
<pathelement path="../org.eclipse.osgi.services"/>
<pathelement path="../org.eclipse.osgi.services/@dot"/>
- <pathelement path="../org.mortbay.jetty.util_6.1.23.v201004211559.jar"/>
- <pathelement path="../org.mortbay.jetty.server_6.1.23.v201004211559.jar"/>
- <pathelement path="../org.apache.jasper_5.5.17.v200903231320.jar"/>
+ <pathelement path="../org.mortbay.jetty.util_6.1.23.v201012071420.jar"/>
+ <pathelement path="../org.mortbay.jetty.server_6.1.23.v201012071420.jar"/>
+ <pathelement path="../org.apache.jasper_5.5.17.v201101211617.jar"/>
<pathelement path="../javax.servlet.jsp_2.0.0.v201101211617.jar"/>
- <pathelement path="../org.apache.commons.el_1.0.0.v200806031608.jar"/>
+ <pathelement path="../org.apache.commons.el_1.0.0.v201101211617.jar"/>
<pathelement path="../org.apache.commons.logging_1.0.4.v201101211617.jar"/>
<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-antlr.jar"/>
<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-bcel.jar"/>
@@ -238,11 +238,11 @@
<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
<pathelement path="../org.eclipse.osgi.services"/>
<pathelement path="../org.eclipse.osgi.services/@dot"/>
- <pathelement path="../org.mortbay.jetty.util_6.1.23.v201004211559.jar"/>
- <pathelement path="../org.mortbay.jetty.server_6.1.23.v201004211559.jar"/>
- <pathelement path="../org.apache.jasper_5.5.17.v200903231320.jar"/>
+ <pathelement path="../org.mortbay.jetty.util_6.1.23.v201012071420.jar"/>
+ <pathelement path="../org.mortbay.jetty.server_6.1.23.v201012071420.jar"/>
+ <pathelement path="../org.apache.jasper_5.5.17.v201101211617.jar"/>
<pathelement path="../javax.servlet.jsp_2.0.0.v201101211617.jar"/>
- <pathelement path="../org.apache.commons.el_1.0.0.v200806031608.jar"/>
+ <pathelement path="../org.apache.commons.el_1.0.0.v201101211617.jar"/>
<pathelement path="../org.apache.commons.logging_1.0.4.v201101211617.jar"/>
<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-antlr.jar"/>
<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-bcel.jar"/>