Index: Makefile =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse-devel/Makefile,v retrieving revision 1.20 diff -u -r1.20 Makefile --- Makefile 13 Sep 2008 04:06:44 -0000 1.20 +++ Makefile 11 Oct 2008 13:29:25 -0000 @@ -6,10 +6,10 @@ # PORTNAME= eclipse-devel -PORTVERSION= 3.4 +PORTVERSION= 3.4.1 CATEGORIES= java devel MASTER_SITES= ${MASTER_SITE_ECLIPSE} -MASTER_SITE_SUBDIR= R-${PORTVERSION}-200806172000 +MASTER_SITE_SUBDIR= R-${PORTVERSION}-200809111700 DISTNAME= eclipse-sourceBuild-srcIncluded-${PORTVERSION} DIST_SUBDIR= eclipse @@ -18,7 +18,7 @@ BUILD_DEPENDS= ant:${PORTSDIR}/devel/apache-ant \ zip:${PORTSDIR}/archivers/zip \ - ${EXTRACT_DEPENDS} + unzip:${PORTSDIR}/archivers/unzip PATCH_DEPENDS+= gpatch:${PORTSDIR}/devel/patch ECLIPSE= ${PORTNAME} @@ -31,7 +31,7 @@ PATCH= ${LOCALBASE}/bin/gpatch .if !defined(WITHOUT_MOZILLA) -USE_GECKO= firefox xulrunner mozilla seamonkey +USE_GECKO= firefox xulrunner seamonkey .endif USE_JAVA= yes @@ -100,7 +100,7 @@ SWTMOZ=${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT Mozilla ECLIPSE_IU=FreeBSD Eclipse SDK -ECLIPSE_IU_VERSION=${PORTVERSION}.0.${PORTREVISION} +ECLIPSE_IU_VERSION=${PORTVERSION}.${PORTREVISION} 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 @@ -115,7 +115,7 @@ @(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.100.v20080509-1800.jar \ + -jar ${WRKSRC}/eclipse/plugins/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar \ -data ${WRKSRC}/workspace \ -application org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \ -flavor tooling \ @@ -133,7 +133,7 @@ @${MKDIR} ${PORTDESTDIR} @${JAVA} \ -Declipse.p2.data.area="file:${PORTDESTDIR}/p2" \ - -jar ${WRKSRC}/eclipse/plugins/org.eclipse.equinox.launcher_1.0.100.v20080509-1800.jar \ + -jar ${WRKSRC}/eclipse/plugins/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar \ -data ${WRKSRC}/workspace \ -application org.eclipse.equinox.p2.director.app.application \ -flavor tooling \ Index: distinfo =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse-devel/distinfo,v retrieving revision 1.8 diff -u -r1.8 distinfo --- distinfo 6 Sep 2008 19:31:47 -0000 1.8 +++ distinfo 8 Oct 2008 15:20:29 -0000 @@ -1,3 +1,3 @@ -MD5 (eclipse/eclipse-sourceBuild-srcIncluded-3.4.zip) = 555c99aee06fc52d2ec03995b5ac0710 -SHA256 (eclipse/eclipse-sourceBuild-srcIncluded-3.4.zip) = df829822473886aa62b15d9f95654f88e868634fb1b78ce0b12c550b85054e93 -SIZE (eclipse/eclipse-sourceBuild-srcIncluded-3.4.zip) = 105671901 +MD5 (eclipse/eclipse-sourceBuild-srcIncluded-3.4.1.zip) = 5814fb2019f70f00c0952f29df1cac3d +SHA256 (eclipse/eclipse-sourceBuild-srcIncluded-3.4.1.zip) = cb451bcc8866ab289b3a322e17eda7d20429463e8b3f329f66626b45b0fd6824 +SIZE (eclipse/eclipse-sourceBuild-srcIncluded-3.4.1.zip) = 106290656 Index: files/patch-build.xml =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse-devel/files/patch-build.xml,v retrieving revision 1.5 diff -u -r1.5 patch-build.xml --- files/patch-build.xml 6 Sep 2008 19:31:47 -0000 1.5 +++ files/patch-build.xml 8 Oct 2008 15:20:29 -0000 @@ -1,11 +1,11 @@ ---- build.xml.orig 2008-08-04 19:39:49.000000000 -0400 -+++ build.xml 2008-08-04 19:17:16.000000000 -0400 +--- build.xml.orig 2008-09-29 19:16:32.000000000 -0400 ++++ build.xml 2008-09-29 19:19:37.000000000 -0400 @@ -1,7 +1,7 @@ - -+ ++ @@ -26,11 +26,11 @@ -@@ -71,6 +81,32 @@ +@@ -71,6 +81,25 @@ -+ ++ + + + @@ -40,13 +40,6 @@ + + + -+ -+ -+ -+ -+ -+ -+ + + + @@ -59,7 +52,7 @@ -@@ -277,6 +313,8 @@ +@@ -277,6 +306,8 @@ @@ -68,7 +61,7 @@ -@@ -284,7 +322,10 @@ +@@ -284,7 +315,10 @@ Index: files/patch-features-org.eclipse.equinox.executable-library-gtk-build.sh =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse-devel/files/patch-features-org.eclipse.equinox.executable-library-gtk-build.sh,v retrieving revision 1.1 diff -u -r1.1 patch-features-org.eclipse.equinox.executable-library-gtk-build.sh --- files/patch-features-org.eclipse.equinox.executable-library-gtk-build.sh 6 Sep 2008 19:31:47 -0000 1.1 +++ files/patch-features-org.eclipse.equinox.executable-library-gtk-build.sh 8 Oct 2008 15:20:29 -0000 @@ -1,5 +1,5 @@ ---- features/org.eclipse.equinox.executable/library/gtk/build.sh.orig 2008-08-02 22:30:31.469155349 -0400 -+++ features/org.eclipse.equinox.executable/library/gtk/build.sh 2008-08-02 22:32:13.519781895 -0400 +--- features/org.eclipse.equinox.executable/library/gtk/build.sh.orig 2008-09-30 19:29:09.000000000 -0400 ++++ features/org.eclipse.equinox.executable/library/gtk/build.sh 2008-09-30 19:28:40.000000000 -0400 @@ -53,6 +53,7 @@ "Linux") makefile="make_linux.mak" @@ -8,7 +8,7 @@ case $MODEL in "x86_64") defaultOSArch="x86_64" -@@ -93,9 +94,30 @@ +@@ -94,9 +95,31 @@ ;; esac ;; @@ -16,6 +16,7 @@ + makefile="make_freebsd.mak" + defaultOS="freebsd" + MAKE=gmake ++ javaHome="$JAVA_HOME" + case $MODEL in + "amd64") + defaultOSArch="amd64" @@ -36,19 +37,19 @@ makefile="make_solaris.mak" defaultOS="solaris" + MAKE=make + javaHome="/usr/jdk/jdk1.5.0_01" OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" #PATH=/usr/ccs/bin:/opt/SUNWspro/bin:$PATH - PATH=/usr/ccs/bin:/export/home/SUNWspro/bin:$PATH -@@ -149,7 +171,7 @@ - DEFAULT_OS="$defaultOS" - DEFAULT_OS_ARCH="$defaultOSArch" - DEFAULT_WS="$defaultWS" --JAVA_HOME=$javaHome -+#JAVA_HOME=$javaHome +@@ -154,7 +177,7 @@ + JAVA_HOME=$javaHome DEFAULT_JAVA=$defaultJava - export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS JAVA_HOME DEFAULT_JAVA -@@ -157,13 +179,13 @@ +-LIBRARY_DIR="../../../org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch" ++LIBRARY_DIR="../../../../plugins/org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch" + 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 @@ # If the OS is supported (a makefile exists) if [ "$makefile" != "" ]; then if [ "$extraArgs" != "" ]; then Index: files/patch-features-org.eclipse.platform-build.xml =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse-devel/files/patch-features-org.eclipse.platform-build.xml,v retrieving revision 1.1 diff -u -r1.1 patch-features-org.eclipse.platform-build.xml --- files/patch-features-org.eclipse.platform-build.xml 6 Sep 2008 19:31:47 -0000 1.1 +++ files/patch-features-org.eclipse.platform-build.xml 8 Oct 2008 15:20:29 -0000 @@ -1,5 +1,5 @@ ---- features/org.eclipse.platform/build.xml.orig 2008-08-02 15:21:05.000000000 -0400 -+++ features/org.eclipse.platform/build.xml 2008-08-02 15:23:39.000000000 -0400 +--- 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 @@ -27,6 +27,11 @@ @@ -52,8 +52,8 @@ -- -+ +- ++ Index: files/patch-features-org.eclipse.platform.source-feature.xml =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse-devel/files/patch-features-org.eclipse.platform.source-feature.xml,v retrieving revision 1.1 diff -u -r1.1 patch-features-org.eclipse.platform.source-feature.xml --- files/patch-features-org.eclipse.platform.source-feature.xml 6 Sep 2008 19:31:47 -0000 1.1 +++ files/patch-features-org.eclipse.platform.source-feature.xml 8 Oct 2008 15:20:29 -0000 @@ -1,10 +1,10 @@ ---- features/org.eclipse.platform.source/feature.xml.orig 2008-08-02 15:27:51.000000000 -0400 -+++ features/org.eclipse.platform.source/feature.xml 2008-08-02 15:28:00.000000000 -0400 -@@ -68,6 +68,7 @@ +--- features/org.eclipse.platform.source/feature.xml.orig 2008-09-25 19:28:09.000000000 -0400 ++++ features/org.eclipse.platform.source/feature.xml 2008-09-25 19:27:48.000000000 -0400 +@@ -67,6 +67,7 @@ + - + - - - + + + Index: files/patch-features-org.eclipse.rcp-build.xml =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse-devel/files/patch-features-org.eclipse.rcp-build.xml,v retrieving revision 1.1 diff -u -r1.1 patch-features-org.eclipse.rcp-build.xml --- files/patch-features-org.eclipse.rcp-build.xml 6 Sep 2008 19:31:47 -0000 1.1 +++ files/patch-features-org.eclipse.rcp-build.xml 8 Oct 2008 15:20:29 -0000 @@ -1,5 +1,5 @@ ---- features/org.eclipse.rcp/build.xml.orig 2008-08-02 15:29:28.000000000 -0400 -+++ features/org.eclipse.rcp/build.xml 2008-08-02 15:33:55.000000000 -0400 +--- 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 @@ -37,6 +37,11 @@ @@ -50,8 +50,8 @@ -- -+ +- ++ Index: files/patch-features-org.eclipse.rcp-feature.xml =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse-devel/files/patch-features-org.eclipse.rcp-feature.xml,v retrieving revision 1.1 diff -u -r1.1 patch-features-org.eclipse.rcp-feature.xml --- files/patch-features-org.eclipse.rcp-feature.xml 6 Sep 2008 19:31:47 -0000 1.1 +++ files/patch-features-org.eclipse.rcp-feature.xml 8 Oct 2008 15:20:29 -0000 @@ -1,12 +1,9 @@ ---- features/org.eclipse.rcp/feature.xml.orig 2008-08-02 15:35:43.000000000 -0400 -+++ features/org.eclipse.rcp/feature.xml 2008-08-02 15:36:20.000000000 -0400 -@@ -205,7 +205,18 @@ - version="0.0.0" - fragment="true" +--- features/org.eclipse.rcp/feature.xml.orig 2008-09-26 19:47:12.000000000 -0400 ++++ features/org.eclipse.rcp/feature.xml 2008-09-26 19:46:59.000000000 -0400 +@@ -207,6 +207,17 @@ unpack="false"/> -- -+ -+ -+ - @@ -38,12 +36,10 @@ id="org.eclipse.swt.carbon.macosx" os="macosx" ws="carbon" -@@ -448,6 +470,17 @@ - version="0.0.0" - fragment="true" - unpack="true"/> -+ -+ + + - - ++ fragment="true"/> + -+ + + - - ++ ++ + + ++ ++ + - - -+ -+ - - - + Index: files/patch-package.org.eclipse.sdk.all.xml =================================================================== RCS file: files/patch-package.org.eclipse.sdk.all.xml diff -N files/patch-package.org.eclipse.sdk.all.xml --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-package.org.eclipse.sdk.all.xml 8 Oct 2008 15:20:29 -0000 @@ -0,0 +1,11 @@ +--- package.org.eclipse.sdk.all.xml.orig 2008-10-01 19:09:30.000000000 -0400 ++++ package.org.eclipse.sdk.all.xml 2008-10-01 19:10:57.000000000 -0400 +@@ -30,6 +30,8 @@ + + + ++ ++ + + + Index: files/patch-plugins-org.eclipse.osgi-build.xml =================================================================== RCS file: files/patch-plugins-org.eclipse.osgi-build.xml diff -N files/patch-plugins-org.eclipse.osgi-build.xml --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-plugins-org.eclipse.osgi-build.xml 8 Oct 2008 15:20:29 -0000 @@ -0,0 +1,25 @@ +--- 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: files/patch-plugins-org.eclipse.pde.api.tools-src_ant-org-eclipse-pde-api-tools-internal-tasks-APIToolsVerivicationTask.java =================================================================== RCS file: files/patch-plugins-org.eclipse.pde.api.tools-src_ant-org-eclipse-pde-api-tools-internal-tasks-APIToolsVerivicationTask.java diff -N files/patch-plugins-org.eclipse.pde.api.tools-src_ant-org-eclipse-pde-api-tools-internal-tasks-APIToolsVerivicationTask.java --- files/patch-plugins-org.eclipse.pde.api.tools-src_ant-org-eclipse-pde-api-tools-internal-tasks-APIToolsVerivicationTask.java 6 Sep 2008 19:31:48 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- plugins/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/APIToolsVerificationTask.java.orig 2008-08-02 23:44:38.060798145 -0400 -+++ plugins/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/APIToolsVerificationTask.java 2008-08-02 23:45:19.561053624 -0400 -@@ -656,7 +656,7 @@ - public int compare(Object o1, Object o2) { - Map.Entry entry1 = (Map.Entry) o1; - Map.Entry entry2 = (Map.Entry) o2; -- return ((String) entry1.getKey()).compareTo(entry2.getKey()); -+ return ((String) entry1.getKey()).compareTo((String) entry2.getKey()); - } - }); - Summary[] summaries = new Summary[size]; Index: files/patch-plugins-org.eclipse.pde.api.tools-src_ant-org-eclipse-pde-api-tools-internal-tasks-DeltaReportConversionTask.java =================================================================== RCS file: files/patch-plugins-org.eclipse.pde.api.tools-src_ant-org-eclipse-pde-api-tools-internal-tasks-DeltaReportConversionTask.java diff -N files/patch-plugins-org.eclipse.pde.api.tools-src_ant-org-eclipse-pde-api-tools-internal-tasks-DeltaReportConversionTask.java --- files/patch-plugins-org.eclipse.pde.api.tools-src_ant-org-eclipse-pde-api-tools-internal-tasks-DeltaReportConversionTask.java 6 Sep 2008 19:31:48 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- plugins/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/DeltaReportConversionTask.java.orig 2008-08-02 23:45:53.571262184 -0400 -+++ plugins/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/DeltaReportConversionTask.java 2008-08-02 23:46:12.521379029 -0400 -@@ -288,7 +288,7 @@ - public int compare(Object o1, Object o2) { - Map.Entry entry1 = (Map.Entry) o1; - Map.Entry entry2 = (Map.Entry) o2; -- return ((String) entry1.getKey()).compareTo(entry2.getKey()); -+ return ((String) entry1.getKey()).compareTo((String) entry2.getKey()); - } - }); - for (Iterator iterator = allEntries.iterator(); iterator.hasNext(); ) { Index: files/patch-plugins-org.eclipse.pde.api.tools.ui-src-org-eclipse-pde-api-tools-ui-internal-wizards-ApiProfileWizardPage.java =================================================================== RCS file: files/patch-plugins-org.eclipse.pde.api.tools.ui-src-org-eclipse-pde-api-tools-ui-internal-wizards-ApiProfileWizardPage.java diff -N files/patch-plugins-org.eclipse.pde.api.tools.ui-src-org-eclipse-pde-api-tools-ui-internal-wizards-ApiProfileWizardPage.java --- files/patch-plugins-org.eclipse.pde.api.tools.ui-src-org-eclipse-pde-api-tools-ui-internal-wizards-ApiProfileWizardPage.java 6 Sep 2008 19:31:48 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- plugins/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/ApiProfileWizardPage.java.orig 2008-08-02 10:08:15.000000000 -0400 -+++ plugins/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/ApiProfileWizardPage.java 2008-08-02 10:08:23.000000000 -0400 -@@ -309,7 +309,7 @@ - } - Collections.sort(items, new Comparator() { - public int compare(Object o1, Object o2) { -- return ((String)o1).compareTo(o2); -+ return ((String)o1).compareTo((String)o2); - } - }); - Index: files/patch-plugins-org.eclipse.pde.ui-src-org-eclipse-pde-internal-ui-pderesources.properties =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse-devel/files/patch-plugins-org.eclipse.pde.ui-src-org-eclipse-pde-internal-ui-pderesources.properties,v retrieving revision 1.1 diff -u -r1.1 patch-plugins-org.eclipse.pde.ui-src-org-eclipse-pde-internal-ui-pderesources.properties --- files/patch-plugins-org.eclipse.pde.ui-src-org-eclipse-pde-internal-ui-pderesources.properties 6 Sep 2008 19:31:48 -0000 1.1 +++ files/patch-plugins-org.eclipse.pde.ui-src-org-eclipse-pde-internal-ui-pderesources.properties 8 Oct 2008 15:20:29 -0000 @@ -1,6 +1,6 @@ ---- plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties.orig 2008-08-02 21:44:34.122219356 -0400 -+++ plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties 2008-08-02 21:45:10.322441730 -0400 -@@ -572,6 +572,7 @@ +--- plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties.orig 2008-09-25 20:35:26.000000000 -0400 ++++ plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties 2008-09-25 20:32:37.000000000 -0400 +@@ -574,6 +574,7 @@ LauncherSection_48Low=48x48 (8-bit): LauncherSection_48High=48x48 (32-bit): LauncherSection_linuxLabel=A single XPM icon is required: @@ -8,10 +8,3 @@ LauncherSection_large=Large: LauncherSection_medium=Medium: LauncherSection_small=Small: -@@ -2516,4 +2517,4 @@ - - PDECompilersConfigurationBlock_error = Error - PDECompilersConfigurationBlock_warning = Warning --PDECompilersConfigurationBlock_ignore = Ignore -\ No newline at end of file -+PDECompilersConfigurationBlock_ignore = Ignore Index: files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64.source-META-INF-MANIFEST.MF =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse-devel/files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64.source-META-INF-MANIFEST.MF,v retrieving revision 1.1 diff -u -r1.1 patch-plugins-org.eclipse.swt.gtk.freebsd.amd64.source-META-INF-MANIFEST.MF --- files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64.source-META-INF-MANIFEST.MF 6 Sep 2008 19:31:48 -0000 1.1 +++ files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64.source-META-INF-MANIFEST.MF 8 Oct 2008 15:20:29 -0000 @@ -1,5 +1,5 @@ ---- plugins/org.eclipse.swt.gtk.freebsd.amd64.source/META-INF/MANIFEST.MF.orig 2008-08-09 16:48:52.839706184 -0400 -+++ plugins/org.eclipse.swt.gtk.freebsd.amd64.source/META-INF/MANIFEST.MF 2008-08-09 16:49:24.369835991 -0400 +--- 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 @@ -7,5 +7,5 @@ -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.0.v3448f + Bundle-Version: 3.4.1.v3449c Index: files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh =================================================================== RCS file: /home/FreeBSD/ncvs/ports/java/eclipse-devel/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 --- files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh 6 Sep 2008 19:31:48 -0000 1.1 +++ files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh 8 Oct 2008 15:20:29 -0000 @@ -1,5 +1,5 @@ ---- gtk/library/build.sh.orig 2008-08-02 20:48:26.157201172 -0400 -+++ gtk/library/build.sh 2008-08-02 22:49:45.246241822 -0400 +--- 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 @@ -50,6 +50,10 @@ fi fi @@ -20,7 +20,7 @@ SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64 export SWT_PTR_CFLAGS if [ -d /lib64 ]; then -@@ -74,23 +78,28 @@ +@@ -74,47 +78,44 @@ fi fi @@ -30,43 +30,80 @@ -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." +- 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 ++ _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 fi --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 -- echo "Cairo not found:" -- echo " *** Advanced graphics support using cairo will not be compiled." +-if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then +- if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then +- MOZILLA_INCLUDES=`pkg-config --cflags mozilla-xpcom` +- MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom` +- export MOZILLA_INCLUDES +- export MOZILLA_LIBS +- MAKE_MOZILLA=make_mozilla +- elif [ x`pkg-config --exists firefox-xpcom && echo YES` = "xYES" ]; then +- MOZILLA_INCLUDES=`pkg-config --cflags firefox-xpcom` +- MOZILLA_LIBS=`pkg-config --libs firefox-xpcom` +- export MOZILLA_INCLUDES +- export MOZILLA_LIBS +- MAKE_MOZILLA=make_mozilla +- elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then +- MOZILLA_INCLUDES=`pkg-config --cflags libxul` +- MOZILLA_LIBS=`pkg-config --libs libxul` +- 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 ++ _MAKE_CAIRO=make_cairo + 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 fi --if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then +if [ x${MAKE_MOZILLA} = "xmake_mozilla" ]; then + if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then - if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then - MOZILLA_INCLUDES=`pkg-config --cflags mozilla-xpcom` - MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom` -@@ -113,6 +122,7 @@ - echo "None of the following libraries were found: Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM" - echo " *** Mozilla embedding support will not be compiled." - fi ++ 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 ++ ;; ++ *) ++ 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 @@ + 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} + fi