From d19e312bf8209421bf68a8ce8b98de2e5722efa1 Mon Sep 17 00:00:00 2001 From: Palle Girgensohn Date: Tue, 7 Nov 2006 11:04:47 +0000 Subject: Update to 3.1.1, which is compatibale with Eclipse 3.2.1 --- java/eclipse-cdt/Makefile | 76 +- java/eclipse-cdt/distinfo | 6 +- java/eclipse-cdt/files/patch-cdt-feature.xml | 14 +- java/eclipse-cdt/files/patch-cdt.core-Makefile | 6 +- java/eclipse-cdt/files/patch-cdt.core-fragment.xml | 23 +- java/eclipse-cdt/files/patch-cdt.core-openpty.c | 4 +- .../files/patch-cdt.core.x86-fragment.xml | 11 - .../eclipse-cdt/files/patch-cdt.source-feature.xml | 14 +- .../patch-managedbuilder.gnu-plugin.properties | 16 +- .../files/patch-managedbuilder.gnu-plugin.xml | 76 +- java/eclipse-cdt/files/patch-plugin.properties | 4 +- java/eclipse-cdt/files/patch-source-fragment.xml | 11 - java/eclipse-cdt/pkg-plist | 2652 +++++++++++++++----- java/eclipse-cdt/scripts/pre-patch | 32 +- 14 files changed, 2195 insertions(+), 750 deletions(-) delete mode 100644 java/eclipse-cdt/files/patch-cdt.core.x86-fragment.xml delete mode 100644 java/eclipse-cdt/files/patch-source-fragment.xml (limited to 'java/eclipse-cdt') diff --git a/java/eclipse-cdt/Makefile b/java/eclipse-cdt/Makefile index 9c1b29567172..89b14e95cb60 100644 --- a/java/eclipse-cdt/Makefile +++ b/java/eclipse-cdt/Makefile @@ -6,14 +6,15 @@ # PORTNAME= cdt -PORTVERSION= 3.0.2 +PORTVERSION= 3.1.1 CATEGORIES= java devel -MASTER_SITES= http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/${PORTVERSION}/ +MASTER_SITES= ${MASTER_SITE_ECLIPSE} +MASTER_SITE_SUBDIR=tools/cdt/releases/callisto/dist/3.1.1 PKGNAMEPREFIX= eclipse- DISTNAME= org.eclipse.cdt.sdk-${PORTVERSION}-linux.x86 DIST_SUBDIR= eclipse -MAINTAINER= freebsd-eclipse@FreeBSD.org +MAINTAINER= girgen@FreeBSD.org COMMENT= C/C++ IDE for Eclipse RUN_DEPENDS= ${LOCALBASE}/eclipse:${PORTSDIR}/java/eclipse @@ -23,6 +24,8 @@ USE_JAVA= yes JAVA_VERSION= 1.4+ JAVA_OS= native USE_GMAKE= yes +USE_UNZIP= yes +PORTVERSION_TS= ${PORTVERSION}.200609270800 .include @@ -31,51 +34,58 @@ ECLIPSE_OS= freebsd ECLIPSE_ARCH= amd64 .else ECLIPSE_ARCH= x86 -PLIST_FILES+= eclipse/plugins/org.eclipse.cdt.core.freebsd.x86_3.0.2/os/freebsd/x86/libpty.so \ - eclipse/plugins/org.eclipse.cdt.core.freebsd.x86_3.0.2/os/freebsd/x86/libspawner.so +PLIST_FILES+= eclipse/plugins/org.eclipse.cdt.core.freebsd.x86_${PORTVERSION_TS}/os/freebsd/x86/libpty.so \ + eclipse/plugins/org.eclipse.cdt.core.freebsd.x86_${PORTVERSION_TS}/os/freebsd/x86/libspawner.so .endif +SCRIPTS_ENV= PORTVERSION_TS=${PORTVERSION_TS} UNZIP_CMD=${UNZIP_CMD} + MAKE_ENV+= ECLIPSE_ARCH=${ECLIPSE_ARCH} \ ECLIPSE_OS=${ECLIPSE_OS} \ PORTVERSION=${PORTVERSION} \ + PORTVERSION_TS=${PORTVERSION_TS} \ JAVA_HOME=${JAVA_HOME} -PLIST_SUB+= PORTVERSION=${PORTVERSION} +PLIST_SUB+= PORTVERSION_TS=${PORTVERSION_TS} do-build: - @${RM} ${WRKSRC}/eclipse/features/org.eclipse.cdt_${PORTVERSION}/*.orig - @${RM} ${WRKSRC}/eclipse/features/org.eclipse.cdt.source_${PORTVERSION}/*.orig - @${RM} ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.core.freebsd.x86_${PORTVERSION}/*.orig - @${RM} ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_${PORTVERSION}/*.orig - @${RM} ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_${PORTVERSION}/src/org.eclipse.cdt.core.freebsd_${PORTVERSION}/library/*.orig - @${RM} ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.core.freebsd_${PORTVERSION}/*.orig - @${RM} ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.core_${PORTVERSION}/*.orig - @${RM} ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_${PORTVERSION}/*.orig + @${FIND} ${WRKSRC} -name \*.orig -delete .if (${ARCH} == "i386") - @(cd ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_${PORTVERSION}/src/org.eclipse.cdt.core.freebsd_${PORTVERSION}/library; \ + @(cd ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_${PORTVERSION_TS}/src/org.eclipse.cdt.core.freebsd_${PORTVERSION_TS}/library; \ ${SETENV} ${MAKE_ENV} ${GMAKE}) .endif +.if !defined(INSTALL_AS_USER) +pre-install: + ${SU_CMD} "${CHMOD} -R go-w ${WRKSRC}" + ${SU_CMD} "${CHOWN} -R 0:0 ${WRKSRC}" +.endif + do-install: @${MKDIR} ${PREFIX}/eclipse @${MKDIR} ${PREFIX}/eclipse/features @${MKDIR} ${PREFIX}/eclipse/plugins - @${CP} -r ${WRKSRC}/eclipse/features/org.eclipse.cdt_${PORTVERSION} ${PREFIX}/eclipse/features - @${CP} -r ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.core.freebsd.x86_${PORTVERSION} ${PREFIX}/eclipse/plugins - @${CP} -r ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.core.freebsd_${PORTVERSION} ${PREFIX}/eclipse/plugins - @${CP} -r ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.core_${PORTVERSION} ${PREFIX}/eclipse/plugins - @${CP} -r ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.debug.core_${PORTVERSION} ${PREFIX}/eclipse/plugins - @${CP} -r ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.debug.mi.core_${PORTVERSION} ${PREFIX}/eclipse/plugins - @${CP} -r ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.debug.mi.ui_${PORTVERSION} ${PREFIX}/eclipse/plugins - @${CP} -r ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.debug.ui_${PORTVERSION} ${PREFIX}/eclipse/plugins - @${CP} -r ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.doc.user_${PORTVERSION} ${PREFIX}/eclipse/plugins - @${CP} -r ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.launch_${PORTVERSION} ${PREFIX}/eclipse/plugins - @${CP} -r ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.make.core_${PORTVERSION} ${PREFIX}/eclipse/plugins - @${CP} -r ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.make.ui_${PORTVERSION} ${PREFIX}/eclipse/plugins - @${CP} -r ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.managedbuilder.core_${PORTVERSION} ${PREFIX}/eclipse/plugins - @${CP} -r ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_${PORTVERSION} ${PREFIX}/eclipse/plugins - @${CP} -r ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.managedbuilder.ui_${PORTVERSION} ${PREFIX}/eclipse/plugins - @${CP} -r ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.refactoring_${PORTVERSION} ${PREFIX}/eclipse/plugins - @${CP} -r ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.ui_${PORTVERSION} ${PREFIX}/eclipse/plugins - @${CP} -r ${WRKSRC}/eclipse/plugins/org.eclipse.cdt_${PORTVERSION} ${PREFIX}/eclipse/plugins + @${CP} -r ${WRKSRC}/eclipse/features/org.eclipse.cdt_${PORTVERSION_TS} ${PREFIX}/eclipse/features + @${CP} -r ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.core.freebsd.x86_${PORTVERSION_TS} ${PREFIX}/eclipse/plugins + @${CP} -r ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.core.freebsd_${PORTVERSION_TS} ${PREFIX}/eclipse/plugins + @${CP} -r ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.core_${PORTVERSION_TS} ${PREFIX}/eclipse/plugins + @${CP} -r ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_${PORTVERSION_TS} ${PREFIX}/eclipse/plugins + @${CP} -r ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_${PORTVERSION_TS} ${PREFIX}/eclipse/plugins + @${CP} -r ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.source.linux.gtk.x86_${PORTVERSION_TS} ${PREFIX}/eclipse/plugins + @${CP} -r ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.source_${PORTVERSION_TS} ${PREFIX}/eclipse/plugins + @${INSTALL_DATA} ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.debug.core_${PORTVERSION_TS}.jar ${PREFIX}/eclipse/plugins + @${INSTALL_DATA} ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.debug.mi.core_${PORTVERSION_TS}.jar ${PREFIX}/eclipse/plugins + @${INSTALL_DATA} ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.debug.mi.ui_${PORTVERSION_TS}.jar ${PREFIX}/eclipse/plugins + @${INSTALL_DATA} ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.debug.ui_${PORTVERSION_TS}.jar ${PREFIX}/eclipse/plugins + @${INSTALL_DATA} ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.doc.isv_${PORTVERSION_TS}.jar ${PREFIX}/eclipse/plugins + @${INSTALL_DATA} ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.doc.user_${PORTVERSION_TS}.jar ${PREFIX}/eclipse/plugins + @${INSTALL_DATA} ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.launch_${PORTVERSION_TS}.jar ${PREFIX}/eclipse/plugins + @${INSTALL_DATA} ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.make.core_${PORTVERSION_TS}.jar ${PREFIX}/eclipse/plugins + @${INSTALL_DATA} ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.make.ui_${PORTVERSION_TS}.jar ${PREFIX}/eclipse/plugins + @${INSTALL_DATA} ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.managedbuilder.core_${PORTVERSION_TS}.jar ${PREFIX}/eclipse/plugins + @${INSTALL_DATA} ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.managedbuilder.ui_${PORTVERSION_TS}.jar ${PREFIX}/eclipse/plugins + @${INSTALL_DATA} ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.refactoring_${PORTVERSION_TS}.jar ${PREFIX}/eclipse/plugins + @${INSTALL_DATA} ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.sdk_${PORTVERSION_TS}.jar ${PREFIX}/eclipse/plugins + @${INSTALL_DATA} ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.ui_${PORTVERSION_TS}.jar ${PREFIX}/eclipse/plugins + @${INSTALL_DATA} ${WRKSRC}/eclipse/plugins/org.eclipse.cdt_${PORTVERSION_TS}.jar ${PREFIX}/eclipse/plugins .include diff --git a/java/eclipse-cdt/distinfo b/java/eclipse-cdt/distinfo index d03385dcacd9..2f73ae070649 100644 --- a/java/eclipse-cdt/distinfo +++ b/java/eclipse-cdt/distinfo @@ -1,3 +1,3 @@ -MD5 (eclipse/org.eclipse.cdt.sdk-3.0.2-linux.x86.tar.gz) = 9bca43cd6ec7393d63ce735961b490c2 -SHA256 (eclipse/org.eclipse.cdt.sdk-3.0.2-linux.x86.tar.gz) = 145999c97aa7b53532f1f2ba2fd6e5897a2fd47ade8976caf38547ccefacaa3d -SIZE (eclipse/org.eclipse.cdt.sdk-3.0.2-linux.x86.tar.gz) = 17493088 +MD5 (eclipse/org.eclipse.cdt.sdk-3.1.1-linux.x86.tar.gz) = a4ec7040849e5711f37917ad7eb90078 +SHA256 (eclipse/org.eclipse.cdt.sdk-3.1.1-linux.x86.tar.gz) = b560c2cd20f2d7077d23b32940ac409e1556343204a7e31b360da1e93244668f +SIZE (eclipse/org.eclipse.cdt.sdk-3.1.1-linux.x86.tar.gz) = 17729899 diff --git a/java/eclipse-cdt/files/patch-cdt-feature.xml b/java/eclipse-cdt/files/patch-cdt-feature.xml index 6d7f78e500cf..5c6eacdaa55c 100644 --- a/java/eclipse-cdt/files/patch-cdt-feature.xml +++ b/java/eclipse-cdt/files/patch-cdt-feature.xml @@ -1,6 +1,6 @@ ---- eclipse/features/org.eclipse.cdt_3.0.2/feature.xml.orig Tue Mar 28 22:33:44 2006 -+++ eclipse/features/org.eclipse.cdt_3.0.2/feature.xml Tue Mar 28 22:36:03 2006 -@@ -112,6 +112,14 @@ +--- eclipse/features/org.eclipse.cdt_3.1.1.200609270800/feature.xml.orig Wed Sep 27 10:15:13 2006 ++++ eclipse/features/org.eclipse.cdt_3.1.1.200609270800/feature.xml Mon Nov 6 13:18:34 2006 +@@ -121,6 +121,14 @@ fragment="true"/> + + + + + + - - + platform="freebsd" - class="org.eclipse.cdt.internal.core.linux.ProcessList"> ++ class="org.eclipse.cdt.internal.core.freebsd.ProcessList"> + diff --git a/java/eclipse-cdt/files/patch-cdt.core-openpty.c b/java/eclipse-cdt/files/patch-cdt.core-openpty.c index 08ae30326bfc..829decdfdf52 100644 --- a/java/eclipse-cdt/files/patch-cdt.core-openpty.c +++ b/java/eclipse-cdt/files/patch-cdt.core-openpty.c @@ -1,5 +1,5 @@ ---- eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_3.0.2/src/org.eclipse.cdt.core.freebsd_3.0.2/library/openpty.c.orig Thu Mar 30 19:18:06 2006 -+++ eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_3.0.2/src/org.eclipse.cdt.core.freebsd_3.0.2/library/openpty.c Thu Mar 30 19:18:47 2006 +--- eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_3.1.1.200609270800/src/org.eclipse.cdt.core.freebsd_3.1.1.200609270800/library/openpty.c.orig Thu Mar 30 19:18:06 2006 ++++ eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_3.1.1.200609270800/src/org.eclipse.cdt.core.freebsd_3.1.1.200609270800/library/openpty.c Thu Mar 30 19:18:47 2006 @@ -20,7 +20,6 @@ #include diff --git a/java/eclipse-cdt/files/patch-cdt.core.x86-fragment.xml b/java/eclipse-cdt/files/patch-cdt.core.x86-fragment.xml deleted file mode 100644 index b9310ec7fd3a..000000000000 --- a/java/eclipse-cdt/files/patch-cdt.core.x86-fragment.xml +++ /dev/null @@ -1,11 +0,0 @@ ---- eclipse/plugins/org.eclipse.cdt.core.freebsd.x86_3.0.2/fragment.xml.orig Thu Mar 30 19:49:21 2006 -+++ eclipse/plugins/org.eclipse.cdt.core.freebsd.x86_3.0.2/fragment.xml Thu Mar 30 19:49:46 2006 -@@ -1,7 +1,7 @@ - - - - - -+ -+ + + + ++ ++ diff --git a/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.properties b/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.properties index 70da5d31c683..2fafe8c91148 100644 --- a/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.properties +++ b/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.properties @@ -1,13 +1,13 @@ ---- eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_3.0.2/plugin.properties.orig Thu Mar 30 19:56:24 2006 -+++ eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_3.0.2/plugin.properties Thu Mar 30 19:57:25 2006 -@@ -36,6 +36,10 @@ - TargetName.solaris.exe=Solaris Executable - TargetName.solaris.so=Solaris Shared Library - TargetName.solaris.lib=Solaris Static Library +--- eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_3.1.1.200609270800/plugin.properties.orig Mon Nov 6 14:44:11 2006 ++++ eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_3.1.1.200609270800/plugin.properties Mon Nov 6 14:45:02 2006 +@@ -27,6 +27,10 @@ + TargetName.solaris.exe=Executable (Gnu on Solaris) + TargetName.solaris.so=Shared Library (Gnu on Solaris) + TargetName.solaris.lib=Static Library (Gnu on Solaris) +TargetName.freebsd=FreeBSD +TargetName.freebsd.exe=FreeBSD Executable +TargetName.freebsd.so=FreeBSD Shared Library +TargetName.freebsd.lib=FreeBSD Static Library - # Default Configuration Names - ConfigName.Rel=Release + # No longer needed post-2.0 + TargetName.cygw=Cygwin diff --git a/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.xml b/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.xml index 77e64879709a..93cdcf15a91c 100644 --- a/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.xml +++ b/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.xml @@ -1,110 +1,110 @@ ---- eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_3.0.2/plugin.xml.orig Thu Mar 30 20:02:27 2006 -+++ eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_3.0.2/plugin.xml Thu Mar 30 20:05:59 2006 -@@ -1334,7 +1334,7 @@ +--- eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_3.1.1.200609270800/plugin.xml~ Mon Nov 6 14:38:36 2006 ++++ eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_3.1.1.200609270800/plugin.xml Mon Nov 6 14:42:23 2006 +@@ -1317,7 +1317,7 @@ errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser"> - -