diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2011-11-26 21:45:18 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2011-11-26 21:45:18 +0000 |
| commit | 4eb68ac46700ae7b81e7cc925d7d8f554e862ba5 (patch) | |
| tree | 5364b0585fae66daa6be9080eb6b115b11d58626 /java | |
| parent | Update to the 20111119 snapshot of GCC 4.7.0 which brings support (diff) | |
. Update the build and install targets used to the current recommendations.
Fixes installation of plugins by a user.
Submitted by: tg@
Confirmed by: Ronald Klop <ronald-freebsd8@klop.yi.org>
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=286468
Diffstat (limited to 'java')
| -rw-r--r-- | java/eclipse-devel/Makefile | 4 | ||||
| -rw-r--r-- | java/eclipse-devel/files/patch-eclipse-build | 39 |
2 files changed, 42 insertions, 1 deletions
diff --git a/java/eclipse-devel/Makefile b/java/eclipse-devel/Makefile index c3b2dc7bf20a..b73db2e8c0e4 100644 --- a/java/eclipse-devel/Makefile +++ b/java/eclipse-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= eclipse-devel PORTVERSION= 3.7.0 -PORTREVISION= 1 +PORTREVISION= 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 \ @@ -105,6 +105,8 @@ JUNIT4_SRCFILE= junit-${JUNIT4_VERSION}.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} _JAVA_OPTIONS="-Xmx1024m" JAVA_VENDOR=${JAVA_VENDOR} diff --git a/java/eclipse-devel/files/patch-eclipse-build b/java/eclipse-devel/files/patch-eclipse-build index 5975368f5430..2aeb23e43252 100644 --- a/java/eclipse-devel/files/patch-eclipse-build +++ b/java/eclipse-devel/files/patch-eclipse-build @@ -190,6 +190,45 @@ $FreeBSD$ </target> +@@ -1126,8 +1129,7 @@ + + <!-- make a copy of the clean platform+CVS installation --> + <exec executable="cp" failonerror="true"> +- <arg value="-rd" /> +- <arg value="--no-target-directory" /> ++ <arg value="-R" /> + <arg value="${provisionDir}" /> + <arg value="${platformAndCVSInstallation}" /> + </exec> +@@ -1143,16 +1145,14 @@ + tofile="${jdtInstallation}"/> + <!-- make a second copy of the clean JDT installation --> + <exec executable="cp" failonerror="true"> +- <arg value="-rd" /> +- <arg value="--no-target-directory" /> ++ <arg value="-R" /> + <arg value="${jdtInstallation}" /> + <arg value="${jdtInstallation}.orig" /> + </exec> + + <!-- restore clean platform+CVS installation --> + <exec executable="cp" failonerror="true"> +- <arg value="-rd" /> +- <arg value="--no-target-directory" /> ++ <arg value="-R" /> + <arg value="${platformAndCVSInstallation}" /> + <arg value="${provisionDir}" /> + </exec> +@@ -1169,8 +1169,7 @@ + + <!-- restore clean platform+CVS installation --> + <exec executable="cp" failonerror="true"> +- <arg value="-rd" /> +- <arg value="--no-target-directory" /> ++ <arg value="-R" /> + <arg value="${platformAndCVSInstallation}" /> + <arg value="${provisionDir}" /> + </exec> --- eclipse-build-0.5.0.orig/pdebuild/eclipse-pdebuild.sh 2009-11-11 07:59:07.000000000 -0500 +++ eclipse-build-0.5.0/pdebuild/eclipse-pdebuild.sh 2009-12-23 16:23:06.357147407 -0500 @@ -230,7 +230,7 @@ |