From owner-freebsd-eclipse@FreeBSD.ORG Mon Oct 25 11:06:57 2010 Return-Path: Delivered-To: freebsd-eclipse@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 802E7106564A for ; Mon, 25 Oct 2010 11:06:57 +0000 (UTC) (envelope-from owner-bugmaster@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 52AAF8FC19 for ; Mon, 25 Oct 2010 11:06:57 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o9PB6vK3088727 for ; Mon, 25 Oct 2010 11:06:57 GMT (envelope-from owner-bugmaster@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o9PB6udh088725 for freebsd-eclipse@FreeBSD.org; Mon, 25 Oct 2010 11:06:56 GMT (envelope-from owner-bugmaster@FreeBSD.org) Date: Mon, 25 Oct 2010 11:06:56 GMT Message-Id: <201010251106.o9PB6udh088725@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: gnats set sender to owner-bugmaster@FreeBSD.org using -f From: FreeBSD bugmaster To: freebsd-eclipse@FreeBSD.org Cc: Subject: Current problem reports assigned to freebsd-eclipse@FreeBSD.org X-BeenThere: freebsd-eclipse@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "FreeBSD users of eclipse EDI, tools, rich client apps & ports." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Oct 2010 11:06:57 -0000 Note: to view an individual PR, use: http://www.freebsd.org/cgi/query-pr.cgi?pr=(number). The following is a listing of current problems submitted by FreeBSD users. These represent problem reports covering all versions including experimental development code and obsolete releases. S Tracker Resp. Description -------------------------------------------------------------------------------- o ports/149704 eclipse java/eclipse: plugins doesn't work in eclipse-3.5.2_1 o ports/149513 eclipse java/eclipse can not compile with 'WITH_TESTS=true' 2 problems total. From owner-freebsd-eclipse@FreeBSD.ORG Tue Oct 26 15:22:02 2010 Return-Path: Delivered-To: freebsd-eclipse@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 36B50106564A for ; Tue, 26 Oct 2010 15:22:02 +0000 (UTC) (envelope-from ken@tydfam.jp) Received: from daemon.sub.tydfam.jp (ns.tydfam.jp [61.197.228.42]) by mx1.freebsd.org (Postfix) with ESMTP id AFFE48FC19 for ; Tue, 26 Oct 2010 15:22:01 +0000 (UTC) Received: from localhost (tyd3.sub.tydfam.jp [192.168.1.3]) by daemon.sub.tydfam.jp (8.14.4/8.14.3) with ESMTP id o9QElI2o046697; Tue, 26 Oct 2010 23:47:19 +0900 (JST) (envelope-from ken@tydfam.jp) Date: Tue, 26 Oct 2010 23:47:18 +0900 (JST) Message-Id: <20101026.234718.59640143160036341.ken@tydfam.jp> To: ronald-freebsd8@klop.yi.org From: ken In-Reply-To: References: <201008291749.01728.js@jschneider.com> X-Mailer: Mew version 6.3 on Emacs 23.2 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=4.4 required=9.5 tests=ALL_TRUSTED, DNS_FROM_OPENWHOIS, FH_DATE_PAST_20XX autolearn=no version=3.2.5 X-Spam-Level: **** X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on daemon.sub.tydfam.jp Cc: john.a.schneider@gmail.com, freebsd-eclipse@freebsd.org Subject: Re: Eclipse 3.6 (Helios) Alpha Port X-BeenThere: freebsd-eclipse@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "FreeBSD users of eclipse EDI, tools, rich client apps & ports." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Oct 2010 15:22:02 -0000 Hi! Is there any plan/progress to port Helios based on John's initial work? From owner-freebsd-eclipse@FreeBSD.ORG Tue Oct 26 15:37:59 2010 Return-Path: Delivered-To: freebsd-eclipse@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0661E106564A for ; Tue, 26 Oct 2010 15:37:59 +0000 (UTC) (envelope-from Thomas.Gellekum@gmx.de) Received: from mail.gmx.net (mailout-de.gmx.net [213.165.64.22]) by mx1.freebsd.org (Postfix) with SMTP id A1C818FC0A for ; Tue, 26 Oct 2010 15:37:57 +0000 (UTC) Received: (qmail invoked by alias); 26 Oct 2010 15:37:51 -0000 Received: from xdsl-87-79-186-86.netcologne.de (EHLO siegel.tg.intern) [87.79.186.86] by mail.gmx.net (mp026) with SMTP; 26 Oct 2010 17:37:51 +0200 X-Authenticated: #18235045 X-Provags-ID: V01U2FsdGVkX19GTlFLOvdGkgR81Tpok7Pqksio38duzAbK+2vO36 0pV/1JDzpxAy1K From: Thomas Gellekum To: freebsd-eclipse@freebsd.org User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (berkeley-unix) Date: Tue, 26 Oct 2010 17:37:50 +0200 Message-ID: <86ocahge29.fsf@siegel.tg.intern> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Y-GMX-Trusted: 0 Subject: Upgrade eclipse-devel to 3.6.1 X-BeenThere: freebsd-eclipse@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "FreeBSD users of eclipse EDI, tools, rich client apps & ports." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Oct 2010 15:37:59 -0000 --=-=-= Moin, attached are patches to upgrade the eclipse-devel port to version 3.6.1. I've tested the new version with a few small Java and RCP projects, and there were no surprises for me at least. However, there are some areas where the port can certainly be improved, and I hope that we get a few more pairs of eyes looking at those. From the top of my head: - JUnit4. I've made the mistake of updating the required version too early. It turned out that there is a build property for the location of a JUnit4 installation. I didn't try that yet, but we might actually take JUnit4 from a separate port and just depend on that. This will simplify the port's makefile a bit. - REINPLACE_CMD. I think I'd like to see patches that add properties to the Ant build files and pass those via MAKE_ARGS. Again, this simplifies the makefile and we'd no longer patch the same files several times with different methods. - Upstream patches were updated for eclipse-build-0.6.1. How do we manage these? - Build output. There seems to be some verbosity flag set somewhere; I didn't look for it yet. - Build errors/warnings. I've seen errors scroll by, haven't checked them yet. - Needs OpenJDK6. The diablo-jdk16 VM crashes when compiling some files. I don't bother (too much), I think that port has become useful mainly for bootstrapping. In the same vein, the javavmwrapper's lookup order should be updated, IMHO. So, please check the patches and send your suggestions/comments/improvements to the list. Working on the improvements might actually be easiest if we'd just update the port; it seems to be lagging behind the standard port anyway ;-). tg --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=eclipse-devel.diff Content-Transfer-Encoding: 8bit cvs diff: Diffing . Index: Makefile =================================================================== RCS file: /home/ncvs/ports/java/eclipse-devel/Makefile,v retrieving revision 1.32 diff -u -r1.32 Makefile --- Makefile 8 Aug 2010 08:56:39 -0000 1.32 +++ Makefile 26 Oct 2010 14:43:23 -0000 @@ -6,15 +6,14 @@ # PORTNAME= eclipse-devel -PORTVERSION= 3.5.2 -PORTREVISION= 3 +PORTVERSION= 3.6.1 +#PORTREVISION= 3 CATEGORIES= java devel -MASTER_SITES= http://download.eclipse.org/technology/linuxtools/eclipse-build/:1 \ - http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/bundles/:2 \ - http://download.eclipse.org/tools/orbit/downloads/drops/S20100308015149/bundles/:3 \ +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_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:4,} \ ${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%/,junit/junit/${JUNIT3_VERSION}/:5,} \ - ${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%/,junit/junit/${JUNIT4_VERSION}/:6,} + http://cloud.github.com/downloads/KentBeck/junit/:6 DISTFILES= ${ECLIPSE_BUILD_SRCFILE}:1 \ ${ECLIPSE_SRCFILE}:1 \ ${ANT_SRCFILE}:4 \ @@ -51,28 +50,29 @@ JAVA_OS= native JAVA_RUN= yes JAVA_VERSION= 1.6 +JAVA_VENDOR= openjdk -ECLIPSE_BUILD_SRCFILE= eclipse-build-0.5.0${EXTRACT_SUFX} +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.0.1.v20090822.jar \ +ECLIPSE_JAR_BUNDLES= com.ibm.icu_4.2.1.v20100412.jar \ com.jcraft.jsch_0.1.41.v200903070017.jar \ - javax.servlet_2.5.0.v200806031605.jar \ + javax.servlet_2.5.0.v200910301333.jar \ javax.servlet.jsp_2.0.0.v200806031607.jar \ org.apache.commons.codec_1.3.0.v20080530-1600.jar \ org.apache.commons.el_1.0.0.v200806031608.jar \ - org.apache.commons.httpclient_3.1.0.v20080605-1935.jar \ - org.apache.commons.logging_1.0.4.v200904062259.jar \ + org.apache.commons.httpclient_3.1.0.v201005080502.jar \ + org.apache.commons.logging_1.0.4.v201005080501.jar \ org.apache.jasper_5.5.17.v200903231320.jar \ - org.apache.lucene_1.9.1.v20080530-1600.jar \ - org.apache.lucene.analysis_1.9.1.v20080530-1600.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 \ org.hamcrest.core_1.1.0.v20090501071000.jar \ - org.mortbay.jetty.server_6.1.15.v200905151201.jar \ - org.mortbay.jetty.util_6.1.15.v200905182336.jar \ - org.objectweb.asm_3.1.0.v200803061910.jar -ECLIPSE_SAT4J_BUNDLES= org.sat4j.core_2.1.1.v20090825.jar \ - org.sat4j.pb_2.1.1.v20090825.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} ANT_BUNDLES= ant-antlr.jar \ @@ -95,12 +95,13 @@ ant-trax.jar JUNIT3_VERSION= 3.8.2 JUNIT3_SRCFILE= junit${JUNIT3_VERSION}.zip -JUNIT4_VERSION= 4.8.1 +JUNIT4_VERSION= 4.8.2 JUNIT4_SRCFILE= junit-${JUNIT4_VERSION}.jar FBSD_SUPPORT_SRCFILE= freebsd-support.patch -MAKE_ARGS= -DbuildOs=freebsd -DbuildArch=${ARCH:C/amd64/x86_64/:C/i386/x86/} -Dprefix=${PREFIX} -Dlocalbase=${LOCALBASE} -MAKE_ENV+= GRE_HOME=${PREFIX}/lib/${GECKO} _JAVA_OPTIONS="-Xmx1024m" +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} + WRKSRC= ${WRKDIR}/${ECLIPSE_BUILD_SRCFILE:C/${EXTRACT_SUFX}//} PATCH_STRIP= -p1 @@ -115,14 +116,10 @@ share/icons/hicolor/48x48/apps/${PORTNAME}.png \ share/pixmaps/${PORTNAME}.png -.for f in ${ECLIPSE_JAR_BUNDLES} +.for f in ${ECLIPSE_JAR_BUNDLES} ${ECLIPSE_SAT4J_BUNDLES} DISTFILES+= ${f}:2 .endfor -.for f in ${ECLIPSE_SAT4J_BUNDLES} -DISTFILES+= ${f}:3 -.endfor - .include .if defined(WITH_TESTS) @@ -134,19 +131,12 @@ ALL_TARGET= provision.tests .endif -.if ${OSVERSION} >= 800000 -JAVA_VENDOR= bsdjava -.endif - # Copy the eclipse source file to the work area post-extract: @${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} - @${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${BUILD_WRKSRC}/bundles/ -.endfor -.for f in ${ECLIPSE_SAT4J_BUNDLES} +.for f in ${ECLIPSE_JAR_BUNDLES} ${ECLIPSE_SAT4J_BUNDLES} @${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${BUILD_WRKSRC}/bundles/ .endfor .for f in ${ANT_BUNDLES} @@ -169,11 +159,14 @@ # Fixup boot classes path post-patch: @${REINPLACE_CMD} -e "s+%%BOOTCLASSPATH%%+${BOOTCLASSPATH}+g" ${BUILD_WRKSRC}/build.properties - @${REINPLACE_CMD} -e "s+%%PORTNAME%%+${PORTNAME}+g" ${BUILD_WRKSRC}/build.xml @${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 + @${REINPLACE_CMD} -e "s+^${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_WRKSRC}/sdkdependencies.properties .endfor .for f in ${ECLIPSE_SAT4J_BUNDLES} @${REINPLACE_CMD} -e "s+^${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_WRKSRC}/dependencies.properties @@ -181,8 +174,9 @@ .for f in ${ANT_BUNDLES} @${REINPLACE_CMD} -e "s+${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_WRKSRC}/nonosgidependencies.properties .endfor - @${REINPLACE_CMD} -e "s+=/usr/share/java/junit.jar+=${BUILD_WRKSRC}/bundles/junit.jar+" ${BUILD_WRKSRC}/nonosgidependencies.properties - @${REINPLACE_CMD} -e "s+=/usr/share/java/junit4.jar+=${BUILD_WRKSRC}/bundles/junit4.jar+" ${BUILD_WRKSRC}/nonosgidependencies.properties + @${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 .if defined(WITH_TESTS) @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} applyTestPatches) .endif @@ -208,16 +202,6 @@ ${BUILD_WRKSRC}/eclipse.tmp .endif @${INSTALL_SCRIPT} ${WRKSRC}/eclipse.tmp ${PREFIX}/bin/${PORTNAME} - @for f in `ls ${BUILD_WRKSRC}/bundles/*.jar`; do \ - BASE=`basename $$f`; \ - FILES=`find ${PORTDESTDIR}/plugins/ -name "$$BASE"`; \ - if [ ! -z "$$FILES" ]; then \ - for s in $$FILES; do \ - ${RM} "$$s"; \ - ${INSTALL_DATA} "$$f" "$$s"; \ - done; \ - fi; \ - done @${PREFIX}/bin/${PORTNAME} -initialize -consolelog -@update-desktop-database @(cd ${PREFIX}; ${FIND} -s lib/${PORTNAME} -not -type d) >> ${TMPPLIST} Index: distinfo =================================================================== RCS file: /home/ncvs/ports/java/eclipse-devel/distinfo,v retrieving revision 1.10 diff -u -r1.10 distinfo --- distinfo 1 May 2010 17:27:58 -0000 1.10 +++ distinfo 26 Oct 2010 14:43:23 -0000 @@ -1,27 +1,27 @@ -MD5 (eclipse/eclipse-build-0.5.0.tar.bz2) = 4222efa5f5817b369db90843b0ca7563 -SHA256 (eclipse/eclipse-build-0.5.0.tar.bz2) = d5f184bb9337eff30e4828c55c866f678eb512b93c908402ef1acc812e1bcf16 -SIZE (eclipse/eclipse-build-0.5.0.tar.bz2) = 276662 -MD5 (eclipse/eclipse-3.5.2-src.tar.bz2) = 942cf2b429c3ce96bd8256f3cb5b2f81 -SHA256 (eclipse/eclipse-3.5.2-src.tar.bz2) = e16b9d392132054733ef510fa41123e61dc5dbc25e386124d497d9d8469324cf -SIZE (eclipse/eclipse-3.5.2-src.tar.bz2) = 59509303 +MD5 (eclipse/eclipse-build-0.6.1.tar.bz2) = dac006a81d45f366ecbf3f78f7fa9424 +SHA256 (eclipse/eclipse-build-0.6.1.tar.bz2) = 66b6344fe55523b1e2243bd37f9ad14aeff0fd7f0f44669a89cada9146e5b46e +SIZE (eclipse/eclipse-build-0.6.1.tar.bz2) = 295425 +MD5 (eclipse/eclipse-3.6.1-src.tar.bz2) = 306f8bf4ec2b0bf6f3f8329608cb15dd +SHA256 (eclipse/eclipse-3.6.1-src.tar.bz2) = 588f90209a75c8359e86deed5a48f5b3bff69e5d7e1856119e8a740c17646250 +SIZE (eclipse/eclipse-3.6.1-src.tar.bz2) = 62707872 MD5 (eclipse/apache-ant-1.7.1-bin.tar.bz2) = 9330447f3763b87570dd1118c49a8efd SHA256 (eclipse/apache-ant-1.7.1-bin.tar.bz2) = 24e54c9d90b81d1b7342695a8285a969393fd883e99ffbbc04203c106d9c2f97 SIZE (eclipse/apache-ant-1.7.1-bin.tar.bz2) = 7641928 MD5 (eclipse/junit3.8.2.zip) = 9b8963ba2147a64bd5f1574b6fd289cb SHA256 (eclipse/junit3.8.2.zip) = aae23d20e6f4dc45b4bf0b10fedcbd209c100342a0cafce1aa07d2da6da1f24a SIZE (eclipse/junit3.8.2.zip) = 461426 -MD5 (eclipse/junit-4.8.1.jar) = fb44723f35c2f1af5c51eb729b502f0d -SHA256 (eclipse/junit-4.8.1.jar) = efd8cf93b57d01e8f5fbefbe1f17ae39e6e22553615926e00a6eefc307da21e6 -SIZE (eclipse/junit-4.8.1.jar) = 237047 -MD5 (eclipse/com.ibm.icu_4.0.1.v20090822.jar) = 2c0e3112c5fe9361ea61b905a02150e8 -SHA256 (eclipse/com.ibm.icu_4.0.1.v20090822.jar) = 9629635b5ab76be6de3364bf2487356f57941a7cbe04239a70db9df566c169e7 -SIZE (eclipse/com.ibm.icu_4.0.1.v20090822.jar) = 5787493 +MD5 (eclipse/junit-4.8.2.jar) = 8a498c3d820db50cc7255d8c46c1ebd1 +SHA256 (eclipse/junit-4.8.2.jar) = a2aa2c3bb2b72da76c3e6a71531f1eefdc350494819baf2b1d80d7146e020f9e +SIZE (eclipse/junit-4.8.2.jar) = 237344 +MD5 (eclipse/com.ibm.icu_4.2.1.v20100412.jar) = 3e6690e17b268a280532c2aff54c0cc6 +SHA256 (eclipse/com.ibm.icu_4.2.1.v20100412.jar) = 78150e19c1084d4ad085de156332f6985872d1da9d7b2e22b2c0360ecdc3b974 +SIZE (eclipse/com.ibm.icu_4.2.1.v20100412.jar) = 6451214 MD5 (eclipse/com.jcraft.jsch_0.1.41.v200903070017.jar) = 43d0a7e7f2b72bc94827a1420c99a3e1 SHA256 (eclipse/com.jcraft.jsch_0.1.41.v200903070017.jar) = ee8af42d01fbdd07a70762483b9eeda5dc8f23b386e04a6aa034b06df75c9396 SIZE (eclipse/com.jcraft.jsch_0.1.41.v200903070017.jar) = 225576 -MD5 (eclipse/javax.servlet_2.5.0.v200806031605.jar) = e3ee9d09500707048362df8b16e7b4c2 -SHA256 (eclipse/javax.servlet_2.5.0.v200806031605.jar) = 4c5fef96a177c72fa28470cb23d65833a541c77e0ea0914fb3d92f7c6aa902f0 -SIZE (eclipse/javax.servlet_2.5.0.v200806031605.jar) = 117853 +MD5 (eclipse/javax.servlet_2.5.0.v200910301333.jar) = e46e37400d01a527fab7a22edc74bd2d +SHA256 (eclipse/javax.servlet_2.5.0.v200910301333.jar) = 27c684a06d3832578e2b0bfbd183d973ad5662cfee5cf116791091b74e0297ee +SIZE (eclipse/javax.servlet_2.5.0.v200910301333.jar) = 118873 MD5 (eclipse/javax.servlet.jsp_2.0.0.v200806031607.jar) = afa76cbe2cf90a605d0d415eae4d7109 SHA256 (eclipse/javax.servlet.jsp_2.0.0.v200806031607.jar) = 7129d8eb8759eae6169cb494d2ee031bb75a3dab68bc789d92d8a34f2f8a873e SIZE (eclipse/javax.servlet.jsp_2.0.0.v200806031607.jar) = 62707 @@ -31,42 +31,36 @@ MD5 (eclipse/org.apache.commons.el_1.0.0.v200806031608.jar) = 8dfda26bbd970749ff7ae341a93c140f SHA256 (eclipse/org.apache.commons.el_1.0.0.v200806031608.jar) = 0d8b55ca35e851ce3d1e5beeb0e4c32ab0630d4d21b3ce324ef0ac0a45e3ad37 SIZE (eclipse/org.apache.commons.el_1.0.0.v200806031608.jar) = 127481 -MD5 (eclipse/org.apache.commons.httpclient_3.1.0.v20080605-1935.jar) = 8dd836d15bf93050746681d726242461 -SHA256 (eclipse/org.apache.commons.httpclient_3.1.0.v20080605-1935.jar) = 339385ec9ffd7398db682988afaf6ccdca82086cf0255e7dd1fc298dc8ba08d5 -SIZE (eclipse/org.apache.commons.httpclient_3.1.0.v20080605-1935.jar) = 320150 -MD5 (eclipse/org.apache.commons.logging_1.0.4.v200904062259.jar) = 805a903497b0a7df138ea5e4a1fd0f54 -SHA256 (eclipse/org.apache.commons.logging_1.0.4.v200904062259.jar) = 001948a5c62731984a3752043fb1f2d892806e1efb2ba8396c12fe5db2afadbd -SIZE (eclipse/org.apache.commons.logging_1.0.4.v200904062259.jar) = 44210 +MD5 (eclipse/org.apache.commons.httpclient_3.1.0.v201005080502.jar) = 4bf4a6337ada12733a56746c679adb72 +SHA256 (eclipse/org.apache.commons.httpclient_3.1.0.v201005080502.jar) = 0f215df922704e121e8504d9c34e60a40729d43badd90576e4c83446203cf77e +SIZE (eclipse/org.apache.commons.httpclient_3.1.0.v201005080502.jar) = 321329 +MD5 (eclipse/org.apache.commons.logging_1.0.4.v201005080501.jar) = a5e6de22b126c858813d5a3431704e71 +SHA256 (eclipse/org.apache.commons.logging_1.0.4.v201005080501.jar) = 5f0c8730284da1752cca07de023eca14bdd50e99f7262239b17db8eaf7b40a71 +SIZE (eclipse/org.apache.commons.logging_1.0.4.v201005080501.jar) = 45398 MD5 (eclipse/org.apache.jasper_5.5.17.v200903231320.jar) = 0376ebc2882221c22315ffee622766fc SHA256 (eclipse/org.apache.jasper_5.5.17.v200903231320.jar) = 0e440bffabde8db6ad20dee3075ad0a7a7699867be4f5e4b755fd1e56a93fb03 SIZE (eclipse/org.apache.jasper_5.5.17.v200903231320.jar) = 1721330 -MD5 (eclipse/org.apache.lucene_1.9.1.v20080530-1600.jar) = 1188266fdd5e5d845ea3a4c54d148de1 -SHA256 (eclipse/org.apache.lucene_1.9.1.v20080530-1600.jar) = 64cfb714fc520fba75277494fadab655d3d14f9429dfcb5a55d547a9e1d90e3f -SIZE (eclipse/org.apache.lucene_1.9.1.v20080530-1600.jar) = 444122 -MD5 (eclipse/org.apache.lucene.analysis_1.9.1.v20080530-1600.jar) = a943517c8c2ce1b2c9bd05f3a0a313b9 -SHA256 (eclipse/org.apache.lucene.analysis_1.9.1.v20080530-1600.jar) = 7eb8cfbe5ff091b186666daa2778b021b1f24d47fffdc8aff7ce693095d6954f -SIZE (eclipse/org.apache.lucene.analysis_1.9.1.v20080530-1600.jar) = 70361 +MD5 (eclipse/org.apache.lucene_1.9.1.v20100518-1140.jar) = 80107b569a61aed776e342626da0b51f +SHA256 (eclipse/org.apache.lucene_1.9.1.v20100518-1140.jar) = 2bab6a2feaabaf8db9c04db16fec03435e37fe201294aead06096884e210ad7b +SIZE (eclipse/org.apache.lucene_1.9.1.v20100518-1140.jar) = 445306 +MD5 (eclipse/org.apache.lucene.analysis_1.9.1.v20100518-1140.jar) = 514505c60dd7d072a190b6daade42eb8 +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 +MD5 (eclipse/org.mortbay.jetty.util_6.1.23.v201004211559.jar) = 54e05281d44ccc038b09b16bd23368e3 +SHA256 (eclipse/org.mortbay.jetty.util_6.1.23.v201004211559.jar) = 36dc0cf4e75888f9ffb0d36551a915926f247cb4b3cfdeed80479ec8a687f011 +SIZE (eclipse/org.mortbay.jetty.util_6.1.23.v201004211559.jar) = 192846 +MD5 (eclipse/org.mortbay.jetty.server_6.1.23.v201004211559.jar) = e800bdb1e4d56a9fe8a87766fe40738c +SHA256 (eclipse/org.mortbay.jetty.server_6.1.23.v201004211559.jar) = 17bcd3edc28a4808a13558077507da6ed5fe88cc8c216d00d87da88683d3d94d +SIZE (eclipse/org.mortbay.jetty.server_6.1.23.v201004211559.jar) = 557434 MD5 (eclipse/org.hamcrest.core_1.1.0.v20090501071000.jar) = aa182429a9bbe01c485571f199a471aa SHA256 (eclipse/org.hamcrest.core_1.1.0.v20090501071000.jar) = 211c869941f7151fe7d3ecaae31b53d128a2d97684ed4ce455d2ca4ea3a0abeb SIZE (eclipse/org.hamcrest.core_1.1.0.v20090501071000.jar) = 26650 -MD5 (eclipse/org.mortbay.jetty.server_6.1.15.v200905151201.jar) = a5108cbf1472be6299c0ea520e9d3dd1 -SHA256 (eclipse/org.mortbay.jetty.server_6.1.15.v200905151201.jar) = 06f490b0b13477cc110c78a9e5a2097e620404fa89ddc3411e66fd111d303599 -SIZE (eclipse/org.mortbay.jetty.server_6.1.15.v200905151201.jar) = 539578 -MD5 (eclipse/org.mortbay.jetty.util_6.1.15.v200905182336.jar) = ff20b874c732e0456f0c68032df06fff -SHA256 (eclipse/org.mortbay.jetty.util_6.1.15.v200905182336.jar) = b112a4f80922bd14ed5737160ba99fa4aabc04db6cea8913f2ca23d622e067ea -SIZE (eclipse/org.mortbay.jetty.util_6.1.15.v200905182336.jar) = 186357 -MD5 (eclipse/org.objectweb.asm_3.1.0.v200803061910.jar) = 35e516bfc32eb9145871c172b7cc4cf9 -SHA256 (eclipse/org.objectweb.asm_3.1.0.v200803061910.jar) = 62eac6f966b20394a349b44da04d87dd99c39edaa16b996d911c1cf88547388e -SIZE (eclipse/org.objectweb.asm_3.1.0.v200803061910.jar) = 220211 -MD5 (eclipse/org.sat4j.core_2.1.1.v20090825.jar) = 762d93cbd20e994347d2a9fabf085c01 -SHA256 (eclipse/org.sat4j.core_2.1.1.v20090825.jar) = 6f8541e936d770f8c21978f8939c5b97e9db38c0ac9826ae9a745ef91181d1a1 -SIZE (eclipse/org.sat4j.core_2.1.1.v20090825.jar) = 181816 -MD5 (eclipse/org.sat4j.pb_2.1.1.v20090825.jar) = a1de7d00453c99b8580bcc4c558be1d8 -SHA256 (eclipse/org.sat4j.pb_2.1.1.v20090825.jar) = 7329c67e844d59bbc2fd5d4cfcfbca7819eecfaac55afaf6c39c0d3dbcc108b0 -SIZE (eclipse/org.sat4j.pb_2.1.1.v20090825.jar) = 111984 -MD5 (eclipse/eclipse-sdktests-3.5.2-src.tar.bz2) = c0103f2bc13eb2049ad9c6abcf46f8d2 -SHA256 (eclipse/eclipse-sdktests-3.5.2-src.tar.bz2) = e2f2490e7854a26ccff3deca732e2565f3d86a246645160997b914a176924b06 -SIZE (eclipse/eclipse-sdktests-3.5.2-src.tar.bz2) = 86258617 -MD5 (eclipse/eclipse-sdktests-3.5.2-scripts.tar.bz2) = 4e0445e114067defa20135a06cb184a1 -SHA256 (eclipse/eclipse-sdktests-3.5.2-scripts.tar.bz2) = e06efe159fe1ee99536799795c6d76324d87fb125366ae03b85ada15f2629137 -SIZE (eclipse/eclipse-sdktests-3.5.2-scripts.tar.bz2) = 4802 +MD5 (eclipse/org.objectweb.asm_3.2.0.v200909071300.jar) = 7aff7763a60c1e2c095e9ab05cca0a29 +SHA256 (eclipse/org.objectweb.asm_3.2.0.v200909071300.jar) = 3b30b0b87d9d517829eb6227c45657c767f3ec90019cb99d26638f5c4a07a15d +SIZE (eclipse/org.objectweb.asm_3.2.0.v200909071300.jar) = 229434 +MD5 (eclipse/org.sat4j.core_2.2.0.v20100429.jar) = 02e0e62e6c55dbba2afb65fb649eda32 +SHA256 (eclipse/org.sat4j.core_2.2.0.v20100429.jar) = 4c3c8b6c3b05576fd1adba3c1ce04e6ea88dd1d9615163411baa76f269c750aa +SIZE (eclipse/org.sat4j.core_2.2.0.v20100429.jar) = 193845 +MD5 (eclipse/org.sat4j.pb_2.2.0.v20100429.jar) = 3ded0a927f1736ba146a4b289c8eb3b9 +SHA256 (eclipse/org.sat4j.pb_2.2.0.v20100429.jar) = 4c57e12cd17a128e14d3cf093ec265e6991a74fcba096c0d284145bf2cd0d44d +SIZE (eclipse/org.sat4j.pb_2.2.0.v20100429.jar) = 121389 cvs diff: Diffing files Index: files/eclipse-build-upstream.patch =================================================================== RCS file: /home/ncvs/ports/java/eclipse-devel/files/eclipse-build-upstream.patch,v retrieving revision 1.1 diff -u -r1.1 eclipse-build-upstream.patch --- files/eclipse-build-upstream.patch 1 May 2010 17:27:59 -0000 1.1 +++ files/eclipse-build-upstream.patch 26 Oct 2010 14:43:24 -0000 @@ -17,7 +17,7 @@ =================================================================== --- build.xml (revision 23733) +++ build.xml (working copy) -@@ -88,6 +88,7 @@ +@@ -130,6 +130,7 @@ @@ -25,7 +25,7 @@ -@@ -264,7 +265,10 @@ +@@ -315,7 +316,10 @@ @@ -34,10 +34,10 @@ + + + + - -@@ -350,6 +354,7 @@ +@@ -399,6 +403,7 @@ -@@ -404,9 +409,9 @@ +@@ -462,9 +467,9 @@ @@ -58,7 +58,7 @@ -@@ -418,16 +423,16 @@ +@@ -476,16 +481,16 @@ @@ -78,14 +78,14 @@ -@@ -435,13 +440,13 @@ +@@ -493,13 +498,13 @@ - -- +- + -+ ++ @@ -95,7 +95,7 @@ -@@ -544,7 +549,7 @@ +@@ -593,7 +598,7 @@ @@ -104,41 +104,41 @@ -@@ -570,6 +575,7 @@ +@@ -631,6 +636,7 @@ + - -@@ -587,7 +593,7 @@ - - + +@@ -721,7 +727,7 @@ + + - + -@@ -647,6 +653,8 @@ - +@@ -800,6 +806,8 @@ + --> + + - - - -@@ -772,7 +780,7 @@ + + + +@@ -924,7 +932,7 @@ - + -- -+ +- ++ - - + + Index: pdebuild.xml =================================================================== --- pdebuild.xml (revision 23733) @@ -179,10 +179,10 @@ =================================================================== --- publishProduct.xml (revision 23733) +++ publishProduct.xml (working copy) -@@ -2,7 +2,7 @@ +@@ -1,7 +1,7 @@ + - - + - + @@ -192,24 +192,25 @@ =================================================================== --- runtests.sh (revision 23733) +++ runtests.sh (working copy) -@@ -14,6 +14,8 @@ - -g Don't run the tests headless - -d Allow remote connection to test runs' JVM +@@ -16,6 +16,8 @@ + -b Tests build directory + -p Clean installation directory to copy for running test suites -t Timestamp string with which to tag the results + -a Architecture to run the tests on + -o OS to run the tests on + -v Make test runs output to the console _EOF_ } +@@ -83,6 +85,8 @@ + headless=1 + fi -@@ -72,6 +74,7 @@ - # Defaults - debugTests=0 - headless=1 + buildOs=linux - testFramework=org.eclipse.test_3.2.0 - if [ -z ${timestamp} ]; then - timestamp=$(date "+%Y%m%d%H%M%S") -@@ -116,21 +119,16 @@ ++ + label=$(grep label build.properties | sed s/label=//) + testframework=$(grep ^testframework build.properties | sed s/testframework=//) + +@@ -142,21 +146,16 @@ if [ ${headless} == 1 ]; then # Try to find Xvnc xvnc= @@ -238,7 +239,7 @@ fi } -@@ -139,9 +137,11 @@ +@@ -165,9 +164,11 @@ port=`expr '(' $RANDOM '*' 9 / 32767 ')' + 58` echo localhost > Xvnc.cfg echo "Setting up Xvnc on port ${port} with password VNCpassword1" @@ -252,7 +253,7 @@ } function setArch() { -@@ -160,13 +160,15 @@ +@@ -186,13 +187,15 @@ arch=ia64 ;; ppc) arch=ppc ;; @@ -269,36 +270,36 @@ fi } -@@ -177,7 +179,7 @@ - -application org.eclipse.ant.core.antRunner \ - -file $testDriver \ - -Declipse-home=${eclipseHome} \ -- -Dos=linux \ -+ -Dos=${buildOs} \ - -Dws=gtk \ - -Darch=${arch} \ - -Dlibrary-file=$libraryXml \ -@@ -185,7 +187,7 @@ - -logger org.apache.tools.ant.DefaultLogger \ - -vmargs \ - -Duser.home=${homedir} \ -- -Dosgi.os=linux \ -+ -Dosgi.os=${buildOs} \ - -Dosgi.ws=gtk \ - -Dosgi.arch=${arch} - } -@@ -288,7 +290,7 @@ +@@ -206,7 +209,7 @@ + -application org.eclipse.ant.core.antRunner \ + -file $testDriver \ + -Declipse-home=${eclipseHome} \ +- -Dos=linux \ ++ -Dos=${buildOs} \ + -Dws=gtk \ + -Darch=${arch} \ + -Dlibrary-file=$libraryXml \ +@@ -214,7 +217,7 @@ + -logger org.apache.tools.ant.DefaultLogger \ + -vmargs \ + -Duser.home=${homedir} \ +- -Dosgi.os=linux \ ++ -Dosgi.os=${buildOs} \ + -Dosgi.ws=gtk \ + -Dosgi.arch=${arch} + else +@@ -348,7 +351,7 @@ } # Command-line arguments --while getopts "de:gt:h" OPTION -+while getopts "de:gt:a:o:h" OPTION +-while getopts "vde:gb:p:t:h" OPTION ++while getopts "vde:gb:p:t:a:o:h" OPTION do case $OPTION in d) -@@ -300,6 +302,12 @@ - t) - timestamp=$OPTARG +@@ -366,6 +369,12 @@ + p) + provisionDir=$OPTARG ;; + a) + buildArch=$OPTARG @@ -309,14 +310,3 @@ h) usage exit 1 -Index: build.sh -=================================================================== ---- build.sh (revision 23733) -+++ build.sh (working copy) -@@ -38,5 +38,5 @@ - esac - DATE=`date +%Y%m%d%H%M%S` - --ant -DbuildArch=${arch} 2>&1 | tee build_${DATE}.log -+ant -DbuildArch=${arch} -DbuildOs=linux 2>&1 | tee build_${DATE}.log - echo "Build log is available in build_${DATE}.log" Index: files/freebsd-support.patch =================================================================== RCS file: /home/ncvs/ports/java/eclipse-devel/files/freebsd-support.patch,v retrieving revision 1.1 diff -u -r1.1 freebsd-support.patch --- files/freebsd-support.patch 1 May 2010 17:27:59 -0000 1.1 +++ files/freebsd-support.patch 26 Oct 2010 14:43:43 -0000 @@ -10,12 +10,12 @@ case $MODEL in "x86_64") defaultOSArch="x86_64" -@@ -97,6 +98,7 @@ +@@ -98,6 +98,7 @@ "SunOS") makefile="make_solaris.mak" defaultOS="solaris" + MAKE=make - javaHome="/usr/jdk/jdk1.5.0_01" + [ -d /usr/jdk/jdk1.5.0_01 ] && javaHome="/usr/jdk/jdk1.5.0_01" OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" #PATH=/usr/ccs/bin:/opt/SUNWspro/bin:$PATH @@ -119,6 +121,24 @@ @@ -109,7 +109,7 @@ +DLL = $(PROGRAM_LIBRARY) +#LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0 -lpthread -ldl +LIBS = -lpthread -+GTK_LIBS = -DGTK_LIB="\"libgtk-x11-2.0.so.0\"" -DGDK_LIB="\"libgdk-x11-2.0.so.0\"" -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" ++GTK_LIBS = -DGTK_LIB="\"libgtk-x11-2.0.so.0\"" -DGDK_LIB="\"libgdk-x11-2.0.so.0\"" -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" -DX11_LIB="\"libX11.so.6\"" +LFLAGS = -shared -fpic -Wl,--export-dynamic +CFLAGS = -g -s -Wall\ + -fpic \ @@ -175,10 +175,10 @@ + rm -f $(EXEC) $(DLL) $(MAIN_OBJS) $(COMMON_OBJS) $(DLL_OBJS) --- build.orig/eclipse-3.5.2-src/features/org.eclipse.equinox.executable/target.build.properties 2009-12-23 15:12:32.595953209 -0500 +++ build/eclipse-3.5.2-src/features/org.eclipse.equinox.executable/target.build.properties 2009-12-23 15:14:12.390811604 -0500 -@@ -89,3 +89,6 @@ +@@ -98,3 +98,6 @@ - root.linux.motif.x86=bin/motif/linux/x86,motif_root - root.linux.motif.x86.permissions.755=libXm.so.2,libcairo-swt.so + root.linux.gtk.s390x=contributed/gtk/linux/s390x,gtk_root + root.linux.gtk.s390=contributed/gtk/linux/s390,gtk_root + +root.freebsd.gtk.x86=bin/gtk/freebsd/x86,gtk_root +root.freebsd.gtk.x86_64=bin/gtk/freebsd/x86_64,gtk_root @@ -305,7 +305,7 @@ ws="motif" --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile 1969-12-31 19:00:00.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile 2009-12-23 15:14:12.391816744 -0500 -@@ -0,0 +1,32 @@ +@@ -0,0 +1,36 @@ +#********************************************************************** +# Copyright (c) 2000, 2004 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials @@ -314,12 +314,12 @@ +# http://www.eclipse.org/legal/epl-v10.html +#********************************************************************** +# -+# makefile for libcore.so ++# makefile for libunixfile_1_0_0.so + -+CORE.C = ../localfile.c -+CORE.O = localfile.o -+LIB_NAME = liblocalfile.so -+LIB_NAME_FULL = liblocalfile_1_0_0.so ++CORE.C = ../unixfile.c ++CORE.O = unixfile.o ++LIB_NAME = libunixfile.so ++LIB_NAME_FULL = libunixfile_1_0_0.so + +#Set this to be your OS type +OS_TYPE = freebsd @@ -338,6 +338,10 @@ + +clean : + rm *.o ++ ++install: core ++ rm -f ../../../../org.eclipse.core.filesystem.linux.x86/os/linux/x86/libunixfile_1_0_0.so ++ mv libunixfile_1_0_0.so ../../../../org.eclipse.core.filesystem.linux.x86/os/linux/x86/ --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem/natives/unix/freebsd/include/os_custom.h 1969-12-31 19:00:00.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem/natives/unix/freebsd/include/os_custom.h 2009-12-23 15:14:12.392819649 -0500 @@ -0,0 +1,23 @@ @@ -859,7 +863,7 @@ +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.x86_64;singleton:=true +Bundle-Version: 1.0.200.qualifier -+Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.1.0)" ++Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.1.0,1.2.0)" +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86_64)) +Bundle-Localization: launcher.gtk.freebsd.x86_64 +Eclipse-BundleShape: dir @@ -1109,7 +1113,7 @@ +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.x86;singleton:=true +Bundle-Version: 1.0.200.qualifier -+Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.1.0)" ++Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.1.0,1.2.0)" +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86)) +Bundle-Localization: launcher.gtk.freebsd.x86 +Eclipse-BundleShape: dir @@ -1267,8 +1271,8 @@ + + + ---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86/launcher.gtk.linux.x86.properties 1969-12-31 19:00:00.000000000 -0500 -+++ build/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86/launcher.gtk.linux.x86.properties 2009-12-23 15:14:12.423942951 -0500 +--- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86/launcher.gtk.freebsd.x86.properties 1969-12-31 19:00:00.000000000 -0500 ++++ build/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86/launcher.gtk.freebsd.x86.properties 2009-12-23 15:14:12.423942951 -0500 @@ -0,0 +1,12 @@ +############################################################################### +# Copyright (c) 2007 IBM Corporation and others. @@ -1323,7 +1327,7 @@ +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.x86_64;singleton:=true +Bundle-Version: 1.0.200.qualifier -+Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.1.0)" ++Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.1.0,1.2.0)" +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86_64)) +Bundle-Localization: launcher.gtk.freebsd.x86_64 +Eclipse-BundleShape: dir @@ -1645,14 +1649,14 @@ +++ build/eclipse-3.5.2-src/plugins/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java 2009-12-23 15:14:12.440005914 -0500 @@ -93,6 +93,8 @@ brandAIX(); - if ("hpux".equals(os)) //$NON-NLS-1$ + else if ("hpux".equals(os)) //$NON-NLS-1$ brandHPUX(); -+ if ("freebsd".equals(os)) //$NON-NLS-1$ ++ else if ("freebsd".equals(os)) //$NON-NLS-1$ + brandFreeBSD(); + else + renameLauncher(); } - - private void brandAIX() { -@@ -213,6 +215,12 @@ +@@ -224,6 +226,12 @@ } } @@ -1985,14 +1989,14 @@ +++ build/eclipse-3.5.2-src/plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BrandingIron.java 2009-12-23 15:14:12.471129495 -0500 @@ -80,6 +80,8 @@ brandAIX(); - if ("hpux".equals(os)) //$NON-NLS-1$ + else if ("hpux".equals(os)) //$NON-NLS-1$ brandHPUX(); -+ if ("freebsd".equals(os)) //$NON-NLS-1$ ++ else if ("freebsd".equals(os)) //$NON-NLS-1$ + brandFreeBSD(); + else + renameLauncher(); } - - private void brandAIX() { -@@ -107,6 +109,12 @@ +@@ -110,6 +112,12 @@ } } @@ -2217,7 +2221,7 @@ @@ -45,7 +45,7 @@ inSDK=1 inSDK=$(echo $PROJECTDIR | grep -c $BUILDDIR) - if [ $inSDK == 0 ]; then + if [ $inSDK = 0 ]; then - PROJECTNAME=$(ant -Dbasedir="$PROJECTDIR" -f $BUILDDIR/tmp/feature-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7) + PROJECTNAME=$(ant -Dbasedir="$PROJECTDIR" -f $BUILDDIR/tmp/feature-build.xml 2>&1 | grep echo | cut -d ' ' -f 7) ERROR="" @@ -2225,7 +2229,7 @@ echo "ERROR: could not determine the feature id for $PROJECTDIR" @@ -59,7 +59,7 @@ if [ "x$ERROR" != "xyes" ]; then - if [[ $TESTING != true || `echo $PROJECTNAME | grep "org.eclipse"` ]]; then + if [ $TESTING != true -o `echo $PROJECTNAME | grep "org.eclipse"` ]; then echo " making symlink: $BUILDDIR/features/$PROJECTNAME -> $PROJECTDIR" - ln -sfT "$PROJECTDIR" $BUILDDIR/features/"$PROJECTNAME" + ln -sf "$PROJECTDIR" $BUILDDIR/features/"$PROJECTNAME" @@ -2234,7 +2238,7 @@ fi @@ -74,11 +74,11 @@ inSDK=$(echo $dir | grep -c $BUILDDIR) - if [ $inSDK == 0 ]; then + if [ $inSDK = 0 ]; then if [ -e "$dir/META-INF/MANIFEST.MF" ]; then - PROJECTNAME=$(grep Bundle-SymbolicName $dir/META-INF/MANIFEST.MF | cut --delimiter=';' -f 1 | cut --delimiter=' ' -f 2) + PROJECTNAME=$(grep Bundle-SymbolicName $dir/META-INF/MANIFEST.MF | cut -d ';' -f 1 | cut -d ' ' -f 2) @@ -2249,7 +2253,7 @@ if [ -z "$PROJECTNAME" ]; then @@ -93,7 +93,7 @@ if [ "x$ERROR" != "xyes" ]; then - if [[ $TESTING != true || `echo $PROJECTNAME | grep "org.eclipse"` ]]; then + if [ $TESTING != true -o `echo $PROJECTNAME | grep "org.eclipse"` ]; then echo " making symlink: $BUILDDIR/plugins/$PROJECTNAME -> $dir" - ln -sfT "$dir" $BUILDDIR/plugins/"$PROJECTNAME" + ln -sf "$dir" $BUILDDIR/plugins/"$PROJECTNAME" @@ -2309,15 +2313,15 @@ +root.freebsd.gtk.x86_64=eclipse,about_files/,about.html,icon.xpm --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/exports/ProductExportOperation.java 2009-04-27 14:28:33.000000000 -0400 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/exports/ProductExportOperation.java 2009-12-23 15:14:12.484181229 -0500 -@@ -327,6 +327,8 @@ - images = getExpandedPath(info.getIconPath(ILauncherInfo.LINUX_ICON)); - } else if (configs[i][0].equals("macosx")) { //$NON-NLS-1$ - images = getExpandedPath(info.getIconPath(ILauncherInfo.MACOSX_ICON)); -+ } else if (configs[i][0].equals("freebsd")) { //$NON-NLS-1$ -+ images = getExpandedPath(info.getIconPath(ILauncherInfo.FREEBSD_ICON)); - } - if (images != null) { - if (icons.length() > 0) +@@ -329,6 +329,8 @@ + images = getExpandedPath(info.getIconPath(ILauncherInfo.LINUX_ICON)); + } else if (configs[i][0].equals("macosx")) { //$NON-NLS-1$ + images = getExpandedPath(info.getIconPath(ILauncherInfo.MACOSX_ICON)); ++ } else if (configs[i][0].equals("freebsd")) { //$NON-NLS-1$ ++ images = getExpandedPath(info.getIconPath(ILauncherInfo.FREEBSD_ICON)); + } + if (images != null) { + if (icons.length() > 0) --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/IArgumentsInfo.java 2009-05-27 16:25:43.000000000 -0400 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/IArgumentsInfo.java 2009-12-23 15:14:12.493217711 -0500 @@ -13,22 +13,25 @@ @@ -2737,13 +2741,6 @@ LauncherSection_linuxLabel=A single XPM icon is required: LauncherSection_large=Large: LauncherSection_medium=Medium: -@@ -2282,4 +2283,4 @@ - - Product_FeatureSection_properties=Properties... - --PDEJUnitLaunchConfigurationTab_Run_Tests_In_UI_Thread=Run in &UI thread -\ No newline at end of file -+PDEJUnitLaunchConfigurationTab_Run_Tests_In_UI_Thread=Run in &UI thread --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroOperation.java 2009-03-06 17:52:06.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroOperation.java 2009-12-23 15:14:12.521328666 -0500 @@ -128,7 +128,7 @@ @@ -2847,8 +2844,8 @@ if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then - if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then + if [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then -+ XULRUNNER_INCLUDES=`pkg-config --cflags libxul-unstable` -+ XULRUNNER_LIBS="`pkg-config --libs libxul-unstable` -lxpcomglue" ++ XULRUNNER_INCLUDES=`pkg-config --cflags libxul` ++ XULRUNNER_LIBS="`pkg-config --libs libxul` -lxpcomglue" + export XULRUNNER_INCLUDES + export XULRUNNER_LIBS + MAKE_MOZILLA="make_xulrunner make_xpcominit" @@ -2871,14 +2868,15 @@ echo " *** Mozilla embedding support will not be compiled." --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak 2007-06-20 12:01:22.000000000 -0400 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak 2009-12-23 15:17:21.337309883 -0500 -@@ -1,5 +1,5 @@ - #******************************************************************************* --# Copyright (c) 2000, 2007 IBM Corporation and others. -+# Copyright (c) 2000, 2009 IBM Corporation and others. - # All rights reserved. This program and the accompanying materials - # are made available under the terms of the Eclipse Public License v1.0 - # which accompanies this distribution, and is available at -@@ -46,7 +46,7 @@ +@@ -39,6 +39,7 @@ + MOZILLA_LIB = lib$(MOZILLA_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so + XULRUNNER_LIB = lib$(XULRUNNER_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so + XPCOMINIT_LIB = lib$(XPCOMINIT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so ++WEBKIT_LIB = lib$(WEBKIT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so + GLX_LIB = lib$(GLX_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so + + CAIROCFLAGS = `pkg-config --cflags cairo` +@@ -46,11 +47,11 @@ # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0) GTKCFLAGS = `pkg-config --cflags gtk+-2.0` @@ -2887,19 +2885,24 @@ CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc -@@ -59,7 +59,7 @@ +-AWT_LFLAGS = -shared ++AWT_LFLAGS = -shared ${SWT_LFLAGS} + AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt + + ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0` +@@ -59,7 +60,7 @@ + GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2 - GLXCFLAGS = --GLXLIBS = -shared -fPIC -L/usr/X11R6/lib -lGL -lGLU -lm -+GLXLIBS = -shared -fPIC -L${LOCALBASE}/lib -lGL -lGLU -lm +-GLXLIBS = -L/usr/X11R6/lib -lGL -lGLU -lm ++GLXLIBS = -L${LOCALBASE}/lib -lGL -lGLU -lm # Uncomment for Native Stats tool #NATIVE_STATS = -DNATIVE_STATS -@@ -78,7 +78,17 @@ +@@ -78,7 +79,20 @@ -I$(JAVA_HOME)/include/freebsd \ ${SWT_PTR_CFLAGS} - MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic + MOZILLALFLAGS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic - +MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \ + -DNO__1XPCOMGlueStartup \ @@ -2912,19 +2915,23 @@ + -DNO_nsDynamicFunctionLoad +XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2 + ++WEBKITCFLAGS = `pkg-config --cflags gtk+-2.0 webkit-1.0` ++WEBKITLIBS = `pkg-config --libs webkit-1.0` ++ SWT_OBJECTS = swt.o c.o c_stats.o callback.o CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o AWT_OBJECTS = swt_awt.o -@@ -87,7 +97,7 @@ +@@ -87,14 +101,16 @@ ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o -XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o xpcomxulglue.o xpcomxulglue_stats.o +XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o ++WEBKIT_OBJECTS = swt.o webkit.o webkit_structs.o webkit_stats.o GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o -@@ -95,6 +105,7 @@ + CFLAGS = -O -Wall \ -DSWT_VERSION=$(SWT_VERSION) \ $(NATIVE_STATS) \ -DFREEBSD -DGTK \ @@ -2932,8 +2939,8 @@ -I$(JAVA_HOME)/include \ -I$(JAVA_HOME)/include/freebsd \ -fPIC \ -@@ -209,16 +220,16 @@ - $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS} +@@ -209,16 +225,16 @@ + $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS} xpcom.o: xpcom.cpp - $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp @@ -2953,8 +2960,8 @@ # # XULRunner lib -@@ -229,22 +240,16 @@ - $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS} +@@ -229,22 +245,16 @@ + $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} xpcomxul.o: xpcom.cpp - $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp @@ -2980,6 +2987,30 @@ # # XPCOMInit lib +@@ -264,6 +274,23 @@ + $(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit_stats.cpp + + # ++# WebKit lib ++# ++make_webkit: $(WEBKIT_LIB) ++ ++$(WEBKIT_LIB): $(WEBKIT_OBJECTS) ++ $(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) $(WEBKITLIBS) ++ ++webkit.o: webkitgtk.c ++ $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c -o webkit.o ++ ++webkit_structs.o: webkitgtk_structs.c ++ $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk_structs.c -o webkit_structs.o ++ ++webkit_stats.o: webkitgtk_stats.c webkitgtk_stats.h ++ $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk_stats.c -o webkit_stats.o ++ ++# + # GLX lib + # + make_glx: $(GLX_LIB) --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java 2009-12-23 15:12:33.298742157 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java 2009-12-23 15:14:12.577551971 -0500 @@ -23,18 +23,19 @@ @@ -3044,7 +3075,7 @@ +Bundle-Name: %fragmentName +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.x86; singleton:=true -+Bundle-Version: 3.5.0.qualifier ++Bundle-Version: 3.6.1.qualifier +Bundle-ManifestVersion: 2 +Bundle-Localization: fragment +Export-Package: @@ -4858,425 +4889,18 @@ +custom = true --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86/build.xml 1969-12-31 19:00:00.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86/build.xml 2009-12-23 15:14:12.583575548 -0500 -@@ -0,0 +1,419 @@ +@@ -0,0 +1,12 @@ + + + -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ ++ ++ ++ + -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ ++ ++ + -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ ++ + --- 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 @@ -7580,17 +7204,6 @@ +############################################################################### +fragmentName = Standard Widget Toolkit for GTK 2.0 +providerName = Eclipse.org ---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.team.cvs.ssh/src/org/eclipse/team/internal/ccvs/ssh/KnownHosts.java 2006-05-10 13:49:07.000000000 -0400 -+++ build/eclipse-3.5.2-src/plugins/org.eclipse.team.cvs.ssh/src/org/eclipse/team/internal/ccvs/ssh/KnownHosts.java 2009-12-23 15:14:12.596627282 -0500 -@@ -38,7 +38,7 @@ - } - - static String defaultFilename() { -- if (!Platform.getOS().equals(Platform.OS_LINUX)) return internalFilename(); -+ if (!Platform.getOS().equals(Platform.OS_LINUX) && !Platform.getOS().equals(Platform.OS_FREEBSD)) return internalFilename(); - String HOME = System.getProperty("user.home"); //$NON-NLS-1$ - if (HOME==null) return internalFilename(); - return HOME+"/.ssh/known_hosts"; //$NON-NLS-1$ --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.ui.intro.universal/plugin.xml 2009-05-26 16:09:14.000000000 -0400 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.ui.intro.universal/plugin.xml 2009-12-23 15:14:12.604659183 -0500 @@ -45,7 +45,7 @@ @@ -8068,3 +7681,91 @@ + +#endif +#endif +--- build/eclipse-3.6.1-src/plugins/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/CompoundIterator.java~ Fri Feb 19 13:12:49 2010 ++++ build/eclipse-3.6.1-src/plugins/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/CompoundIterator.java Wed Oct 20 15:55:11 2010 +@@ -25,7 +25,7 @@ + private final Iterator iteratorIterator; + private Iterator currentIterator; + +- private T nextObject = noElement(); ++ private Object nextObject = NO_ELEMENT; + + /** + * Creates a compound iterator that will iterated over the elements +@@ -47,8 +47,9 @@ + if (!positionNext()) + throw new NoSuchElementException(); + +- T nxt = nextObject; +- nextObject = noElement(); ++ @SuppressWarnings("unchecked") ++ T nxt = (T) nextObject; ++ nextObject = NO_ELEMENT; + return nxt; + } + +@@ -76,9 +77,4 @@ + nextObject = currentIterator.next(); + return true; + } +- +- @SuppressWarnings("unchecked") +- private static T noElement() { +- return (T) NO_ELEMENT; +- } +-} +\ No newline at end of file ++} +--- build/eclipse-3.6.1-src/plugins/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/MatchIteratorFilter.java.orig Fri Feb 19 13:12:48 2010 ++++ build/eclipse-3.6.1-src/plugins/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/MatchIteratorFilter.java Wed Oct 20 15:58:15 2010 +@@ -21,7 +21,7 @@ + + private final Iterator innerIterator; + +- private T nextObject = noElement(); ++ private Object nextObject = NO_ELEMENT; + + public MatchIteratorFilter(Iterator iterator) { + this.innerIterator = iterator; +@@ -35,8 +35,9 @@ + if (!positionNext()) + throw new NoSuchElementException(); + +- T nxt = nextObject; +- nextObject = noElement(); ++ @SuppressWarnings("unchecked") ++ T nxt = (T) nextObject; ++ nextObject = NO_ELEMENT; + return nxt; + } + +@@ -63,9 +64,4 @@ + } + return false; + } +- +- @SuppressWarnings("unchecked") +- private static T noElement() { +- return (T) NO_ELEMENT; +- } +-} +\ No newline at end of file ++} +--- 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 +@@ -33,6 +33,7 @@ + org.eclipse.equinox.launcher.motif.hpux.ia64_32,0.0.0=R36x_v20100810 + org.eclipse.equinox.http,0.0.0=v20100503 + org.eclipse.swt.gtk.linux.x86_64,0.0.0=v3655c ++org.eclipse.swt.gtk.freebsd.x86_64,0.0.0=v3655c + org.eclipse.swt.photon.qnx.x86,0.0.0=v3655c + org.eclipse.equinox.p2.ui.admin,0.0.0=v20100503 + org.eclipse.equinox.weaving.caching.j9,0.0.0=v20100503 +@@ -244,6 +245,7 @@ + org.eclipse.swt.examples,0.0.0=v3655c + org.eclipse.cvs,0.0.0=v20100414 + org.eclipse.swt.gtk.linux.x86,0.0.0=v3655c ++org.eclipse.swt.gtk.freebsd.x86,0.0.0=v3655c + org.eclipse.equinox.log,0.0.0=v20100503 + org.eclipse.equinox.jmx.client,0.0.0=v20100503 + org.eclipse.ui.win32,0.0.0=I20100509-0800 Index: files/patch-eclipse-build =================================================================== RCS file: /home/ncvs/ports/java/eclipse-devel/files/patch-eclipse-build,v retrieving revision 1.1 diff -u -r1.1 patch-eclipse-build --- files/patch-eclipse-build 1 May 2010 17:27:59 -0000 1.1 +++ files/patch-eclipse-build 26 Oct 2010 14:43:44 -0000 @@ -63,7 +63,21 @@ +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 -@@ -124,8 +124,7 @@ +@@ -117,11 +117,11 @@ + + + +- ++ + + + +- ++ + + + +@@ -166,8 +166,7 @@ @@ -73,59 +87,73 @@ -@@ -243,8 +242,14 @@ +@@ -292,8 +291,10 @@ + - - -- -- -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -269,6 +274,10 @@ - + +- +- ++ ++ ++ ++ + + + +@@ -306,9 +307,15 @@ + + + +- ++ ++ ++ ++ + +- ++ ++ ++ ++ + + + +@@ -321,6 +328,10 @@ -+ -+ -+ -+ + ++ ++ ++ ++ -@@ -651,7 +660,8 @@ - - - +@@ -804,7 +815,8 @@ + - -+ -+ ++ ++ -@@ -755,44 +765,42 @@ - +@@ -906,26 +918,25 @@ - -- -+ - + + +- - - -- -- -+ -+ -+ +- +- ++ ++ ++ ++ + - + @@ -139,44 +167,57 @@ - + - + - -- -- -- + + + +- ++ + -- -+ - -- -+ - -- -+ - -- -- -- -- -- -+ -+ -+ -+ -+ - + +@@ -938,7 +949,7 @@ + + + +- ++ + + + +@@ -990,8 +1001,8 @@ + + + +- +- ++ ++ + + + +@@ -1012,7 +1023,7 @@ + + + +- ++ + + + +@@ -1027,9 +1038,11 @@ + + + -+ + - --- 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 @@ @@ -190,16 +231,22 @@ 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 -@@ -5,7 +5,7 @@ +@@ -1,11 +1,11 @@ + buildArch=x86 + ws=gtk +-os=linux ++os=freebsd + buildId=M20100211-1343 buildTag=vM20100211-1343 - label=3.5.2 +-label=3.6.0 -bootclasspath=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar ++label=3.6.1 +bootclasspath=%%BOOTCLASSPATH%% #build.compiler=org.eclipse.jdt.core.JDTCompilerAdapter javacFailOnError=true -@@ -28,21 +28,21 @@ +@@ -29,21 +29,21 @@ CDC-1.1/PersonalBasis-1.1=${bootclasspath} CDC-1.1/PersonalJava-1.1=${bootclasspath} # Somehow bootclasspath isn't expanded when used by antRunner @@ -250,3 +297,15 @@ Delivered-To: freebsd-eclipse@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B33D31065670 for ; Tue, 26 Oct 2010 23:02:21 +0000 (UTC) (envelope-from john.a.schneider@gmail.com) Received: from mail-qy0-f175.google.com (mail-qy0-f175.google.com [209.85.216.175]) by mx1.freebsd.org (Postfix) with ESMTP id 2E9188FC18 for ; Tue, 26 Oct 2010 23:02:20 +0000 (UTC) Received: by qyk7 with SMTP id 7so2947346qyk.13 for ; Tue, 26 Oct 2010 16:02:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type; bh=ABXUD2nooNLkO34QJ6LAXOVI3RUraSLMkbbFXk6eTxo=; b=wqHNvJxu3YUEH1QtoVYerXuoY9GecLfo/wsbEwX9/fiho9E0bckZZniA92NB3USA74 7dTh9B9oGcCPzj6E9kgFylDdXQOuW/Y1nDaIJYEV6kjywaQQFUy3ZQUa6jd+Fnay5r58 bpTEI9N1grYRTiZgxnCjdwsKZ72nC0+pA4urA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=iHIFVMQ3dE9fKSrdGl+jNxbHmNjNE9o9fmM+kfy59fy0DNQY0gIRjcf2JKWb2bdZ/X ET4wnA2g/DTiVPM87FYkIHWMsdT3rRPVFtpJiHsmLyGbgm7RL7+8KDtBJBsmViy7Ef1P tIdWozWcBtzc5w7zXm0Qq5Hr/gp0VN+Z6VzbE= MIME-Version: 1.0 Received: by 10.224.206.138 with SMTP id fu10mr1911043qab.179.1288132529594; Tue, 26 Oct 2010 15:35:29 -0700 (PDT) Received: by 10.224.73.201 with HTTP; Tue, 26 Oct 2010 15:35:29 -0700 (PDT) In-Reply-To: <20101026.234718.59640143160036341.ken@tydfam.jp> References: <201008291749.01728.js@jschneider.com> <20101026.234718.59640143160036341.ken@tydfam.jp> Date: Tue, 26 Oct 2010 18:35:29 -0400 Message-ID: From: John Schneider To: ken Content-Type: multipart/mixed; boundary=20cf300facfbd9a3c604938cb90d X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: freebsd-eclipse@freebsd.org Subject: Re: Eclipse 3.6 (Helios) Alpha Port X-BeenThere: freebsd-eclipse@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "FreeBSD users of eclipse EDI, tools, rich client apps & ports." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Oct 2010 23:02:21 -0000 --20cf300facfbd9a3c604938cb90d Content-Type: text/plain; charset=ISO-8859-1 Hi Ken, I'd love to continue, but I don't have time now. Also, I've never done any serious patching before, so I'm not the best suited for this. Greg, any chance you could lend a hand? I've attached the initial port in case you don't have it. John On Tue, Oct 26, 2010 at 10:47 AM, ken wrote: > Hi! > Is there any plan/progress to port Helios based on John's initial work? > > --20cf300facfbd9a3c604938cb90d-- From owner-freebsd-eclipse@FreeBSD.ORG Wed Oct 27 10:57:23 2010 Return-Path: Delivered-To: freebsd-eclipse@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 32AE51065672 for ; Wed, 27 Oct 2010 10:57:23 +0000 (UTC) (envelope-from ken@tydfam.jp) Received: from daemon.sub.tydfam.jp (ns.tydfam.jp [61.197.228.42]) by mx1.freebsd.org (Postfix) with ESMTP id DA0958FC1D for ; Wed, 27 Oct 2010 10:57:22 +0000 (UTC) Received: from localhost (tyd3.sub.tydfam.jp [192.168.1.3]) by daemon.sub.tydfam.jp (8.14.4/8.14.3) with ESMTP id o9RAvH4D002252; Wed, 27 Oct 2010 19:57:17 +0900 (JST) (envelope-from ken@tydfam.jp) Date: Wed, 27 Oct 2010 19:57:17 +0900 (JST) Message-Id: <20101027.195717.519459540419521514.ken@tydfam.jp> To: Thomas.Gellekum@gmx.de From: ken In-Reply-To: <86ocahge29.fsf@siegel.tg.intern> References: <86ocahge29.fsf@siegel.tg.intern> X-Mailer: Mew version 6.3 on Emacs 23.2 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=4.4 required=9.5 tests=ALL_TRUSTED, DNS_FROM_OPENWHOIS, FH_DATE_PAST_20XX autolearn=no version=3.2.5 X-Spam-Level: **** X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on daemon.sub.tydfam.jp Cc: freebsd-eclipse@freebsd.org Subject: Re: Upgrade eclipse-devel to 3.6.1 X-BeenThere: freebsd-eclipse@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "FreeBSD users of eclipse EDI, tools, rich client apps & ports." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Oct 2010 10:57:23 -0000 Thomas, I have tried your patch attached, but had the following patch error. Could you try to compressing diff file? # patch -p < eclipse-devel.diff : : |diff -u -r1.1 freebsd-support.patch |--- files/freebsd-support.patch 1 May 2010 17:27:59 -0000 1.1 |+++ files/freebsd-support.patch 26 Oct 2010 14:43:43 -0000 -------------------------- Patching file files/freebsd-support.patch using Plan A... Hunk #1 succeeded at 10. Hunk #2 succeeded at 109. Hunk #3 succeeded at 175. Hunk #4 succeeded at 305. Hunk #5 succeeded at 314. Hunk #6 succeeded at 338. Hunk #7 succeeded at 863. Hunk #8 succeeded at 1113. Hunk #9 succeeded at 1271. Hunk #10 succeeded at 1327. Hunk #11 succeeded at 1649. Hunk #12 succeeded at 1989. Hunk #13 succeeded at 2221. Hunk #14 succeeded at 2229. Hunk #15 succeeded at 2238. Hunk #16 succeeded at 2253. patch: **** malformed patch at line 791: # From owner-freebsd-eclipse@FreeBSD.ORG Wed Oct 27 11:14:00 2010 Return-Path: Delivered-To: freebsd-eclipse@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2C3361065694 for ; Wed, 27 Oct 2010 11:14:00 +0000 (UTC) (envelope-from Thomas.Gellekum@gmx.de) Received: from mail.gmx.net (mailout-de.gmx.net [213.165.64.23]) by mx1.freebsd.org (Postfix) with SMTP id 77A908FC1D for ; Wed, 27 Oct 2010 11:13:58 +0000 (UTC) Received: (qmail invoked by alias); 27 Oct 2010 11:13:57 -0000 Received: from xdsl-78-34-216-244.netcologne.de (EHLO siegel.tg.intern) [78.34.216.244] by mail.gmx.net (mp005) with SMTP; 27 Oct 2010 13:13:57 +0200 X-Authenticated: #18235045 X-Provags-ID: V01U2FsdGVkX1+FibYYmMOF9X8c4LSY3Fqs4FvXVe3t4UB2R+O+ul QW/dIipRwEsbZr From: Thomas Gellekum To: ken In-Reply-To: <20101027.195717.519459540419521514.ken@tydfam.jp> (ken@tydfam.jp's message of "Wed, 27 Oct 2010 19:57:17 +0900 (JST)") References: <86ocahge29.fsf@siegel.tg.intern> <20101027.195717.519459540419521514.ken@tydfam.jp> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (berkeley-unix) Date: Wed, 27 Oct 2010 13:13:55 +0200 Message-ID: <86wrp3nb0s.fsf@siegel.tg.intern> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Y-GMX-Trusted: 0 Cc: freebsd-eclipse@freebsd.org Subject: Re: Upgrade eclipse-devel to 3.6.1 X-BeenThere: freebsd-eclipse@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "FreeBSD users of eclipse EDI, tools, rich client apps & ports." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Oct 2010 11:14:00 -0000 ken writes: > Thomas, > I have tried your patch attached, but had the following patch error. > Could you try to compressing diff file? Hm, maybe the patch was corrupted in the mail. You can now also get the file from . HTH, tg From owner-freebsd-eclipse@FreeBSD.ORG Wed Oct 27 13:49:51 2010 Return-Path: Delivered-To: freebsd-eclipse@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C93D210656C6 for ; Wed, 27 Oct 2010 13:49:51 +0000 (UTC) (envelope-from ken@tydfam.jp) Received: from daemon.sub.tydfam.jp (ns.tydfam.jp [61.197.228.42]) by mx1.freebsd.org (Postfix) with ESMTP id 7B3198FC1C for ; Wed, 27 Oct 2010 13:49:51 +0000 (UTC) Received: from localhost (tyd3.sub.tydfam.jp [192.168.1.3]) by daemon.sub.tydfam.jp (8.14.4/8.14.3) with ESMTP id o9RDngjb003306; Wed, 27 Oct 2010 22:49:42 +0900 (JST) (envelope-from ken@tydfam.jp) Date: Wed, 27 Oct 2010 22:49:42 +0900 (JST) Message-Id: <20101027.224942.59640143160037004.ken@tydfam.jp> To: Thomas.Gellekum@gmx.de From: ken In-Reply-To: <86wrp3nb0s.fsf@siegel.tg.intern> References: <86ocahge29.fsf@siegel.tg.intern> <20101027.195717.519459540419521514.ken@tydfam.jp> <86wrp3nb0s.fsf@siegel.tg.intern> X-Mailer: Mew version 6.3 on Emacs 23.2 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=4.4 required=9.5 tests=ALL_TRUSTED, DNS_FROM_OPENWHOIS, FH_DATE_PAST_20XX autolearn=no version=3.2.5 X-Spam-Level: **** X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on daemon.sub.tydfam.jp Cc: freebsd-eclipse@freebsd.org Subject: Re: Upgrade eclipse-devel to 3.6.1 X-BeenThere: freebsd-eclipse@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "FreeBSD users of eclipse EDI, tools, rich client apps & ports." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Oct 2010 13:49:51 -0000 Thank you! I downloaded and the patch applied cleanly. However, I have compile errors and could not complete the compilation on FreeBSD-current (amd64). It is seemingly because of org.eclipse.jdt.core.JDTCompilerAdapter not being compiled. : : : : [java] /usr/ports/java/eclipse-devel/work/eclipse-build-0.6.1/build/eclipse-3.6.1-src/plugins/org.eclipse.osgi/build.xml:69: Class not found: org.eclipse.jdt.core.JDTCompilerAdapter [java] at org.apache.tools.ant.ProjectHelper.addLocationToBuildException(ProjectHelper.java:508) [java] at org.apache.tools.ant.taskdefs.Ant.execute(Ant.java:418) [java] at org.apache.tools.ant.taskdefs.CallTarget.execute(CallTarget.java:105) From owner-freebsd-eclipse@FreeBSD.ORG Thu Oct 28 08:26:42 2010 Return-Path: Delivered-To: freebsd-eclipse@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 920F9106574D for ; Thu, 28 Oct 2010 08:26:42 +0000 (UTC) (envelope-from Thomas.Gellekum@gmx.de) Received: from mail.gmx.net (mailout-de.gmx.net [213.165.64.23]) by mx1.freebsd.org (Postfix) with SMTP id D32978FC13 for ; Thu, 28 Oct 2010 08:26:41 +0000 (UTC) Received: (qmail invoked by alias); 28 Oct 2010 08:26:39 -0000 Received: from xdsl-87-79-185-148.netcologne.de (EHLO siegel.tg.intern) [87.79.185.148] by mail.gmx.net (mp007) with SMTP; 28 Oct 2010 10:26:39 +0200 X-Authenticated: #18235045 X-Provags-ID: V01U2FsdGVkX1+Jh5FC6gGJd+WhXj8nft/V0h1bGXgTQvnGbBwv8f dorhTts+9PRN5/ From: Thomas Gellekum To: ken In-Reply-To: <20101027.224942.59640143160037004.ken@tydfam.jp> (ken@tydfam.jp's message of "Wed, 27 Oct 2010 22:49:42 +0900 (JST)") References: <86ocahge29.fsf@siegel.tg.intern> <20101027.195717.519459540419521514.ken@tydfam.jp> <86wrp3nb0s.fsf@siegel.tg.intern> <20101027.224942.59640143160037004.ken@tydfam.jp> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (berkeley-unix) Date: Thu, 28 Oct 2010 10:26:37 +0200 Message-ID: <86ocaepvsy.fsf@siegel.tg.intern> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Y-GMX-Trusted: 0 Cc: freebsd-eclipse@freebsd.org Subject: Re: Upgrade eclipse-devel to 3.6.1 X-BeenThere: freebsd-eclipse@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "FreeBSD users of eclipse EDI, tools, rich client apps & ports." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Oct 2010 08:26:42 -0000 ken writes: > Thank you! > I downloaded and the patch applied cleanly. > However, I have compile errors and could not complete the compilation on FreeBSD-current (amd64). > It is seemingly because of org.eclipse.jdt.core.JDTCompilerAdapter not being compiled. > > : : : : > [java] /usr/ports/java/eclipse-devel/work/eclipse-build-0.6.1/build/eclipse-3.6.1-src/plugins/org.eclipse.osgi/build.xml:69: Class not found: org.eclipse.jdt.core.JDTCompilerAdapter > [java] at org.apache.tools.ant.ProjectHelper.addLocationToBuildException(ProjectHelper.java:508) > [java] at org.apache.tools.ant.taskdefs.Ant.execute(Ant.java:418) > [java] at org.apache.tools.ant.taskdefs.CallTarget.execute(CallTarget.java:105) I can't reproduce this on my system (8-stable, i386, openjdk6). Can you find the error message for JDTCompilerAdapter? tg From owner-freebsd-eclipse@FreeBSD.ORG Thu Oct 28 13:01:19 2010 Return-Path: Delivered-To: freebsd-eclipse@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 28366106566B for ; Thu, 28 Oct 2010 13:01:19 +0000 (UTC) (envelope-from mgmartin@comcast.net) Received: from mx.appliedtechnicalknowledge.com (appliedtechnicalknowledge.com [173.14.31.49]) by mx1.freebsd.org (Postfix) with ESMTP id CE7628FC15 for ; Thu, 28 Oct 2010 13:01:18 +0000 (UTC) Received: from [10.0.0.4] (gandalf.martins.home [10.0.0.4]) by mx.appliedtechnicalknowledge.com (Postfix) with ESMTPSA id 407112FA82; Thu, 28 Oct 2010 06:44:24 -0600 (MDT) Message-ID: <4CC97027.9050805@comcast.net> Date: Thu, 28 Oct 2010 06:44:23 -0600 From: Michael Martin User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US; rv:1.9.2.11) Gecko/20101024 Thunderbird/3.1.5 MIME-Version: 1.0 To: Thomas Gellekum References: <86ocahge29.fsf@siegel.tg.intern> <20101027.195717.519459540419521514.ken@tydfam.jp> <86wrp3nb0s.fsf@siegel.tg.intern> <20101027.224942.59640143160037004.ken@tydfam.jp> <86ocaepvsy.fsf@siegel.tg.intern> In-Reply-To: <86ocaepvsy.fsf@siegel.tg.intern> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: freebsd-eclipse@freebsd.org Subject: Re: Upgrade eclipse-devel to 3.6.1 X-BeenThere: freebsd-eclipse@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "FreeBSD users of eclipse EDI, tools, rich client apps & ports." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Oct 2010 13:01:19 -0000 On 10/28/2010 02:26, Thomas Gellekum wrote: > ken writes: > >> Thank you! >> I downloaded and the patch applied cleanly. >> However, I have compile errors and could not complete the compilation on FreeBSD-current (amd64). >> It is seemingly because of org.eclipse.jdt.core.JDTCompilerAdapter not being compiled. >> >> : : : : >> [java] /usr/ports/java/eclipse-devel/work/eclipse-build-0.6.1/build/eclipse-3.6.1-src/plugins/org.eclipse.osgi/build.xml:69: Class not found: org.eclipse.jdt.core.JDTCompilerAdapter >> [java] at org.apache.tools.ant.ProjectHelper.addLocationToBuildException(ProjectHelper.java:508) >> [java] at org.apache.tools.ant.taskdefs.Ant.execute(Ant.java:418) >> [java] at org.apache.tools.ant.taskdefs.CallTarget.execute(CallTarget.java:105) > I can't reproduce this on my system (8-stable, i386, openjdk6). Can you > find the error message for JDTCompilerAdapter? > > tg I'm seeing the same error on amd64 build. Running make the first time errors out in not finding the swt libraries. The native libraries look like they weren't build prior to building org.eclipse.jface , so ant make stops. Running make the second time does build the native swt libraries right away, then fails out with the error Ken shows. I've placed both full make outputs here: http://appliedtechnicalknowledge.com/freebsd/eclipse-3.6.1-make1.txt and http://appliedtechnicalknowledge.com/freebsd/eclipse-3.6.1-make2.txt It'll be nice to get this working. I recently built my own hacked 3.6.1 version manually replacing all native Linux amd64 libraries with FreeBSD built libraries. That works well, but a native port will be much cleaner. Thanks for the efforts. mm From owner-freebsd-eclipse@FreeBSD.ORG Thu Oct 28 13:04:20 2010 Return-Path: Delivered-To: freebsd-eclipse@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AFC541065672 for ; Thu, 28 Oct 2010 13:04:20 +0000 (UTC) (envelope-from ken@tydfam.jp) Received: from daemon.sub.tydfam.jp (ns.tydfam.jp [61.197.228.42]) by mx1.freebsd.org (Postfix) with ESMTP id 3BD818FC24 for ; Thu, 28 Oct 2010 13:04:19 +0000 (UTC) Received: from localhost (tyd3.sub.tydfam.jp [192.168.1.3]) by daemon.sub.tydfam.jp (8.14.4/8.14.3) with ESMTP id o9SD49RV003673; Thu, 28 Oct 2010 22:04:09 +0900 (JST) (envelope-from ken@tydfam.jp) Date: Thu, 28 Oct 2010 22:04:09 +0900 (JST) Message-Id: <20101028.220409.59640143160042971.ken@tydfam.jp> To: mgmartin@comcast.net From: ken In-Reply-To: <4CC97027.9050805@comcast.net> References: <20101027.224942.59640143160037004.ken@tydfam.jp> <86ocaepvsy.fsf@siegel.tg.intern> <4CC97027.9050805@comcast.net> X-Mailer: Mew version 6.3 on Emacs 23.2 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=4.4 required=9.5 tests=ALL_TRUSTED, DNS_FROM_OPENWHOIS, FH_DATE_PAST_20XX autolearn=no version=3.2.5 X-Spam-Level: **** X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on daemon.sub.tydfam.jp Cc: Thomas.Gellekum@gmx.de, freebsd-eclipse@freebsd.org Subject: Re: Upgrade eclipse-devel to 3.6.1 X-BeenThere: freebsd-eclipse@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "FreeBSD users of eclipse EDI, tools, rich client apps & ports." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Oct 2010 13:04:20 -0000 Hi! I found that some patch failed with freebsd-support.patch probably because of ^M in original freebsd-support.patch. I am struggling with it without success, yet. Would you upload patched eclipse-devel.tgz to your URL? I want to confirm if it is because of amd64 or simply because of patch failure. Regards, From owner-freebsd-eclipse@FreeBSD.ORG Thu Oct 28 13:13:50 2010 Return-Path: Delivered-To: freebsd-eclipse@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B6AF1106566B for ; Thu, 28 Oct 2010 13:13:50 +0000 (UTC) (envelope-from mgmartin@comcast.net) Received: from mx.appliedtechnicalknowledge.com (appliedtechnicalknowledge.com [173.14.31.49]) by mx1.freebsd.org (Postfix) with ESMTP id 925948FC0C for ; Thu, 28 Oct 2010 13:13:50 +0000 (UTC) Received: from [10.0.0.4] (gandalf.martins.home [10.0.0.4]) by mx.appliedtechnicalknowledge.com (Postfix) with ESMTPSA id 2094D2FB35; Thu, 28 Oct 2010 07:13:50 -0600 (MDT) Message-ID: <4CC9770D.3050605@comcast.net> Date: Thu, 28 Oct 2010 07:13:49 -0600 From: Michael Martin User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US; rv:1.9.2.11) Gecko/20101024 Thunderbird/3.1.5 MIME-Version: 1.0 To: ken References: <20101027.224942.59640143160037004.ken@tydfam.jp> <86ocaepvsy.fsf@siegel.tg.intern> <4CC97027.9050805@comcast.net> <20101028.220409.59640143160042971.ken@tydfam.jp> In-Reply-To: <20101028.220409.59640143160042971.ken@tydfam.jp> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Thomas.Gellekum@gmx.de, freebsd-eclipse@freebsd.org Subject: Re: Upgrade eclipse-devel to 3.6.1 X-BeenThere: freebsd-eclipse@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "FreeBSD users of eclipse EDI, tools, rich client apps & ports." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Oct 2010 13:13:50 -0000 > Hi! > I found that some patch failed with freebsd-support.patch probably because of ^M in original freebsd-support.patch. I am struggling with it without success, yet. > Would you upload patched eclipse-devel.tgz to your URL? I want to confirm if it is because of amd64 or simply because of patch failure. > > Regards, > I placed a patched only tar and a full tar after build breakage: http://appliedtechnicalknowledge.com/freebsd/eclipse-devel-patch-only.tgz , http://appliedtechnicalknowledge.com/freebsd/eclipse-devel.tgz mm From owner-freebsd-eclipse@FreeBSD.ORG Thu Oct 28 13:52:01 2010 Return-Path: Delivered-To: freebsd-eclipse@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2BD7C1065674 for ; Thu, 28 Oct 2010 13:52:01 +0000 (UTC) (envelope-from ken@tydfam.jp) Received: from daemon.sub.tydfam.jp (ns.tydfam.jp [61.197.228.42]) by mx1.freebsd.org (Postfix) with ESMTP id C768A8FC17 for ; Thu, 28 Oct 2010 13:52:00 +0000 (UTC) Received: from localhost (tyd3.sub.tydfam.jp [192.168.1.3]) by daemon.sub.tydfam.jp (8.14.4/8.14.3) with ESMTP id o9SDpqZV004274; Thu, 28 Oct 2010 22:51:52 +0900 (JST) (envelope-from ken@tydfam.jp) Date: Thu, 28 Oct 2010 22:51:52 +0900 (JST) Message-Id: <20101028.225152.519459540419512324.ken@tydfam.jp> To: Thomas.Gellekum@gmx.de, freebsd-eclipse@freebsd.org From: ken In-Reply-To: <20101028.220409.59640143160042971.ken@tydfam.jp> References: <86ocaepvsy.fsf@siegel.tg.intern> <4CC97027.9050805@comcast.net> <20101028.220409.59640143160042971.ken@tydfam.jp> X-Mailer: Mew version 6.3 on Emacs 23.2 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=4.4 required=9.5 tests=ALL_TRUSTED, DNS_FROM_OPENWHOIS, FH_DATE_PAST_20XX autolearn=no version=3.2.5 X-Spam-Level: **** X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on daemon.sub.tydfam.jp Cc: Subject: Re: Upgrade eclipse-devel to 3.6.1 X-BeenThere: freebsd-eclipse@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "FreeBSD users of eclipse EDI, tools, rich client apps & ports." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Oct 2010 13:52:01 -0000 Sorry, I send the previous e-mail to wrong address. From: ken Subject: Re: Upgrade eclipse-devel to 3.6.1 Date: Thu, 28 Oct 2010 22:04:09 +0900 (JST) > Hi! > I found that some patch failed with freebsd-support.patch probably because of ^M in original freebsd-support.patch. I am struggling with it without success, yet. > Would you upload patched eclipse-devel.tgz to your URL? I want to confirm if it is because of amd64 or simply because of patch failure. > > Regards, > > _______________________________________________ > freebsd-eclipse@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-eclipse > To unsubscribe, send any mail to "freebsd-eclipse-unsubscribe@freebsd.org" > From owner-freebsd-eclipse@FreeBSD.ORG Thu Oct 28 14:00:58 2010 Return-Path: Delivered-To: freebsd-eclipse@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 685E010656E1 for ; Thu, 28 Oct 2010 14:00:58 +0000 (UTC) (envelope-from Thomas.Gellekum@gmx.de) Received: from mail.gmx.net (mailout-de.gmx.net [213.165.64.22]) by mx1.freebsd.org (Postfix) with SMTP id AA9008FC0C for ; Thu, 28 Oct 2010 14:00:57 +0000 (UTC) Received: (qmail invoked by alias); 28 Oct 2010 14:00:55 -0000 Received: from xdsl-87-79-55-106.netcologne.de (EHLO siegel.tg.intern) [87.79.55.106] by mail.gmx.net (mp068) with SMTP; 28 Oct 2010 16:00:55 +0200 X-Authenticated: #18235045 X-Provags-ID: V01U2FsdGVkX19BSp1DIgZB8tdF/zw7F3/gpPGhWOsd4HC6bI2giU oy/L3Oxp0QE2b3 From: Thomas Gellekum To: Michael Martin In-Reply-To: <4CC97027.9050805@comcast.net> (Michael Martin's message of "Thu, 28 Oct 2010 06:44:23 -0600") References: <86ocahge29.fsf@siegel.tg.intern> <20101027.195717.519459540419521514.ken@tydfam.jp> <86wrp3nb0s.fsf@siegel.tg.intern> <20101027.224942.59640143160037004.ken@tydfam.jp> <86ocaepvsy.fsf@siegel.tg.intern> <4CC97027.9050805@comcast.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (berkeley-unix) Date: Thu, 28 Oct 2010 16:00:53 +0200 Message-ID: <86k4l2pgbu.fsf@siegel.tg.intern> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Y-GMX-Trusted: 0 Cc: freebsd-eclipse@freebsd.org Subject: Re: Upgrade eclipse-devel to 3.6.1 X-BeenThere: freebsd-eclipse@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "FreeBSD users of eclipse EDI, tools, rich client apps & ports." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Oct 2010 14:00:58 -0000 Michael Martin writes: > On 10/28/2010 02:26, Thomas Gellekum wrote: >> ken writes: >> >>> Thank you! >>> I downloaded and the patch applied cleanly. >>> However, I have compile errors and could not complete the compilation on FreeBSD-current (amd64). >>> It is seemingly because of org.eclipse.jdt.core.JDTCompilerAdapter not being compiled. >>> >>> : : : : >>> [java] /usr/ports/java/eclipse-devel/work/eclipse-build-0.6.1/build/eclipse-3.6.1-src/plugins/org.eclipse.osgi/build.xml:69: Class not found: org.eclipse.jdt.core.JDTCompilerAdapter >>> [java] at org.apache.tools.ant.ProjectHelper.addLocationToBuildException(ProjectHelper.java:508) >>> [java] at org.apache.tools.ant.taskdefs.Ant.execute(Ant.java:418) >>> [java] at org.apache.tools.ant.taskdefs.CallTarget.execute(CallTarget.java:105) >> I can't reproduce this on my system (8-stable, i386, openjdk6). Can you >> find the error message for JDTCompilerAdapter? >> >> tg > I'm seeing the same error on amd64 build. Ok, thanks for checking. I'll take a look at the make output you've provided. tg From owner-freebsd-eclipse@FreeBSD.ORG Fri Oct 29 13:34:12 2010 Return-Path: Delivered-To: freebsd-eclipse@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 60B1E106566C for ; Fri, 29 Oct 2010 13:34:12 +0000 (UTC) (envelope-from Thomas.Gellekum@gmx.de) Received: from mail.gmx.net (mailout-de.gmx.net [213.165.64.23]) by mx1.freebsd.org (Postfix) with SMTP id 9E9498FC0C for ; Fri, 29 Oct 2010 13:34:11 +0000 (UTC) Received: (qmail invoked by alias); 29 Oct 2010 13:34:09 -0000 Received: from xdsl-84-44-238-54.netcologne.de (EHLO siegel.tg.intern) [84.44.238.54] by mail.gmx.net (mp059) with SMTP; 29 Oct 2010 15:34:09 +0200 X-Authenticated: #18235045 X-Provags-ID: V01U2FsdGVkX1+7PecoJM67oVg8H2JsQ7H4ypLrDhdDdrTH01FwC7 MAFoNiRkPlN0vm From: Thomas Gellekum To: Michael Martin In-Reply-To: <4CC97027.9050805@comcast.net> (Michael Martin's message of "Thu, 28 Oct 2010 06:44:23 -0600") References: <86ocahge29.fsf@siegel.tg.intern> <20101027.195717.519459540419521514.ken@tydfam.jp> <86wrp3nb0s.fsf@siegel.tg.intern> <20101027.224942.59640143160037004.ken@tydfam.jp> <86ocaepvsy.fsf@siegel.tg.intern> <4CC97027.9050805@comcast.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (berkeley-unix) Date: Fri, 29 Oct 2010 15:34:07 +0200 Message-ID: <86zktxazsg.fsf@siegel.tg.intern> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Y-GMX-Trusted: 0 Cc: freebsd-eclipse@freebsd.org Subject: Re: Upgrade eclipse-devel to 3.6.1 X-BeenThere: freebsd-eclipse@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "FreeBSD users of eclipse EDI, tools, rich client apps & ports." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Oct 2010 13:34:12 -0000 Michael Martin writes: > I'm seeing the same error on amd64 build. I'm going to set up a virtual machine running FreeBSD/amd64 over the weekend. For now I might have a fix for this problem: > Running make the first time errors out in not finding the swt > libraries. The native libraries look like they weren't build prior to > building org.eclipse.jface , so ant make stops. If you'd care to check, here's the new diff: . tg