From 257d46643508f582b41b39766dbc45982d8076a6 Mon Sep 17 00:00:00 2001 From: Edwin Groothuis Date: Tue, 3 Jan 2006 03:28:05 +0000 Subject: [PATCH] [patch] update java/eclipse-cdt to version 3.0.1 This patch updates java/eclipse-cdt to the latest version 3.0.1. It also installs the native shared libraries that were previously missing. In order to do this the distfile of the cdt-sdk had to be used instead. A static pkg-plist is also used to help people searching through the ports files. PR: ports/89893 Submitted by: Panagiotis Astithas Approved by: maintainer timeout --- java/eclipse-cdt/Makefile | 56 +- java/eclipse-cdt/distinfo | 5 +- java/eclipse-cdt/files/patch-cdt-feature.xml | 42 ++ .../eclipse-cdt/files/patch-cdt.core-Makefile | 24 + .../files/patch-cdt.core-fragment.xml | 22 + .../files/patch-cdt.core-openpty.c | 10 + .../files/patch-cdt.core.x86-fragment.xml | 11 + .../files/patch-cdt.source-feature.xml | 9 + ...patch-managedbuilder.gnu-plugin.properties | 13 + .../files/patch-managedbuilder.gnu-plugin.xml | 110 ++++ .../eclipse-cdt/files/patch-plugin.properties | 10 + .../files/patch-source-fragment.xml | 11 + java/eclipse-cdt/pkg-plist | 606 ++++++++++++++++++ java/eclipse-cdt/scripts/pre-patch | 43 ++ 14 files changed, 960 insertions(+), 12 deletions(-) create mode 100644 java/eclipse-cdt/files/patch-cdt-feature.xml create mode 100644 java/eclipse-cdt/files/patch-cdt.core-Makefile create mode 100644 java/eclipse-cdt/files/patch-cdt.core-fragment.xml create mode 100644 java/eclipse-cdt/files/patch-cdt.core-openpty.c create mode 100644 java/eclipse-cdt/files/patch-cdt.core.x86-fragment.xml create mode 100644 java/eclipse-cdt/files/patch-cdt.source-feature.xml create mode 100644 java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.properties create mode 100644 java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.xml create mode 100644 java/eclipse-cdt/files/patch-plugin.properties create mode 100644 java/eclipse-cdt/files/patch-source-fragment.xml create mode 100644 java/eclipse-cdt/pkg-plist create mode 100644 java/eclipse-cdt/scripts/pre-patch diff --git a/java/eclipse-cdt/Makefile b/java/eclipse-cdt/Makefile index fbe5487fd197..91104aa02007 100644 --- a/java/eclipse-cdt/Makefile +++ b/java/eclipse-cdt/Makefile @@ -6,11 +6,11 @@ # PORTNAME= cdt -PORTVERSION= 3.0.0 +PORTVERSION= 3.0.1 CATEGORIES= java devel MASTER_SITES= http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/${PORTVERSION}/ PKGNAMEPREFIX= eclipse- -DISTNAME= org.eclipse.cdt-${PORTVERSION}-linux.${ECLIPSE_ARCH} +DISTNAME= org.eclipse.cdt.sdk-${PORTVERSION}-linux.${ECLIPSE_ARCH} DIST_SUBDIR= eclipse MAINTAINER= freebsd-eclipse@FreeBSD.org @@ -19,19 +19,55 @@ COMMENT= C/C++ IDE for Eclipse RUN_DEPENDS= ${LOCALBASE}/eclipse:${PORTSDIR}/java/eclipse NO_WRKSUBDIR= yes -NO_BUILD= yes USE_JAVA= yes JAVA_VERSION= 1.4+ JAVA_OS= native +USE_GMAKE= yes +.include + +ECLIPSE_OS= freebsd +.if (${ARCH} == "amd64") +ECLIPSE_ARCH= amd64 +.else ECLIPSE_ARCH= x86 +.endif + +MAKE_ENV+= ECLIPSE_ARCH=${ECLIPSE_ARCH} \ + ECLIPSE_OS=${ECLIPSE_OS} \ + PORTVERSION=${PORTVERSION} \ + JAVA_HOME=${JAVA_HOME} + +do-build: + @${RM} ${WRKSRC}/eclipse/features/org.eclipse.cdt_${PORTVERSION}/*.orig + @${RM} ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.core.freebsd.x86_${PORTVERSION}/*.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 + @(cd ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_${PORTVERSION}/src/org.eclipse.cdt.core.freebsd_${PORTVERSION}/library; \ + ${SETENV} ${MAKE_ENV} ${GMAKE}) do-install: @${MKDIR} ${PREFIX}/eclipse - @${CP} -r ${WRKSRC}/eclipse/plugins ${PREFIX}/eclipse - @${CP} -r ${WRKSRC}/eclipse/features ${PREFIX}/eclipse - @(cd ${WRKSRC}; ${FIND} -s eclipse -not -type d) >> ${TMPPLIST} - @(cd ${WRKSRC}; ${FIND} -s -d eclipse -type d) \ - | ${GREP} -vE 'eclipse$$|eclipse/plugins$$|eclipse/features$$' \ - | ${SED} -ne 's,^,@dirrm ,p' >> ${TMPPLIST} -.include + @${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 + +.include diff --git a/java/eclipse-cdt/distinfo b/java/eclipse-cdt/distinfo index 86466f43b2ea..d512a2785237 100644 --- a/java/eclipse-cdt/distinfo +++ b/java/eclipse-cdt/distinfo @@ -1,2 +1,3 @@ -MD5 (eclipse/org.eclipse.cdt-3.0.0-linux.x86.tar.gz) = fd578bf9bcbcd89cdbf1480e792a5506 -SIZE (eclipse/org.eclipse.cdt-3.0.0-linux.x86.tar.gz) = 11946636 +MD5 (eclipse/org.eclipse.cdt.sdk-3.0.1-linux.x86.tar.gz) = eab0b40b99b0d37dd0f1b0d963cd554a +SHA256 (eclipse/org.eclipse.cdt.sdk-3.0.1-linux.x86.tar.gz) = 3f6ffbb28f32e1e61f4f54a64524ec3c42a5eb88dfdcc540fe9c3e89cdfa9500 +SIZE (eclipse/org.eclipse.cdt.sdk-3.0.1-linux.x86.tar.gz) = 19619055 diff --git a/java/eclipse-cdt/files/patch-cdt-feature.xml b/java/eclipse-cdt/files/patch-cdt-feature.xml new file mode 100644 index 000000000000..b4b821f5790c --- /dev/null +++ b/java/eclipse-cdt/files/patch-cdt-feature.xml @@ -0,0 +1,42 @@ +--- eclipse/features/org.eclipse.cdt_3.0.1/feature.xml.orig Thu Nov 3 05:32:10 2005 ++++ eclipse/features/org.eclipse.cdt_3.0.1/feature.xml Fri Dec 2 23:19:06 2005 +@@ -112,6 +112,14 @@ + fragment="true"/> + + ++ ++ ++ ++ ++ ++ + + + + + diff --git a/java/eclipse-cdt/files/patch-cdt.core-openpty.c b/java/eclipse-cdt/files/patch-cdt.core-openpty.c new file mode 100644 index 000000000000..c0daa2e8525f --- /dev/null +++ b/java/eclipse-cdt/files/patch-cdt.core-openpty.c @@ -0,0 +1,10 @@ +--- eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_3.0.1/src/org.eclipse.cdt.core.freebsd_3.0.1/library/openpty.c.orig Sat Dec 3 01:10:16 2005 ++++ eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_3.0.1/src/org.eclipse.cdt.core.freebsd_3.0.1/library/openpty.c Sat Dec 3 01:13:46 2005 +@@ -20,7 +20,6 @@ + #include + + #include +-#include + + /** + * This is taken from R. W. Stevens book. diff --git a/java/eclipse-cdt/files/patch-cdt.core.x86-fragment.xml b/java/eclipse-cdt/files/patch-cdt.core.x86-fragment.xml new file mode 100644 index 000000000000..e0e0175103fa --- /dev/null +++ b/java/eclipse-cdt/files/patch-cdt.core.x86-fragment.xml @@ -0,0 +1,11 @@ +--- eclipse/plugins/org.eclipse.cdt.core.freebsd.x86_3.0.1/fragment.xml.orig Sat Dec 3 17:47:53 2005 ++++ eclipse/plugins/org.eclipse.cdt.core.freebsd.x86_3.0.1/fragment.xml Sat Dec 3 18:03:31 2005 +@@ -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 new file mode 100644 index 000000000000..51b5a5d53cca --- /dev/null +++ b/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.properties @@ -0,0 +1,13 @@ +--- eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_3.0.1/plugin.properties.orig Thu Nov 3 05:32:10 2005 ++++ eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_3.0.1/plugin.properties Fri Dec 2 23:57:06 2005 +@@ -36,6 +36,10 @@ + TargetName.solaris.exe=Solaris Executable + TargetName.solaris.so=Solaris Shared Library + TargetName.solaris.lib=Solaris Static Library ++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 diff --git a/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.xml b/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.xml new file mode 100644 index 000000000000..543f3df2ea3b --- /dev/null +++ b/java/eclipse-cdt/files/patch-managedbuilder.gnu-plugin.xml @@ -0,0 +1,110 @@ +--- eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_3.0.1/plugin.xml.orig Thu Nov 3 05:32:10 2005 ++++ eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_3.0.1/plugin.xml Fri Dec 2 23:55:19 2005 +@@ -1334,7 +1334,7 @@ + errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser"> + + + + + + + + + + + + + + + + + + + + /dev/null || true +@unexec rmdir %D/eclipse/features 2>/dev/null || true +@unexec rmdir %D/eclipse 2>/dev/null || true diff --git a/java/eclipse-cdt/scripts/pre-patch b/java/eclipse-cdt/scripts/pre-patch new file mode 100644 index 000000000000..6f9a7aa9376e --- /dev/null +++ b/java/eclipse-cdt/scripts/pre-patch @@ -0,0 +1,43 @@ +#!/bin/sh +# $FreeBSD: /tmp/pcvs/ports/java/eclipse-cdt/scripts/pre-patch,v 1.1 2006-01-03 03:28:05 edwin Exp $ + +copy_dir() +{ + srcdir="$1" + dstdir="$2" + + rm -rf "$dstdir" + cp -r "$srcdir" "$dstdir" || exit 1 + + if [ -d "$dstdir" ] + then + find "$dstdir" -name \*.so -delete + fi +} + +prepare_files() +{ + # Copy the files and rename/change them appropriately + for src in $COPY_LIST + do + dst=`echo $src | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g; s/x86_64/amd64/g'` + echo Copying $src into $dst + if [ -d ${WRKSRC}/$src ] + then + copy_dir ${WRKSRC}/$src ${WRKSRC}/$dst + fi + done + find ${WRKSRC} -type d -name linux | xargs rm -r +} + +COPY_LIST=" +eclipse/plugins/org.eclipse.cdt.core.linux.x86_3.0.1 +eclipse/plugins/org.eclipse.cdt.core.linux.x86_3.0.1/os/linux +eclipse/plugins/org.eclipse.cdt.core.linux.x86_3.0.1/os/linux/x86 +eclipse/plugins/org.eclipse.cdt.core.linux_3.0.1 +eclipse/plugins/org.eclipse.cdt.source.linux.gtk.x86_3.0.1 +eclipse/plugins/org.eclipse.cdt.source.linux.gtk.x86_3.0.1/src/org.eclipse.cdt.core.linux_3.0.1 +" + +prepare_files +exit 0