Date: Thu, 26 Jun 2014 08:48:11 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359322 - in head/java/eclipse: . files scripts Message-ID: <201406260848.s5Q8mBuN060904@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Thu Jun 26 08:48:10 2014 New Revision: 359322 URL: http://svnweb.freebsd.org/changeset/ports/359322 QAT: https://qat.redports.org/buildarchive/r359322/ Log: java/eclipse: Update version 3.7.1 => 4.3.2 and assign maintainer At long last, eclipse has been updated to the latest release and is now under the stewardship of Jimmy Kelly. This version supports OpenJDK8 runtime environments. A special thanks to Jonathan Chen for getting the ball rolling after the PR stalled. PR: 188659 Submitted by: Jimmy Kelly Distfiles by: Jonathan Chen Verified by: F10/amd64 poudriere Added: head/java/eclipse/files/patch-aggregator (contents, props changed) head/java/eclipse/files/patch-freebsd_natives (contents, props changed) head/java/eclipse/files/patch-submodules (contents, props changed) head/java/eclipse/scripts/ head/java/eclipse/scripts/pre-patch (contents, props changed) Deleted: head/java/eclipse/Makefile.plugins head/java/eclipse/files/eclipse-build-config-upstream.patch head/java/eclipse/files/eclipse-build-upstream.patch head/java/eclipse/files/freebsd-support.patch head/java/eclipse/files/patch-dependencyManifests head/java/eclipse/files/patch-eclipse-build head/java/eclipse/files/patch-generatedScripts Modified: head/java/eclipse/Makefile head/java/eclipse/distinfo Modified: head/java/eclipse/Makefile ============================================================================== --- head/java/eclipse/Makefile Thu Jun 26 08:41:34 2014 (r359321) +++ head/java/eclipse/Makefile Thu Jun 26 08:48:10 2014 (r359322) @@ -1,247 +1,100 @@ +# Created by: Jimmy Kelley <ljboiler@gmail.com> # $FreeBSD$ PORTNAME= eclipse -PORTVERSION= 3.7.1 -PORTREVISION= 4 +PORTVERSION= 4.3.2 CATEGORIES= java devel -MASTER_SITES= http://download.eclipse.org/technology/linuxtools/eclipse-build/3.7.x_Indigo/:1 \ - http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository/plugins/:2 \ - ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:4,} \ - ${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%/,junit/junit/${JUNIT3_VERSION}/:5,} \ - http://cloud.github.com/downloads/KentBeck/junit/:6 \ - ${MASTER_SITE_APACHE_TOMCAT:S,%SUBDIR%/,tomcat-7/v${TOMCAT_VERSION}/bin/:7,} \ - ${MASTER_SITE_APACHE_TOMCAT:S,%SUBDIR%/,tomcat-7/v${TOMCAT_VERSION}/bin/extras/:7,} -DISTFILES= ${ECLIPSE_BUILD_SRCFILE}:1 \ - ${ECLIPSE_SRCFILE}:1 \ - ${ANT_SRCFILE}:4 \ - ${JUNIT3_SRCFILE}:5 \ - ${JUNIT4_SRCFILE}:6 \ - ${TOMCAT_SRCFILES:C,(.*),\\1:7,} +MASTER_SITES= https://googledrive.com/host/0B2kYpXHnC5LpSk01bU1ud0N5bXc/ +DISTFILES= eclipse.platform.releng.aggregator-${PORTVERSION}.xz \ + ${PORTNAME}-maven-repo-${PORTVERSION}.xz DIST_SUBDIR= eclipse -EXTRACT_ONLY= ${ECLIPSE_BUILD_SRCFILE} -MAINTAINER= ports@FreeBSD.org -COMMENT= Open extensible IDE for anything and nothing in particular +MAINTAINER= ljboiler@gmail.com +COMMENT= Eclipse Kepler SR-2 -EXTRACT_DEPENDS=${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip -PATCH_DEPENDS= ant:${PORTSDIR}/devel/apache-ant \ - gpatch:${PORTSDIR}/devel/patch \ - zip:${PORTSDIR}/archivers/zip \ - ${DEPEND_JAVA} -BUILD_DEPENDS= gpatch:${PORTSDIR}/devel/patch \ - rsync:${PORTSDIR}/net/rsync \ - ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip \ - zip:${PORTSDIR}/archivers/zip -LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \ - webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 +LICENSE= EPL -OPTIONS_DEFINE= TESTS -TESTS_DESC= Build SDK test suite +BUILD_DEPENDS= ${LOCALBASE}/share/java/maven31/bin/mvn:${PORTSDIR}/devel/maven31 +LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \ + libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2 ONLY_FOR_ARCHS= i386 amd64 +CONFLICTS_INSTALL= eclipse -USES= pkgconfig gmake tar:xz -USE_ANT= yes +USES= gmake pkgconfig tar:xz USE_GL= glu -USE_GNOME= desktopfileutils gconf2 gtk20 gnomevfs2 libgnome libgnomeui +USE_GNOME= gconf2 gtk20 gnomevfs2 libgnome libgnomeui USE_JAVA= yes -BZIP2_SUFX= .tar.bz2 -ZIP_CMD?= ${LOCALBASE}/bin/zip - -JAVA_BUILD= yes JAVA_OS= native -JAVA_RUN= yes -JAVA_VERSION= 1.6 +JAVA_VERSION= 1.7 JAVA_VENDOR= openjdk +JAVA_BUILD= yes +JAVA_RUN= yes -ECLIPSE_BUILD_SRCFILE= eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92${EXTRACT_SUFX} -ECLIPSE_SRCFILE= eclipse-${PORTVERSION}-src${BZIP2_SUFX} -ECLIPSE_TEST_SRCFILE= eclipse-sdktests-${PORTVERSION}-src${BZIP2_SUFX} -ECLIPSE_TEST_SCRIPTFILE=eclipse-sdktests-${PORTVERSION}-scripts${BZIP2_SUFX} -ECLIPSE_JAR_BUNDLES= com.ibm.icu_4.4.2.v20110208.jar \ - com.jcraft.jsch_0.1.41.v201101211617.jar \ - org.apache.commons.codec_1.3.0.v201101211617.jar \ - org.apache.commons.el_1.0.0.v201101211617.jar \ - org.apache.commons.httpclient_3.1.0.v201012070820.jar \ - org.apache.commons.logging_1.0.4.v201101211617.jar \ - org.apache.lucene.core_2.9.1.v201101211721.jar \ - org.apache.lucene.analysis_2.9.1.v201101211721.jar \ - org.hamcrest.core_1.1.0.v20090501071000.jar \ - org.mortbay.jetty.util_6.1.23.v201012071420.jar \ - org.mortbay.jetty.server_6.1.23.v201012071420.jar \ - org.objectweb.asm_3.3.1.v201105211655.jar -ECLIPSE_SAT4J_BUNDLES= org.sat4j.core_2.3.0.v20110329.jar \ - org.sat4j.pb_2.3.0.v20110329.jar -ANT_VERSION= 1.8.2 -ANT_SRCFILE= apache-ant-${ANT_VERSION}-bin${BZIP2_SUFX} -ANT_BUNDLES= ant-antlr.jar \ - ant-apache-bcel.jar \ - ant-apache-bsf.jar \ - ant-apache-log4j.jar \ - ant-apache-oro.jar \ - ant-apache-regexp.jar \ - ant-apache-resolver.jar \ - ant-apache-xalan2.jar \ - ant-commons-logging.jar \ - ant-commons-net.jar \ - ant.jar \ - ant-javamail.jar \ - ant-jdepend.jar \ - ant-jmf.jar \ - ant-jsch.jar \ - ant-junit.jar \ - ant-junit4.jar \ - ant-launcher.jar \ - ant-swing.jar \ - ant-testutil.jar -JUNIT3_VERSION= 3.8.2 -JUNIT3_SRCFILE= junit${JUNIT3_VERSION}.zip -JUNIT4_VERSION= 4.8.2 -JUNIT4_SRCFILE= junit-${JUNIT4_VERSION}.jar -TOMCAT_VERSION= 7.0.25 -TOMCAT_SRCFILES= apache-tomcat-${TOMCAT_VERSION}.tar.gz tomcat-juli.jar -TOMCAT_BUNDLES= el-api.jar \ - jasper-el.jar \ - jasper.jar \ - jsp-api.jar \ - servlet-api.jar \ - tomcat-api.jar \ - tomcat-juli.jar -FBSD_SUPPORT_SRCFILE= freebsd-support.patch -ECLIPSE_GENERATED_BUILDSCRIPTS= eclipse-build-generatedScripts.tar.bz2 - -ALL_TARGET= provision.cvs -INSTALL_TARGET= installSDKinDropins -MAKE_ARGS= -DbuildOs=freebsd -DbuildArch=${ARCH:C/amd64/x86_64/:C/i386/x86/} -Dprefix=${PREFIX} -Dlocalbase=${LOCALBASE} -Dlabel=${PORTVERSION} -MAKE_ENV+= GRE_HOME=${PREFIX}/lib/${GECKO:S/19//} _JAVA_OPTIONS="-Xmx1024m" JAVA_VENDOR=${JAVA_VENDOR} - -WRKSRC= ${WRKDIR}/${ECLIPSE_BUILD_SRCFILE:C/${EXTRACT_SUFX}//} +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) + +OPTIONS_DEFAULT= FULL_SDK + +.include <bsd.port.pre.mk> + +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 +PATCH_DEPENDS+= gpatch:${PORTSDIR}/devel/patch +PATCH= gpatch +.endif PATCH_STRIP= -p1 -BOOTCLASSPATH= ${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/jsse.jar -PORTDESTDIR= ${PREFIX}/lib/${PORTNAME} -DROPINS_DIR= share/${PORTNAME}/dropins - -PLIST_FILES= bin/${PORTNAME} \ - share/applications/${PORTNAME}.desktop \ - share/icons/hicolor/16x16/apps/${PORTNAME}.png \ - share/icons/hicolor/32x32/apps/${PORTNAME}.png \ - share/icons/hicolor/48x48/apps/${PORTNAME}.png \ - share/pixmaps/${PORTNAME}.png - -.for f in ${ECLIPSE_JAR_BUNDLES} ${ECLIPSE_SAT4J_BUNDLES} -DISTFILES+= ${f}:2 -.endfor - -NO_STAGE= yes -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MTESTS} -DISTFILES+= ${ECLIPSE_TEST_SRCFILE}:1 ${ECLIPSE_TEST_SCRIPTFILE}:1 +WRKSRC=${WRKDIR}/eclipse.platform.releng.aggregator-${PORTVERSION} +GITCLONE=${DISTDIR}/eclipse/eclipse-gitclone/eclipse.platform.releng.aggregator -BUILD_DEPENDS+= bash:${PORTSDIR}/shells/bash \ - Xvnc:${PORTSDIR}/net/tightvnc - -ALL_TARGET= runTests +MVN_LOCAL_REPO= -Dmaven.repo.local=${WRKDIR}/eclipse-maven-repo-${PORTVERSION}/repository +MVN_TEST_FLAG= -Dmaven.test.skip=true +MVN_OPTS+= # a placeholder for MAVEN_OPTS environment variable + #in the following format: MAVEN_OPTS='-Xmx1792m' +MVN_SETTINGS+= --offline +ECLIPSE_WS= gtk +ECLIPSE_ARCH= x86${ARCH:C/^i.86//:C/^amd/_/} +E_SHORTARCH= ${ARCH:C/^i.86//:C/^amd//} +ECLIPSE_BUILDID=M20140224-0627 +SCRIPTS_ENV+= ECLIPSE_ARCH=${ECLIPSE_ARCH} \ + E_SHORTARCH=${E_SHORTARCH} +PORTDESTDIR= ${PREFIX}/lib/eclipse + +# 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 - -# Prepare Eclipse source, Ant, JUnit and Tomcat bundles -post-extract: - @${MKDIR} ${BUILD_WRKSRC}/bundles - - @${CP} ${DISTDIR}/${DIST_SUBDIR}/${ECLIPSE_SRCFILE} ${BUILD_WRKSRC} - @${CP} ${FILESDIR}/${FBSD_SUPPORT_SRCFILE} ${BUILD_WRKSRC}/patches/ -.for f in ${ECLIPSE_JAR_BUNDLES} ${ECLIPSE_SAT4J_BUNDLES} - @${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${BUILD_WRKSRC}/bundles/ -.endfor - @(${MKDIR} ${BUILD_WRKSRC}/generatedScripts && cd ${BUILD_WRKSRC}/generatedScripts && ${TAR} ${EXTRACT_BEFORE_ARGS} ${BUILD_WRKSRC}/${ECLIPSE_GENERATED_BUILDSCRIPTS} ${EXTRACT_AFTER_ARGS}) - - @(cd ${WRKDIR} && ${TAR} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${ANT_SRCFILE} ${EXTRACT_AFTER_ARGS}) -.for f in ${ANT_BUNDLES} - @${CP} ${WRKDIR}/apache-ant-${ANT_VERSION}/lib/${f} ${BUILD_WRKSRC}/bundles/ -.endfor - - @${MKDIR} ${WRKDIR}/junit - @${UNZIP_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/${JUNIT3_SRCFILE} -d ${WRKDIR}/junit - @${CP} ${WRKDIR}/junit/junit${JUNIT3_VERSION}/junit.jar ${BUILD_WRKSRC}/bundles/ - @${CP} ${DISTDIR}/${DIST_SUBDIR}/${JUNIT4_SRCFILE} ${BUILD_WRKSRC}/bundles/junit4.jar - - @(cd ${WRKDIR} && ${TAR} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${TOMCAT_SRCFILES:Mapache-tomcat*.tar.gz} ${EXTRACT_AFTER_ARGS}) - @${CP} ${DISTDIR}/${DIST_SUBDIR}/${TOMCAT_SRCFILES:M*.jar} ${WRKDIR}/apache-tomcat-${TOMCAT_VERSION}/lib/ -.for f in ${TOMCAT_BUNDLES} - @${CP} ${WRKDIR}/apache-tomcat-${TOMCAT_VERSION}/lib/${f} ${BUILD_WRKSRC}/bundles/ -.endfor - -.if ${PORT_OPTIONS:MTESTS} - @${CP} ${DISTDIR}/${DIST_SUBDIR}/${ECLIPSE_TEST_SRCFILE} ${BUILD_WRKSRC} - @${CP} ${DISTDIR}/${DIST_SUBDIR}/${ECLIPSE_TEST_SCRIPTFILE} ${BUILD_WRKSRC} +.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 -# Apply patches that have been pushed upstream -pre-patch: - @${PATCH} -d ${BUILD_WRKSRC} --forward --quiet --suffix .orig -E -p0 -i ${PATCHDIR}/eclipse-build-upstream.patch - @${PATCH} -d ${BUILD_WRKSRC}/eclipse-build-config --forward --quiet --suffix .orig -E -p0 -i ${PATCHDIR}/eclipse-build-config-upstream.patch - -# Fixup boot classes path post-patch: - @(cd ${BUILD_WRKSRC}/generatedScripts; tar cjf ${BUILD_WRKSRC}/${ECLIPSE_GENERATED_BUILDSCRIPTS} plugins) - - @${REINPLACE_CMD} -e "s+%%BOOTCLASSPATH%%+${BOOTCLASSPATH}+g" ${BUILD_WRKSRC}/build.properties - @${REINPLACE_CMD} -e "s+%%BOOTCLASSPATH%%+${BOOTCLASSPATH}+g" ${BUILD_WRKSRC}/pdebuild.properties - @${REINPLACE_CMD} -e "s+%%PORTNAME%%+${PORTNAME}+g" ${BUILD_WRKSRC}/build.xml - @${REINPLACE_CMD} -e "s+%%PORTNAME%%+${PORTNAME}+g" ${BUILD_WRKSRC}/eclipse.desktop - - @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} applyPatches) - -.for f in ${ECLIPSE_JAR_BUNDLES} - @${REINPLACE_CMD} -e "s+^${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_WRKSRC}/dependencies.properties - @${REINPLACE_CMD} -e "s+^${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_WRKSRC}/jdtdependencies.properties - @${REINPLACE_CMD} -e "s+^${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_WRKSRC}/sdkdependencies.properties -.endfor -.for f in ${ECLIPSE_SAT4J_BUNDLES} - @${REINPLACE_CMD} -e "s+^${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_WRKSRC}/dependencies.properties -.endfor -.for f in ${ANT_BUNDLES} - @${REINPLACE_CMD} -e "s+${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_WRKSRC}/nonosgidependencies.properties -.endfor - @${REINPLACE_CMD} -e "s+=/usr/share/java/junit.jar+=${BUILD_WRKSRC}/bundles/junit.jar+" ${BUILD_WRKSRC}/jdtnonosgidependencies.properties - @${REINPLACE_CMD} -e "s+=/usr/share/java/junit4.jar+=${BUILD_WRKSRC}/bundles/junit4.jar+" ${BUILD_WRKSRC}/jdtnonosgidependencies.properties - @${REINPLACE_CMD} -e "s+/usr/share/java/junit4.jar+${BUILD_WRKSRC}/bundles/junit4.jar+" ${BUILD_WRKSRC}/build.xml - - @${REINPLACE_CMD} -e "s+^\(javax.el_2.2.0.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/el-api.jar+" ${BUILD_WRKSRC}/dependencies.properties - @${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/javax.el_2.2.0.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/el-api.jar - @${REINPLACE_CMD} -e "s+^\(org.apache.el_7.0.21.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/jasper-el.jar+" ${BUILD_WRKSRC}/dependencies.properties - @${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/org.apache.el_7.0.21.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/jasper-el.jar - @${REINPLACE_CMD} -e "s+^\(org.apache.jasper_7.0.21.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/jasper.jar+" ${BUILD_WRKSRC}/dependencies.properties - @${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/org.apache.jasper_7.0.21.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/jasper.jar - @${REINPLACE_CMD} -e "s+^\(javax.servlet.jsp_2.2.0.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/jsp-api.jar+" ${BUILD_WRKSRC}/dependencies.properties - @${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/javax.servlet.jsp_2.2.0.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/jsp-api.jar - @${REINPLACE_CMD} -e "s+^\(javax.servlet_3.0.0.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/servlet-api.jar+" ${BUILD_WRKSRC}/dependencies.properties - @${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/javax.servlet_3.0.0.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/servlet-api.jar - @${REINPLACE_CMD} -e "s+^\(org.apache.tomcat_7.0.21.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/tomcat-api.jar+" ${BUILD_WRKSRC}/dependencies.properties - @${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/org.apache.tomcat_7.0.21.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/tomcat-api.jar - @${REINPLACE_CMD} -e "s+^\(org.apache.juli_7.0.21.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/tomcat-juli.jar+" ${BUILD_WRKSRC}/dependencies.properties - @${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/org.apache.juli_7.0.21.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/tomcat-juli.jar - - @${MV} ${BUILD_WRKSRC}/dependencyManifests/com.jcraft.jsch_0.1.41.v200903070017.jar ${BUILD_WRKSRC}/dependencyManifests/com.jcraft.jsch_0.1.41.v201101211617.jar - @${MV} ${BUILD_WRKSRC}/dependencyManifests/org.apache.commons.el_1.0.0.v200806031608.jar ${BUILD_WRKSRC}/dependencyManifests/org.apache.commons.el_1.0.0.v201101211617.jar - @${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/org.apache.commons.el_1.0.0.v201101211617.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/org.apache.commons.el_1.0.0.v201101211617.jar - @${ZIP_CMD} -qd ${BUILD_WRKSRC}/bundles/org.apache.commons.el_1.0.0.v201101211617.jar META-INF/ECLIPSEF.SF META-INF/ECLIPSEF.RSA - @${MV} ${BUILD_WRKSRC}/dependencyManifests/org.apache.commons.httpclient_3.1.0.v201005080502.jar ${BUILD_WRKSRC}/dependencyManifests/org.apache.commons.httpclient_3.1.0.v201012070820.jar - @${MV} ${BUILD_WRKSRC}/dependencyManifests/org.mortbay.jetty.server_6.1.23.v201004211559.jar ${BUILD_WRKSRC}/dependencyManifests/org.mortbay.jetty.server_6.1.23.v201012071420.jar - @${MV} ${BUILD_WRKSRC}/dependencyManifests/org.mortbay.jetty.util_6.1.23.v201004211559.jar ${BUILD_WRKSRC}/dependencyManifests/org.mortbay.jetty.util_6.1.23.v201012071420.jar - @${MV} ${BUILD_WRKSRC}/dependencyManifests/org.objectweb.asm_3.3.1.v201101071600.jar ${BUILD_WRKSRC}/dependencyManifests/org.objectweb.asm_3.3.1.v201105211655.jar - -.if defined(WITH_TESTS) - @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} applyTestPatches) -.endif + @(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/maven31 ${MVN_OPTS} \ + mvn ${MVN_SETTINGS} ${MVN_TEST_FLAG} ${MVN_LOCAL_REPO} clean verify -Dnative=${ECLIPSE_WS}.freebsd.${ECLIPSE_ARCH} \ + -DbuildId=${ECLIPSE_BUILDID} -Pupdate-branding-plugins) do-install: - @${RM} -rf ${PORTDESTDIR} - @${MKDIR} ${PORTDESTDIR} - @${MKDIR} ${PREFIX}/${DROPINS_DIR} - @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} ${INSTALL_TARGET}) - @${FIND} ${PORTDESTDIR}/plugins -type f -perm 600 -print0 | ${XARGS} -0 ${CHMOD} 644 + @${RM} -rf ${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" \ @@ -257,23 +110,19 @@ do-install: @${REINPLACE_CMD} -e "s+%%JAVA_VENDOR_SPECIFICATION%%++g" \ ${BUILD_WRKSRC}/eclipse.tmp .endif - @${INSTALL_SCRIPT} ${WRKSRC}/eclipse.tmp ${PREFIX}/bin/${PORTNAME} - @${PREFIX}/bin/${PORTNAME} -initialize -consolelog - -@update-desktop-database - @(cd ${PREFIX}; ${FIND} -s lib/${PORTNAME} -not -type d) >> ${TMPPLIST} - @(cd ${PREFIX}; ${FIND} -s -d lib/${PORTNAME} -type d) | ${SED} -ne "s,^,@dirrm ,p" >> ${TMPPLIST} - @${ECHO_CMD} "@exec ${MKDIR} %D/share/${PORTNAME}/dropins 2>/dev/null || true " >> ${TMPPLIST} - @${ECHO_CMD} "@unexec ${RMDIR} %D/share/${PORTNAME}/dropins 2>/dev/null || true " >> ${TMPPLIST} - @${ECHO_CMD} "@unexec ${RMDIR} %D/share/${PORTNAME} 2>/dev/null || true " >> ${TMPPLIST} - @${ECHO_CMD} "@exec ${PREFIX}/bin/update-desktop-database > /dev/null || /usr/bin/true" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec ${PREFIX}/bin/update-desktop-database > /dev/null || /usr/bin/true" >> ${TMPPLIST} - -.if ${PORT_OPTIONS:MTESTS} -tests: build - @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} runTests) -.else -tests: - @${ECHO_CMD} "Tests are not enabled!" -.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) | ${SED} -ne "s,^,@dirrm ,p" >> ${TMPPLIST} + @${ECHO_CMD} "@exec ${MKDIR} %D/lib/eclipse/dropins > /dev/null || ${TRUE}" >> ${TMPPLIST} + @${ECHO_CMD} "@exec ${MKDIR} %D/share/eclipse/dropins > /dev/null || ${TRUE}" >> ${TMPPLIST} + @${ECHO_CMD} "@dirrm share/eclipse/dropins" >> ${TMPPLIST} + @${ECHO_CMD} "@dirrm share/eclipse" >> ${TMPPLIST} + +post-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/share/eclipse/dropins + +distclean: + ${RM} -rf ${DISTDIR}/eclipse -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/java/eclipse/distinfo ============================================================================== --- head/java/eclipse/distinfo Thu Jun 26 08:41:34 2014 (r359321) +++ head/java/eclipse/distinfo Thu Jun 26 08:48:10 2014 (r359322) @@ -1,44 +1,4 @@ -SHA256 (eclipse/eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92.tar.xz) = 07f3d9c564e0c8b5ad8a9cee5645a295913059885290e4e4a77631d17b494265 -SIZE (eclipse/eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92.tar.xz) = 253596 -SHA256 (eclipse/eclipse-3.7.1-src.tar.bz2) = f3a87ff4408aeadc6823eb849330527df07d5706d6456af282170bb9bbbd31d6 -SIZE (eclipse/eclipse-3.7.1-src.tar.bz2) = 69243059 -SHA256 (eclipse/apache-ant-1.8.2-bin.tar.bz2) = ecb49f5017807c9320bf19702149328cf4779a01bddca2b6c47e3ebb0e39c9c7 -SIZE (eclipse/apache-ant-1.8.2-bin.tar.bz2) = 6740047 -SHA256 (eclipse/junit3.8.2.zip) = aae23d20e6f4dc45b4bf0b10fedcbd209c100342a0cafce1aa07d2da6da1f24a -SIZE (eclipse/junit3.8.2.zip) = 461426 -SHA256 (eclipse/junit-4.8.2.jar) = a2aa2c3bb2b72da76c3e6a71531f1eefdc350494819baf2b1d80d7146e020f9e -SIZE (eclipse/junit-4.8.2.jar) = 237344 -SHA256 (eclipse/apache-tomcat-7.0.25.tar.gz) = 7ba03b6703b43da6868613fd625bfb13a791d57478b4a4e49bdb56f9fc3994b4 -SIZE (eclipse/apache-tomcat-7.0.25.tar.gz) = 7527434 -SHA256 (eclipse/tomcat-juli.jar) = cafd9cf2e73dd21d3fbe89fc83ae235a588342c11f7b8df7c55573aebc25f0d1 -SIZE (eclipse/tomcat-juli.jar) = 78801 -SHA256 (eclipse/com.ibm.icu_4.4.2.v20110208.jar) = 432cdb7d9af5f138fbfd1902c197f01a314422a7db760e291cab2c76d8d65be8 -SIZE (eclipse/com.ibm.icu_4.4.2.v20110208.jar) = 6690628 -SHA256 (eclipse/com.jcraft.jsch_0.1.41.v201101211617.jar) = 7e916b685794f33f494668f738a5aee51da67af04f0ebfb68048900032e36d1a -SIZE (eclipse/com.jcraft.jsch_0.1.41.v201101211617.jar) = 226770 -SHA256 (eclipse/org.apache.commons.codec_1.3.0.v201101211617.jar) = 47dc744368dc7a4cde2be1e9d9e744ec014dca27ff7a23722da12db10e67419e -SIZE (eclipse/org.apache.commons.codec_1.3.0.v201101211617.jar) = 55011 -SHA256 (eclipse/org.apache.commons.el_1.0.0.v201101211617.jar) = 31867a6e2166e744dced07606852ef84e41db24bfd93a3da375ef4454bde13bc -SIZE (eclipse/org.apache.commons.el_1.0.0.v201101211617.jar) = 128684 -SHA256 (eclipse/org.apache.commons.httpclient_3.1.0.v201012070820.jar) = 606861c12a82c8336bfd38e9f1e80d105a9cdebd87e4fbd88bc4203f21441402 -SIZE (eclipse/org.apache.commons.httpclient_3.1.0.v201012070820.jar) = 321633 -SHA256 (eclipse/org.apache.commons.logging_1.0.4.v201101211617.jar) = 453d6f5e9d3f1682ed0eb86110231b6182f1d6d2a95fd2c528496818a01383ac -SIZE (eclipse/org.apache.commons.logging_1.0.4.v201101211617.jar) = 45405 -SHA256 (eclipse/org.apache.lucene.core_2.9.1.v201101211721.jar) = 87215c54c69432935278f72fe5594500cc076630018dee21646131b4d678bd51 -SIZE (eclipse/org.apache.lucene.core_2.9.1.v201101211721.jar) = 1168475 -SHA256 (eclipse/org.apache.lucene.analysis_2.9.1.v201101211721.jar) = cc5dde23abac55f232543732ab2f97131c058295e4e33e60872234cef73c405a -SIZE (eclipse/org.apache.lucene.analysis_2.9.1.v201101211721.jar) = 216089 -SHA256 (eclipse/org.hamcrest.core_1.1.0.v20090501071000.jar) = 3990293a31c98e079be5c24410fcaefb06f2770547879b27796651f8df092a0e -SIZE (eclipse/org.hamcrest.core_1.1.0.v20090501071000.jar) = 27827 -SHA256 (eclipse/org.mortbay.jetty.util_6.1.23.v201012071420.jar) = b41cf1845a7b05dbdcc57a4631367f4ba94fea2a2a7145797167533cb73edbdd -SIZE (eclipse/org.mortbay.jetty.util_6.1.23.v201012071420.jar) = 193298 -SHA256 (eclipse/org.mortbay.jetty.server_6.1.23.v201012071420.jar) = 88fcf37ef94f63d920a1ca438cf17a79f19900da95ba27c6374440d9388ecaeb -SIZE (eclipse/org.mortbay.jetty.server_6.1.23.v201012071420.jar) = 557887 -SHA256 (eclipse/org.objectweb.asm_3.3.1.v201105211655.jar) = 84920bb2d003a88e9a585b7daa2cc163aa6bc5e9efa997f8622436ca3fac3b95 -SIZE (eclipse/org.objectweb.asm_3.3.1.v201105211655.jar) = 228617 -SHA256 (eclipse/org.sat4j.core_2.3.0.v20110329.jar) = 3e6c4a633ede8c24a86559cf9fc2231840dbf032398a38a960677723906728c1 -SIZE (eclipse/org.sat4j.core_2.3.0.v20110329.jar) = 210700 -SHA256 (eclipse/org.sat4j.pb_2.3.0.v20110329.jar) = c40ca55dad3a937dc4c4005e5facf11204a61d56824c2b19eac480dfbeeaaafd -SIZE (eclipse/org.sat4j.pb_2.3.0.v20110329.jar) = 140725 -SHA256 (eclipse/eclipse-sdktests-3.7.1-src.tar.bz2) = 584a95a956c92bcf812563404da1e232a6cbd50cbe9757ab471b0d95f283a20f -SIZE (eclipse/eclipse-sdktests-3.7.1-src.tar.bz2) = 123690224 +SHA256 (eclipse/eclipse.platform.releng.aggregator-4.3.2.xz) = 2453b2f8e12c7cd90f15dc34519e785befb69ef014e07cd2b180f8a4d7b557cd +SIZE (eclipse/eclipse.platform.releng.aggregator-4.3.2.xz) = 196545676 +SHA256 (eclipse/eclipse-maven-repo-4.3.2.xz) = f5288a26d9bdb22f5a455bba52f73589918c9bcff65bb667ae6d246467a61ca8 +SIZE (eclipse/eclipse-maven-repo-4.3.2.xz) = 185972692 Added: head/java/eclipse/files/patch-aggregator ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/eclipse/files/patch-aggregator Thu Jun 26 08:48:10 2014 (r359322) @@ -0,0 +1,385 @@ +diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml +index ce98be7..fa2d1e1 100644 +--- a/eclipse-platform-parent/pom.xml ++++ b/eclipse-platform-parent/pom.xml +@@ -155,6 +155,12 @@ + </target> + <environments> + <environment> ++ <os>freebsd</os> ++ <ws>gtk</ws> ++ <arch>%%ECLIPSE_ARCH%%</arch> ++ </environment> ++<!-- ++ <environment> + <os>linux</os> + <ws>gtk</ws> + <arch>x86</arch> +@@ -229,6 +235,7 @@ + <ws>gtk</ws> + <arch>ppc64</arch> + </environment> ++--> + </environments> + </configuration> + </plugin> +@@ -308,11 +315,11 @@ + <artifactId>tycho-packaging-plugin</artifactId> + <version>${tycho.version}</version> + <dependencies> +- <dependency> ++ <!--dependency> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-buildtimestamp-jgit</artifactId> + <version>${tycho-extras.version}</version> +- </dependency> ++ </dependency--> + <dependency> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-sourceref-jgit</artifactId> +@@ -322,14 +329,14 @@ + <configuration> + <strictBinIncludes>false</strictBinIncludes> + <format>'v'yyyyMMdd-HHmm</format> +- <timestampProvider>jgit</timestampProvider> ++ <!--timestampProvider>jgit</timestampProvider--> + <jgit.ignore> + pom.xml + </jgit.ignore> + <jgit.dirtyWorkingTree>${jgit.dirtyWorkingTree}</jgit.dirtyWorkingTree> +- <sourceReferences> ++ <!--sourceReferences> + <generate>true</generate> +- </sourceReferences> ++ </sourceReferences--> + <archive> + <addMavenDescriptor>false</addMavenDescriptor> + </archive> +diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml +index 81a82e1..dc2fdd9 100644 +--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml ++++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml +@@ -121,6 +121,12 @@ + <resolver>p2</resolver> + <environments> + <environment> ++ <os>freebsd</os> ++ <ws>gtk</ws> ++ <arch>%%ECLIPSE_ARCH%%</arch> ++ </environment> ++<!-- ++ <environment> + <os>linux</os> + <ws>gtk</ws> + <arch>x86</arch> +@@ -145,6 +156,7 @@ + <ws>cocoa</ws> + <arch>x86_64</arch> + </environment> ++--> + </environments> + </configuration> + </plugin> +diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml +index 60e4299..4c9106e 100644 +--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml ++++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml +@@ -112,6 +112,7 @@ + <configuration> + <formats> + <win32>zip</win32> ++ <freebsd>tar.gz</freebsd> + <linux>tar.gz</linux> + <macosx>tar.gz</macosx> + </formats> +diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml +index 14b8336..0b97442 100644 +--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml ++++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml +@@ -15,6 +15,8 @@ + <property name="archiveRoot" value="launchers" /> + <buildRepos os="win32" ws="win32" arch="x86" archiveName="${archiveRoot}-win32.win32.x86.${buildId}.zip" /> + <buildRepos os="win32" ws="win32" arch="x86_64" archiveName="${archiveRoot}-win32.win32.x86_64.${buildId}.zip" /> ++ <buildRepos os="freebsd" ws="gtk" arch="x86" archiveName="${archiveRoot}-freebsd.gtk.x86.${buildId}.tar.gz" /> ++ <buildRepos os="freebsd" ws="gtk" arch="x86_64" archiveName="${archiveRoot}-freebsd.gtk.x86_64.${buildId}.tar.gz" /> + <buildRepos os="linux" ws="gtk" arch="x86" archiveName="${archiveRoot}-linux.gtk.x86.${buildId}.tar.gz" /> + <buildRepos os="linux" ws="gtk" arch="x86_64" archiveName="${archiveRoot}-linux.gtk.x86_64.${buildId}.tar.gz" /> + <buildRepos os="linux" ws="gtk" arch="ppc" archiveName="${archiveRoot}-linux.gtk.ppc.${buildId}.tar.gz" /> +diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml +index 129d0a6..a8f76b6 100644 +--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml ++++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml +@@ -278,6 +278,16 @@ + fileName="launchers-win32.win32.x86_64.${BUILD_ID}.zip" /> + <platform + format="equinox" ++ id="SFG2" ++ name="FreeBSD (x86/GTK 2)" ++ fileName="launchers-freebsd.gtk.x86.${BUILD_ID}.tar.gz" /> ++ <platform ++ format="equinox" ++ id="SFG264" ++ name="FreeBSD (x86_64/GTK 2)" ++ fileName="launchers-freebsd.gtk.x86_64.${BUILD_ID}.tar.gz" /> ++ <platform ++ format="equinox" + id="SLG2" + name="Linux (x86/GTK 2)" + fileName="launchers-linux.gtk.x86.${BUILD_ID}.tar.gz" /> +@@ -346,6 +356,16 @@ + fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-win32-win32-x86_64.zip" /> + <platform + format="equinox" ++ id="ESFG2" ++ name="FreeBSD (x86/GTK 2)" ++ fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-freebsd-gtk-x86.tar.gz" /> ++ <platform ++ format="equinox" ++ id="ESFG264" ++ name="FreeBSD (x86_64/GTK 2)" ++ fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-freebsd-gtk-x86_64.tar.gz" /> ++ <platform ++ format="equinox" + id="ESLG2" + name="Linux (x86/GTK 2)" + fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-linux-gtk-x86.tar.gz" /> +diff --git a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties +index 80a32e4..fcb7ed5 100644 +--- a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties ++++ b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties +@@ -27,6 +27,11 @@ root.solaris.gtk.sparc.permissions.755=eclipse + root.solaris.gtk.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/x86 + root.solaris.gtk.x86.permissions.755=eclipse + ++root.freebsd.gtk.x86=rootfiles/freebsd.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/x86 ++root.freebsd.gtk.x86.permissions.755=libcairo-swt.so,eclipse ++root.freebsd.gtk.x86_64=rootfiles/freebsd.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/x86_64 ++root.freebsd.gtk.x86_64.permissions.755=libcairo-swt.so,eclipse ++ + root.linux.gtk.x86=rootfiles/linux.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86 + root.linux.gtk.x86.permissions.755=libcairo-swt.so,eclipse + root.linux.gtk.ppc=rootfiles/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc +@@ -69,10 +74,3 @@ root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/eclipse + root.macosx.cocoa.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse + + bin.includes = feature.properties +- +- +- +- +- +- +- +diff --git a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/pom.xml +index 2c342a3..5e27062 100644 +--- a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/pom.xml ++++ b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/pom.xml +@@ -20,6 +20,25 @@ + <version>2.6</version> + <executions> + <execution> ++ <id>copy-resources-gtk.freebsd.%%ECLIPSE_ARCH%%</id> ++ <phase>validate</phase> ++ <goals> ++ <goal>copy-resources</goal> ++ </goals> ++ <configuration> ++ <outputDirectory>${basedir}/rootfiles/freebsd.gtk.%%ECLIPSE_ARCH%%</outputDirectory> ++ <resources> ++ <resource> ++ <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.%%ECLIPSE_ARCH%%</directory> ++ <includes> ++ <include>about_files/*</include> ++ <include>about.html</include> ++ </includes> ++ </resource> ++ </resources> ++ </configuration> ++ </execution> ++ <execution> + <id>copy-resources-gtk.linux.x86</id> + <phase>validate</phase> + <goals> +diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml +index bc261f9..88e8522 100644 +--- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml ++++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml +@@ -91,6 +91,7 @@ + <configuration> + <formats> + <win32>zip</win32> ++ <freebsd>tar.gz</freebsd> + <linux>tar.gz</linux> + <macosx>tar.gz</macosx> + </formats> +diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf +index c2f679b..742fe0b 100644 +--- a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf ++++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf +@@ -55,6 +55,23 @@ units.3.touchpoint.version=1.0.0 + units.3.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true); + units.3.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo); + ++requires.4.namespace=org.eclipse.equinox.p2.iu ++requires.4.name=toolingorg.eclipse.platform.configuration.gtk.freebsd.%%ECLIPSE_ARCH%% ++requires.4.filter=(&(osgi.os=freebsd) (osgi.arch=%%ECLIPSE_ARCH%%) (osgi.ws=gtk)) ++requires.4.range=[1.0.0,1.0.0] ++requires.4.greedy=true ++ ++units.4.id=toolingorg.eclipse.platform.configuration.gtk.freebsd.%%ECLIPSE_ARCH%% ++units.4.version=1.0.0 ++units.4.provides.1.namespace=org.eclipse.equinox.p2.iu ++units.4.provides.1.name=toolingorg.eclipse.platform.configuration.gtk.freebsd.%%ECLIPSE_ARCH%% ++units.4.provides.1.version=1.0.0 ++units.4.filter=(&(osgi.os=freebsd) (osgi.arch=%%ECLIPSE_ARCH%%) (osgi.ws=gtk)) ++units.4.touchpoint.id=org.eclipse.equinox.p2.osgi ++units.4.touchpoint.version=1.0.0 ++units.4.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true); ++units.4.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo); ++ + # Restrict range so we are not an automatic update for 3.x. + update.id = org.eclipse.platform.ide + update.range = [4.0,$version$) +diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml +index d8468e6..b6c77d5 100644 +--- a/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml ++++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml +@@ -92,6 +92,7 @@ + <configuration> + <formats> + <win32>zip</win32> ++ <freebsd>tar.gz</freebsd> + <linux>tar.gz</linux> + <macosx>tar.gz</macosx> + </formats> +diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties +index 80a32e4..fcb7ed5 100644 +--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties ++++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties +@@ -27,6 +27,11 @@ root.solaris.gtk.sparc.permissions.755=eclipse + root.solaris.gtk.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/x86 + root.solaris.gtk.x86.permissions.755=eclipse + ++root.freebsd.gtk.x86=rootfiles/freebsd.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/x86 ++root.freebsd.gtk.x86.permissions.755=libcairo-swt.so,eclipse ++root.freebsd.gtk.x86_64=rootfiles/freebsd.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/x86_64 ++root.freebsd.gtk.x86_64.permissions.755=libcairo-swt.so,eclipse ++ + root.linux.gtk.x86=rootfiles/linux.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86 + root.linux.gtk.x86.permissions.755=libcairo-swt.so,eclipse + root.linux.gtk.ppc=rootfiles/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc +@@ -69,10 +74,3 @@ root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/eclipse + root.macosx.cocoa.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse + + bin.includes = feature.properties +- +- +- +- +- +- +- +diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml +index bb03da8..75632a0 100644 +--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml ++++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml +@@ -20,6 +20,25 @@ + <version>2.6</version> + <executions> + <execution> ++ <id>copy-resources-gtk.freebsd.%%ECLIPSE_ARCH%%</id> ++ <phase>validate</phase> ++ <goals> ++ <goal>copy-resources</goal> ++ </goals> ++ <configuration> ++ <outputDirectory>${basedir}/rootfiles/freebsd.gtk.%%ECLIPSE_ARCH%%</outputDirectory> ++ <resources> ++ <resource> ++ <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.%%ECLIPSE_ARCH%%</directory> ++ <includes> ++ <include>about_files/*</include> ++ <include>about.html</include> ++ </includes> ++ </resource> ++ </resources> ++ </configuration> ++ </execution> ++ <execution> + <id>copy-resources-gtk.linux.x86</id> + <phase>validate</phase> + <goals> +diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml +index 0ea4fd3..5bd93db 100644 +--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml ++++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml +@@ -91,6 +91,7 @@ + <configuration> + <formats> + <win32>zip</win32> ++ <freebsd>tar.gz</freebsd> + <linux>tar.gz</linux> + <macosx>tar.gz</macosx> + </formats> +diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml +index ce76451..3b40705 100644 +--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml ++++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml +@@ -91,6 +91,7 @@ + <configuration> + <formats> + <win32>zip</win32> ++ <freebsd>tar.gz</freebsd> + <linux>tar.gz</linux> + <macosx>tar.gz</macosx> + </formats> +diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml +index bf2f66a..5a37141 100644 +--- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml ++++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml +@@ -91,6 +91,7 @@ + <configuration> + <formats> + <win32>zip</win32> ++ <freebsd>tar.gz</freebsd> + <linux>tar.gz</linux> + <macosx>tar.gz</macosx> + </formats> +diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf +index 6b59ed2..64975ba 100644 +--- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf ++++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf +@@ -89,6 +89,23 @@ units.5.touchpoint.version=1.0.0 + units.5.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true); + units.5.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo); + ++requires.6.namespace=org.eclipse.equinox.p2.iu ++requires.6.name=toolingorg.eclipse.sdk.configuration.gtk.freebsd.%%ECLIPSE_ARCH%% ++requires.6.filter=(&(osgi.os=freebsd) (osgi.arch=%%ECLIPSE_ARCH%%) (osgi.ws=gtk)) ++requires.6.range=[1.0.0,1.0.0] ++requires.6.greedy=true ++ ++units.6.id=toolingorg.eclipse.sdk.configuration.gtk.freebsd.%%ECLIPSE_ARCH%% ++units.6.version=1.0.0 ++units.6.provides.1.namespace=org.eclipse.equinox.p2.iu ++units.6.provides.1.name=toolingorg.eclipse.sdk.configuration.gtk.freebsd.%%ECLIPSE_ARCH%% ++units.6.provides.1.version=1.0.0 ++units.6.filter=(&(osgi.os=freebsd) (osgi.arch=%%ECLIPSE_ARCH%%) (osgi.ws=gtk)) ++units.6.touchpoint.id=org.eclipse.equinox.p2.osgi ++units.6.touchpoint.version=1.0.0 ++units.6.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true); ++units.6.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo); ++ + # Restrict range so we are not an automatic update for 3.x. + update.id= org.eclipse.sdk.ide + update.range = [4.0,$version$) +--- a/pom.xml.orig 2014-06-05 16:00:15.000000000 -0500 ++++ a/pom.xml 2014-06-19 18:03:47.000000000 -0500 +@@ -50,6 +50,6 @@ + + <module>eclipse.platform.releng</module> + <module>eclipse.platform.releng.tychoeclipsebuilder</module> +- <module>eclipse.platform.repository</module> ++<!-- <module>eclipse.platform.repository</module> --> + </modules> + </project> Added: head/java/eclipse/files/patch-freebsd_natives ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/eclipse/files/patch-freebsd_natives Thu Jun 26 08:48:10 2014 (r359322) @@ -0,0 +1,577 @@ +--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile.orig 2014-03-30 18:38:29.000000000 -0500 ++++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile 2014-03-30 19:41:07.000000000 -0500 +@@ -17,7 +17,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},) +@@ -25,15 +25,11 @@ + endif + + JDK_INCLUDE = -I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS_TYPE} +-OPT_FLAGS=-O -s -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 ++OPT_FLAGS=-O -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/ +--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.x86/META-INF/MANIFEST.MF.orig 2014-03-30 18:38:29.000000000 -0500 ++++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.x86/META-INF/MANIFEST.MF 2014-03-30 19:32:26.000000000 -0500 +@@ -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.x86; singleton:=true + Bundle-Version: 1.4.100.qualifier + Bundle-Vendor: %providerName + Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.3.0,2.0.0)" + Bundle-Localization: fragment +-Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86)) ++Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86)) +--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.x86/pom.xml.orig 2014-03-30 18:38:29.000000000 -0500 ++++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.x86/pom.xml 2014-03-30 19:37:41.000000000 -0500 +@@ -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.x86</artifactId> + <version>1.4.100-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + +@@ -33,7 +33,7 @@ + <resolver>p2</resolver> + <environments> + <environment> +- <os>linux</os> ++ <os>freebsd</os> + <ws>gtk</ws> + <arch>x86</arch> + </environment> +@@ -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</value> ++ <value>gtk.freebsd.x86</value> + </property> + </activation> + <build> +@@ -64,12 +64,13 @@ + <phase>process-resources</phase> + <configuration> + <target> +- <exec executable="make" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/linux/"/> +- <copy todir="os/linux/x86" > +- <fileset dir="../org.eclipse.core.filesystem/natives/unix/linux/"> +- <include name="libunixfile_*.so"/> +- </fileset> +- </copy> ++ <exec executable="gmake" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/freebsd/"/> ++ <mkdir dir="os/freebsd/x86"/> ++ <copy todir="os/freebsd/x86" > ++ <fileset dir="../org.eclipse.core.filesystem/natives/unix/freebsd/"> ++ <include name="libunixfile_*.so"/> ++ </fileset> ++ </copy> + </target> + </configuration> + <goals> +--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.x86_64/META-INF/MANIFEST.MF.orig 2014-03-30 18:38:29.000000000 -0500 ++++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.x86_64/META-INF/MANIFEST.MF 2014-03-30 19:33:50.000000000 -0500 +@@ -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.x86_64; singleton:=true + Bundle-Version: 1.2.100.qualifier + Bundle-Vendor: %providerName + Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.3.0,2.0.0)" + Bundle-Localization: fragment +-Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64)) ++Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86_64)) +--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.x86_64/pom.xml.orig 2014-03-30 18:38:29.000000000 -0500 ++++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.x86_64/pom.xml 2014-03-30 19:36:09.000000000 -0500 +@@ -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.x86_64</artifactId> + <version>1.2.100-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + +@@ -33,7 +33,7 @@ + <resolver>p2</resolver> + <environments> + <environment> +- <os>linux</os> ++ <os>freebsd</os> + <ws>gtk</ws> + <arch>x86_64</arch> + </environment> +@@ -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.x86_64</value> + </property> + </activation> + <build> +@@ -64,13 +64,13 @@ + <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/"> +- <include name="libunixfile_*.so"/> +- </fileset> +- </copy> ++ <exec executable="gmake" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/freebsd/"/> ++ <mkdir dir="os/freebsd/x86_64/"/> ++ <copy todir="os/freebsd/x86_64/" > ++ <fileset dir="../org.eclipse.core.filesystem/natives/unix/freebsd/"> ++ <include name="libunixfile_*.so"/> ++ </fileset> ++ </copy> + </target> + </configuration> + <goals> +--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/META-INF/MANIFEST.MF.orig 2014-03-30 18:51:08.000000000 -0500 ++++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/META-INF/MANIFEST.MF 2014-03-30 19:50:51.000000000 -0500 +@@ -2,7 +2,7 @@ + Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)" + Bundle-Name: %fragmentName + Bundle-Vendor: %providerName +-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86; singleton:=true ++Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.x86; singleton:=true + Bundle-Version: 3.102.1.qualifier + Bundle-ManifestVersion: 2 + Bundle-Localization: fragment +@@ -30,6 +30,6 @@ + org.eclipse.swt.internal.gtk; x-internal:=true, + org.eclipse.swt.internal.mozilla; x-internal:=true, + org.eclipse.swt.internal.opengl.glx; x-internal:=true +-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86)) ++Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86)) + Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0, + J2SE-1.3 +--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/pom.xml.orig 2014-03-30 18:51:08.000000000 -0500 ++++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/pom.xml 2014-03-30 19:49:19.000000000 -0500 +@@ -20,12 +20,12 @@ + <relativePath>../binaries-parent/</relativePath> + </parent> + <groupId>org.eclipse.swt</groupId> +- <artifactId>org.eclipse.swt.gtk.linux.x86</artifactId> ++ <artifactId>org.eclipse.swt.gtk.freebsd.x86</artifactId> + <version>3.102.1-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + + <properties> +- <os>linux</os> ++ <os>freebsd</os> + <ws>gtk</ws> + <arch>x86</arch> + <buildid>${buildId}</buildid> +@@ -112,7 +112,7 @@ + <property> + <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( --> + <name>native</name> *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406260848.s5Q8mBuN060904>