From 945903b25a66eef4a3be608178b10047c770b84a Mon Sep 17 00:00:00 2001 From: girgen Date: Tue, 27 Mar 2007 07:19:44 +0000 Subject: Update to 3.1.2, and hopefully fix build problems on amd64. --- java/eclipse-cdt/Makefile | 67 +- java/eclipse-cdt/distinfo | 6 +- java/eclipse-cdt/files/patch-cdt-feature.xml | 10 +- java/eclipse-cdt/files/patch-cdt.core-Makefile | 4 +- java/eclipse-cdt/files/patch-cdt.core-fragment.xml | 4 +- java/eclipse-cdt/files/patch-cdt.core-openpty.c | 4 +- .../eclipse-cdt/files/patch-cdt.source-feature.xml | 14 +- .../patch-managedbuilder.gnu-plugin.properties | 4 +- .../files/patch-managedbuilder.gnu-plugin.xml | 4 +- java/eclipse-cdt/files/patch-plugin.properties | 4 +- java/eclipse-cdt/pkg-plist | 2055 +------------------- 11 files changed, 69 insertions(+), 2107 deletions(-) (limited to 'java') diff --git a/java/eclipse-cdt/Makefile b/java/eclipse-cdt/Makefile index 2eef4b0..c3f25bf 100644 --- a/java/eclipse-cdt/Makefile +++ b/java/eclipse-cdt/Makefile @@ -6,10 +6,10 @@ # PORTNAME= cdt -PORTVERSION= 3.1.1 +PORTVERSION= 3.1.2 CATEGORIES= java devel MASTER_SITES= ${MASTER_SITE_ECLIPSE} -MASTER_SITE_SUBDIR=tools/cdt/releases/callisto/dist/3.1.1 +MASTER_SITE_SUBDIR=tools/cdt/releases/callisto/dist/${PORTVERSION} PKGNAMEPREFIX= eclipse- DISTNAME= org.eclipse.cdt.sdk-${PORTVERSION}-linux.x86 DIST_SUBDIR= eclipse @@ -25,7 +25,7 @@ USE_JAVA= yes JAVA_VERSION= 1.4+ JAVA_OS= native USE_GMAKE= yes -PORTVERSION_TS= ${PORTVERSION}.200609270800 +PORTVERSION_TS= ${PORTVERSION}.200702150621 .include @@ -47,6 +47,35 @@ MAKE_ENV+= ECLIPSE_ARCH=${ECLIPSE_ARCH} \ JAVA_HOME=${JAVA_HOME} PLIST_SUB+= PORTVERSION_TS=${PORTVERSION_TS} +CDT_DIRS= eclipse/features/org.eclipse.cdt_${PORTVERSION_TS} \ + eclipse/plugins/org.eclipse.cdt.core.freebsd.x86_${PORTVERSION_TS} \ + eclipse/plugins/org.eclipse.cdt.core.freebsd_${PORTVERSION_TS} \ + eclipse/plugins/org.eclipse.cdt.core_${PORTVERSION_TS} \ + eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_${PORTVERSION_TS} \ + eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_${PORTVERSION_TS} \ + eclipse/plugins/org.eclipse.cdt.source.linux.gtk.x86_${PORTVERSION_TS} \ + eclipse/plugins/org.eclipse.cdt.source_${PORTVERSION_TS} + +CDT_JARS= eclipse/plugins/org.eclipse.cdt.core_${PORTVERSION_TS}.jar \ + eclipse/plugins/org.eclipse.cdt.debug.core_${PORTVERSION_TS}.jar \ + eclipse/plugins/org.eclipse.cdt.debug.mi.core_${PORTVERSION_TS}.jar \ + eclipse/plugins/org.eclipse.cdt.debug.mi.ui_${PORTVERSION_TS}.jar \ + eclipse/plugins/org.eclipse.cdt.debug.ui_${PORTVERSION_TS}.jar \ + eclipse/plugins/org.eclipse.cdt.doc.isv_${PORTVERSION_TS}.jar \ + eclipse/plugins/org.eclipse.cdt.doc.user_${PORTVERSION_TS}.jar \ + eclipse/plugins/org.eclipse.cdt.launch_${PORTVERSION_TS}.jar \ + eclipse/plugins/org.eclipse.cdt.make.core_${PORTVERSION_TS}.jar \ + eclipse/plugins/org.eclipse.cdt.make.ui_${PORTVERSION_TS}.jar \ + eclipse/plugins/org.eclipse.cdt.managedbuilder.core_${PORTVERSION_TS}.jar \ + eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_${PORTVERSION_TS}.jar \ + eclipse/plugins/org.eclipse.cdt.managedbuilder.ui_${PORTVERSION_TS}.jar \ + eclipse/plugins/org.eclipse.cdt.refactoring_${PORTVERSION_TS}.jar \ + eclipse/plugins/org.eclipse.cdt.sdk_${PORTVERSION_TS}.jar \ + eclipse/plugins/org.eclipse.cdt.ui_${PORTVERSION_TS}.jar \ + eclipse/plugins/org.eclipse.cdt_${PORTVERSION_TS}.jar + +PLIST_FILES= ${CDT_JARS} + do-build: @${FIND} ${WRKSRC} -name \*.orig -delete .if (${ARCH} == "i386") @@ -64,28 +93,14 @@ do-install: @${MKDIR} ${PREFIX}/eclipse @${MKDIR} ${PREFIX}/eclipse/features @${MKDIR} ${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 + cd ${WRKSRC} && ${INSTALL_DATA} ${CDT_JARS} ${PREFIX}/eclipse/plugins + cd ${WRKSRC} && ${FIND} ${CDT_DIRS} \ + -type f -not -name '*.o' -print0 | ${XARGS} -0 ${TAR} -cf - | ( cd ${PREFIX} && ${TAR} -xf - ) + +post-install: + cd ${WRKSRC} && ${FIND} -d ${CDT_DIRS} \ + -type f -not -name '*.o' -print >> ${TMPPLIST} + cd ${WRKSRC} && ${FIND} -d ${CDT_DIRS} \ + -type d -not -name '*.o' -print0 | ${XARGS} -0 printf '@dirrm %s\n' >> ${TMPPLIST} .include diff --git a/java/eclipse-cdt/distinfo b/java/eclipse-cdt/distinfo index 2f73ae0..a0696ff 100644 --- a/java/eclipse-cdt/distinfo +++ b/java/eclipse-cdt/distinfo @@ -1,3 +1,3 @@ -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 +MD5 (eclipse/org.eclipse.cdt.sdk-3.1.2-linux.x86.tar.gz) = 3c6a25246243683ac40c2a2beb0a2e57 +SHA256 (eclipse/org.eclipse.cdt.sdk-3.1.2-linux.x86.tar.gz) = d5e22e9db29a6f4f76fd7676e4d53b4fd64bca196660aa16246cc481fc869b9a +SIZE (eclipse/org.eclipse.cdt.sdk-3.1.2-linux.x86.tar.gz) = 17767758 diff --git a/java/eclipse-cdt/files/patch-cdt-feature.xml b/java/eclipse-cdt/files/patch-cdt-feature.xml index 5c6eacd..64e92e9 100644 --- a/java/eclipse-cdt/files/patch-cdt-feature.xml +++ b/java/eclipse-cdt/files/patch-cdt-feature.xml @@ -1,5 +1,5 @@ ---- 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 +--- eclipse/features/org.eclipse.cdt_3.1.2.200702150621/feature.xml.orig Wed Sep 27 10:15:13 2006 ++++ eclipse/features/org.eclipse.cdt_3.1.2.200702150621/feature.xml Mon Nov 6 13:18:34 2006 @@ -121,6 +121,14 @@ fragment="true"/> @@ -8,7 +8,7 @@ + os="freebsd" + download-size="0" + install-size="0" -+ version="3.1.1" ++ version="3.1.2" + fragment="true"/> + + + + + + diff --git a/java/eclipse-cdt/files/patch-cdt.core-openpty.c b/java/eclipse-cdt/files/patch-cdt.core-openpty.c index 829decd..993bd35 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.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 +--- eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_3.1.2.200702150621/src/org.eclipse.cdt.core.freebsd_3.1.2.200702150621/library/openpty.c.orig Thu Mar 30 19:18:06 2006 ++++ eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_3.1.2.200702150621/src/org.eclipse.cdt.core.freebsd_3.1.2.200702150621/library/openpty.c Thu Mar 30 19:18:47 2006 @@ -20,7 +20,6 @@ #include diff --git a/java/eclipse-cdt/files/patch-cdt.source-feature.xml b/java/eclipse-cdt/files/patch-cdt.source-feature.xml index 1611e3c..3d9050c 100644 --- a/java/eclipse-cdt/files/patch-cdt.source-feature.xml +++ b/java/eclipse-cdt/files/patch-cdt.source-feature.xml @@ -1,9 +1,9 @@ ---- eclipse/features/org.eclipse.cdt.source_3.1.1.200609270800/feature.xml.orig Thu Mar 30 19:51:01 2006 -+++ eclipse/features/org.eclipse.cdt.source_3.1.1.200609270800/feature.xml Thu Mar 30 19:52:13 2006 +--- eclipse/features/org.eclipse.cdt.source_3.1.2.200702150621/feature.xml.orig Thu Mar 30 19:51:01 2006 ++++ eclipse/features/org.eclipse.cdt.source_3.1.2.200702150621/feature.xml Thu Mar 30 19:52:13 2006 @@ -22,4 +22,6 @@ - - - -+ -+ + + + ++ ++ diff --git a/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.properties b/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.properties index 2fafe8c..ae19941 100644 --- a/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.properties +++ b/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.properties @@ -1,5 +1,5 @@ ---- 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 +--- eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_3.1.2.200702150621/plugin.properties.orig Mon Nov 6 14:44:11 2006 ++++ eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_3.1.2.200702150621/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) diff --git a/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.xml b/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.xml index 93cdcf1..915c1f7 100644 --- a/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.xml +++ b/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.xml @@ -1,5 +1,5 @@ ---- 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 +--- eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_3.1.2.200702150621/plugin.xml~ Mon Nov 6 14:38:36 2006 ++++ eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_3.1.2.200702150621/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">