Date: Sun, 14 Apr 2019 09:14:32 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r498880 - in head/java/eclipse: . files scripts Message-ID: <201904140914.x3E9EXMq046519@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Sun Apr 14 09:14:32 2019 New Revision: 498880 URL: https://svnweb.freebsd.org/changeset/ports/498880 Log: java/eclipse: update 4.6 -> 4.11, submitter becomes maintainer - port is rewritten from scratch - Warning: UI widgets are oddly sized, currently under investigation PR: 236792 Submitted by: Jonathan Chen <jonc@chen.org.nz> Reviewed by: mizhka@gmail.com, Curtis Hamilton Approved by: ljboiler@gmail.com (maintainer timeout) Relnotes: https://www.eclipse.org/eclipseide/2019-03/noteworthy/ Added: head/java/eclipse/files/patch-eclipse-platform-parent (contents, props changed) head/java/eclipse/files/patch-eclipse.pde.build (contents, props changed) head/java/eclipse/files/patch-eclipse.pde.ui (contents, props changed) head/java/eclipse/files/patch-eclipse.platform.releng (contents, props changed) head/java/eclipse/files/patch-eclipse.platform.releng.prereqs.sdk (contents, props changed) head/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder (contents, props changed) head/java/eclipse/files/patch-eclipse.platform.resources (contents, props changed) head/java/eclipse/files/patch-eclipse.platform.runtime (contents, props changed) head/java/eclipse/files/patch-eclipse.platform.swt (contents, props changed) head/java/eclipse/files/patch-eclipse.platform.swt.binaries (contents, props changed) head/java/eclipse/files/patch-eclipse.platform.team (contents, props changed) head/java/eclipse/files/patch-eclipse.platform.ua (contents, props changed) head/java/eclipse/files/patch-eclipse.platform.ui (contents, props changed) head/java/eclipse/files/patch-production (contents, props changed) head/java/eclipse/files/patch-rt.equinox.bundles (contents, props changed) head/java/eclipse/files/patch-rt.equinox.framework (contents, props changed) head/java/eclipse/files/patch-rt.equinox.p2 (contents, props changed) head/java/eclipse/pkg-plist (contents, props changed) head/java/eclipse/scripts/post-extract (contents, props changed) head/java/eclipse/scripts/pre-build (contents, props changed) Deleted: head/java/eclipse/Makefile.plugins head/java/eclipse/files/amd64-patch-freebsd_natives head/java/eclipse/files/i386-patch-freebsd_natives head/java/eclipse/files/patch-aggregator head/java/eclipse/files/patch-freebsd_natives head/java/eclipse/files/patch-submodules Modified: head/java/eclipse/Makefile head/java/eclipse/distinfo head/java/eclipse/files/eclipse.in head/java/eclipse/pkg-descr head/java/eclipse/scripts/pre-patch (contents, props changed) Modified: head/java/eclipse/Makefile ============================================================================== --- head/java/eclipse/Makefile Sun Apr 14 09:14:10 2019 (r498879) +++ head/java/eclipse/Makefile Sun Apr 14 09:14:32 2019 (r498880) @@ -1,144 +1,98 @@ -# Created by: Jimmy Kelley <ljboiler@gmail.com> +# Created by: Jonathan Chen <jonc@chen.org.nz> # $FreeBSD$ PORTNAME= eclipse -PORTVERSION= 4.6 -PORTREVISION= 2 +PORTVERSION= 4.11 CATEGORIES= java devel -MASTER_SITES= https://s3.amazonaws.com/freebsd-eclipse-dist/ -DISTFILES= eclipse.platform.releng.aggregator-${PORTVERSION}.xz \ - ${PORTNAME}-maven-repo-${PORTVERSION}.xz -DIST_SUBDIR= eclipse -MAINTAINER= ljboiler@gmail.com -COMMENT= Eclipse Neon +# Update to git-tag on git.eclipse.org +ECLIPSE_TAG= R4_11 +ECLIPSE_TSTAMP= 20190321-0023 -LICENSE= EPL +ECLIPSE_SUFX= ${ECLIPSE_TAG}.tar.xz +ECLIPSE_MODULES=jdt/eclipse.jdt \ + jdt/eclipse.jdt.core \ + jdt/eclipse.jdt.core.binaries \ + jdt/eclipse.jdt.debug \ + jdt/eclipse.jdt.ui \ + pde/eclipse.pde.build \ + pde/eclipse.pde.ui \ + platform/eclipse.platform \ + platform/eclipse.platform.common \ + platform/eclipse.platform.debug \ + platform/eclipse.platform.releng \ + platform/eclipse.platform.releng.aggregator \ + platform/eclipse.platform.resources \ + platform/eclipse.platform.runtime \ + platform/eclipse.platform.swt \ + platform/eclipse.platform.swt.binaries \ + platform/eclipse.platform.team \ + platform/eclipse.platform.text \ + platform/eclipse.platform.ua \ + platform/eclipse.platform.ui \ + platform/eclipse.platform.ui.tools \ + equinox/rt.equinox.binaries \ + equinox/rt.equinox.bundles \ + equinox/rt.equinox.framework \ + equinox/rt.equinox.p2 +# Each Eclipse module has its own MASTER_SITE +.for M in ${ECLIPSE_MODULES} +MASTER_SITES+= https://git.eclipse.org/c/${M}.git/snapshot/:${M:C/[\.\/]//g} +DISTFILES+= ${M:C/.*\///}-${ECLIPSE_SUFX}:${M:C/[\.\/]//g} +.endfor -BROKEN= fails to build -DEPRECATED= Uses webkit-gtk2 which has security issues -EXPIRATION_DATE=2019-04-30 -ONLY_FOR_ARCHS= amd64 i386 -CONFLICTS_INSTALL= eclipse +DIST_SUBDIR= ${PORTNAME} -BUILD_DEPENDS= ${LOCALBASE}/share/java/maven33/bin/mvn:devel/maven33 -LIB_DEPENDS= libcairo.so:graphics/cairo -# libwebkitgtk-1.0.so:www/webkit-gtk2 +MAINTAINER= jonc@chen.org.nz +COMMENT= Eclipse IDE 2019-03 -USES= gmake pkgconfig tar:xz -USE_GL= glu -USE_GNOME= gconf2 gtk20 gnomevfs2 libgnome libgnomeui -USE_JAVA= yes -JAVA_OS= native -JAVA_VERSION= 1.8 -JAVA_VENDOR= openjdk -JAVA_BUILD= yes -JAVA_RUN= yes +LICENSE= EPL -OPTIONS_DEFINE= SWT_GTK3_SUPPORT -SWT_GTK3_SUPPORT_DESC= Enable GTK3 support in SWT (GUI) -OPTIONS_SINGLE= INSTALLPKG -OPTIONS_SINGLE_INSTALLPKG= FULL_SDK PLATFORM_SDK PLATFORM -FULL_SDK_DESC= Full SDK (JDT, PDE, source, API docs) -PLATFORM_SDK_DESC= Platform with source, API Docs (no Java tools) -PLATFORM_DESC= Platform only (no Java tools, no source or docs) +ONLY_FOR_ARCHS= amd64 power64 -OPTIONS_DEFAULT= FULL_SDK +BUILD_DEPENDS= git:devel/git-lite \ + ${LOCALBASE}/share/java/maven/bin/mvn:devel/maven +LIB_DEPENDS= libsecret-1.so:security/libsecret \ + libwebkit2gtk-4.0.so:www/webkit2-gtk3 +USES= gmake pkgconfig gnome +USE_GNOME= gtk30 -.include <bsd.port.options.mk> +USE_GITHUB= yes +GH_ACCOUNT= daemonblade +GH_PROJECT= eclipse-maven-repo +GH_TAGNAME= ${PORTVERSION} -PATCH_STRIP= -p1 +USE_JAVA= yes +JAVA_VERSION= 1.8 -.if ${PORT_OPTIONS:MSWT_GTK3_SUPPORT} -USE_GNOME+= gtk30 -#LIB_DEPENDS+= libwebkitgtk-3.0.so:www/webkit-gtk3 -MVN_SETTINGS+= -Dmachine_gtk3=1 -SWTGTK3OPT= -.else -SWTGTK3OPT= SWT_GTK3=0 -.endif +DESKTOP_ENTRIES="Eclipse" \ + "${COMMENT}" \ + "${PORTNAME}" \ + "${PORTNAME}" \ + "Development;IDE;Java;" \ + false -WRKSRC=${WRKDIR}/eclipse.platform.releng.aggregator-${PORTVERSION} -GITCLONE=${DISTDIR}/eclipse/eclipse-gitclone/eclipse.platform.releng.aggregator +SUB_FILES= ${PORTNAME} -MVN_LOCAL_REPO= -Dmaven.repo.local=${WRKDIR}/eclipse-maven-repo-${PORTVERSION}/repository -MVN_TEST_FLAG= -Dmaven.test.skip=true -DskipTests=true -MVN_SETTINGS+= --offline -MVN_OPTS?= MAVEN_OPTS='-Xmx1024m' -ECLIPSE_WS= gtk -ECLIPSE_ARCH= x86${ARCH:C/^i.86//:C/^amd/_/} -E_SHORTARCH= ${ARCH:C/^i.86//:C/^amd//} -ECLIPSE_BUILDID=I20160606-1100 -SCRIPTS_ENV+= ECLIPSE_ARCH=${ECLIPSE_ARCH} \ - E_SHORTARCH=${E_SHORTARCH} -PORTDESTDIR= ${PREFIX}/lib/eclipse +MAVEN_ENV= MAVEN_OPTS=-Xmx1024m +MAVEN_REPO= -Dmaven.repo.local=${WRKDIR}/${GH_PROJECT}-${PORTVERSION} +MAVEN_ECLIPSE= -Dnative=gtk.freebsd.${ARCH} -Dcomparator.repo=file://${WRKDIR}/${GH_PROJECT}-${PORTVERSION}/p2-stub -DforceContextQualifier=v${ECLIPSE_TSTAMP} -.if ${ARCH}=="i386" -EXTRA_PATCHES= ${FILESDIR}/i386-patch-freebsd_natives -.endif +ECLIPSE_RESULT= eclipse.platform.releng.tychoeclipsebuilder/sdk/target/products/org.eclipse.sdk.ide-freebsd.gtk.${ARCH}.tar.gz -.if ${ARCH}=="amd64" -EXTRA_PATCHES= ${FILESDIR}/amd64-patch-freebsd_natives -.endif +# Let's abuse this to get to the right place. +WRKSRC_SUBDIR= ../eclipse.platform.releng.aggregator-${ECLIPSE_TAG} -# Someday it would be nice to see about moving the product selection into the patch phase (and only build the -# product the user wants), but that may prove to be difficult if not impossible with the way the eclipse tycho -# builder is a "all-or-nothing" thing right now. -.if ${PORT_OPTIONS:MFULL_SDK} -PRODUCT_TARFILE= \ - ${WRKSRC}/eclipse.platform.releng.tychoeclipsebuilder/sdk/target/products/org.eclipse.sdk.ide-freebsd.${ECLIPSE_WS}.${ECLIPSE_ARCH}.tar.gz -.endif -.if ${PORT_OPTIONS:MPLATFORM_SDK} -PRODUCT_TARFILE= \ - ${WRKSRC}/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/target/products/org.eclipse.platform.sdk-freebsd.${ECLIPSE_WS}.${ECLIPSE_ARCH}.tar.gz -.endif -.if ${PORT_OPTIONS:MPLATFORM} -PRODUCT_TARFILE= \ - ${WRKSRC}/eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide-freebsd.${ECLIPSE_WS}.${ECLIPSE_ARCH}.tar.gz -.endif - -post-patch: - @(for f in `${GREP} -hE '(\-\-\-|%%ECLIPSE_ARCH%%)' ${FILESDIR}/patch-* | ${GREP} -B1 'ECLIPSE_ARCH' | ${GREP} '^\-\-\-' | ${SED} -e 's/^\-\-\- .\///'` ; \ - do \ - ${ECHO_MSG} "Updating ECLIPSE_ARCH in file $$f"; \ - ${REINPLACE_CMD} -e "s|%%ECLIPSE_ARCH%%|${ECLIPSE_ARCH}|g" ${WRKSRC}/$$f; \ - done) - do-build: - @(cd ${WRKSRC}; ${SETENV} JAVA_HOME=${JAVA_HOME} M2_HOME=${LOCALBASE}/share/java/maven33 ${MVN_OPTS} \ - mvn ${MVN_SETTINGS} ${MVN_TEST_FLAG} ${MVN_LOCAL_REPO} clean verify -Dnative=${ECLIPSE_WS}.freebsd.${ECLIPSE_ARCH} \ - -DbuildId=${ECLIPSE_BUILDID}) + cd ${WRKSRC} && ${SETENV} ${MAVEN_ENV} mvn --offline ${MAVEN_REPO} ${MAVEN_ECLIPSE} -DskipTests clean verify do-install: - @${RM} -r ${STAGEDIR}${PORTDESTDIR} - @( cd ${STAGEDIR}${PREFIX}/lib; ${TAR} xfz ${PRODUCT_TARFILE} ) - @${FIND} ${STAGEDIR}${PREFIX}/lib -type f -name \*.orig -delete - @${SED} \ - -e "s+%%BROWSER%%+${GECKO:S/19//}+g" \ - -e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \ - -e "s+%%JAVA_HOME%%+${JAVA_HOME}+g" \ - -e "s+%%JAVA_OS%%+${JAVA_OS}+g" \ - -e "s+%%JAVA_VERSION%%+${JAVA_VERSION}+g" \ - -e "s+%%LOCALBASE%%+${LOCALBASE}+g" \ - -e "s+%%SWTGTK3OPT%%+${SWTGTK3OPT}+g" \ - ${FILESDIR}/eclipse.in > ${BUILD_WRKSRC}/eclipse.tmp -.if defined(JAVA_VENDOR) - @${REINPLACE_CMD} -e "s+%%JAVA_VENDOR_SPECIFICATION%%+JAVA_VENDOR=\"${JAVA_VENDOR}\"+g" \ - ${BUILD_WRKSRC}/eclipse.tmp -.else - @${REINPLACE_CMD} -e "s+%%JAVA_VENDOR_SPECIFICATION%%++g" \ - ${BUILD_WRKSRC}/eclipse.tmp -.endif - ${INSTALL_SCRIPT} ${BUILD_WRKSRC}/eclipse.tmp ${STAGEDIR}${PREFIX}/bin/eclipse - @(cd ${STAGEDIR}${PREFIX}; ${FIND} -s lib/eclipse -not -type d) >> ${TMPPLIST} - @(cd ${STAGEDIR}${PREFIX}; ${FIND} -s bin/eclipse -not -type d) >> ${TMPPLIST} - @(cd ${STAGEDIR}${PREFIX}; ${FIND} -s -d lib/eclipse -type d -empty) | ${SED} -ne "s,^,@dir ,p" >> ${TMPPLIST} - @${ECHO_CMD} "@exec echo '-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=%D/share/eclipse/dropins' >> %D/lib/eclipse/eclipse.ini" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec ${SED} -i '' '/^-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=/d' %D/lib/eclipse/eclipse.ini" >> ${TMPPLIST} - @${MKDIR} ${STAGEDIR}${PREFIX}/share/eclipse/dropins - @${ECHO_CMD} "@dir share/eclipse/dropins" >> ${TMPPLIST} + ${MKDIR} ${STAGEDIR}${DATADIR} + ${TAR} -x --directory ${STAGEDIR}${DATADIR}/.. --file ${WRKSRC}/${ECLIPSE_RESULT} + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin -distclean: - ${RM} -r ${DISTDIR}/eclipse +# dynamically add timestamped profiles, which should be excluded from pkg-plist +post-install: + cd ${STAGEDIR}${PREFIX} && ${FIND} -s share/${PORTNAME} -name '*.profile.gz' >> ${TMPPLIST} .include <bsd.port.mk> Modified: head/java/eclipse/distinfo ============================================================================== --- head/java/eclipse/distinfo Sun Apr 14 09:14:10 2019 (r498879) +++ head/java/eclipse/distinfo Sun Apr 14 09:14:32 2019 (r498880) @@ -1,5 +1,53 @@ -TIMESTAMP = 1466985570 -SHA256 (eclipse/eclipse.platform.releng.aggregator-4.6.xz) = 916df36f28bd53dd17c9f059b19bad2f58c58865705c1d81ca59bf128bda32f7 -SIZE (eclipse/eclipse.platform.releng.aggregator-4.6.xz) = 215088004 -SHA256 (eclipse/eclipse-maven-repo-4.6.xz) = 5f6e816b012158a5c7e4b5bc7ecc1b12d1cae91e530ec503e8cd9910ab28a624 -SIZE (eclipse/eclipse-maven-repo-4.6.xz) = 135692066 +TIMESTAMP = 1554503098 +SHA256 (eclipse/eclipse.jdt-R4_11.tar.xz) = 69cfb50655af18880880ef4292e2856ad12d847527553bb7d13f2a3443f566ce +SIZE (eclipse/eclipse.jdt-R4_11.tar.xz) = 37580 +SHA256 (eclipse/eclipse.jdt.core-R4_11.tar.xz) = 903c7591a4698badbd279d09b2aefd3604820aba54cf2958e4fd5cfa0d806f24 +SIZE (eclipse/eclipse.jdt.core-R4_11.tar.xz) = 8371984 +SHA256 (eclipse/eclipse.jdt.core.binaries-R4_11.tar.xz) = ddcf1962d1b869c22cc31d0634d280e68b91a6c8f5561f64a5072e558460e7a2 +SIZE (eclipse/eclipse.jdt.core.binaries-R4_11.tar.xz) = 34416600 +SHA256 (eclipse/eclipse.jdt.debug-R4_11.tar.xz) = 028222dbe3d2ebc4002b3b362e0500a791e86ef9e4fca9a5d7a1bed97f9bc395 +SIZE (eclipse/eclipse.jdt.debug-R4_11.tar.xz) = 1425276 +SHA256 (eclipse/eclipse.jdt.ui-R4_11.tar.xz) = 28ca01db7a12183125b9794cd56bb0dd6b5ba449014bc8bfe9ac6991e63b5a77 +SIZE (eclipse/eclipse.jdt.ui-R4_11.tar.xz) = 14117296 +SHA256 (eclipse/eclipse.pde.build-R4_11.tar.xz) = 32496ccf12e630762fd59fd18ebc1bae9f96437f012aaeab5797ba29f6b2ddd7 +SIZE (eclipse/eclipse.pde.build-R4_11.tar.xz) = 868176 +SHA256 (eclipse/eclipse.pde.ui-R4_11.tar.xz) = 7ac38d3c2b52c030d7011395c94fe6dbdacc735a308911c1c0689388e54f6e87 +SIZE (eclipse/eclipse.pde.ui-R4_11.tar.xz) = 29759352 +SHA256 (eclipse/eclipse.platform-R4_11.tar.xz) = f9512fc71c40c37703b89617efdbd48f1fac4d4558e705b9a13596a567241a5d +SIZE (eclipse/eclipse.platform-R4_11.tar.xz) = 952108 +SHA256 (eclipse/eclipse.platform.common-R4_11.tar.xz) = a3062ed00ebe342a98e1132449d42987e104b741e1b86201c456af47fdd004c3 +SIZE (eclipse/eclipse.platform.common-R4_11.tar.xz) = 34049880 +SHA256 (eclipse/eclipse.platform.debug-R4_11.tar.xz) = 2e2b675035e808b121a9cb38cd5c26e35a6f2c38853f9dbd9db37d5e2ef1b921 +SIZE (eclipse/eclipse.platform.debug-R4_11.tar.xz) = 1369408 +SHA256 (eclipse/eclipse.platform.releng-R4_11.tar.xz) = a550feae2316d591b0990460a053abc19dd87b80c86c351cce98bff33194ede9 +SIZE (eclipse/eclipse.platform.releng-R4_11.tar.xz) = 411064 +SHA256 (eclipse/eclipse.platform.releng.aggregator-R4_11.tar.xz) = c25d05c355585e5fcd6465a95899dd1eb6d2af92aab16d90bf0cdf3a6044c4fc +SIZE (eclipse/eclipse.platform.releng.aggregator-R4_11.tar.xz) = 690924 +SHA256 (eclipse/eclipse.platform.resources-R4_11.tar.xz) = 59be5020229e5053909194c55d416a384b2cf00b7a578d8df50d80c6bb8c6948 +SIZE (eclipse/eclipse.platform.resources-R4_11.tar.xz) = 857244 +SHA256 (eclipse/eclipse.platform.runtime-R4_11.tar.xz) = 70b9ea7151ea5c60feea289f3a8b7fcd66619f46f2ef2fde0a7ae2a034355330 +SIZE (eclipse/eclipse.platform.runtime-R4_11.tar.xz) = 432764 +SHA256 (eclipse/eclipse.platform.swt-R4_11.tar.xz) = b779fe217ac503b28b83fa1104b17cd99e8b6086bdb31be3f9efbd2f4135bc96 +SIZE (eclipse/eclipse.platform.swt-R4_11.tar.xz) = 3535864 +SHA256 (eclipse/eclipse.platform.swt.binaries-R4_11.tar.xz) = 805b830cb1cc45895594c1ac5fb96173a968fa954a33cb90dacf57215b651796 +SIZE (eclipse/eclipse.platform.swt.binaries-R4_11.tar.xz) = 1077336 +SHA256 (eclipse/eclipse.platform.team-R4_11.tar.xz) = f4f36cb722f393e25626ea5131b4d9017f3d47d69f33f2982f7a6bdeda5b3dad +SIZE (eclipse/eclipse.platform.team-R4_11.tar.xz) = 4665536 +SHA256 (eclipse/eclipse.platform.text-R4_11.tar.xz) = da6fad72804338e40efa7572bf162e7f88dac8dc8a14eb2fe4f733ed47b0c6be +SIZE (eclipse/eclipse.platform.text-R4_11.tar.xz) = 1247548 +SHA256 (eclipse/eclipse.platform.ua-R4_11.tar.xz) = a879ef849eaf4585832bd8203f167a031c4f05c9916dc5138ed541eba4f0a870 +SIZE (eclipse/eclipse.platform.ua-R4_11.tar.xz) = 4438264 +SHA256 (eclipse/eclipse.platform.ui-R4_11.tar.xz) = 00e5235b09106bd2f23c01257d50330ff2ed7511bb4dbdbbbe21929e2f25dc85 +SIZE (eclipse/eclipse.platform.ui-R4_11.tar.xz) = 6013124 +SHA256 (eclipse/eclipse.platform.ui.tools-R4_11.tar.xz) = 4cc9941e49bb5f10b9155649165643e9afe5b758b2d3e0807c7c368797963b03 +SIZE (eclipse/eclipse.platform.ui.tools-R4_11.tar.xz) = 316036 +SHA256 (eclipse/rt.equinox.binaries-R4_11.tar.xz) = a4476629efbd4f5063ff42e0aebb9b75e0f40f667fa7a90152e6e1b14934e8f7 +SIZE (eclipse/rt.equinox.binaries-R4_11.tar.xz) = 623604 +SHA256 (eclipse/rt.equinox.bundles-R4_11.tar.xz) = 4b1cada1dcb6b4cddd65f96a85740fcfe053722e836351f0e2ab53a54d531bc9 +SIZE (eclipse/rt.equinox.bundles-R4_11.tar.xz) = 1139768 +SHA256 (eclipse/rt.equinox.framework-R4_11.tar.xz) = 39ea7af8cb7c56e6b4819902de00f498f881c6b66599d5a5b275f2bd32765480 +SIZE (eclipse/rt.equinox.framework-R4_11.tar.xz) = 2812036 +SHA256 (eclipse/rt.equinox.p2-R4_11.tar.xz) = 019ec06efb58a12417c0a1ae9ecfdc368ab8e4ad25364970bd112dc03b9a53c8 +SIZE (eclipse/rt.equinox.p2-R4_11.tar.xz) = 45251216 +SHA256 (eclipse/daemonblade-eclipse-maven-repo-4.11_GH0.tar.gz) = ab9e83997cccc02c235c8d3aa67db6f9963b25ede3d22d961d9292925a2f6bfa +SIZE (eclipse/daemonblade-eclipse-maven-repo-4.11_GH0.tar.gz) = 167655977 Modified: head/java/eclipse/files/eclipse.in ============================================================================== --- head/java/eclipse/files/eclipse.in Sun Apr 14 09:14:10 2019 (r498879) +++ head/java/eclipse/files/eclipse.in Sun Apr 14 09:14:32 2019 (r498880) @@ -6,41 +6,4 @@ # # $FreeBSD$ # -DEFAULT_JAVA_HOME=%%JAVA_HOME%% -ECLIPSE_HOME=%%ECLIPSE_HOME%% -DEFAULT_JAVA_CMD=java -export GRE_HOME=%%LOCALBASE%%/lib/%%BROWSER%% - -#----------------------------------------------------------------------------- -# Determine configuration settings -#----------------------------------------------------------------------------- - -# Determine the JDK home directory -if [ -z "${JAVA_HOME}" ]; then - JAVA_HOME=${DEFAULT_JAVA_HOME} -fi - -# Determine 'java' executable -if [ -z "${JAVACMD}" ]; then - if [ -n "${JAVA_HOME}" ]; then - JAVACMD="${JAVA_HOME}/bin/java" - else - JAVACMD=${DEFAULT_JAVACMD} - fi -fi - -# Check if 'java' executable can be found -if [ ! -x "$JAVACMD" ]; then - echo "Error: JAVA_HOME is not defined correctly: ${JAVA_HOME}" - echo " Unable to find ${JAVACMD}" - exit 1 -fi - -# Check if 'eclipse' executable can be found -if [ ! -x "${ECLIPSE_HOME}/eclipse" ]; then - echo "Error: ECLIPSE_HOME is not defined correctly: ${ECLIPSE_HOME}" - echo " Unable to find eclipse launcher binary" - exit 1 -fi - -JAVA_VERSION="%%JAVA_VERSION%%" JAVA_OS="%%JAVA_OS%%" PATH=${JAVA_HOME}/bin:${PATH} %%SWTGTK3OPT%% exec "${ECLIPSE_HOME}/eclipse" "$@" +exec %%DATADIR%%/eclipse "$@" Added: head/java/eclipse/files/patch-eclipse-platform-parent ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/eclipse/files/patch-eclipse-platform-parent Sun Apr 14 09:14:32 2019 (r498880) @@ -0,0 +1,52 @@ +diff -ru eclipse-platform-parent/pom.xml eclipse-platform-parent/pom.xml +--- eclipse-platform-parent/pom.xml 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse-platform-parent/pom.xml 0000-00-00 00:00:00.000000000 +0000 +@@ -89,9 +89,9 @@ + 'eclipiserun-repo' repository, such as for computing .api-descriptions and + generating API Tools reports. + --> +- <eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.11-I-builds/</eclipserun-repo>; ++ <eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.11/</eclipserun-repo>; + +- <comparator.repo>http://download.eclipse.org/eclipse/updates/4.11-I-builds</comparator.repo>; ++ <comparator.repo>http://download.eclipse.org/eclipse/updates/4.11</comparator.repo>; + + <!-- + NOTE: this EMF and ECF URL must match exactly what is in the eclipse-sdk-prereqs.target file. +@@ -100,7 +100,7 @@ + it). + And, of course, in the PDE target file, the URL is expected to be the actual URL, not a variable. + --> +- <emf-repo.url>http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201903030654/</emf-repo.url>; ++ <emf-repo.url>http://download.eclipse.org/modeling/emf/emf/builds/release/2.17/</emf-repo.url>; + + <ecf-repo.url>http://download.eclipse.org/rt/ecf/3.14.4/site.p2/</ecf-repo.url>; + +@@ -262,14 +262,14 @@ + </target> + <environments> + <environment> +- <os>linux</os> ++ <os>freebsd</os> + <ws>gtk</ws> +- <arch>x86_64</arch> ++ <arch>amd64</arch> + </environment> + <environment> +- <os>linux</os> ++ <os>freebsd</os> + <ws>gtk</ws> +- <arch>ppc64le</arch> ++ <arch>powerpc64</arch> + </environment> + <environment> + <os>win32</os> +@@ -639,7 +639,7 @@ + For maintenance streams should always be "M-builds". + Ideally, this value would be provided by the environment, see bug 489789. + --> +- <eclipse-p2-repo.url>http://download.eclipse.org/eclipse/updates/4.11-I-builds</eclipse-p2-repo.url>; ++ <eclipse-p2-repo.url>http://download.eclipse.org/eclipse/updates/4.11</eclipse-p2-repo.url>; + </properties> + <repositories> + <repository> Added: head/java/eclipse/files/patch-eclipse.pde.build ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/eclipse/files/patch-eclipse.pde.build Sun Apr 14 09:14:32 2019 (r498880) @@ -0,0 +1,77 @@ +diff -ru eclipse.pde.build/org.eclipse.pde.build/scripts/productBuild/allElements.xml eclipse.pde.build/org.eclipse.pde.build/scripts/productBuild/allElements.xml +--- eclipse.pde.build/org.eclipse.pde.build/scripts/productBuild/allElements.xml 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.pde.build/org.eclipse.pde.build/scripts/productBuild/allElements.xml 0000-00-00 00:00:00.000000000 +0000 +@@ -59,10 +59,10 @@ + </ant> + </target> + +- <property name="assemble.org.eclipse.pde.build.container.feature.linux.gtk.x86_64" value="true" /> +- <target name="assemble.org.eclipse.pde.build.container.feature.linux.gtk.x86_64"> ++ <property name="assemble.org.eclipse.pde.build.container.feature.freebsd.gtk.amd64" value="true" /> ++ <target name="assemble.org.eclipse.pde.build.container.feature.freebsd.gtk.amd64"> + <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> +- <property name="archiveName" value="${archiveNamePrefix}-linux.gtk.x86_64.zip"/> ++ <property name="archiveName" value="${archiveNamePrefix}-freebsd.gtk.amd64.zip"/> + </ant> + </target> + +diff -ru eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java +--- eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java 0000-00-00 00:00:00.000000000 +0000 +@@ -704,7 +704,7 @@ + arguments.add("-sf"); //$NON-NLS-1$ + arguments.add(links[i]); + arguments.add(links[i + 1]); +- script.printExecTask("ln", dir, arguments, "Linux"); //$NON-NLS-1$ //$NON-NLS-2$ ++ script.printExecTask("ln", dir, arguments, "Linux,FreeBSD"); //$NON-NLS-1$ //$NON-NLS-2$ + arguments.clear(); + } + } +diff -ru eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java +--- eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java 0000-00-00 00:00:00.000000000 +0000 +@@ -922,7 +922,7 @@ + for (int i = 0; i < links.length; i += 2) { + arguments.add(links[i]); + arguments.add(links[i + 1]); +- script.printExecTask("ln -s", dir, arguments, "Linux"); //$NON-NLS-1$ //$NON-NLS-2$ ++ script.printExecTask("ln -s", dir, arguments, "Linux,FreeBSD"); //$NON-NLS-1$ //$NON-NLS-2$ + arguments.clear(); + } + } +diff -ru eclipse.pde.build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java eclipse.pde.build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java +--- eclipse.pde.build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.pde.build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java 0000-00-00 00:00:00.000000000 +0000 +@@ -306,6 +306,8 @@ + private String convertOS(String os) { + if (os == null) + return null; ++ if ("freebsd".equalsIgnoreCase(os)) //$NON-NLS-1$ ++ return "FreeBSD"; //$NON-NLS-1$ + if ("win32".equalsIgnoreCase(os)) //$NON-NLS-1$ + return "Windows"; //$NON-NLS-1$ + if ("macosx".equalsIgnoreCase(os)) //$NON-NLS-1$ +diff -ru eclipse.pde.build/org.eclipse.pde.build/templates/packager/customTargets.xml eclipse.pde.build/org.eclipse.pde.build/templates/packager/customTargets.xml +--- eclipse.pde.build/org.eclipse.pde.build/templates/packager/customTargets.xml 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.pde.build/org.eclipse.pde.build/templates/packager/customTargets.xml 0000-00-00 00:00:00.000000000 +0000 +@@ -19,9 +19,9 @@ + </ant> + </target> + +- <target name="assemble.linux.gtk.x86_64.xml"> ++ <target name="assemble.freebsd.gtk.amd64.xml"> + <ant antfile="${assembleScriptName}" > +- <property name="archiveName" value="${archiveNamePrefix}-linux.gtk.x86_64.zip"/> ++ <property name="archiveName" value="${archiveNamePrefix}-freebsd.gtk.amd64.zip"/> + </ant> + </target> + +diff -ru eclipse.pde.build/org.eclipse.pde.build/templates/packager/packaging.properties eclipse.pde.build/org.eclipse.pde.build/templates/packager/packaging.properties +--- eclipse.pde.build/org.eclipse.pde.build/templates/packager/packaging.properties 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.pde.build/org.eclipse.pde.build/templates/packager/packaging.properties 0000-00-00 00:00:00.000000000 +0000 +@@ -19,4 +19,4 @@ + root.permissions.755=eclipse,*.so* + + root.win32.win32.x86_64=eclipse.exe, eclipsec.exe +-root.linux.gtk.x86_64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm ++root.freebsd.gtk.amd64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm Added: head/java/eclipse/files/patch-eclipse.pde.ui ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/eclipse/files/patch-eclipse.pde.ui Sun Apr 14 09:14:32 2019 (r498880) @@ -0,0 +1,14 @@ +diff -ru eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product +--- eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product 0000-00-00 00:00:00.000000000 +0000 +@@ -80,8 +80,8 @@ + <plugin id="org.eclipse.osgi.util"/> + <plugin id="org.eclipse.swt"/> + <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/> +- <plugin id="org.eclipse.swt.gtk.linux.ppc64" fragment="true"/> +- <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/> ++ <plugin id="org.eclipse.swt.gtk.freebsd.powerpc64" fragment="true"/> ++ <plugin id="org.eclipse.swt.gtk.freebsd.amd64" fragment="true"/> + <plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/> + <plugin id="org.w3c.css.sac"/> + <plugin id="org.w3c.dom.events"/> Added: head/java/eclipse/files/patch-eclipse.platform.releng ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/eclipse/files/patch-eclipse.platform.releng Sun Apr 14 09:14:32 2019 (r498880) @@ -0,0 +1,71 @@ +diff -ru eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml +--- eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 +@@ -96,9 +96,9 @@ + unpack="false"/> + + <plugin +- id="org.eclipse.core.net.linux.x86_64" +- os="linux" +- arch="x86_64" ++ id="org.eclipse.core.net.freebsd.amd64" ++ os="freebsd" ++ arch="amd64" + download-size="0" + install-size="0" + version="0.0.0" +@@ -348,9 +348,9 @@ + unpack="false"/> + + <plugin +- id="org.eclipse.core.filesystem.linux.x86_64" +- os="linux" +- arch="x86_64" ++ id="org.eclipse.core.filesystem.freebsd.amd64" ++ os="freebsd" ++ arch="amd64" + download-size="0" + install-size="0" + version="0.0.0" +@@ -387,9 +387,9 @@ + unpack="false"/> + + <plugin +- id="org.eclipse.core.filesystem.linux.ppc64le" +- os="linux" +- arch="ppc64le" ++ id="org.eclipse.core.filesystem.freebsd.powerpc64" ++ os="freebsd" ++ arch="powerpc64" + download-size="0" + install-size="0" + version="0.0.0" +@@ -451,9 +451,9 @@ + unpack="false"/> + + <plugin +- id="org.eclipse.equinox.security.linux.x86_64" +- os="linux" +- arch="x86_64" ++ id="org.eclipse.equinox.security.freebsd.amd64" ++ os="freebsd" ++ arch="amd64" + download-size="0" + install-size="0" + version="0.0.0" +diff -ru eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml +--- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml 0000-00-00 00:00:00.000000000 +0000 +@@ -55,10 +55,10 @@ + </plugins> + <excludes> + <plugin id="org.eclipse.platform.doc.user"/> +- <plugin id="org.eclipse.core.filesystem.linux.x86_64"/> ++ <plugin id="org.eclipse.core.filesystem.freebsd.amd64"/> + <plugin id="org.eclipse.core.filesystem.macosx"/> + <plugin id="org.eclipse.core.filesystem.win32.x86_64"/> +- <plugin id="org.eclipse.core.filesystem.linux.ppc64le"/> ++ <plugin id="org.eclipse.core.filesystem.freebsd.powerpc64"/> + <plugin id="org.eclipse.core.resources.win32.x86_64"/> + </excludes> + </configuration> Added: head/java/eclipse/files/patch-eclipse.platform.releng.prereqs.sdk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/eclipse/files/patch-eclipse.platform.releng.prereqs.sdk Sun Apr 14 09:14:32 2019 (r498880) @@ -0,0 +1,12 @@ +diff -ru eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target +--- eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target 0000-00-00 00:00:00.000000000 +0000 +@@ -167,7 +167,7 @@ + <unit id="org.eclipse.emf.edit" version="2.14.0.v20180823-0456"/> + <unit id="org.eclipse.emf.databinding" version="1.5.0.v20180706-1146"/> + <unit id="org.eclipse.emf.databinding.edit" version="1.5.0.v20180823-0456"/> +- <repository location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201903030654/"/>; ++ <repository location="http://download.eclipse.org/modeling/emf/emf/builds/release/2.17/"/>; + </location> + + <location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit"> Added: head/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder Sun Apr 14 09:14:32 2019 (r498880) @@ -0,0 +1,288 @@ +diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml +--- eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml 0000-00-00 00:00:00.000000000 +0000 +@@ -111,7 +111,7 @@ + --> + <property + name="platformFile" +- value="eclipse-platform-${eclispeBaseLabel}-linux-gtk-x86_64.tar.gz" /> ++ value="eclipse-platform-${eclispeBaseLabel}-freebsd-gtk-amd64.tar.gz" /> + + <!-- + mavenproperties.properties is produced during the build and contains +@@ -334,4 +334,4 @@ + file="${settingsDir}/org.eclipse.core.net.prefs" /> + </target> + +-</project> +\ No newline at end of file ++</project> +diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml +--- eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml 0000-00-00 00:00:00.000000000 +0000 +@@ -8,12 +8,12 @@ + fileName="eclipse-SDK-${BUILD_ID}-win32-x86_64.zip"></platform> + <platform + id="SLG264" +- name="Linux (64 bit version)" +- fileName="eclipse-SDK-${BUILD_ID}-linux-gtk-x86_64.tar.gz"></platform> ++ name="FreeBSD (64 bit version)" ++ fileName="eclipse-SDK-${BUILD_ID}-freebsd-gtk-amd64.tar.gz"></platform> + <platform + id="SLG2PPC64LE" +- name="Linux (64 bit version for Power PC)" +- fileName="eclipse-SDK-${BUILD_ID}-linux-gtk-ppc64le.tar.gz"></platform> ++ name="FreeBSD (64 bit version for Power PC)" ++ fileName="eclipse-SDK-${BUILD_ID}-freebsd-gtk-powerpc64.tar.gz"></platform> + <platform + id="SMCC64" + name="Mac OSX (64 bit version)" +@@ -70,12 +70,12 @@ + fileName="eclipse-platform-${BUILD_ID}-win32-x86_64.zip"></platform> + <platform + id="PLG264" +- name="Linux (64 bit version)" +- fileName="eclipse-platform-${BUILD_ID}-linux-gtk-x86_64.tar.gz"></platform> ++ name="FreeBSD (64 bit version)" ++ fileName="eclipse-platform-${BUILD_ID}-freebsd-gtk-amd64.tar.gz"></platform> + <platform + id="PLG2PPC64LE" +- name="Linux (64 bit version for Power PC)" +- fileName="eclipse-platform-${BUILD_ID}-linux-gtk-ppc64le.tar.gz"></platform> ++ name="FreeBSD (64 bit version for Power PC)" ++ fileName="eclipse-platform-${BUILD_ID}-freebsd-gtk-powerpc64.tar.gz"></platform> + <platform + id="PMCC64" + name="Mac OSX (64 bit version)" +@@ -150,12 +150,12 @@ + fileName="swt-${BUILD_ID}-win32-win32-x86_64.zip"></platform> + <platform + id="SWTLG64" +- name="Linux (64 bit version)" +- fileName="swt-${BUILD_ID}-gtk-linux-x86_64.zip"></platform> ++ name="FreeBSD (64 bit version)" ++ fileName="swt-${BUILD_ID}-gtk-freebsd-amd64.zip"></platform> + <platform + id="SWTLG2PPC64LE" +- name="Linux (64 bit version for Power PC)" +- fileName="swt-${BUILD_ID}-gtk-linux-ppc64le.zip"></platform> ++ name="FreeBSD (64 bit version for Power PC)" ++ fileName="swt-${BUILD_ID}-gtk-freebsd-powerpc64.zip"></platform> + <platform + id="SWTMCC64" + name="Mac OSX (64 bit version)" +diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml +--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml 0000-00-00 00:00:00.000000000 +0000 +@@ -138,9 +138,9 @@ + <resolver>p2</resolver> + <environments> + <environment> +- <os>linux</os> ++ <os>freebsd</os> + <ws>gtk</ws> +- <arch>x86_64</arch> ++ <arch>amd64</arch> + </environment> + <environment> + <os>win32</os> +diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties +--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties 0000-00-00 00:00:00.000000000 +0000 +@@ -1,11 +1,11 @@ + #Properties required by equinox p2 tests + # Version from .../eclipse-junit-tests/src/main/resources/ + +-org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-${buildId}-linux-gtk-x86_64.tar.gz ++org.eclipse.equinox.p2.reconciler.tests.platform.archive.freebsd-amd64=\${basedir}/eclipse-platform-${buildId}-freebsd-gtk-amd64.tar.gz + org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-${buildId}-win32-x86_64.zip + org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-${buildId}-macosx-cocoa-x86_64.tar.gz + +-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.10-linux-gtk-x86_64.tar.gz ++org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.freebsd-x86_64=\${basedir}/eclipse-platform-4.10-freebsd-gtk-amd64.tar.gz + org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.10-win32-x86_64.zip + org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.10-macosx-cocoa-x86_64.tar.gz + +diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh +--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh 0000-00-00 00:00:00.000000000 +0000 +@@ -7,10 +7,10 @@ + + + mkdir -p workarea/${buildId}/eclipse-testing +-#cp /home/files/buildzips/oxygen/R/R-4.10-201812060815/eclipse-SDK-4.10-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/ +-cp /home/files/buildzips/oxygen/R/R-4.10-201812060815/eclipse-platform-4.10-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/ ++#cp /home/files/buildzips/oxygen/R/R-4.10-201812060815/eclipse-SDK-4.10-freebsd-gtk-amd64.tar.gz ./workarea/${buildId}/eclipse-testing/ ++cp /home/files/buildzips/oxygen/R/R-4.10-201812060815/eclipse-platform-4.10-freebsd-gtk-amd64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/ + +-cp ../../eclipse-SDK-${buildId}-linux-gtk-x86_64.tar.gz workarea/${buildId}/eclipse-testing/ ++cp ../../eclipse-SDK-${buildId}-freebsd-gtk-amd64.tar.gz workarea/${buildId}/eclipse-testing/ + + cp eclipse-junit-tests-${buildId}.zip workarea/${buildId}/eclipse-testing/ + +diff -ru eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml +--- eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml 0000-00-00 00:00:00.000000000 +0000 +@@ -14,8 +14,8 @@ + <target name="equinoxlaunchers"> + <property name="archiveRoot" value="launchers" /> + <buildRepos os="win32" ws="win32" arch="x86_64" archiveName="${archiveRoot}-win32.win32.x86_64.${buildId}.zip" /> +- <buildRepos os="linux" ws="gtk" arch="x86_64" archiveName="${archiveRoot}-linux.gtk.x86_64.${buildId}.tar.gz" /> +- <buildRepos os="linux" ws="gtk" arch="ppc64le" archiveName="${archiveRoot}-linux.gtk.ppc64le.${buildId}.tar.gz" /> ++ <buildRepos os="freebsd" ws="gtk" arch="amd64" archiveName="${archiveRoot}-freebsd.gtk.amd64.${buildId}.tar.gz" /> ++ <buildRepos os="freebsd" ws="gtk" arch="powerpc64" archiveName="${archiveRoot}-freebsd.gtk.powerpc64.${buildId}.tar.gz" /> + <buildRepos os="macosx" ws="cocoa" arch="x86_64" archiveName="${archiveRoot}-macosx.cocoa.x86_64.${buildId}.tar.gz" /> + </target> + +diff -ru eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product +--- eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product 0000-00-00 00:00:00.000000000 +0000 +@@ -18,7 +18,7 @@ + <windowImages/> + + <launcher name="rt"> +- <linux icon="icon.xpm"/> ++ <freebsd icon="icon.xpm"/> + <macosx icon="rt.icns"/> + <win useIco="true"> + <ico path="rt.ico"/> +diff -ru eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml +--- eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml 0000-00-00 00:00:00.000000000 +0000 +@@ -43,9 +43,9 @@ + <resolver>p2</resolver> + <environments> + <environment> +- <os>linux</os> ++ <os>freebsd</os> + <ws>gtk</ws> +- <arch>x86_64</arch> ++ <arch>amd64</arch> + </environment> + <environment> + <os>win32</os> +@@ -91,7 +91,7 @@ + <configuration> + <formats> + <win32>zip</win32> +- <linux>tar.gz</linux> ++ <freebsd>tar.gz</freebsd> + <macosx>tar.gz</macosx> + </formats> + </configuration> +diff -ru eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product +--- eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product 0000-00-00 00:00:00.000000000 +0000 +@@ -18,7 +18,7 @@ + <splash + location="org.eclipse.platform" /> + <launcher name="eclipse"> +- <linux icon="icons/icon.xpm"/> ++ <freebsd icon="icons/icon.xpm"/> + <macosx icon="icons/Eclipse.icns"/> + <win useIco="true"> + <ico path="icons/eclipse.ico"/> +diff -ru eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml +--- eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml 0000-00-00 00:00:00.000000000 +0000 +@@ -79,7 +79,7 @@ + <configuration> + <formats> + <win32>zip</win32> +- <linux>tar.gz</linux> ++ <freebsd>tar.gz</freebsd> + <macosx>tar.gz</macosx> + </formats> + </configuration> +diff -ru eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product +--- eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product 0000-00-00 00:00:00.000000000 +0000 +@@ -18,7 +18,7 @@ + <splash + location="org.eclipse.platform" /> + <launcher name="eclipse"> +- <linux icon="icons/icon.xpm"/> ++ <freebsd icon="icons/icon.xpm"/> + <macosx icon="icons/Eclipse.icns"/> + <win useIco="true"> + <ico path="icons/eclipse.ico"/> +diff -ru eclipse.platform.releng.tychoeclipsebuilder/pom.xml eclipse.platform.releng.tychoeclipsebuilder/pom.xml +--- eclipse.platform.releng.tychoeclipsebuilder/pom.xml 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.releng.tychoeclipsebuilder/pom.xml 0000-00-00 00:00:00.000000000 +0000 +@@ -36,7 +36,9 @@ + <module>platform</module> + <module>platform.sdk</module> + <module>sdk</module> ++ <!-- disabled + <module>eclipse-junit-tests</module> + <module>eclipse.platform.repository</module> ++ --> + </modules> + </project> +diff -ru eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product +--- eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product 0000-00-00 00:00:00.000000000 +0000 +@@ -16,7 +16,7 @@ + </launcherArgs> + + <launcher name="eclipse"> +- <linux icon="icons/icon.xpm"/> ++ <freebsd icon="icons/icon.xpm"/> + <macosx icon="icons/Eclipse.icns"/> + <win useIco="true"> + <ico path="icons/eclipse.ico"/> +diff -ru eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties +--- eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties 0000-00-00 00:00:00.000000000 +0000 +@@ -29,11 +29,11 @@ + #root.win32.win32.x86=file:executables/win32.win32.x86/eclipsec.exe + #root.win32.win32.x86_64=file:executables/win32.win32.x86_64/eclipsec.exe + +-root.linux.gtk.ppc64le=rootfiles/linux.gtk.ppc64le,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc64le +-root.linux.gtk.ppc64le.permissions.755=eclipse ++root.freebsd.gtk.powerpc64=rootfiles/freebsd.gtk.powerpc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/powerpc64 ++root.freebsd.gtk.powerpc64.permissions.755=eclipse + +-root.linux.gtk.x86_64=rootfiles/linux.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86_64 +-root.linux.gtk.x86_64.permissions.755=eclipse ++root.freebsd.gtk.amd64=rootfiles/freebsd.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/amd64 ++root.freebsd.gtk.amd64.permissions.755=eclipse + + bin.includes = feature.properties + +diff -ru eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product +--- eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product 0000-00-00 00:00:00.000000000 +0000 +@@ -18,7 +18,7 @@ + <windowImages/> + + <launcher name="eclipse"> +- <linux icon="icons/icon.xpm"/> ++ <freebsd icon="icons/icon.xpm"/> + <macosx icon="icons/Eclipse.icns"/> + <win useIco="true"> + <ico path="icons/eclipse.ico"/> +diff -ru eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml +--- eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml 0000-00-00 00:00:00.000000000 +0000 +@@ -77,7 +77,7 @@ + <configuration> + <formats> + <win32>zip</win32> +- <linux>tar.gz</linux> ++ <freebsd>tar.gz</freebsd> + <macosx>tar.gz</macosx> + </formats> + </configuration> +diff -ru eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product +--- eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product 0000-00-00 00:00:00.000000000 +0000 +@@ -18,7 +18,7 @@ + <splash + location="org.eclipse.platform" /> + <launcher name="eclipse"> +- <linux icon="icons/icon.xpm"/> ++ <freebsd icon="icons/icon.xpm"/> + <macosx icon="icons/Eclipse.icns"/> + <win useIco="true"> + <ico path="icons/eclipse.ico"/> Added: head/java/eclipse/files/patch-eclipse.platform.resources ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/eclipse/files/patch-eclipse.platform.resources Sun Apr 14 09:14:32 2019 (r498880) @@ -0,0 +1,235 @@ +diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile +--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile 0000-00-00 00:00:00.000000000 +0000 +@@ -20,7 +20,7 @@ + LIB_NAME_FULL = libunixfile_1_0_0.so + + #Set this to be your OS type +-OS_TYPE = linux ++OS_TYPE = freebsd + + #Set this to be the location of your JRE + ifeq (${JAVA_HOME},) +@@ -28,15 +28,11 @@ + endif + + JDK_INCLUDE = -I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS_TYPE} +-OPT_FLAGS=-O2 -g -s -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 ++OPT_FLAGS=-O2 -g -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 + + core: +- gcc $(OPT_FLAGS) -fPIC -c $(JDK_INCLUDE) -o $(CORE.O) $(CORE.C) +- gcc $(OPT_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(CORE.O) -lc ++ ${CC} $(OPT_FLAGS) -fPIC -c $(JDK_INCLUDE) -o $(CORE.O) $(CORE.C) ++ ${CC} $(OPT_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(CORE.O) -lc + + clean: + rm -f $(CORE.O) $(LIB_NAME_FULL) +- +-install: core +- rm -f ../../../../org.eclipse.core.filesystem.linux.x86/os/linux/x86/libunixfile_1_0_0.so +- mv libunixfile_1_0_0.so ../../../../org.eclipse.core.filesystem.linux.x86/os/linux/x86/ +diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/.project eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/.project +--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/.project 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/.project 0000-00-00 00:00:00.000000000 +0000 +@@ -1,6 +1,6 @@ + <?xml version="1.0" encoding="UTF-8"?> + <projectDescription> +- <name>org.eclipse.core.filesystem.linux.x86_64</name> ++ <name>org.eclipse.core.filesystem.freebsd.amd64</name> + <comment></comment> + <projects> + </projects> +diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/META-INF/MANIFEST.MF eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/META-INF/MANIFEST.MF +--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 +@@ -1,9 +1,9 @@ + Manifest-Version: 1.0 + Bundle-ManifestVersion: 2 + Bundle-Name: %fragmentName +-Bundle-SymbolicName: org.eclipse.core.filesystem.linux.x86_64; singleton:=true ++Bundle-SymbolicName: org.eclipse.core.filesystem.freebsd.amd64; singleton:=true + Bundle-Version: 1.2.300.qualifier + Bundle-Vendor: %providerName + Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.7.200,2.0.0)" + Bundle-Localization: fragment +-Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64)) ++Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=amd64)) +diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/pom.xml eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/pom.xml +--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/pom.xml 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.amd64/pom.xml 0000-00-00 00:00:00.000000000 +0000 +@@ -18,7 +18,7 @@ + <relativePath>../../</relativePath> + </parent> + <groupId>org.eclipse.core</groupId> +- <artifactId>org.eclipse.core.filesystem.linux.x86_64</artifactId> ++ <artifactId>org.eclipse.core.filesystem.freebsd.amd64</artifactId> + <version>1.2.300-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + +@@ -33,9 +33,9 @@ + <resolver>p2</resolver> + <environments> + <environment> +- <os>linux</os> ++ <os>freebsd</os> + <ws>gtk</ws> +- <arch>x86_64</arch> ++ <arch>amd64</arch> + </environment> + </environments> + </configuration> +@@ -50,7 +50,7 @@ + <property> + <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( --> + <name>native</name> +- <value>gtk.linux.x86_64</value> ++ <value>gtk.freebsd.amd64</value> + </property> + </activation> + <build> +@@ -63,10 +63,10 @@ + <phase>process-resources</phase> + <configuration> + <target> +- <exec executable="make" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/linux/"/> +- <mkdir dir="os/linux/x86_64/"/> +- <copy todir="os/linux/x86_64/"> +- <fileset dir="../org.eclipse.core.filesystem/natives/unix/linux/"> ++ <exec executable="gmake" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/freebsd/"/> ++ <mkdir dir="os/freebsd/amd64/"/> ++ <copy todir="os/freebsd/amd64/"> ++ <fileset dir="../org.eclipse.core.filesystem/natives/unix/freebsd/"> + <include name="libunixfile_*.so"/> + </fileset> + </copy> +diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.i386/META-INF/MANIFEST.MF eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.i386/META-INF/MANIFEST.MF +--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.i386/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.i386/META-INF/MANIFEST.MF 0000-00-00 00:00:00.000000000 +0000 +@@ -1,9 +1,9 @@ + Manifest-Version: 1.0 + Bundle-ManifestVersion: 2 + Bundle-Name: %fragmentName +-Bundle-SymbolicName: org.eclipse.core.filesystem.linux.x86; singleton:=true ++Bundle-SymbolicName: org.eclipse.core.filesystem.freebsd.i386; singleton:=true + Bundle-Version: 1.4.300.qualifier + Bundle-Vendor: %providerName + Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.7.200,2.0.0)" + Bundle-Localization: fragment +-Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86)) ++Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=i386)) +diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.i386/pom.xml eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.i386/pom.xml +--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.i386/pom.xml 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.i386/pom.xml 0000-00-00 00:00:00.000000000 +0000 +@@ -18,7 +18,7 @@ + <relativePath>../../</relativePath> + </parent> + <groupId>org.eclipse.core</groupId> +- <artifactId>org.eclipse.core.filesystem.linux.x86</artifactId> ++ <artifactId>org.eclipse.core.filesystem.freebsd.i386</artifactId> + <version>1.4.300-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + +@@ -33,9 +33,9 @@ + <resolver>p2</resolver> + <environments> + <environment> +- <os>linux</os> ++ <os>freebsd</os> + <ws>gtk</ws> *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904140914.x3E9EXMq046519>