Index: eclipse/Makefile =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/Makefile,v retrieving revision 1.61 diff -u -r1.61 Makefile --- eclipse/Makefile 15 Feb 2009 03:19:41 -0000 1.61 +++ eclipse/Makefile 25 Feb 2009 03:46:06 -0000 @@ -4,16 +4,23 @@ # # $FreeBSD: ports/java/eclipse/Makefile,v 1.61 2009/02/15 03:19:41 glewis Exp $ # +ECLIPSE_VERSION=3.4.1.M20080911-1700 +ECLIPSE_BUILDID=${ECLIPSE_VERSION:C/.*(.[0-9]{8}-[0-9]{4})/\1/} +ECLIPSE_BUILDTYPE=${ECLIPSE_BUILDID:C/[0-9]{8}-[0-9]{4}//} +ECLIPSE_TIMESTAMP=${ECLIPSE_BUILDID:C/.([0-9]{8})-([0-9]{4})/\1\2/} +ECLIPSE_PDE_BUILD_VERSION=3.4.1.R34x_v20080805 +ECLIPSE_LAUNCHER_VERSION=1.0.101.R34x_v20080819 PORTNAME= eclipse -PORTVERSION= 3.4.1 +PORTVERSION= ${ECLIPSE_VERSION:C/(.*)\.[A-Z][0-9]{8}-[0-9]{4}/\1/} +PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= ${MASTER_SITE_ECLIPSE} -MASTER_SITE_SUBDIR= R-${PORTVERSION}-200809111700 +MASTER_SITE_SUBDIR= R-${PORTVERSION}-${ECLIPSE_TIMESTAMP} DISTNAME= eclipse-sourceBuild-srcIncluded-${PORTVERSION} DIST_SUBDIR= eclipse -MAINTAINER= freebsd-eclipse@FreeBSD.org +MAINTAINER= sepotvin@FreeBSD.org COMMENT= An open extensible IDE for anything and nothing in particular BUILD_DEPENDS= ant:${PORTSDIR}/devel/apache-ant \ @@ -40,11 +47,7 @@ NO_WRKSUBDIR= yes -PORTDESTDIR= ${PREFIX}/${ECLIPSE} - -ECLIPSE_OS= freebsd - -ECLIPSE_WS= gtk +PORTDESTDIR= ${PREFIX}/${PORTNAME} .if defined(WITHOUT_GNOMEVFS) MAKE_GNOME= @@ -75,8 +78,10 @@ MAKE_MOZILLA= .endif +ECLIPSE_OS= freebsd +ECLIPSE_WS= gtk .if (${ARCH} == "amd64") -ECLIPSE_ARCH= amd64 +ECLIPSE_ARCH= x86_64 ECLIPSE_SWT= gtk64 .else ECLIPSE_ARCH= x86 @@ -93,14 +98,15 @@ MAKE_CAIRO=${MAKE_CAIRO} \ MACHINE_ARCH=${MACHINE_ARCH} -PLIST_FILES= bin/${ECLIPSE} share/applications/${ECLIPSE}.desktop +PLIST_FILES= bin/${PORTNAME} share/applications/${PORTNAME}.desktop SWTBASE=${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT SWTGTK=${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT PI SWTMOZ=${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT Mozilla -ECLIPSE_IU=FreeBSD Eclipse SDK -ECLIPSE_IU_VERSION=${PORTVERSION}.${PORTREVISION} +JAVA_BOOTCLASSES=${JAVA_HOME}/jre/lib/rt.jar;${JAVA_HOME}/jre/lib/jce.jar;${JAVA_HOME}/jre/lib/jsse.jar +ECLIPSE_LAUNCHER=${WRKSRC}/eclipse/plugins/org.eclipse.equinox.launcher_${ECLIPSE_LAUNCHER_VERSION}.jar +ECLIPSE_PDE_BUILD=${WRKSRC}/eclipse/plugins/org.eclipse.pde.build_${ECLIPSE_PDE_BUILD_VERSION} post-patch: @${PATCH} ${PATCH_DIST_ARGS} -d "${SWTBASE}" -i ${FILESDIR}/post-patch-plugins-org.eclipse.swt-Eclipse_SWT-gtk-org-eclipse-swt-widgets-FileDialog.java @@ -110,37 +116,53 @@ @${PATCH} ${PATCH_DIST_ARGS} -d "${SWTGTK}" -i ${FILESDIR}/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-make_freebsd.mak @${PATCH} ${PATCH_DIST_ARGS} -d "${SWTGTK}" -i ${FILESDIR}/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-org-eclipse-swt-internal-gtk-OS.java @${PATCH} ${PATCH_DIST_ARGS} -d "${SWTMOZ}" -i ${FILESDIR}/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_Mozilla-gtk-org-eclipse-swt-browser-MozillaDelegate.java + @${MKDIR} ${WRKSRC}/packager + @${CP} ${WRKSRC}/plugins/org.eclipse.pde.build/templates/packager/customTargets.xml ${WRKSRC}/packager/ + @${PATCH} ${PATCH_DIST_ARGS} -d "${WRKSRC}" -i ${FILESDIR}/post-patch-packager-customTargets.xml + @${SED} -e "s+%%JAVA_BOOTCLASSES%%+${JAVA_BOOTCLASSES}+g" ${FILESDIR}/build.properties.in > ${WRKSRC}/build.properties + @${SED} \ + -e "s+%%ECLIPSE_ARCH%%+${ECLIPSE_ARCH}+g" \ + -e "s+%%ECLIPSE_BUILDID%%+${ECLIPSE_BUILDID}+g" \ + -e "s+%%ECLIPSE_BUILDTYPE%%+${ECLIPSE_BUILDTYPE}+g" \ + -e "s+%%ECLIPSE_TIMESTAMP%%+${ECLIPSE_TIMESTAMP}+g" \ + ${FILESDIR}/packager-packager.properties.in > ${WRKSRC}/packager/packager.properties + @${SED} \ + -e "s+%%ECLIPSE_ARCH%%+${ECLIPSE_ARCH}+g" \ + -e "s+%%WRKSRC%%+${WRKSRC}+g" \ + ${FILESDIR}/packager-packaging.map.in > ${WRKSRC}/packager/packaging.map + @${SED} \ + -e "s+%%ECLIPSE_VERSION%%+${ECLIPSE_VERSION}+g" \ + ${FILESDIR}/packager-sdk.product.in > ${WRKSRC}/packager/sdk.product + @${CP} ${FILESDIR}/packager-packaging.properties ${WRKSRC}/packager/packaging.properties do-build: @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \ ./build -os ${ECLIPSE_OS} -ws ${ECLIPSE_WS} -arch ${ECLIPSE_ARCH} -compilelibs) @${JAVA} \ - -jar ${WRKSRC}/eclipse/plugins/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar \ + -jar ${ECLIPSE_LAUNCHER} \ -data ${WRKSRC}/workspace \ - -application org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \ - -flavor tooling \ - -metadataRepositoryName "FreeBSD Eclipse" \ - -artifactRepositoryName "FreeBSD Eclipse" \ - -metadataRepository "file:${WRKSRC}/eclipse/metadata" \ - -artifactRepository "file:${WRKSRC}/eclipse/metadata" \ - -root "${ECLIPSE_IU}" \ - -rootVersion "${ECLIPSE_IU_VERSION}" \ - -source ${WRKSRC}/eclipse \ - -append \ - -publishArtifacts + -application org.eclipse.ant.core.antRunner \ + -consoleLog \ + -nosplash \ + -buildfile ${ECLIPSE_PDE_BUILD}/scripts/package.xml \ + -DpackagingInfo=${WRKSRC}/packager \ + -quiet do-install: @${MKDIR} ${PORTDESTDIR} + @${RM} -rf ${WRKSRC}/eclipse/configuration/.settings @${JAVA} \ - -Declipse.p2.data.area="file:${PORTDESTDIR}/p2" \ - -jar ${WRKSRC}/eclipse/plugins/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar \ + -Declipse.p2.data.area=file:${PORTDESTDIR}/p2 \ + -jar ${ECLIPSE_LAUNCHER} \ -data ${WRKSRC}/workspace \ -application org.eclipse.equinox.p2.director.app.application \ + -consoleLog \ + -nosplash \ -flavor tooling \ - -metadataRepository "file:${WRKSRC}/eclipse/metadata" \ - -artifactRepository "file:${WRKSRC}/eclipse/metadata" \ - -installIU "${ECLIPSE_IU}" \ - -version "${ECLIPSE_IU_VERSION}" \ + -metadataRepository file:${WRKSRC}/packager/repo \ + -artifactRepository file:${WRKSRC}/packager/repo \ + -installIU org.eclipse.sdk.ide \ + -version ${ECLIPSE_VERSION} \ -p2.os ${ECLIPSE_OS} \ -p2.ws ${ECLIPSE_WS} \ -p2.arch ${ECLIPSE_ARCH} \ @@ -149,8 +171,7 @@ -destination "${PORTDESTDIR}" \ -bundlepool "${PORTDESTDIR}" \ -roaming - (cd ${WRKSRC}/eclipse; \ - ${CP} -R about.html epl-v10.html icon.xpm notice.html readme ${PORTDESTDIR}) + @${RM} -rf ${POSTDESTDIR}/p2/org.eclipse.equinox.p2.core/cache @${SED} \ -e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \ -e "s+%%PREFIX%%+${PREFIX}+g" \ @@ -169,18 +190,18 @@ -e "s+%%JAVA_VENDOR_SPECIFICATION%%++g" \ ${WRKSRC}/eclipse.tmp .endif - @${INSTALL_SCRIPT} ${WRKSRC}/eclipse.tmp ${PREFIX}/bin/${ECLIPSE} + @${INSTALL_SCRIPT} ${WRKSRC}/eclipse.tmp ${PREFIX}/bin/${PORTNAME} @${SED} \ -e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \ - -e "s+%%ECLIPSE%%+${ECLIPSE}+g" \ + -e "s+%%ECLIPSE%%+${PORTNAME}+g" \ -e "s+%%PREFIX%%+${PREFIX}+g" \ ${FILESDIR}/eclipse.desktop > ${WRKSRC}/eclipse.desktop.tmp @${MKDIR} ${PREFIX}/share/applications/ || ${TRUE} - @${INSTALL_DATA} ${WRKSRC}/eclipse.desktop.tmp ${PREFIX}/share/applications/${ECLIPSE}.desktop + @${INSTALL_DATA} ${WRKSRC}/eclipse.desktop.tmp ${PREFIX}/share/applications/${PORTNAME}.desktop @-update-desktop-database - @(cd ${PREFIX}; ${FIND} -s ${ECLIPSE} -not -type d) >> ${TMPPLIST} + @(cd ${PREFIX}; ${FIND} -s ${PORTNAME} -not -type d) >> ${TMPPLIST} @echo '@exec ${PREFIX}/bin/update-desktop-database > /dev/null || /usr/bin/true' >> ${TMPPLIST} - @(cd ${PREFIX}; ${FIND} -s -d ${ECLIPSE} -type d) | ${SED} -ne 's,^,@dirrm ,p' >> ${TMPPLIST} + @(cd ${PREFIX}; ${FIND} -s -d ${PORTNAME} -type d) | ${SED} -ne 's,^,@dirrm ,p' >> ${TMPPLIST} @echo '@unexec ${PREFIX}/bin/update-desktop-database > /dev/null || /usr/bin/true' >> ${TMPPLIST} setup-user: Index: eclipse/files/build.properties.in =================================================================== RCS file: eclipse/files/build.properties.in diff -N eclipse/files/build.properties.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ eclipse/files/build.properties.in 16 Feb 2009 03:58:57 -0000 @@ -0,0 +1,4 @@ +CDC-1.0/Foundation-1.0=%%JAVA_BOOTCLASSES%% +J2SE-1.4=%%JAVA_BOOTCLASSES%% +J2SE-1.5=%%JAVA_BOOTCLASSES%% +JavaSE-1.6=%%JAVA_BOOTCLASSES%% Index: eclipse/files/packager-packager.properties.in =================================================================== RCS file: eclipse/files/packager-packager.properties.in diff -N eclipse/files/packager-packager.properties.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ eclipse/files/packager-packager.properties.in 24 Feb 2009 03:30:14 -0000 @@ -0,0 +1,96 @@ +############################################################################### +# Copyright (c) 2005, 2006 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 +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### + +repo = ${packagingInfo}/repo +p2.repo.name = FreeBSD Eclipse Repository +product = ${packagingInfo}/sdk.product +generate.p2.metadata=true +p2.metadata.repo = file:${repo} +p2.artifact.repo = file:${repo} +p2.flavor = tooling +p2.publish.artifacts=true +p2.metadata.repo.name=${p2.repo.name} +p2.artifact.repo.name=${p2.repo.name} + +generateVersionsList=true + +################## CONTENT ########################## +# A comma separated list of feature ids that will be part of the archive. +# This list must completely cover the features you want and all their dependencies. +featureList = org.eclipse.sdk + +# A comma seperated list of the components from which the features listed +# in featureList can be found. This is used to optimize the set of zips downloaded. +# The values given here should match those found at the end of the lines in the map file +# Specify * if you don't know +#componentFilter=full,root,root-launcher,root-sdk +componentFilter=* + +# The zip content types to fetch. Like the componentFilter, this filters the set of +# available zips and allows the packager to optimize the set of zips downloaded. +#contentFilter=runtime +contentFilter=sdk + +# The platform configuration (e.g., os, ws, arch) being packaged. *,*,* can be +# specified when the config is completely platform independent. Only one configuration +# can be specified at a time. +config = freebsd,gtk,%%ECLIPSE_ARCH%% + +archivesFormat = freebsd, gtk, %%ECLIPSE_ARCH%%-tar + +################ FOLDERS ############################ +#The directory used as a base for the all process +baseDirectory = ${packagingInfo} + +# The place in which all the scripts will be contained +workingDirectory = ${baseDirectory}/workingPlace +buildDirectory = ${workingDirectory} + +# The folder in which all the zips will be downloaded +downloadDirectory = ${baseDirectory}/toPackage + +# The folder where all the operations are being done +tempDirectory = ${baseDirectory}/temp + +# The place in which the zips are located +sourceFolder = ${downloadDirectory} + +################# SOURCES ########################### +# A comma separated list of the path where features and plugins are located. +# Locations can either be relative or absolute. +# An entry must point to one level above the "features" and "plugins" directory +#featurePaths = eclipse +#baseLocation=${tempDirectory}/${featurePaths} +target = ${tempDirectory}/eclipse + +################## MISC ########################## +# This controls the build id in the default name of the archive +timestamp=%%ECLIPSE_BUILDTIMESTAMP%% +buildType=%%ECLIPSE_BUILDTYPE%% +buildId=%%ECLIPSE_BUILDID%% +buildLabel=%%ECLIPSE_BUILDID%% + +archiveNamePrefix=eclipse + +# extra arguments to be passed to zip / unzip (-y is usually used on unix for zip) / tar +zipargs=-y -q +unzipArgs=-qq + +# the prefix in the archive +archivePrefix=eclipse + +# the folder in which the files that will be added to the archive will be placed +collectingFolder=eclipse + + +############### PACKAGING.PROPERTIES ############################# +# a relative path to the file containing the properties for element to package +packagingProperties = packaging.properties Index: eclipse/files/packager-packaging.map.in =================================================================== RCS file: eclipse/files/packager-packaging.map.in diff -N eclipse/files/packager-packaging.map.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ eclipse/files/packager-packaging.map.in 24 Feb 2009 03:31:54 -0000 @@ -0,0 +1 @@ +freebsd-gtk-%%ECLIPSE_ARCH%%-sdk.tar.gz=file:%%WRKSRC%%/result/ | | | sdk | eclipse Index: eclipse/files/packager-packaging.properties =================================================================== RCS file: eclipse/files/packager-packaging.properties diff -N eclipse/files/packager-packaging.properties --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ eclipse/files/packager-packaging.properties 24 Feb 2009 03:34:56 -0000 @@ -0,0 +1,41 @@ +############################################################################### +# Copyright (c) 2005, 2006 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 +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +# The chmod and links must indicate a path relative to the root directory. + +# List the files and folders to be copied into the root of eclipse for all platform +# configurations +root=epl-v10.html, notice.html, configuration/, .eclipseproduct, eclipse.ini, readme/ +root.permissions.755=eclipse,*.so* +root.macosx.carbon.ppc.permissions.755=Eclipse.app/Contents/MacOS/eclipse +root.macosx.cocoa.x86.permissions.755=Eclipse.app/Contents/MacOS/eclipse +root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/eclipse +root.win32.win32.x86=eclipse.exe,eclipsec.exe +root.win32.win32.x86_64=eclipse.exe,eclipsec.exe +root.win32.wpf.x86=eclipse.exe,eclipsec.exe +root.linux.motif.x86=eclipse,libcairo-swt.so,libXm.so.2,about_files/,about.html +root.linux.gtk.x86=eclipse,libcairo-swt.so,about_files/,about.html +root.linux.gtk.x86_64=eclipse,libcairo-swt.so,about_files/,about.html +root.linux.gtk.ppc=eclipse +root.hpux.motif.ia64_32=eclipse +root.macosx.carbon.ppc=eclipse,Eclipse.app/ +root.macosx.carbon.ppc.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS +root.macosx.carbon.x86=eclipse,Eclipse.app/ +root.macosx.carbon.x86.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS +root.macosx.cocoa.ppc=eclipse,Eclipse.app/ +root.macosx.cocoa.ppc.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS +root.macosx.cocoa.x86=eclipse,Eclipse.app/ +root.macosx.cocoa.x86.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS +root.macosx.cocoa.x86_64=eclipse,Eclipse.app/ +root.macosx.cocoa.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS +root.aix.motif.ppc=eclipse +root.solaris.gtk.sparc=eclipse,Eclipse.l.pm,Eclipse.m.pm,Eclipse.s.pm,Eclipse.t.pm +root.freebsd.gtk.x86=eclipse,about_files/,about.html +root.freebsd.gtk.x86_64=eclipse,about_files/,about.html Index: eclipse/files/packager-sdk.product.in =================================================================== RCS file: eclipse/files/packager-sdk.product.in diff -N eclipse/files/packager-sdk.product.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ eclipse/files/packager-sdk.product.in 24 Feb 2009 03:37:04 -0000 @@ -0,0 +1,38 @@ + + + + + + + + + + -showsplash +org.eclipse.platform + -Xdock:icon=../Resources/Eclipse.icns +-XstartOnFirstThread +-Xms40m +-Xmx256m +-XX:MaxPermSize=256m +-Dorg.eclipse.swt.internal.carbon.smallFonts + + + + + + + + + + + + + + + + + + + + + Index: eclipse/files/patch-assemble.org.eclipse.sdk.all.xml =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-assemble.org.eclipse.sdk.all.xml,v retrieving revision 1.1 diff -u -r1.1 patch-assemble.org.eclipse.sdk.all.xml --- eclipse/files/patch-assemble.org.eclipse.sdk.all.xml 15 Feb 2009 03:19:41 -0000 1.1 +++ eclipse/files/patch-assemble.org.eclipse.sdk.all.xml 16 Feb 2009 03:58:57 -0000 @@ -5,7 +5,7 @@ + -+ ++ Index: eclipse/files/patch-assemble.org.eclipse.sdk.freebsd.gtk.x86_64.xml =================================================================== RCS file: eclipse/files/patch-assemble.org.eclipse.sdk.freebsd.gtk.x86_64.xml diff -N eclipse/files/patch-assemble.org.eclipse.sdk.freebsd.gtk.x86_64.xml --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ eclipse/files/patch-assemble.org.eclipse.sdk.freebsd.gtk.x86_64.xml 16 Feb 2009 03:58:57 -0000 @@ -0,0 +1,21 @@ +--- assemble.org.eclipse.sdk.freebsd.gtk.x86_64.xml.orig 2009-02-15 20:17:31.428811457 -0500 ++++ assemble.org.eclipse.sdk.freebsd.gtk.x86_64.xml 2009-02-15 20:19:39.389340239 -0500 +@@ -147,6 +147,7 @@ + + + ++ + + + +@@ -660,6 +661,10 @@ + + + ++ ++ ++ ++ + + + Index: eclipse/files/patch-build =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-build,v retrieving revision 1.6 diff -u -r1.6 patch-build --- eclipse/files/patch-build 15 Feb 2009 03:19:41 -0000 1.6 +++ eclipse/files/patch-build 16 Feb 2009 03:58:57 -0000 @@ -5,7 +5,7 @@ fi -if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ia64" ] || [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-x86" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32"] || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-ia64" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "win32-wpf-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32" ] || [ "$os-$ws-$arch" = "linux-gtk-s390" ] || [ "$os-$ws-$arch" = "linux-gtk-s390x" ] -+if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ia64" ] || [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-x86" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32"] || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-ia64" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "win32-wpf-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32" ] || [ "$os-$ws-$arch" = "linux-gtk-s390" ] || [ "$os-$ws-$arch" = "linux-gtk-s390x" ] || [ "$os-$ws-$arch" = "freebsd-gtk-x86" ] || [ "$os-$ws-$arch" = "freebsd-gtk-amd64" ] ++if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ia64" ] || [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-x86" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32" ] || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-ia64" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "win32-wpf-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32" ] || [ "$os-$ws-$arch" = "linux-gtk-s390" ] || [ "$os-$ws-$arch" = "linux-gtk-s390x" ] || [ "$os-$ws-$arch" = "freebsd-gtk-x86" ] || [ "$os-$ws-$arch" = "freebsd-gtk-x86_64" ] then ORIGCLASSPATH=$CLASSPATH;export ORIGCLASSPATH ant -q -buildfile jdtcoresrc/compilejdtcorewithjavac.xml -propertyfile build.properties Index: eclipse/files/patch-build.properties =================================================================== RCS file: eclipse/files/patch-build.properties diff -N eclipse/files/patch-build.properties --- eclipse/files/patch-build.properties 15 Feb 2009 03:19:41 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,10 +0,0 @@ ---- build.properties.orig 2008-08-02 14:21:21.000000000 -0400 -+++ build.properties 2008-08-02 14:50:18.000000000 -0400 -@@ -1,3 +1,3 @@ --J2SE-1.4= --J2SE-1.5= --JavaSE-1.6= -\ No newline at end of file -+#J2SE-1.4= -+#J2SE-1.5= -+#JavaSE-1.6= Index: eclipse/files/patch-build.xml =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-build.xml,v retrieving revision 1.7 diff -u -r1.7 patch-build.xml --- eclipse/files/patch-build.xml 15 Feb 2009 03:19:41 -0000 1.7 +++ eclipse/files/patch-build.xml 16 Feb 2009 03:58:57 -0000 @@ -1,11 +1,11 @@ ---- build.xml.orig 2008-09-29 19:16:32.000000000 -0400 -+++ build.xml 2008-09-29 19:19:37.000000000 -0400 +--- build.xml.orig 2009-02-15 20:58:04.041374506 -0500 ++++ build.xml 2009-02-15 20:57:43.961291144 -0500 @@ -1,7 +1,7 @@ - -+ ++ @@ -18,50 +18,54 @@ + + + -+ -+ -+ -+ ++ ++ ++ ++ + -@@ -71,6 +81,25 @@ +@@ -71,6 +81,29 @@ -+ -+ -+ -+ -+ -+ -+ ++ ++ ++ ++ ++ ++ + + + -+ -+ -+ -+ -+ -+ -+ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + -@@ -277,6 +306,8 @@ +@@ -277,6 +310,8 @@ + -+ ++ -@@ -284,7 +315,10 @@ +@@ -284,7 +319,10 @@ Index: eclipse/files/patch-features-org.eclipse.cvs-build.xml =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-features-org.eclipse.cvs-build.xml,v retrieving revision 1.1 diff -u -r1.1 patch-features-org.eclipse.cvs-build.xml --- eclipse/files/patch-features-org.eclipse.cvs-build.xml 15 Feb 2009 03:19:41 -0000 1.1 +++ eclipse/files/patch-features-org.eclipse.cvs-build.xml 16 Feb 2009 03:58:57 -0000 @@ -19,9 +19,9 @@ -+ -+ -+ ++ ++ ++ + + + @@ -35,7 +35,7 @@ + -+ ++ Index: eclipse/files/patch-features-org.eclipse.cvs.source-build.xml =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-features-org.eclipse.cvs.source-build.xml,v retrieving revision 1.1 diff -u -r1.1 patch-features-org.eclipse.cvs.source-build.xml --- eclipse/files/patch-features-org.eclipse.cvs.source-build.xml 15 Feb 2009 03:19:41 -0000 1.1 +++ eclipse/files/patch-features-org.eclipse.cvs.source-build.xml 16 Feb 2009 03:58:57 -0000 @@ -6,7 +6,7 @@ + + -+ ++ + @@ -16,7 +16,7 @@ + -+ ++ Index: eclipse/files/patch-features-org.eclipse.equinox.executable-feature.xml =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-features-org.eclipse.equinox.executable-feature.xml,v retrieving revision 1.1 diff -u -r1.1 patch-features-org.eclipse.equinox.executable-feature.xml --- eclipse/files/patch-features-org.eclipse.equinox.executable-feature.xml 15 Feb 2009 03:19:41 -0000 1.1 +++ eclipse/files/patch-features-org.eclipse.equinox.executable-feature.xml 16 Feb 2009 03:58:57 -0000 @@ -21,10 +21,10 @@ fragment="true"/> " @@ -40,7 +37,7 @@ javaHome="/usr/jdk/jdk1.5.0_01" OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" #PATH=/usr/ccs/bin:/opt/SUNWspro/bin:$PATH -@@ -154,7 +177,7 @@ +@@ -154,7 +174,7 @@ JAVA_HOME=$javaHome DEFAULT_JAVA=$defaultJava @@ -49,7 +46,7 @@ OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS JAVA_HOME DEFAULT_JAVA LIBRARY_DIR -@@ -162,13 +185,13 @@ +@@ -162,13 +182,13 @@ # If the OS is supported (a makefile exists) if [ "$makefile" != "" ]; then if [ "$extraArgs" != "" ]; then Index: eclipse/files/patch-features-org.eclipse.equinox.executable-target.build.properties =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-features-org.eclipse.equinox.executable-target.build.properties,v retrieving revision 1.1 diff -u -r1.1 patch-features-org.eclipse.equinox.executable-target.build.properties --- eclipse/files/patch-features-org.eclipse.equinox.executable-target.build.properties 15 Feb 2009 03:19:41 -0000 1.1 +++ eclipse/files/patch-features-org.eclipse.equinox.executable-target.build.properties 16 Feb 2009 04:16:24 -0000 @@ -1,6 +1,6 @@ ---- features/org.eclipse.equinox.executable/target.build.properties.orig 2008-08-02 14:57:57.000000000 -0400 -+++ features/org.eclipse.equinox.executable/target.build.properties 2008-08-02 15:02:29.000000000 -0400 -@@ -46,4 +46,9 @@ +--- features/org.eclipse.equinox.executable/target.build.properties.orig 2009-02-15 19:26:32.101660938 -0500 ++++ features/org.eclipse.equinox.executable/target.build.properties 2009-02-15 20:02:53.388184225 -0500 +@@ -46,4 +46,7 @@ root.qnx.photon.x86=bin/photon/qnx/x86 root.linux.motif.x86=bin/motif/linux/x86,motif_root @@ -9,6 +9,4 @@ +root.linux.motif.x86.permissions.755=libXm.so.2,libcairo-swt.so + +root.freebsd.gtk.x86=bin/gtk/freebsd/x86,gtk_root -+root.freebsd.gtk.x86.permissions.755=${launcherName} -+root.freebsd.gtk.amd64=bin/gtk/freebsd/amd64,gtk_root -+root.freebsd.gtk.amd64.permissions.755=${launcherName} ++root.freebsd.gtk.x86_64=bin/gtk/freebsd/x86_64,gtk_root Index: eclipse/files/patch-features-org.eclipse.equinox.executable-target.build.xml =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-features-org.eclipse.equinox.executable-target.build.xml,v retrieving revision 1.1 diff -u -r1.1 patch-features-org.eclipse.equinox.executable-target.build.xml --- eclipse/files/patch-features-org.eclipse.equinox.executable-target.build.xml 15 Feb 2009 03:19:41 -0000 1.1 +++ eclipse/files/patch-features-org.eclipse.equinox.executable-target.build.xml 16 Feb 2009 03:58:57 -0000 @@ -19,13 +19,13 @@ -+ -+ -+ -+ ++ ++ ++ ++ + + -+ ++ + @@ -35,7 +35,7 @@ + -+ ++ Index: eclipse/files/patch-features-org.eclipse.equinox.p2.user.ui-build.xml =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-features-org.eclipse.equinox.p2.user.ui-build.xml,v retrieving revision 1.1 diff -u -r1.1 patch-features-org.eclipse.equinox.p2.user.ui-build.xml --- eclipse/files/patch-features-org.eclipse.equinox.p2.user.ui-build.xml 15 Feb 2009 03:19:41 -0000 1.1 +++ eclipse/files/patch-features-org.eclipse.equinox.p2.user.ui-build.xml 16 Feb 2009 03:58:57 -0000 @@ -6,7 +6,7 @@ + + -+ ++ + @@ -16,7 +16,7 @@ + -+ ++ Index: eclipse/files/patch-features-org.eclipse.equinox.p2.user.ui.source-build.xml =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-features-org.eclipse.equinox.p2.user.ui.source-build.xml,v retrieving revision 1.1 diff -u -r1.1 patch-features-org.eclipse.equinox.p2.user.ui.source-build.xml --- eclipse/files/patch-features-org.eclipse.equinox.p2.user.ui.source-build.xml 15 Feb 2009 03:19:41 -0000 1.1 +++ eclipse/files/patch-features-org.eclipse.equinox.p2.user.ui.source-build.xml 16 Feb 2009 03:58:57 -0000 @@ -6,7 +6,7 @@ + + -+ ++ + @@ -16,7 +16,7 @@ + -+ ++ Index: eclipse/files/patch-features-org.eclipse.help-build.xml =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-features-org.eclipse.help-build.xml,v retrieving revision 1.1 diff -u -r1.1 patch-features-org.eclipse.help-build.xml --- eclipse/files/patch-features-org.eclipse.help-build.xml 15 Feb 2009 03:19:41 -0000 1.1 +++ eclipse/files/patch-features-org.eclipse.help-build.xml 16 Feb 2009 03:58:57 -0000 @@ -6,7 +6,7 @@ + + -+ ++ + @@ -16,7 +16,7 @@ + -+ ++ Index: eclipse/files/patch-features-org.eclipse.help.source-build.xml =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-features-org.eclipse.help.source-build.xml,v retrieving revision 1.1 diff -u -r1.1 patch-features-org.eclipse.help.source-build.xml --- eclipse/files/patch-features-org.eclipse.help.source-build.xml 15 Feb 2009 03:19:41 -0000 1.1 +++ eclipse/files/patch-features-org.eclipse.help.source-build.xml 16 Feb 2009 03:58:57 -0000 @@ -6,7 +6,7 @@ + + -+ ++ + @@ -16,7 +16,7 @@ + -+ ++ Index: eclipse/files/patch-features-org.eclipse.jdt-build.xml =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-features-org.eclipse.jdt-build.xml,v retrieving revision 1.1 diff -u -r1.1 patch-features-org.eclipse.jdt-build.xml --- eclipse/files/patch-features-org.eclipse.jdt-build.xml 15 Feb 2009 03:19:41 -0000 1.1 +++ eclipse/files/patch-features-org.eclipse.jdt-build.xml 16 Feb 2009 03:58:57 -0000 @@ -19,9 +19,9 @@ -+ -+ -+ ++ ++ ++ + + + @@ -35,7 +35,7 @@ + -+ ++ Index: eclipse/files/patch-features-org.eclipse.jdt.source-build.xml =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-features-org.eclipse.jdt.source-build.xml,v retrieving revision 1.1 diff -u -r1.1 patch-features-org.eclipse.jdt.source-build.xml --- eclipse/files/patch-features-org.eclipse.jdt.source-build.xml 15 Feb 2009 03:19:41 -0000 1.1 +++ eclipse/files/patch-features-org.eclipse.jdt.source-build.xml 16 Feb 2009 03:58:57 -0000 @@ -6,7 +6,7 @@ + + -+ ++ + @@ -16,7 +16,7 @@ + -+ ++ Index: eclipse/files/patch-features-org.eclipse.pde-build.xml =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-features-org.eclipse.pde-build.xml,v retrieving revision 1.1 diff -u -r1.1 patch-features-org.eclipse.pde-build.xml --- eclipse/files/patch-features-org.eclipse.pde-build.xml 15 Feb 2009 03:19:41 -0000 1.1 +++ eclipse/files/patch-features-org.eclipse.pde-build.xml 16 Feb 2009 03:58:57 -0000 @@ -6,7 +6,7 @@ + + -+ ++ + @@ -16,7 +16,7 @@ + -+ ++ Index: eclipse/files/patch-features-org.eclipse.pde.p2-build.xml =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-features-org.eclipse.pde.p2-build.xml,v retrieving revision 1.1 diff -u -r1.1 patch-features-org.eclipse.pde.p2-build.xml --- eclipse/files/patch-features-org.eclipse.pde.p2-build.xml 15 Feb 2009 03:19:41 -0000 1.1 +++ eclipse/files/patch-features-org.eclipse.pde.p2-build.xml 16 Feb 2009 03:58:57 -0000 @@ -6,7 +6,7 @@ + + -+ ++ + @@ -16,7 +16,7 @@ + -+ ++ Index: eclipse/files/patch-features-org.eclipse.pde.p2.source-build.xml =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-features-org.eclipse.pde.p2.source-build.xml,v retrieving revision 1.1 diff -u -r1.1 patch-features-org.eclipse.pde.p2.source-build.xml --- eclipse/files/patch-features-org.eclipse.pde.p2.source-build.xml 15 Feb 2009 03:19:41 -0000 1.1 +++ eclipse/files/patch-features-org.eclipse.pde.p2.source-build.xml 16 Feb 2009 03:58:57 -0000 @@ -6,7 +6,7 @@ + + -+ ++ + @@ -16,7 +16,7 @@ + -+ ++ Index: eclipse/files/patch-features-org.eclipse.pde.source-build.xml =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-features-org.eclipse.pde.source-build.xml,v retrieving revision 1.1 diff -u -r1.1 patch-features-org.eclipse.pde.source-build.xml --- eclipse/files/patch-features-org.eclipse.pde.source-build.xml 15 Feb 2009 03:19:41 -0000 1.1 +++ eclipse/files/patch-features-org.eclipse.pde.source-build.xml 16 Feb 2009 03:58:57 -0000 @@ -6,7 +6,7 @@ + + -+ ++ + @@ -16,7 +16,7 @@ + -+ ++ Index: eclipse/files/patch-features-org.eclipse.platform-build.properties =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-features-org.eclipse.platform-build.properties,v retrieving revision 1.1 diff -u -r1.1 patch-features-org.eclipse.platform-build.properties --- eclipse/files/patch-features-org.eclipse.platform-build.properties 15 Feb 2009 03:19:41 -0000 1.1 +++ eclipse/files/patch-features-org.eclipse.platform-build.properties 16 Feb 2009 04:17:38 -0000 @@ -1,18 +1,16 @@ ---- features/org.eclipse.platform/build.properties.orig 2008-08-02 15:18:51.000000000 -0400 -+++ features/org.eclipse.platform/build.properties 2008-08-02 15:20:21.000000000 -0400 -@@ -49,6 +49,11 @@ +--- features/org.eclipse.platform/build.properties.orig 2009-02-15 19:26:44.521712369 -0500 ++++ features/org.eclipse.platform/build.properties 2009-02-15 20:08:31.509583453 -0500 +@@ -49,6 +49,9 @@ #root.linux.gtk.ia64=../../features/org.eclipse.equinox.executable/bin/gtk/linux/ia64,gtk root.hpux.motif.ia64_32=../../features/org.eclipse.equinox.executable/bin/motif/hpux/ia64_32,motif +root.freebsd.gtk.x86=about_files/freebsd.gtk.x86,../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/x86,gtk -+root.freebsd.gtk.x86.permissions.755=*.so* -+root.freebsd.gtk.amd64=about_files/freebsd.gtk.amd64,../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/amd64,gtk -+root.freebsd.gtk.amd64.permissions.755=*.so* ++root.freebsd.gtk.x86_64=about_files/freebsd.gtk.x86_64,../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/x86_64,gtk + # Need to be fixed to reflect eventual change into feature.xml #root.qnx.photon.x86=../../features/org.eclipse.equinox.executable/bin/photon/qnx/x86,win32 -@@ -62,4 +67,4 @@ +@@ -62,4 +65,4 @@ #expected location of eclipse executable when compiled as part of build root.linux.gtk.ppc64=../../launchertmp,gtk root.linux.gtk.ppc64.permissions.755=*.so* Index: eclipse/files/patch-features-org.eclipse.platform-build.xml =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-features-org.eclipse.platform-build.xml,v retrieving revision 1.1 diff -u -r1.1 patch-features-org.eclipse.platform-build.xml --- eclipse/files/patch-features-org.eclipse.platform-build.xml 15 Feb 2009 03:19:41 -0000 1.1 +++ eclipse/files/patch-features-org.eclipse.platform-build.xml 16 Feb 2009 04:17:59 -0000 @@ -1,11 +1,11 @@ ---- features/org.eclipse.platform/build.xml.orig 2008-09-25 19:20:11.000000000 -0400 -+++ features/org.eclipse.platform/build.xml 2008-09-25 19:19:54.000000000 -0400 +--- features/org.eclipse.platform/build.xml.orig 2009-02-15 20:19:07.822215366 -0500 ++++ features/org.eclipse.platform/build.xml 2009-02-15 20:17:39.791852568 -0500 @@ -27,6 +27,11 @@ -+ -+ ++ ++ + + + @@ -36,7 +36,7 @@ -@@ -157,6 +172,11 @@ +@@ -157,6 +172,16 @@ @@ -45,19 +45,24 @@ + + + ++ ++ ++ ++ ++ -@@ -390,7 +410,7 @@ +@@ -390,7 +415,7 @@ - -+ ++ -@@ -517,6 +537,28 @@ +@@ -517,6 +542,27 @@ @@ -81,22 +86,21 @@ + + + -+ + -@@ -558,6 +600,28 @@ +@@ -558,6 +604,27 @@ -+ -+ -+ -+ ++ ++ ++ ++ + + -+ ++ + + + @@ -109,18 +113,17 @@ + + + -+ -+ ++ + -@@ -769,6 +833,8 @@ +@@ -769,6 +836,8 @@ + -+ ++ Index: eclipse/files/patch-features-org.eclipse.platform-feature.xml =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-features-org.eclipse.platform-feature.xml,v retrieving revision 1.1 diff -u -r1.1 patch-features-org.eclipse.platform-feature.xml --- eclipse/files/patch-features-org.eclipse.platform-feature.xml 15 Feb 2009 03:19:41 -0000 1.1 +++ eclipse/files/patch-features-org.eclipse.platform-feature.xml 16 Feb 2009 04:18:18 -0000 @@ -1,6 +1,6 @@ ---- features/org.eclipse.platform/feature.xml.orig 2008-08-02 15:25:04.000000000 -0400 -+++ features/org.eclipse.platform/feature.xml 2008-08-02 15:25:49.000000000 -0400 -@@ -96,6 +96,16 @@ +--- features/org.eclipse.platform/feature.xml.orig 2009-02-15 19:26:44.531713361 -0500 ++++ features/org.eclipse.platform/feature.xml 2009-02-15 20:22:35.033072891 -0500 +@@ -96,6 +96,26 @@ unpack="false"/> + + ++ ++ + + + + -+ ++ + @@ -28,7 +28,7 @@ + -+ ++ Index: eclipse/files/patch-features-org.eclipse.rcp-build.properties =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-features-org.eclipse.rcp-build.properties,v retrieving revision 1.1 diff -u -r1.1 patch-features-org.eclipse.rcp-build.properties --- eclipse/files/patch-features-org.eclipse.rcp-build.properties 15 Feb 2009 03:19:41 -0000 1.1 +++ eclipse/files/patch-features-org.eclipse.rcp-build.properties 16 Feb 2009 04:18:43 -0000 @@ -1,13 +1,11 @@ ---- features/org.eclipse.rcp/build.properties.orig 2008-08-02 15:34:27.000000000 -0400 -+++ features/org.eclipse.rcp/build.properties 2008-08-02 15:35:07.000000000 -0400 -@@ -42,6 +42,11 @@ +--- features/org.eclipse.rcp/build.properties.orig 2009-02-15 19:26:44.191710651 -0500 ++++ features/org.eclipse.rcp/build.properties 2009-02-15 20:26:06.036446225 -0500 +@@ -42,6 +42,9 @@ root.linux.motif.x86=../../features/org.eclipse.platform/about_files/linux.motif.x86,../../features/org.eclipse.equinox.executable/bin/motif/linux/x86,file:../../plugins/org.eclipse.swt.motif.linux.x86/libXm.so.2 root.linux.motif.x86.permissions.755=*.so* +root.freebsd.gtk.x86=../../features/org.eclipse.platform/about_files/freebsd.gtk.x86,../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/x86 -+root.freebsd.gtk.x86.permissions.755=*.so* -+root.freebsd.gtk.amd64=../../features/org.eclipse.platform/about_files/freebsd.gtk.amd64,../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/amd64 -+root.freebsd.gtk.amd64.permissions.755=*.so* ++root.freebsd.gtk.x86_64=../../features/org.eclipse.platform/about_files/freebsd.gtk.x86_64,../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/x86_64 + root.macosx.carbon.ppc=../../features/org.eclipse.equinox.executable/bin/carbon/macosx/ppc root.macosx.carbon.ppc.link=Eclipse.app/Contents/MacOS/eclipse,eclipse Index: eclipse/files/patch-features-org.eclipse.rcp-build.xml =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-features-org.eclipse.rcp-build.xml,v retrieving revision 1.1 diff -u -r1.1 patch-features-org.eclipse.rcp-build.xml --- eclipse/files/patch-features-org.eclipse.rcp-build.xml 15 Feb 2009 03:19:41 -0000 1.1 +++ eclipse/files/patch-features-org.eclipse.rcp-build.xml 16 Feb 2009 04:19:04 -0000 @@ -1,5 +1,5 @@ ---- features/org.eclipse.rcp/build.xml.orig 2008-09-26 19:38:22.000000000 -0400 -+++ features/org.eclipse.rcp/build.xml 2008-09-26 19:38:10.000000000 -0400 +--- features/org.eclipse.rcp/build.xml.orig 2009-02-15 20:31:09.427700700 -0500 ++++ features/org.eclipse.rcp/build.xml 2009-02-15 20:30:48.377613608 -0500 @@ -37,6 +37,11 @@ @@ -16,8 +16,8 @@ -+ -+ ++ ++ + + + @@ -28,8 +28,8 @@ -+ -+ ++ ++ + + + @@ -51,11 +51,11 @@ - -+ ++ -@@ -472,6 +492,25 @@ +@@ -472,6 +492,24 @@ @@ -76,22 +76,21 @@ + + + -+ + -@@ -506,6 +545,25 @@ +@@ -506,6 +544,24 @@ -+ -+ -+ -+ ++ ++ ++ ++ + + -+ ++ + + + @@ -101,18 +100,17 @@ + + + -+ -+ ++ + -@@ -684,6 +742,8 @@ +@@ -684,6 +740,8 @@ + -+ ++ Index: eclipse/files/patch-features-org.eclipse.rcp-feature.xml =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-features-org.eclipse.rcp-feature.xml,v retrieving revision 1.1 diff -u -r1.1 patch-features-org.eclipse.rcp-feature.xml --- eclipse/files/patch-features-org.eclipse.rcp-feature.xml 15 Feb 2009 03:19:41 -0000 1.1 +++ eclipse/files/patch-features-org.eclipse.rcp-feature.xml 16 Feb 2009 03:58:57 -0000 @@ -22,10 +22,10 @@ unpack="false"/> + + -+ -+ ++ ++ + + + @@ -23,7 +23,7 @@ + + -+ ++ + @@ -33,7 +33,7 @@ + -+ ++ Index: eclipse/files/patch-features-org.eclipse.rcp.source-feature.xml =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-features-org.eclipse.rcp.source-feature.xml,v retrieving revision 1.1 diff -u -r1.1 patch-features-org.eclipse.rcp.source-feature.xml --- eclipse/files/patch-features-org.eclipse.rcp.source-feature.xml 15 Feb 2009 03:19:41 -0000 1.1 +++ eclipse/files/patch-features-org.eclipse.rcp.source-feature.xml 16 Feb 2009 03:58:57 -0000 @@ -5,7 +5,7 @@ + -+ ++ Index: eclipse/files/patch-features-org.eclipse.sdk-build.properties =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-features-org.eclipse.sdk-build.properties,v retrieving revision 1.1 diff -u -r1.1 patch-features-org.eclipse.sdk-build.properties --- eclipse/files/patch-features-org.eclipse.sdk-build.properties 15 Feb 2009 03:19:41 -0000 1.1 +++ eclipse/files/patch-features-org.eclipse.sdk-build.properties 16 Feb 2009 03:58:57 -0000 @@ -5,4 +5,4 @@ root.linux.motif.x86=motif root.macosx.carbon.ppc=macosx.carbon +root.freebsd.gtk.x86=gtk -+root.freebsd.gtk.amd64=gtk ++root.freebsd.gtk.x86_64=gtk Index: eclipse/files/patch-features-org.eclipse.sdk-build.xml =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-features-org.eclipse.sdk-build.xml,v retrieving revision 1.1 diff -u -r1.1 patch-features-org.eclipse.sdk-build.xml --- eclipse/files/patch-features-org.eclipse.sdk-build.xml 15 Feb 2009 03:19:41 -0000 1.1 +++ eclipse/files/patch-features-org.eclipse.sdk-build.xml 16 Feb 2009 03:58:57 -0000 @@ -12,9 +12,9 @@ + + + -+ -+ -+ ++ ++ ++ + + + @@ -28,7 +28,7 @@ + -+ ++ Index: eclipse/files/patch-package.org.eclipse.sdk.all.xml =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-package.org.eclipse.sdk.all.xml,v retrieving revision 1.1 diff -u -r1.1 patch-package.org.eclipse.sdk.all.xml --- eclipse/files/patch-package.org.eclipse.sdk.all.xml 15 Feb 2009 03:19:41 -0000 1.1 +++ eclipse/files/patch-package.org.eclipse.sdk.all.xml 16 Feb 2009 03:58:57 -0000 @@ -5,7 +5,7 @@ + -+ ++ Index: eclipse/files/patch-plugins-org.eclipse.ant.ui-buildfiles-buildRemoteExtraJAR.xml =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-plugins-org.eclipse.ant.ui-buildfiles-buildRemoteExtraJAR.xml,v retrieving revision 1.1 diff -u -r1.1 patch-plugins-org.eclipse.ant.ui-buildfiles-buildRemoteExtraJAR.xml --- eclipse/files/patch-plugins-org.eclipse.ant.ui-buildfiles-buildRemoteExtraJAR.xml 15 Feb 2009 03:19:42 -0000 1.1 +++ eclipse/files/patch-plugins-org.eclipse.ant.ui-buildfiles-buildRemoteExtraJAR.xml 16 Feb 2009 03:58:57 -0000 @@ -7,14 +7,14 @@ - + + -+ ++ - + + -+ ++ Index: eclipse/files/patch-plugins-org.eclipse.core.net-natives-unix-GetProxyGnome-makefile =================================================================== RCS file: eclipse/files/patch-plugins-org.eclipse.core.net-natives-unix-GetProxyGnome-makefile diff -N eclipse/files/patch-plugins-org.eclipse.core.net-natives-unix-GetProxyGnome-makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ eclipse/files/patch-plugins-org.eclipse.core.net-natives-unix-GetProxyGnome-makefile 16 Feb 2009 03:58:57 -0000 @@ -0,0 +1,11 @@ +--- plugins/org.eclipse.core.net/natives/unix/GetProxyGnome/makefile.orig 2009-02-15 13:44:59.076375045 -0500 ++++ plugins/org.eclipse.core.net/natives/unix/GetProxyGnome/makefile 2009-02-15 19:33:42.687935173 -0500 +@@ -28,7 +28,7 @@ + libproxygnome.so: $(OBJS) $(USER_OBJS) + @echo 'Building target: $@' + @echo 'Invoking: GCC C Linker' +- gcc -m32 -shared -o"libproxygnome.so" $(OBJS) $(USER_OBJS) $(LIBS) ++ @gcc -shared -o"libproxygnome.so" $(OBJS) $(USER_OBJS) $(LIBS) + @echo 'Finished building target: $@' + @echo ' ' + Index: eclipse/files/patch-plugins-org.eclipse.core.net-natives-unix-GetProxyGnome-objects.mk =================================================================== RCS file: eclipse/files/patch-plugins-org.eclipse.core.net-natives-unix-GetProxyGnome-objects.mk diff -N eclipse/files/patch-plugins-org.eclipse.core.net-natives-unix-GetProxyGnome-objects.mk --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ eclipse/files/patch-plugins-org.eclipse.core.net-natives-unix-GetProxyGnome-objects.mk 16 Feb 2009 03:58:57 -0000 @@ -0,0 +1,8 @@ +--- plugins/org.eclipse.core.net/natives/unix/GetProxyGnome/objects.mk.orig 2009-02-15 19:17:00.008787963 -0500 ++++ plugins/org.eclipse.core.net/natives/unix/GetProxyGnome/objects.mk 2009-02-15 19:17:13.588843249 -0500 +@@ -4,4 +4,4 @@ + + USER_OBJS := + +-LIBS := -lgconf-2 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0 ++LIBS := -L${LOCALBASE}/lib -lgconf-2 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0 Index: eclipse/files/patch-plugins-org.eclipse.core.net-natives-unix-GetProxyGnome-subdir.mk =================================================================== RCS file: eclipse/files/patch-plugins-org.eclipse.core.net-natives-unix-GetProxyGnome-subdir.mk diff -N eclipse/files/patch-plugins-org.eclipse.core.net-natives-unix-GetProxyGnome-subdir.mk --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ eclipse/files/patch-plugins-org.eclipse.core.net-natives-unix-GetProxyGnome-subdir.mk 16 Feb 2009 03:58:57 -0000 @@ -0,0 +1,11 @@ +--- plugins/org.eclipse.core.net/natives/unix/GetProxyGnome/subdir.mk.orig 2009-02-15 13:45:15.836444551 -0500 ++++ plugins/org.eclipse.core.net/natives/unix/GetProxyGnome/subdir.mk 2009-02-15 19:33:53.177979019 -0500 +@@ -17,7 +17,7 @@ + %.o: ../%.c + @echo 'Building file: $<' + @echo 'Invoking: GCC C Compiler' +- gcc -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include/ -O0 -fPIC -g3 -Wall -c -fmessage-length=0 -m32 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<" ++ @gcc -I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd -I${LOCALBASE}/include/gconf/2 -I${LOCALBASE}/include/orbit-2.0 -I${LOCALBASE}/include/glib-2.0 -O0 -fPIC -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<" + @echo 'Finished building: $<' + @echo ' ' + Index: eclipse/files/patch-plugins-org.eclipse.core.net-natives-unix-getproxygnome.c =================================================================== RCS file: eclipse/files/patch-plugins-org.eclipse.core.net-natives-unix-getproxygnome.c diff -N eclipse/files/patch-plugins-org.eclipse.core.net-natives-unix-getproxygnome.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ eclipse/files/patch-plugins-org.eclipse.core.net-natives-unix-getproxygnome.c 16 Feb 2009 03:58:57 -0000 @@ -0,0 +1,11 @@ +--- plugins/org.eclipse.core.net/natives/unix/getproxygnome.c.orig 2009-02-15 19:43:28.612859430 -0500 ++++ plugins/org.eclipse.core.net/natives/unix/getproxygnome.c 2009-02-15 19:43:50.402949790 -0500 +@@ -16,7 +16,7 @@ + #include + #include + +-#ifdef __linux__ ++#if defined(__linux__) || defined (__FreeBSD__) + #include + #else + #include Index: eclipse/files/patch-plugins-org.eclipse.core.net.freebsd.x86_64-META-INF-MANIFEST.MF =================================================================== RCS file: eclipse/files/patch-plugins-org.eclipse.core.net.freebsd.x86_64-META-INF-MANIFEST.MF diff -N eclipse/files/patch-plugins-org.eclipse.core.net.freebsd.x86_64-META-INF-MANIFEST.MF --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ eclipse/files/patch-plugins-org.eclipse.core.net.freebsd.x86_64-META-INF-MANIFEST.MF 17 Feb 2009 01:08:19 -0000 @@ -0,0 +1,14 @@ +--- plugins/org.eclipse.core.net.freebsd.x86_64/META-INF/MANIFEST.MF.orig 2009-02-16 20:06:52.424901811 -0500 ++++ plugins/org.eclipse.core.net.freebsd.x86_64/META-INF/MANIFEST.MF 2009-02-16 20:07:30.240058207 -0500 +@@ -3,8 +3,9 @@ + Bundle-Name: %fragmentName + Bundle-Vendor: %providerName + Bundle-Localization: fragment +-Bundle-SymbolicName: org.eclipse.core.net.freebsd.x86;singleton:=true ++Bundle-SymbolicName: org.eclipse.core.net.freebsd.x86_64;singleton:=tr ++ ue + Bundle-Version: 1.0.0.qualifier + Fragment-Host: org.eclipse.core.net;bundle-version="1.1.0" +-Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86)) ++Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86_64)) + Bundle-RequiredExecutionEnvironment: J2SE-1.4 Index: eclipse/files/patch-plugins-org.eclipse.core.net.freebsd.x86_64-build.xml =================================================================== RCS file: eclipse/files/patch-plugins-org.eclipse.core.net.freebsd.x86_64-build.xml diff -N eclipse/files/patch-plugins-org.eclipse.core.net.freebsd.x86_64-build.xml --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ eclipse/files/patch-plugins-org.eclipse.core.net.freebsd.x86_64-build.xml 16 Feb 2009 04:26:23 -0000 @@ -0,0 +1,153 @@ +--- plugins/org.eclipse.core.net.freebsd.x86_64/build.xml.orig 2009-02-15 10:55:52.288949117 -0500 ++++ plugins/org.eclipse.core.net.freebsd.x86_64/build.xml 2009-02-15 10:55:37.650385879 -0500 +@@ -1,11 +1,11 @@ + +- ++ + + + + + +- ++ + + + +@@ -44,7 +44,7 @@ + + + +- ++ + + + +@@ -57,18 +57,18 @@ + + + +- ++ + + + + + + +- ++ + + + +- ++ + + + +@@ -110,10 +110,8 @@ + + + +- +- +- +- ++ ++ + + + +@@ -157,7 +155,7 @@ + + + +- ++ + + + +@@ -168,13 +166,13 @@ + + + +- +- ++ ++ + + + + +- ++ + + + +@@ -183,17 +181,17 @@ + + + +- ++ + + + + + + +- +- ++ ++ + +- ++ + + + +@@ -215,28 +213,28 @@ + + + +- +- ++ ++ + + + + + + +- ++ + + +- +- ++ ++ + + + + +- ++ + + + +- ++ + + + +@@ -252,7 +250,7 @@ + + + +- ++ + + + Index: eclipse/files/patch-plugins-org.eclipse.core.runtime-src-org-eclipse-core-runtime-Platform.java =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-plugins-org.eclipse.core.runtime-src-org-eclipse-core-runtime-Platform.java,v retrieving revision 1.1 diff -u -r1.1 patch-plugins-org.eclipse.core.runtime-src-org-eclipse-core-runtime-Platform.java --- eclipse/files/patch-plugins-org.eclipse.core.runtime-src-org-eclipse-core-runtime-Platform.java 15 Feb 2009 03:19:42 -0000 1.1 +++ eclipse/files/patch-plugins-org.eclipse.core.runtime-src-org-eclipse-core-runtime-Platform.java 16 Feb 2009 04:21:49 -0000 @@ -1,5 +1,5 @@ ---- plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java.orig 2008-08-09 09:17:56.822774634 -0400 -+++ plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java 2008-08-09 09:17:33.922680697 -0400 +--- plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java.orig 2009-02-15 19:26:27.391641089 -0500 ++++ plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java 2009-02-15 20:39:45.324834833 -0500 @@ -204,6 +204,17 @@ public static final String OS_LINUX = "linux";//$NON-NLS-1$ @@ -18,12 +18,3 @@ * Constant string (value "aix") indicating the platform is running on an * AIX-based operating system. *

-@@ -329,7 +340,7 @@ - * @deprecated use ARCH_X86_64 instead. Note the values - * has been changed to be the value of the ARCH_X86_64 constant. - */ -- public static final String ARCH_AMD64 = ARCH_X86_64; -+ public static final String ARCH_AMD64 = "amd64";//$NON-NLS-1$ - - /** - * Constant string (value "ia64") indicating the platform is running on an Index: eclipse/files/patch-plugins-org.eclipse.equinox.launcher-src-org-eclipse-equinox-launcher-Main.java =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-plugins-org.eclipse.equinox.launcher-src-org-eclipse-equinox-launcher-Main.java,v retrieving revision 1.1 diff -u -r1.1 patch-plugins-org.eclipse.equinox.launcher-src-org-eclipse-equinox-launcher-Main.java --- eclipse/files/patch-plugins-org.eclipse.equinox.launcher-src-org-eclipse-equinox-launcher-Main.java 15 Feb 2009 03:19:42 -0000 1.1 +++ eclipse/files/patch-plugins-org.eclipse.equinox.launcher-src-org-eclipse-equinox-launcher-Main.java 16 Feb 2009 03:58:57 -0000 @@ -18,13 +18,3 @@ if (osName.equalsIgnoreCase(Constants.INTERNAL_OS_QNX)) return Constants.OS_QNX; if (osName.equalsIgnoreCase(Constants.INTERNAL_OS_AIX)) -@@ -334,9 +338,6 @@ - // Map i386 architecture to x86 - if (name.equalsIgnoreCase(Constants.INTERNAL_ARCH_I386)) - return Constants.ARCH_X86; -- // Map amd64 architecture to x86_64 -- else if (name.equalsIgnoreCase(Constants.INTERNAL_AMD64)) -- return Constants.ARCH_X86_64; - - return name; - } Index: eclipse/files/patch-plugins-org.eclipse.frameworkadmin.equinox-src-org-eclipse-equinox-internal-frameworkadmin-equinox-EquinoxBundlesState.java =================================================================== RCS file: eclipse/files/patch-plugins-org.eclipse.frameworkadmin.equinox-src-org-eclipse-equinox-internal-frameworkadmin-equinox-EquinoxBundlesState.java diff -N eclipse/files/patch-plugins-org.eclipse.frameworkadmin.equinox-src-org-eclipse-equinox-internal-frameworkadmin-equinox-EquinoxBundlesState.java --- eclipse/files/patch-plugins-org.eclipse.frameworkadmin.equinox-src-org-eclipse-equinox-internal-frameworkadmin-equinox-EquinoxBundlesState.java 15 Feb 2009 03:19:42 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ ---- plugins/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxBundlesState.java.orig 2008-08-09 14:32:49.360935838 -0400 -+++ plugins/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxBundlesState.java 2008-08-09 14:32:30.730855758 -0400 -@@ -209,9 +209,6 @@ - // Map i386 architecture to x86 - if (name.equalsIgnoreCase(INTERNAL_ARCH_I386)) - arch = org.eclipse.osgi.service.environment.Constants.ARCH_X86; -- // Map amd64 architecture to x86_64 -- else if (name.equalsIgnoreCase(INTERNAL_AMD64)) -- arch = org.eclipse.osgi.service.environment.Constants.ARCH_X86_64; - else - arch = name; - platformProperties.setProperty("osgi.arch", arch); //$NON-NLS-1$ Index: eclipse/files/patch-plugins-org.eclipse.osgi-build.xml =================================================================== RCS file: eclipse/files/patch-plugins-org.eclipse.osgi-build.xml diff -N eclipse/files/patch-plugins-org.eclipse.osgi-build.xml --- eclipse/files/patch-plugins-org.eclipse.osgi-build.xml 15 Feb 2009 03:19:42 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,25 +0,0 @@ ---- plugins/org.eclipse.osgi/build.xml.orig 2008-09-29 19:38:37.000000000 -0400 -+++ plugins/org.eclipse.osgi/build.xml 2008-09-29 19:39:37.000000000 -0400 -@@ -16,7 +16,13 @@ - - - -- -+ -+ -+ -+ -+ -+ -+ - - - -@@ -37,6 +43,7 @@ - - - -+ - - - Index: eclipse/files/patch-plugins-org.eclipse.osgi-core-adaptor-org-eclipse-osgi-util-TextProcessor.java =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-plugins-org.eclipse.osgi-core-adaptor-org-eclipse-osgi-util-TextProcessor.java,v retrieving revision 1.1 diff -u -r1.1 patch-plugins-org.eclipse.osgi-core-adaptor-org-eclipse-osgi-util-TextProcessor.java --- eclipse/files/patch-plugins-org.eclipse.osgi-core-adaptor-org-eclipse-osgi-util-TextProcessor.java 15 Feb 2009 03:19:42 -0000 1.1 +++ eclipse/files/patch-plugins-org.eclipse.osgi-core-adaptor-org-eclipse-osgi-util-TextProcessor.java 16 Feb 2009 03:58:57 -0000 @@ -5,7 +5,7 @@ if ("iw".equals(lang) || "he".equals(lang) || "ar".equals(lang) || "fa".equals(lang) || "ur".equals(lang)) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ String osName = System.getProperty("os.name").toLowerCase(); //$NON-NLS-1$ - if (osName.startsWith("windows") || osName.startsWith("linux")) { //$NON-NLS-1$ //$NON-NLS-2$ -+ if (osName.startsWith("windows") || osName.startsWith("linux") || osName.startsWith("freebsd")) { //$NON-NLS-1$ //$NON-NLS-2$ ++ if (osName.startsWith("windows") || osName.startsWith("linux") || osName.startsWith("freebsd")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ IS_PROCESSING_NEEDED = true; } } Index: eclipse/files/patch-plugins-org.eclipse.osgi-eclipseAdaptor-src-org-eclipse-core-runtime-internal-adaptor-EclipseEnvironementInfo.java =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-plugins-org.eclipse.osgi-eclipseAdaptor-src-org-eclipse-core-runtime-internal-adaptor-EclipseEnvironementInfo.java,v retrieving revision 1.1 diff -u -r1.1 patch-plugins-org.eclipse.osgi-eclipseAdaptor-src-org-eclipse-core-runtime-internal-adaptor-EclipseEnvironementInfo.java --- eclipse/files/patch-plugins-org.eclipse.osgi-eclipseAdaptor-src-org-eclipse-core-runtime-internal-adaptor-EclipseEnvironementInfo.java 15 Feb 2009 03:19:42 -0000 1.1 +++ eclipse/files/patch-plugins-org.eclipse.osgi-eclipseAdaptor-src-org-eclipse-core-runtime-internal-adaptor-EclipseEnvironementInfo.java 16 Feb 2009 04:22:29 -0000 @@ -1,5 +1,5 @@ ---- ./plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseEnvironmentInfo.java.orig 2008-08-08 23:54:36.137941647 -0400 -+++ ./plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseEnvironmentInfo.java 2008-08-08 23:52:33.527433817 -0400 +--- plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseEnvironmentInfo.java.orig 2009-02-15 19:25:53.501501141 -0500 ++++ plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseEnvironmentInfo.java 2009-02-15 20:52:03.177887665 -0500 @@ -33,6 +33,7 @@ // this internally to be Solaris. private static final String INTERNAL_OS_SUNOS = "SunOS"; //$NON-NLS-1$ @@ -8,27 +8,7 @@ private static final String INTERNAL_OS_MACOSX = "Mac OS"; //$NON-NLS-1$ private static final String INTERNAL_OS_AIX = "AIX"; //$NON-NLS-1$ private static final String INTERNAL_OS_HPUX = "HP-UX"; //$NON-NLS-1$ -@@ -41,9 +42,6 @@ - // While we recognize the i386 architecture, we change - // this internally to be x86. - private static final String INTERNAL_ARCH_I386 = "i386"; //$NON-NLS-1$ -- // While we recognize the amd64 architecture, we change -- // this internally to be x86_64. -- private static final String INTERNAL_AMD64 = "amd64"; //$NON-NLS-1$ - - private EclipseEnvironmentInfo() { - super(); -@@ -159,9 +157,6 @@ - // Map i386 architecture to x86 - if (name.equalsIgnoreCase(INTERNAL_ARCH_I386)) - arch = Constants.ARCH_X86; -- // Map amd64 architecture to x86_64 -- else if (name.equalsIgnoreCase(INTERNAL_AMD64)) -- arch = Constants.ARCH_X86_64; - else - arch = name; - FrameworkProperties.setProperty("osgi.arch", arch); //$NON-NLS-1$ -@@ -189,6 +184,8 @@ +@@ -189,6 +190,8 @@ return Constants.WS_WIN32; if (os.equals(Constants.OS_LINUX)) return Constants.WS_GTK; @@ -37,7 +17,7 @@ if (os.equals(Constants.OS_MACOSX)) return Constants.WS_CARBON; if (os.equals(Constants.OS_HPUX)) -@@ -212,6 +209,8 @@ +@@ -212,6 +215,8 @@ return Constants.OS_SOLARIS; if (osName.equalsIgnoreCase(INTERNAL_OS_LINUX)) return Constants.OS_LINUX; Index: eclipse/files/patch-plugins-org.eclipse.osgi-supplement-src-org-eclipse-osgi-service-environment-Constants.java =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-plugins-org.eclipse.osgi-supplement-src-org-eclipse-osgi-service-environment-Constants.java,v retrieving revision 1.1 diff -u -r1.1 patch-plugins-org.eclipse.osgi-supplement-src-org-eclipse-osgi-service-environment-Constants.java --- eclipse/files/patch-plugins-org.eclipse.osgi-supplement-src-org-eclipse-osgi-service-environment-Constants.java 15 Feb 2009 03:19:42 -0000 1.1 +++ eclipse/files/patch-plugins-org.eclipse.osgi-supplement-src-org-eclipse-osgi-service-environment-Constants.java 16 Feb 2009 03:58:57 -0000 @@ -13,12 +13,3 @@ * Constant string (value "aix") indicating the platform is running on an * AIX-based operating system. */ -@@ -115,7 +121,7 @@ - * @deprecated use ARCH_X86_64 instead. Note the values - * has been changed to be the value of the ARCH_X86_64 constant. - */ -- public static final String ARCH_AMD64 = ARCH_X86_64; -+ public static final String ARCH_AMD64 = "amd64";//$NON-NLS-1$ - - /** - * Constant string (value "ia64") indicating the platform is running on an Index: eclipse/files/patch-plugins-org.eclipse.pde.build-build.xml =================================================================== RCS file: eclipse/files/patch-plugins-org.eclipse.pde.build-build.xml diff -N eclipse/files/patch-plugins-org.eclipse.pde.build-build.xml --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ eclipse/files/patch-plugins-org.eclipse.pde.build-build.xml 16 Feb 2009 04:22:52 -0000 @@ -0,0 +1,23 @@ +--- plugins/org.eclipse.pde.build/build.xml.orig 2009-02-15 14:54:04.518255168 -0500 ++++ plugins/org.eclipse.pde.build/build.xml 2009-02-15 14:53:17.438264370 -0500 +@@ -26,14 +26,14 @@ + + + +- +- ++ ++ + +- +- ++ ++ + +- +- ++ ++ + + + Index: eclipse/files/patch-plugins-org.eclipse.pde.build-scripts-productBuild-allElements.xml =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-plugins-org.eclipse.pde.build-scripts-productBuild-allElements.xml,v retrieving revision 1.1 diff -u -r1.1 patch-plugins-org.eclipse.pde.build-scripts-productBuild-allElements.xml --- eclipse/files/patch-plugins-org.eclipse.pde.build-scripts-productBuild-allElements.xml 15 Feb 2009 03:19:42 -0000 1.1 +++ eclipse/files/patch-plugins-org.eclipse.pde.build-scripts-productBuild-allElements.xml 16 Feb 2009 03:58:57 -0000 @@ -11,9 +11,9 @@ + + + -+ ++ + -+ ++ + + Index: eclipse/files/patch-plugins-org.eclipse.pde.build-templates-headless-build-build.properties =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-plugins-org.eclipse.pde.build-templates-headless-build-build.properties,v retrieving revision 1.1 diff -u -r1.1 patch-plugins-org.eclipse.pde.build-templates-headless-build-build.properties --- eclipse/files/patch-plugins-org.eclipse.pde.build-templates-headless-build-build.properties 15 Feb 2009 03:19:42 -0000 1.1 +++ eclipse/files/patch-plugins-org.eclipse.pde.build-templates-headless-build-build.properties 16 Feb 2009 03:58:57 -0000 @@ -5,7 +5,7 @@ # linux, gtk, x86_64 & \ # linux, motif, x86 & \ +# freebsd, gtk, x86 & \ -+# freebsd, gtk, amd64 & \ ++# freebsd, gtk, x86_64 & \ # solaris, motif, sparc & \ # solaris, gtk, sparc & \ # aix, motif, ppc & \ @@ -14,7 +14,7 @@ # linux, gtk, x86_64 - antZip& \ # linux, motif, x86 - antZip& \ +# freebsd, gtk, x86 - antZip & \ -+# freebsd, gtk, amd64 - antZip & \ ++# freebsd, gtk, x86_64 - antZip & \ # solaris, motif, sparc - antZip& \ # solaris, gtk, sparc - antZip& \ # aix, motif, ppc - antZip& \ Index: eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-customTargets.xml =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-customTargets.xml,v retrieving revision 1.1 diff -u -r1.1 patch-plugins-org.eclipse.pde.build-templates-packager-customTargets.xml --- eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-customTargets.xml 15 Feb 2009 03:19:42 -0000 1.1 +++ eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-customTargets.xml 16 Feb 2009 03:58:57 -0000 @@ -18,9 +18,9 @@ + -+ ++ + -+ ++ + + Index: eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-packager.properties =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-packager.properties,v retrieving revision 1.1 diff -u -r1.1 patch-plugins-org.eclipse.pde.build-templates-packager-packager.properties --- eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-packager.properties 15 Feb 2009 03:19:42 -0000 1.1 +++ eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-packager.properties 16 Feb 2009 03:58:57 -0000 @@ -5,7 +5,7 @@ # linux, gtk, x86_64 & \ # linux, motif, x86 & \ +# freebsd, gtk, x86 & \ -+# freebsd, gtk, amd64 & \ ++# freebsd, gtk, x86_64 & \ # solaris, motif, sparc & \ # solaris, gtk, sparc & \ # aix, motif, ppc & \ @@ -14,7 +14,7 @@ # linux, gtk, x86_64 - antZip& \ # linux, motif, x86 - antZip& \ +# freebsd, gtk, x86 - antZip& \ -+# freebsd, gtk, amd64 - antZip& \ ++# freebsd, gtk, x86_64 - antZip& \ # solaris, motif, sparc - antZip& \ # solaris, gtk, sparc - antZip& \ # aix, motif, ppc - antZip& \ Index: eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-packaging.properties =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-packaging.properties,v retrieving revision 1.1 diff -u -r1.1 patch-plugins-org.eclipse.pde.build-templates-packager-packaging.properties --- eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-packaging.properties 15 Feb 2009 03:19:42 -0000 1.1 +++ eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-packaging.properties 16 Feb 2009 03:58:57 -0000 @@ -5,7 +5,7 @@ root.linux.gtk.x86_64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm root.linux.gtk.ppc=eclipse +root.freebsd.gtk.x86=eclipse,about_files/,about.html,icon.xpm -+root.freebsd.gtk.amd64=eclipse,about_files/,about.html,icon.xpm ++root.freebsd.gtk.x86_64=eclipse,about_files/,about.html,icon.xpm root.macosx.carbon.ppc=eclipse,Eclipse.app/ root.macosx.carbon.ppc.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS root.aix.motif.ppc=eclipse Index: eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64-build.xml =================================================================== RCS file: eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64-build.xml diff -N eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64-build.xml --- eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64-build.xml 15 Feb 2009 03:19:42 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,64 +0,0 @@ ---- plugins/org.eclipse.swt.gtk.freebsd.amd64/build.xml.orig 2008-08-02 20:56:10.950055571 -0400 -+++ plugins/org.eclipse.swt.gtk.freebsd.amd64/build.xml 2008-08-02 20:58:39.830970324 -0400 -@@ -273,6 +273,9 @@ - - - -+ -+ -+ - - - -@@ -287,21 +290,27 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -+ -+ - -+ -+ -+ -+ -+ -+ -+ - - - Index: eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64.source-META-INF-MANIFEST.MF =================================================================== RCS file: eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64.source-META-INF-MANIFEST.MF diff -N eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64.source-META-INF-MANIFEST.MF --- eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64.source-META-INF-MANIFEST.MF 15 Feb 2009 03:19:42 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- plugins/org.eclipse.swt.gtk.freebsd.amd64.source/META-INF/MANIFEST.MF.orig 2008-09-25 20:44:00.000000000 -0400 -+++ plugins/org.eclipse.swt.gtk.freebsd.amd64.source/META-INF/MANIFEST.MF 2008-09-25 20:46:29.000000000 -0400 -@@ -6,7 +6,6 @@ - Bundle-ManifestVersion: 2 - Bundle-Localization: fragment - Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.amd64.source --Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x8 -- 6_64)) -+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=amd64)) - Bundle-Version: 3.4.1.v3449c - Index: eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.x86-build.xml =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.x86-build.xml,v retrieving revision 1.1 diff -u -r1.1 patch-plugins-org.eclipse.swt.gtk.freebsd.x86-build.xml --- eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.x86-build.xml 15 Feb 2009 03:19:42 -0000 1.1 +++ eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.x86-build.xml 16 Feb 2009 04:26:44 -0000 @@ -1,30 +1,18 @@ ---- plugins/org.eclipse.swt.gtk.freebsd.x86/build.xml.orig 2008-08-02 16:19:48.000000000 -0400 -+++ plugins/org.eclipse.swt.gtk.freebsd.x86/build.xml 2008-08-02 16:20:07.000000000 -0400 -@@ -142,12 +142,13 @@ - - - -- -- -+ -+ - - +--- plugins/org.eclipse.swt.gtk.freebsd.x86/build.xml.orig 2009-02-15 09:49:28.812369523 -0500 ++++ plugins/org.eclipse.swt.gtk.freebsd.x86/build.xml 2009-02-15 09:59:58.545568057 -0500 +@@ -149,13 +149,14 @@ -+ ++ -@@ -156,9 +157,9 @@ + + - -- -+ +- ++ + -- -+ - - - + Index: eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.x86_64-build.xml =================================================================== RCS file: eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.x86_64-build.xml diff -N eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.x86_64-build.xml --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.x86_64-build.xml 16 Feb 2009 04:23:31 -0000 @@ -0,0 +1,50 @@ +--- plugins/org.eclipse.swt.gtk.freebsd.x86_64/build.xml.orig 2009-02-15 09:36:21.377637363 -0500 ++++ plugins/org.eclipse.swt.gtk.freebsd.x86_64/build.xml 2009-02-15 10:02:04.923231253 -0500 +@@ -272,7 +272,12 @@ + + + +- ++ ++ ++ ++ ++ ++ + + + +@@ -294,6 +299,7 @@ + + + ++ + + + +@@ -302,21 +308,11 @@ + + + +- +- +- +- +- +- ++ ++ ++ ++ + +- +- +- +- +- +- +- +- + + + Index: eclipse/files/patch-plugins-org.eclipse.swt.tools-build.xml =================================================================== RCS file: eclipse/files/patch-plugins-org.eclipse.swt.tools-build.xml diff -N eclipse/files/patch-plugins-org.eclipse.swt.tools-build.xml --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ eclipse/files/patch-plugins-org.eclipse.swt.tools-build.xml 16 Feb 2009 04:23:50 -0000 @@ -0,0 +1,11 @@ +--- plugins/org.eclipse.swt.tools/build.xml.orig 2009-02-15 08:51:01.911768069 -0500 ++++ plugins/org.eclipse.swt.tools/build.xml 2009-02-15 08:51:54.966137634 -0500 +@@ -80,6 +80,8 @@ + + + ++ ++ + + + Index: eclipse/files/post-patch-packager-customTargets.xml =================================================================== RCS file: eclipse/files/post-patch-packager-customTargets.xml diff -N eclipse/files/post-patch-packager-customTargets.xml --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ eclipse/files/post-patch-packager-customTargets.xml 24 Feb 2009 01:17:33 -0000 @@ -0,0 +1,11 @@ +--- packager/customTargets.xml.orig 2009-02-23 20:09:35.539631847 -0500 ++++ packager/customTargets.xml 2009-02-22 10:21:35.186241128 -0500 +@@ -5,7 +5,7 @@ + + +- ++ + + + Index: eclipse/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh,v retrieving revision 1.1 diff -u -r1.1 post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh --- eclipse/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh 15 Feb 2009 03:19:42 -0000 1.1 +++ eclipse/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh 16 Feb 2009 04:24:04 -0000 @@ -1,5 +1,5 @@ ---- gtk/library/build.sh.orig 2008-09-11 21:18:02.725614374 -0400 -+++ gtk/library/build.sh 2008-09-11 21:18:07.455632295 -0400 +--- gtk/library/build.sh.orig 2009-02-15 12:44:50.966087957 -0500 ++++ gtk/library/build.sh 2009-02-15 12:45:01.414490300 -0500 @@ -50,6 +50,10 @@ fi fi @@ -20,32 +20,28 @@ SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64 export SWT_PTR_CFLAGS if [ -d /lib64 ]; then -@@ -74,47 +78,44 @@ +@@ -74,45 +78,36 @@ fi fi -if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES" ]; then -- echo "libgnomeui-2.0 found, compiling SWT program support using GNOME" ++if [ x${MAKE_GNOME} = "xmake_gnome" -a x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES" ]; then + echo "libgnomeui-2.0 found, compiling SWT program support using GNOME" - MAKE_GNOME=make_gnome --else -- echo "libgnome-2.0 and libgnomeui-2.0 not found:" -- echo " *** SWT Program support for GNOME will not be compiled." --fi -- ++ INTERNAL_MAKE_GNOME=make_gnome + else + echo "libgnome-2.0 and libgnomeui-2.0 not found:" + echo " *** SWT Program support for GNOME will not be compiled." + fi + -if [ x`pkg-config --exists cairo && echo YES` = "xYES" ]; then -- echo "Cairo found, compiling SWT support for the cairo graphics library." ++if [ x${MAKE_CAIRO} = "xmake_cairo" -a x`pkg-config --exists cairo && echo YES` = "xYES" ]; then + echo "Cairo found, compiling SWT support for the cairo graphics library." - MAKE_CAIRO=make_cairo --else -- echo "Cairo not found:" -- echo " *** Advanced graphics support using cairo will not be compiled." -+if [ x${MAKE_GNOME} = "xmake_gnome" ]; then -+ if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES" ]; then -+ echo "libgnomeui-2.0 found, compiling SWT program support using GNOME" -+ _MAKE_GNOME=make_gnome -+ else -+ echo "libgnome-2.0 and libgnomeui-2.0 not found:" -+ echo " *** SWT Program support for GNOME will not be compiled." -+ fi ++ INTERNAL_MAKE_CAIRO=make_cairo + else + echo "Cairo not found:" + echo " *** Advanced graphics support using cairo will not be compiled." fi -if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then @@ -67,43 +63,31 @@ - export MOZILLA_INCLUDES - export MOZILLA_LIBS - MAKE_MOZILLA=make_mozilla -+if [ x${MAKE_CAIRO} = "xmake_cairo" ]; then -+ if [ x`pkg-config --exists cairo && echo YES` = "xYES" ]; then -+ echo "Cairo found, compiling SWT support for the cairo graphics library." -+ _MAKE_CAIRO=make_cairo - else +- else - echo "None of the following libraries were found: Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM" - echo " *** Mozilla embedding support will not be compiled." -+ echo "Cairo not found:" -+ echo " *** Advanced graphics support using cairo will not be compiled." - fi - fi - -+if [ x${MAKE_MOZILLA} = "xmake_mozilla" ]; then -+ if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then +- fi ++if [ x${MAKE_MOZILLA} = "xmake_mozilla" -a -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then + case ${BROWSER} in + "firefox" | "mozilla" | "seamonkey" | "xulrunner") + MOZILLA_INCLUDES=`pkg-config --cflags ${BROWSER}-xpcom` + MOZILLA_LIBS=`pkg-config --libs ${BROWSER}-xpcom` + export MOZILLA_INCLUDES + export MOZILLA_LIBS -+ _MAKE_MOZILLA=make_mozilla ++ INTERNAL_MAKE_MOZILLA=make_mozilla + ;; + *) + echo "None of the following libraries were found: Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM" + echo " *** Mozilla embedding support will not be compiled." -+ ;; ++ ;; + esac -+ fi -+fi -+ + fi + # Find AWT if available - if [ -z "${AWT_LIB_PATH}" ]; then - if [ -d ${JAVA_HOME}/jre/lib/${AWT_ARCH} ]; then -@@ -142,5 +143,5 @@ +@@ -142,5 +137,5 @@ if [ "x${1}" = "xclean" ]; then make -f $MAKEFILE clean else - make -f $MAKEFILE all $MAKE_GNOME $MAKE_CAIRO $MAKE_AWT $MAKE_MOZILLA ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} -+ make -f $MAKEFILE all $_MAKE_GNOME $_MAKE_CAIRO $MAKE_AWT $_MAKE_MOZILLA ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ++ make -f $MAKEFILE all $INTERNAL_MAKE_GNOME $INTERNAL_MAKE_CAIRO $MAKE_AWT $INTERNAL_MAKE_MOZILLA ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} fi Index: eclipse/scripts/pre-patch =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse/scripts/pre-patch,v retrieving revision 1.6 diff -u -r1.6 pre-patch --- eclipse/scripts/pre-patch 15 Feb 2009 03:19:44 -0000 1.6 +++ eclipse/scripts/pre-patch 16 Feb 2009 04:33:56 -0000 @@ -5,7 +5,7 @@ { srcfile="$1" dstfile="$2" - + case $distfile in *.zip) #We may not want to push all files through sed echo "zip file" @@ -13,7 +13,7 @@ ;; *) rm -f $dstfile - cat "$srcfile" | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g; s/x86_64/amd64/g' > "$dstfile" + cat "$srcfile" | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g' > "$dstfile" ;; esac } @@ -31,9 +31,10 @@ find "$dstdir" -name \*.so -delete find "$dstdir" -name \*.so.\* -delete find "$dstdir" -type f -print0 | \ - xargs -0 sed -i '.bak' 's/linux/freebsd/g; s/Linux/FreeBSD/g; s/x86_64/amd64/g' - find "$dstdir" -name \*.bak -delete - fi + xargs -0 sed -i '.bak' 's/linux/freebsd/g; s/Linux/FreeBSD/g' + find "$dstdir" -name \*.bak -delete + find "$dstdir" -type d -name "linux" -delete + fi } prepare_files() @@ -43,7 +44,7 @@ # Copy the files and rename/change them appropriately for src in $COPY_LIST do - dst=`echo $src | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g; s/x86_64/amd64/g'` + dst=`echo $src | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g'` echo Copying $src into $dst if [ -d ${WRKSRC}/$src ] then @@ -55,14 +56,20 @@ # Files with spaces in their path... src="${SWTGTK}/make_linux.mak" - dst=`echo $src | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g; s/x86_64/amd64/g'` + dst=`echo $src | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g'` echo Copying $src into $dst copy_file "${WRKSRC}/$src" "${WRKSRC}/$dst" + # New x86_64 fragment + src="plugins/org.eclipse.core.net.freebsd.x86" + dst="plugins/org.eclipse.core.net.freebsd.x86_64" + echo Copying $src into $dst + copy_dir "${WRKSRC}/$src" "${WRKSRC}/$dst" + find ${WRKSRC} -name \*.so -delete find ${WRKSRC} -name \*.so.\* -delete } -#features/org.eclipse.platform.launchers/library/gtk/make_linux.mak + COPY_LIST=" assemble.org.eclipse.sdk.linux.gtk.x86.xml assemble.org.eclipse.sdk.linux.gtk.x86_64.xml @@ -104,4 +111,6 @@ SWTGTK="plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library" prepare_files + + exit 0