Update to 3.1.2, and hopefully fix build problems on amd64.

This commit is contained in:
Palle Girgensohn 2007-03-27 07:19:44 +00:00
parent 539eb1ff2f
commit 43f1cc100e
11 changed files with 69 additions and 2107 deletions

View file

@ -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 <bsd.port.pre.mk>
@ -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 <bsd.port.post.mk>

View file

@ -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

View file

@ -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"/>
+
+ <plugin
@ -22,7 +22,7 @@
+ arch="x86"
+ download-size="0"
+ install-size="0"
+ version="3.1.1"
+ version="3.1.2"
+ fragment="true"/>
+
+ <plugin
@ -31,7 +31,7 @@
+ arch="amd64"
+ download-size="0"
+ install-size="0"
+ version="3.1.1"
+ version="3.1.2"
+ fragment="true"/>
+
+ <plugin

View file

@ -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/Makefile.orig Tue Mar 28 22:42:53 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/Makefile Tue Mar 28 22:51:40 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/Makefile.orig Tue Mar 28 22:42:53 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/Makefile Tue Mar 28 22:51:40 2006
@@ -5,17 +5,17 @@
endif

View file

@ -1,5 +1,5 @@
--- eclipse/plugins/org.eclipse.cdt.core.freebsd_3.1.1.200609270800/fragment.xml.orig Mon Nov 6 13:53:49 2006
+++ eclipse/plugins/org.eclipse.cdt.core.freebsd_3.1.1.200609270800/fragment.xml Mon Nov 6 13:54:04 2006
--- eclipse/plugins/org.eclipse.cdt.core.freebsd_3.1.2.200702150621/fragment.xml.orig Mon Nov 6 13:53:49 2006
+++ eclipse/plugins/org.eclipse.cdt.core.freebsd_3.1.2.200702150621/fragment.xml Mon Nov 6 13:54:04 2006
@@ -5,8 +5,8 @@
<extension
point="org.eclipse.cdt.core.ProcessList">

View file

@ -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 <grp.h>

View file

@ -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 @@
<plugin ws="win32" os="win32" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.cdt.source.win32.win32.x86" version="3.1.1"/>
<plugin ws="motif" os="solaris" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.cdt.source.solaris.motif.sparc" version="3.1.1"/>
<plugin ws="gtk" os="linux" fragment="true" arch="x86_64" download-size="0" install-size="0" id="org.eclipse.cdt.source.linux.gtk.x86_64" version="3.1.1"/>
+ <plugin ws="gtk" os="freebsd" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.cdt.source.freebsd.gtk.x86" version="3.1.1"/>
+ <plugin ws="gtk" os="freebsd" fragment="true" arch="amd64" download-size="0" install-size="0" id="org.eclipse.cdt.source.freebsd.gtk.amd64" version="3.1.1"/>
<plugin ws="win32" os="win32" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.cdt.source.win32.win32.x86" version="3.1.2"/>
<plugin ws="motif" os="solaris" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.cdt.source.solaris.motif.sparc" version="3.1.2"/>
<plugin ws="gtk" os="linux" fragment="true" arch="x86_64" download-size="0" install-size="0" id="org.eclipse.cdt.source.linux.gtk.x86_64" version="3.1.2"/>
+ <plugin ws="gtk" os="freebsd" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.cdt.source.freebsd.gtk.x86" version="3.1.2"/>
+ <plugin ws="gtk" os="freebsd" fragment="true" arch="amd64" download-size="0" install-size="0" id="org.eclipse.cdt.source.freebsd.gtk.amd64" version="3.1.2"/>
</feature>

View file

@ -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)

View file

@ -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">
<toolChain

View file

@ -1,5 +1,5 @@
--- eclipse/plugins/org.eclipse.cdt.core_3.1.1.200609270800/plugin.properties.orig Thu Mar 30 20:15:52 2006
+++ eclipse/plugins/org.eclipse.cdt.core_3.1.1.200609270800/plugin.properties Thu Mar 30 20:16:31 2006
--- eclipse/plugins/org.eclipse.cdt.core_3.1.2.200702150621/plugin.properties.orig Thu Mar 30 20:15:52 2006
+++ eclipse/plugins/org.eclipse.cdt.core_3.1.2.200702150621/plugin.properties Thu Mar 30 20:16:31 2006
@@ -56,6 +56,7 @@
fragmentName.solaris = C/C++ Development Tools Core for Solaris
fragmentName.win32 = C/C++ Development Tools Core for Windows

File diff suppressed because it is too large Load diff