diff options
Diffstat (limited to 'java/eclipse-devel/Makefile')
| -rw-r--r-- | java/eclipse-devel/Makefile | 78 |
1 files changed, 31 insertions, 47 deletions
diff --git a/java/eclipse-devel/Makefile b/java/eclipse-devel/Makefile index a80ca400484a..31b5cc651cb9 100644 --- a/java/eclipse-devel/Makefile +++ b/java/eclipse-devel/Makefile @@ -6,15 +6,14 @@ # PORTNAME= eclipse-devel -PORTVERSION= 3.5.2 -PORTREVISION= 3 +PORTVERSION= 3.6.1 +#PORTREVISION= 3 CATEGORIES= java devel -MASTER_SITES= http://download.eclipse.org/technology/linuxtools/eclipse-build/:1 \ - http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/bundles/:2 \ - http://download.eclipse.org/tools/orbit/downloads/drops/S20100308015149/bundles/:3 \ +MASTER_SITES= http://download.eclipse.org/technology/linuxtools/eclipse-build/3.6.x_Helios/:1 \ + http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/bundles/:2 \ ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:4,} \ ${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%/,junit/junit/${JUNIT3_VERSION}/:5,} \ - ${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%/,junit/junit/${JUNIT4_VERSION}/:6,} + http://cloud.github.com/downloads/KentBeck/junit/:6 DISTFILES= ${ECLIPSE_BUILD_SRCFILE}:1 \ ${ECLIPSE_SRCFILE}:1 \ ${ANT_SRCFILE}:4 \ @@ -51,28 +50,29 @@ JAVA_BUILD= yes JAVA_OS= native JAVA_RUN= yes JAVA_VERSION= 1.6 +JAVA_VENDOR= openjdk -ECLIPSE_BUILD_SRCFILE= eclipse-build-0.5.0${EXTRACT_SUFX} +ECLIPSE_BUILD_SRCFILE= eclipse-build-0.6.1${EXTRACT_SUFX} ECLIPSE_SRCFILE= eclipse-${PORTVERSION}-src${EXTRACT_SUFX} ECLIPSE_TEST_SRCFILE= eclipse-sdktests-${PORTVERSION}-src${EXTRACT_SUFX} ECLIPSE_TEST_SCRIPTFILE=eclipse-sdktests-${PORTVERSION}-scripts${EXTRACT_SUFX} -ECLIPSE_JAR_BUNDLES= com.ibm.icu_4.0.1.v20090822.jar \ +ECLIPSE_JAR_BUNDLES= com.ibm.icu_4.2.1.v20100412.jar \ com.jcraft.jsch_0.1.41.v200903070017.jar \ - javax.servlet_2.5.0.v200806031605.jar \ + javax.servlet_2.5.0.v200910301333.jar \ javax.servlet.jsp_2.0.0.v200806031607.jar \ org.apache.commons.codec_1.3.0.v20080530-1600.jar \ org.apache.commons.el_1.0.0.v200806031608.jar \ - org.apache.commons.httpclient_3.1.0.v20080605-1935.jar \ - org.apache.commons.logging_1.0.4.v200904062259.jar \ + org.apache.commons.httpclient_3.1.0.v201005080502.jar \ + org.apache.commons.logging_1.0.4.v201005080501.jar \ org.apache.jasper_5.5.17.v200903231320.jar \ - org.apache.lucene_1.9.1.v20080530-1600.jar \ - org.apache.lucene.analysis_1.9.1.v20080530-1600.jar \ + org.apache.lucene_1.9.1.v20100518-1140.jar \ + org.apache.lucene.analysis_1.9.1.v20100518-1140.jar \ + org.mortbay.jetty.util_6.1.23.v201004211559.jar \ + org.mortbay.jetty.server_6.1.23.v201004211559.jar \ org.hamcrest.core_1.1.0.v20090501071000.jar \ - org.mortbay.jetty.server_6.1.15.v200905151201.jar \ - org.mortbay.jetty.util_6.1.15.v200905182336.jar \ - org.objectweb.asm_3.1.0.v200803061910.jar -ECLIPSE_SAT4J_BUNDLES= org.sat4j.core_2.1.1.v20090825.jar \ - org.sat4j.pb_2.1.1.v20090825.jar + org.objectweb.asm_3.2.0.v200909071300.jar +ECLIPSE_SAT4J_BUNDLES= org.sat4j.core_2.2.0.v20100429.jar \ + org.sat4j.pb_2.2.0.v20100429.jar ANT_VERSION= 1.7.1 ANT_SRCFILE= apache-ant-${ANT_VERSION}-bin${EXTRACT_SUFX} ANT_BUNDLES= ant-antlr.jar \ @@ -95,12 +95,13 @@ ANT_BUNDLES= ant-antlr.jar \ ant-trax.jar JUNIT3_VERSION= 3.8.2 JUNIT3_SRCFILE= junit${JUNIT3_VERSION}.zip -JUNIT4_VERSION= 4.8.1 +JUNIT4_VERSION= 4.8.2 JUNIT4_SRCFILE= junit-${JUNIT4_VERSION}.jar FBSD_SUPPORT_SRCFILE= freebsd-support.patch -MAKE_ARGS= -DbuildOs=freebsd -DbuildArch=${ARCH:C/amd64/x86_64/:C/i386/x86/} -Dprefix=${PREFIX} -Dlocalbase=${LOCALBASE} -MAKE_ENV+= GRE_HOME=${PREFIX}/lib/${GECKO} _JAVA_OPTIONS="-Xmx1024m" +MAKE_ARGS= -DbuildOs=freebsd -DbuildArch=${ARCH:C/amd64/x86_64/:C/i386/x86/} -Dprefix=${PREFIX} -Dlocalbase=${LOCALBASE} -Dlabel=${PORTVERSION} +MAKE_ENV+= GRE_HOME=${PREFIX}/lib/${GECKO} _JAVA_OPTIONS="-Xmx1024m" JAVA_VENDOR=${JAVA_VENDOR} + WRKSRC= ${WRKDIR}/${ECLIPSE_BUILD_SRCFILE:C/${EXTRACT_SUFX}//} PATCH_STRIP= -p1 @@ -115,14 +116,10 @@ PLIST_FILES= bin/${PORTNAME} \ share/icons/hicolor/48x48/apps/${PORTNAME}.png \ share/pixmaps/${PORTNAME}.png -.for f in ${ECLIPSE_JAR_BUNDLES} +.for f in ${ECLIPSE_JAR_BUNDLES} ${ECLIPSE_SAT4J_BUNDLES} DISTFILES+= ${f}:2 .endfor -.for f in ${ECLIPSE_SAT4J_BUNDLES} -DISTFILES+= ${f}:3 -.endfor - .include <bsd.port.pre.mk> .if defined(WITH_TESTS) @@ -134,19 +131,12 @@ BUILD_DEPENDS+= bash:${PORTSDIR}/shells/bash \ ALL_TARGET= provision.tests .endif -.if ${OSVERSION} >= 800000 -JAVA_VENDOR= bsdjava -.endif - # Copy the eclipse source file to the work area post-extract: @${CP} ${DISTDIR}/${DIST_SUBDIR}/${ECLIPSE_SRCFILE} ${BUILD_WRKSRC} @${CP} ${FILESDIR}/${FBSD_SUPPORT_SRCFILE} ${BUILD_WRKSRC}/patches/ @${MKDIR} ${BUILD_WRKSRC}/bundles -.for f in ${ECLIPSE_JAR_BUNDLES} - @${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${BUILD_WRKSRC}/bundles/ -.endfor -.for f in ${ECLIPSE_SAT4J_BUNDLES} +.for f in ${ECLIPSE_JAR_BUNDLES} ${ECLIPSE_SAT4J_BUNDLES} @${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${BUILD_WRKSRC}/bundles/ .endfor .for f in ${ANT_BUNDLES} @@ -169,11 +159,14 @@ pre-patch: # Fixup boot classes path post-patch: @${REINPLACE_CMD} -e "s+%%BOOTCLASSPATH%%+${BOOTCLASSPATH}+g" ${BUILD_WRKSRC}/build.properties - @${REINPLACE_CMD} -e "s+%%PORTNAME%%+${PORTNAME}+g" ${BUILD_WRKSRC}/build.xml @${REINPLACE_CMD} -e "s+%%BOOTCLASSPATH%%+${BOOTCLASSPATH}+g" ${BUILD_WRKSRC}/pdebuild.properties + @${REINPLACE_CMD} -e "s+%%PORTNAME%%+${PORTNAME}+g" ${BUILD_WRKSRC}/build.xml + @${REINPLACE_CMD} -e "s+%%PORTNAME%%+${PORTNAME}+g" ${BUILD_WRKSRC}/eclipse.desktop @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} applyPatches) .for f in ${ECLIPSE_JAR_BUNDLES} @${REINPLACE_CMD} -e "s+^${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_WRKSRC}/dependencies.properties + @${REINPLACE_CMD} -e "s+^${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_WRKSRC}/jdtdependencies.properties + @${REINPLACE_CMD} -e "s+^${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_WRKSRC}/sdkdependencies.properties .endfor .for f in ${ECLIPSE_SAT4J_BUNDLES} @${REINPLACE_CMD} -e "s+^${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_WRKSRC}/dependencies.properties @@ -181,8 +174,9 @@ post-patch: .for f in ${ANT_BUNDLES} @${REINPLACE_CMD} -e "s+${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_WRKSRC}/nonosgidependencies.properties .endfor - @${REINPLACE_CMD} -e "s+=/usr/share/java/junit.jar+=${BUILD_WRKSRC}/bundles/junit.jar+" ${BUILD_WRKSRC}/nonosgidependencies.properties - @${REINPLACE_CMD} -e "s+=/usr/share/java/junit4.jar+=${BUILD_WRKSRC}/bundles/junit4.jar+" ${BUILD_WRKSRC}/nonosgidependencies.properties + @${REINPLACE_CMD} -e "s+=/usr/share/java/junit.jar+=${BUILD_WRKSRC}/bundles/junit.jar+" ${BUILD_WRKSRC}/jdtnonosgidependencies.properties + @${REINPLACE_CMD} -e "s+=/usr/share/java/junit4.jar+=${BUILD_WRKSRC}/bundles/junit4.jar+" ${BUILD_WRKSRC}/jdtnonosgidependencies.properties + @${REINPLACE_CMD} -e "s+/usr/share/java/junit4.jar+${BUILD_WRKSRC}/bundles/junit4.jar+" ${BUILD_WRKSRC}/build.xml .if defined(WITH_TESTS) @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} applyTestPatches) .endif @@ -208,16 +202,6 @@ do-install: ${BUILD_WRKSRC}/eclipse.tmp .endif @${INSTALL_SCRIPT} ${WRKSRC}/eclipse.tmp ${PREFIX}/bin/${PORTNAME} - @for f in `ls ${BUILD_WRKSRC}/bundles/*.jar`; do \ - BASE=`basename $$f`; \ - FILES=`find ${PORTDESTDIR}/plugins/ -name "$$BASE"`; \ - if [ ! -z "$$FILES" ]; then \ - for s in $$FILES; do \ - ${RM} "$$s"; \ - ${INSTALL_DATA} "$$f" "$$s"; \ - done; \ - fi; \ - done @${PREFIX}/bin/${PORTNAME} -initialize -consolelog -@update-desktop-database @(cd ${PREFIX}; ${FIND} -s lib/${PORTNAME} -not -type d) >> ${TMPPLIST} |