Attachment #53605 for bug #81076

View | Details | Raw Unified | Return to bug 81076
Collapse All | Expand All




#

PORTNAME=	eclipse
PORTVERSION=	3.1M7
CATEGORIES=	java devel
MASTER_SITES=	${MASTER_SITE_ECLIPSE}
MASTER_SITE_SUBDIR=	S-${PORTVERSION}-200505131415
DISTNAME=	${PORTNAME}-sourceBuild-srcIncluded-${PORTVERSION}
DIST_SUBDIR=	eclipse


USE_MOTIF=	yes
.else
ECLIPSE_WS=	gtk
.if defined(WITH_MOZILLA)
BROWSER=	${WITH_MOZILLA}
BUILD_DEPENDS+=	${BROWSER}:${PORTSDIR}/www/${BROWSER}
.else

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	MD5 (eclipse/eclipse-sourceBuild-srcIncluded-3.1M6.zip) = 51d81345d2fa0e8aa0b455f6cf4c447f	1	MD5 (eclipse/eclipse-sourceBuild-srcIncluded-3.1M7.zip) = 30279e8c74de2db219418f645291be39
2	SIZE (eclipse/eclipse-sourceBuild-srcIncluded-3.1M6.zip) = 59038692	2	SIZE (eclipse/eclipse-sourceBuild-srcIncluded-3.1M7.zip) = 59421339




--- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig	Fri May 13 11:37:09 2005
+++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	Sat May 14 21:02:00 2005
@@ -100,6 +100,33 @@
 				;;	
 		esac
 		;;

+		CC=gcc
+		LD=gcc
+		XTEST_LIB_PATH=$X11BASE/lib
+		KDE_LIB_PATH=$PREFIX/lib
+		KDE_INCLUDE_PATH=$PREFIX/include
+		QT_HOME=$X11BASE
+		GECKO_I=${X11BASE}/include/${BROWSER}
+		GECKO_INCLUDES="-I${GECKO_I} -I${GECKO_I}/nspr -I${GECKO_I}/xpcom -I${GECKO_I}/string -I${GECKO_I}/embed_base -I${GECKO_I}/embedstring"
+		GECKO_L=${X11BASE}/lib/${BROWSER}

+			"amd64")
+				AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64
+				SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64
+				OUTPUT_DIR=../../../org.eclipse.swt.gtk.freebsd.amd64
+				makefile="make_freebsd.mak"
+				echo "Building FreeBSD GTK AMD64 version of SWT"
+				;;
+			i?86)
+				AWT_LIB_PATH=$JAVA_HOME/jre/lib/i386
+				OUTPUT_DIR=../../../org.eclipse.swt.gtk.freebsd.x86
+				makefile="make_freebsd.mak"
+				echo "Building FreeBSD GTK x86 version of SWT"
+				;;

 	"SunOS")
 		CC=gcc
 		LD=gcc
@@ -128,4 +155,4 @@
 
 export CC LD JAVA_HOME AWT_LIB_PATH XTEST_LIB_PATH GECKO_SDK GECKO_INCLUDES GECKO_LIBS SWT_PTR_CFLAGS CDE_HOME OUTPUT_DIR
 
-make -f $makefile ${1} ${2} ${3} ${4}
+gmake -f $makefile ${1} ${2} ${3} ${4}
+
+build_kde=`pkg_info -xc kdebase | grep "no packages match"`
+if [ "$build_kde" != "" ]; then
+  echo "Building FreeBSD version of KDE DLL."
+  gmake -f $makefile make_kde
+fi
+
+cp -p library/xpcom* .
+gmake -f $makefile make_mozilla




--- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak.orig	Sat May 14 19:50:23 2005
+++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak	Sat May 14 21:24:34 2005
@@ -78,15 +78,16 @@
 GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`
 GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2
 
-KDE_LIBS = -shared -L$(KDE_LIB_PATH) -lkdecore -lkparts -L$(QT_HOME)/lib -lqt
-KDE_CFLAGS = -fno-rtti -c -O -I$(KDE_INCLUDE_PATH) -I$(QT_HOME)/include -I$(JAVA_HOME)/include
+KDE_LIBS = -shared -L$(KDE_LIB_PATH) -lkdecore -lkparts -L$(QT_HOME)/lib -lqt-mt
+KDE_CFLAGS = -fno-rtti -c -O -I$(KDE_INCLUDE_PATH) -I$(QT_HOME)/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd
 
 # Uncomment for Native Stats tool
 #NATIVE_STATS = -DNATIVE_STATS
@@ -65,6 +65,7 @@
 	-Wno-non-virtual-dtor \
 	-fPIC \
 	-I./ \
+	-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd \
 	${GECKO_INCLUDES} \
 	${SWT_PTR_CFLAGS}
 	
@@ -82,14 +83,14 @@
 CFLAGS = -O -Wall \
 		-DSWT_VERSION=$(SWT_VERSION) \
 		$(NATIVE_STATS) \
-		-DLINUX -DGTK \
-		-I$(JAVA_HOME)/include \
-		-fpic \
+		-DFREEBSD -DGTK \
 		-I$(JAVA_HOME)/include \
 		-I$(JAVA_HOME)/include/freebsd \
-		-fpic \
+		-I$(X11BASE)/include \
+		-fpic -fPIC \
 		${SWT_PTR_CFLAGS}
-LIBS = -shared -fpic -s
+LIBS = -shared -fpic -fPIC -s
 
 
-all: make_swt make_atk make_gnome make_awt
+all: make_swt make_atk $(MAKE_GNOME) make_awt
 
 #




--- plugins/org.eclipse.swt/Eclipse SWT PI/motif/library/build.sh.orig	Fri May 13 11:37:09 2005
+++ plugins/org.eclipse.swt/Eclipse SWT PI/motif/library/build.sh	Sat May 14 21:03:05 2005
@@ -54,6 +54,18 @@
 			echo "Building Linux motif x86 version of SWT"
 		esac
 		;;
+	"FreeBSD")
+		case $MODEL in
+		i?86) 
+			OUTPUT_DIR=../../../org.eclipse.swt.motif.freebsd.x86
+			makefile="make_freebsd.mak"
+			echo "Building FreeBSD motif x86 version of SWT"
+			;;

 	"SunOS")
 		case $MODEL in
 		*) 
@@ -113,4 +125,4 @@
 
 export JAVA_HOME MOTIF_HOME CDE_HOME OUTPUT_DIR
 
-make -f $makefile $1 $2 $3 $4
\ No newline at end of file
+gmake -f $makefile $1 $2 $3 $4




--- plugins/org.eclipse.swt/Eclipse SWT PI/motif/library/make_freebsd.mak~	Sat May 14 19:38:40 2005
+++ plugins/org.eclipse.swt/Eclipse SWT PI/motif/library/make_freebsd.mak	Sat May 14 19:43:29 2005
@@ -25,26 +25,26 @@
 WS_PREFIX = motif
 SWT_LIB = lib$(SWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 SWT_OBJS = swt.o callback.o os.o os_structs.o os_custom.o os_stats.o

 # Uncomment for Native Stats tool
 #NATIVE_STATS = -DNATIVE_STATS
 
-CFLAGS = -O -s -Wall -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) -DLINUX -DMOTIF  -fpic \
-	-I$(JAVA_HOME)/include -I$(MOTIF_HOME)/include -I/usr/X11R6/include 
+CFLAGS = -O -s -Wall -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) -DFREEBSD -DMOTIF  -fpic -fPIC \
+	-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd -I$(MOTIF_HOME)/include -I$(X11BASE)/include -I$(PREFIX)/include
 
 # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0)
 GNOME_PREFIX = swt-gnome
 GNOME_LIB = lib$(GNOME_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o
-GNOME_CFLAGS = -O -Wall -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) -DLINUX -DGTK -I$(JAVA_HOME)/include `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`
+GNOME_CFLAGS = -O -Wall -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) -DFREEBSD -DGTK -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd -fpic -fPIC `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`
 GNOME_LIBS = -shared -fpic -fPIC `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2
 
 KDE_PREFIX = swt-kde
 KDE_LIB = lib$(KDE_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 KDE_OBJS = swt.o kde.o kde_stats.o
-KDE_LIBS = -L/usr/lib  -L$(QT_HOME)/lib -shared  -lkdecore -lqt -lkparts
-KDE_CFLAGS = -fno-rtti -c -O -I/usr/include/kde -I$(QT_HOME)/include -I$(JAVA_HOME)/include
+KDE_LIBS = -L$(PREFIX)/lib  -L$(QT_HOME)/lib -shared  -lkdecore -lqt -lkparts
+KDE_CFLAGS = -fno-rtti -c -O -I/usr/include/kde -I$(QT_HOME)/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd 
 
 AWT_PREFIX = swt-awt
 AWT_LIB = lib$(AWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 AWT_OBJS = swt_awt.o

 
 GTK_PREFIX = swt-gtk
 GTK_LIB = lib$(GTK_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
@@ -58,7 +58,7 @@
 CAIROCFLAGS = `pkg-config --cflags cairo`
 CAIROLIBS = -shared -fpic -fPIC -s `pkg-config --libs-only-L cairo` -lcairo
 	
-all: make_swt make_awt make_gnome make_gtk
+all: make_swt make_awt $(MAKE_GNOME) make_gtk
 
 make_swt: $(SWT_LIB)
 
@@ -80,16 +80,16 @@
 make_gnome: $(GNOME_LIB)
 
 $(GNOME_LIB): $(GNOME_OBJECTS)
-	gcc -o $@ $(GNOME_OBJECTS) $(GNOME_LIBS)
+	$(CC) -o $@ $(GNOME_OBJECTS) $(GNOME_LIBS)
 
 gnome.o: gnome.c
-	gcc $(GNOME_CFLAGS) -c -o gnome.o gnome.c
+	$(CC) $(GNOME_CFLAGS) -c -o gnome.o gnome.c
 
 gnome_structs.o: gnome_structs.c
-	gcc $(GNOME_CFLAGS) -c -o gnome_structs.o gnome_structs.c
+	$(CC) $(GNOME_CFLAGS) -c -o gnome_structs.o gnome_structs.c
 
 gnome_stats.o: gnome_stats.c
-	gcc $(GNOME_CFLAGS) -c -o gnome_stats.o gnome_stats.c
+	$(CC) $(GNOME_CFLAGS) -c -o gnome_stats.o gnome_stats.c
 
 make_kde: $(KDE_LIB)
 




--- plugins/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/ExternalBrowserInstance.java.orig	Sun Apr  3 15:44:23 2005
+++ plugins/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/ExternalBrowserInstance.java	Sun Apr  3 15:44:47 2005

@@ -74,7 +74,7 @@
 			public void run() {
 				try {
 					process.waitFor();
-					DefaultBrowserSupport.getInstance().removeBrowser(getId());
+					DefaultBrowserSupport.getInstance().removeBrowser(ExternalBrowserInstance.this.getId());
 				} catch (Exception e) {
 					// ignore
 				}





--- build.xml.orig	Fri May 13 11:38:39 2005
+++ build.xml	Sat May 14 23:42:22 2005
@@ -53,7 +53,7 @@
 		<exec dir="${swtlibs}/" executable="sh" failonerror="true">
 			<arg line="build.sh"/>
 		</exec>
-		<property name="swtdir" value="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.{installOs}.{installArch}"/>
+		<property name="swtdir" value="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}"/>
 		<mkdir dir="${swtdir}"/>
 		<move todir="${swtdir}/">
 			<fileset dir="${swtlibs}">
@@ -63,12 +63,12 @@
 				<equals arg1="${installOs}-${installWs}-${installArch}"	arg2="linux-gtk-x86"/>
+				<equals arg1="${installOs}-${installWs}-${installArch}"	arg2="freebsd-gtk-x86"/>
 			</or>
 		</condition>
 		<condition property="wsType" value="motif">
 			<or>
 				<equals arg1="${installOs}-${installWs}-${installArch}" arg2="linux-motif-x86"/>
+				<equals arg1="${installOs}-${installWs}-${installArch}" arg2="freebsd-motif-x86"/>
 				<equals arg1="${installOs}-${installWs}-${installArch}" arg2="hpux-motif-ia64"/>
 			</or>
 		</condition>
@@ -82,12 +85,12 @@
 		<!--unzip launcher -->
 		<property name="launcherlibs" value="${buildDirectory}/launchertmp"/>
 		<mkdir dir="${launcherlibs}"/>

-			<fileset dir="${buildDirectory}/plugins/org.eclipse.platform.source/src/">
-				<include name ="org.eclipse.platform_*/launchersrc.zip"/>
+		<copy todir="${launcherlibs}">
+			<fileset dir="${buildDirectory}/features/org.eclipse.platform.launchers">
+				<include name ="**"/>
 			</fileset>
-		</unzip>




--- features/org.eclipse.jdt/build.xml.orig	Fri May 13 11:34:52 2005
+++ features/org.eclipse.jdt/build.xml	Sat May 14 18:42:27 2005
@@ -164,6 +164,24 @@
 			<fileset dir="${basedir}/rootfiles" includes="**"			/>
 		</copy>
 	</target>
+	<target name="rootFilesfreebsd_gtk_amd64">
+		<mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}"/>
+		<copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" failonerror="true" overwrite="true">
+			<fileset dir="${basedir}/rootfiles" includes="**"			/>
+		</copy>
+	</target>
+	<target name="rootFilesfreebsd_gtk_x86">
+		<mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}"/>
+		<copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" failonerror="true" overwrite="true">
+			<fileset dir="${basedir}/rootfiles" includes="**"			/>
+		</copy>
+	</target>
+	<target name="rootFilesfreebsd_motif_x86">
+		<mkdir dir="${feature.base}/freebsd.motif.x86/${collectingFolder}"/>
+		<copy todir="${feature.base}/freebsd.motif.x86/${collectingFolder}" failonerror="true" overwrite="true">
+			<fileset dir="${basedir}/rootfiles" includes="**"			/>
+		</copy>
+	</target>
 	<target name="rootFilessolaris_motif_sparc">
 		<mkdir dir="${feature.base}/solaris.motif.sparc/${collectingFolder}"/>
 		<copy todir="${feature.base}/solaris.motif.sparc/${collectingFolder}" failonerror="true" overwrite="true">

Lines 1-5 Link Here

(-)files/patch-features-launchers-gtk-build.sh (-2 / +2 lines)
1	--- features/org.eclipse.launchers/library/gtk/build.sh.orig Fri Apr 1 13:57:19 2005	1	--- features/org.eclipse.platform.launchers/library/gtk/build.sh.orig Fri Apr 1 13:57:19 2005
2	+++ features/org.eclipse.launchers/library/gtk/build.sh Sun Apr 3 11:37:51 2005	2	+++ features/org.eclipse.platform.launchers/library/gtk/build.sh Sun Apr 3 11:37:51 2005
3	@@ -67,6 +67,23 @@	3	@@ -67,6 +67,23 @@
4	;;	4	;;
5	esac	5	esac

Lines 1-5 Link Here

(-)files/patch-features-launchers-gtk-make_freebsd.mak (-2 / +2 lines)
1	--- features/org.eclipse.launchers/library/gtk/make_freebsd.mak.orig Sun Apr 17 20:24:58 2005	1	--- features/org.eclipse.platform.launchers/library/gtk/make_freebsd.mak.orig Sun Apr 17 20:24:58 2005
2	+++ features/org.eclipse.launchers/library/gtk/make_freebsd.mak Sun Apr 17 20:25:45 2005	2	+++ features/org.eclipse.platform.launchers/library/gtk/make_freebsd.mak Sun Apr 17 20:25:45 2005
3	@@ -26,7 +26,7 @@	3	@@ -26,7 +26,7 @@
4	CC=gcc	4	CC=gcc
5	OBJS = eclipse.o eclipseUtil.o eclipseShm.o eclipseConfig.o eclipseGtk.o	5	OBJS = eclipse.o eclipseUtil.o eclipseShm.o eclipseConfig.o eclipseGtk.o

Lines 1-5 Link Here

(-)files/patch-features-launchers-library-eclipseShm.c (-2 / +2 lines)
1	--- features/org.eclipse.launchers/library/eclipseShm.c.orig Fri Apr 1 13:55:58 2005	1	--- features/org.eclipse.platform.launchers/library/eclipseShm.c.orig Fri Apr 1 13:55:58 2005
2	+++ features/org.eclipse.launchers/library/eclipseShm.c Sun Apr 3 11:34:02 2005	2	+++ features/org.eclipse.platform.launchers/library/eclipseShm.c Sun Apr 3 11:34:02 2005
3	@@ -182,11 +182,13 @@	3	@@ -182,11 +182,13 @@
4		4
5	#else /* Unix like platforms */	5	#else /* Unix like platforms */

Lines 1-5 Link Here

(-)files/patch-features-launchers-motif-build.sh (-2 / +2 lines)
1	--- features/org.eclipse.launchers/library/motif/build.sh~ Sat Feb 19 12:13:49 2005	1	--- features/org.eclipse.platform.launchers/library/motif/build.sh~ Sat Feb 19 12:13:49 2005
2	+++ features/org.eclipse.launchers/library/motif/build.sh Sun Mar 20 15:27:04 2005	2	+++ features/org.eclipse.platform.launchers/library/motif/build.sh Sun Mar 20 15:27:04 2005
3	@@ -55,6 +55,15 @@	3	@@ -55,6 +55,15 @@
4	MOTIF_HOME=/bluebird/teamswt/swt-builddir/motif21	4	MOTIF_HOME=/bluebird/teamswt/swt-builddir/motif21
5	OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"	5	OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"

Lines 1-75 Link Here

(-)files/patch-features-platform-build.xml (-53 / +51 lines)
1	--- features/org.eclipse.platform/build.xml.orig Fri Apr 1 13:54:42 2005	1	--- features/org.eclipse.platform/build.xml.orig Fri May 13 11:34:52 2005
2	+++ features/org.eclipse.platform/build.xml Sat Apr 2 13:43:10 2005	2	+++ features/org.eclipse.platform/build.xml Sat May 14 20:43:11 2005
3	@@ -44,6 +44,16 @@	3	@@ -42,6 +42,11 @@
		4	<property name="os" value="linux"/>
		5	<property name="ws" value="motif"/>
4	</ant>	6	</ant>
5	<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk" target="${target}">	7	+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.freebsd.x86" target="${target}">
6	<property name="arch" value="x86"/>
7	+ <property name="os" value="freebsd"/>
8	+ <property name="ws" value="gtk"/>
9	+ </ant>
10	+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk" target="${target}">
11	+ <property name="arch" value="x86"/>	8	+ <property name="arch" value="x86"/>
12	+ <property name="os" value="freebsd"/>	9	+ <property name="os" value="freebsd"/>
13	+ <property name="ws" value="motif"/>	10	+ <property name="ws" value="motif"/>
14	+ </ant>	11	+ </ant>
15	+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif" target="${target}">	12	<ant antfile="build.xml" dir="../../plugins/org.apache.ant" target="${target}">
16	+ <property name="arch" value="x86"/>	13	<property name="arch" value="x86"/>
		14	<property name="os" value="win32"/>
		15	@@ -62,6 +67,11 @@
17	<property name="os" value="linux"/>	16	<property name="os" value="linux"/>
18	<property name="ws" value="gtk"/>	17	<property name="ws" value="gtk"/>
19	</ant>	18	</ant>
20	@@ -63,6 +73,11 @@	19	+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.freebsd.amd64" target="${target}">
		20	+ <property name="arch" value="amd64"/>
		21	+ <property name="os" value="freebsd"/>
		22	+ <property name="ws" value="gtk"/>
		23	+ </ant>
		24	<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.solaris.sparc" target="${target}">
		25	<property name="arch" value="sparc"/>
		26	<property name="os" value="solaris"/>
		27	@@ -107,6 +117,11 @@
		28	<property name="os" value="linux"/>
21	<property name="ws" value="gtk"/>	29	<property name="ws" value="gtk"/>
22	</ant>	30	</ant>
23	<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk64" target="${target}">	31	+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.freebsd.x86" target="${target}">
24	+ <property name="arch" value="amd64"/>	32	+ <property name="arch" value="x86"/>
25	+ <property name="os" value="freebsd"/>	33	+ <property name="os" value="freebsd"/>
26	+ <property name="ws" value="gtk"/>	34	+ <property name="ws" value="gtk"/>
27	+ </ant>	35	+ </ant>
28	+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk64" target="${target}">	36	<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.solaris.sparc" target="${target}">
29	<property name="arch" value="ia64"/>	37	<property name="arch" value="sparc"/>
		38	<property name="os" value="solaris"/>
		39	@@ -187,6 +202,11 @@
30	<property name="os" value="linux"/>	40	<property name="os" value="linux"/>
31	<property name="ws" value="gtk"/>	41	<property name="ws" value="gtk"/>
32	@@ -182,6 +197,11 @@
33	<property name="os" value="win32"/>
34	<property name="ws" value="win32"/>
35	</ant>	42	</ant>
36	+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.update.core.freebsd" target="${target}">	43	+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.update.core.freebsd" target="${target}">
37	+ <property name="arch" value="x86"/>	44	+ <property name="arch" value="x86"/>
38	+ <property name="os" value="freebsd"/>	45	+ <property name="os" value="freebsd"/>
39	+ <property name="ws" value="motif"/>	46	+ <property name="ws" value="gtk"/>
40	+ </ant>	47	+ </ant>
41	<ant antfile="build.xml" dir="../../plugins/org.eclipse.update.core.linux" target="${target}">	48	<ant antfile="build.xml" dir="../../plugins/org.eclipse.jface.text" target="${target}">
42	<property name="arch" value="x86"/>	49	<property name="arch" value="x86"/>
43	<property name="os" value="linux"/>	50	<property name="os" value="win32"/>
44	@@ -222,6 +242,11 @@	51	@@ -222,6 +242,11 @@
45	<property name="os" value="qnx"/>	52	<property name="os" value="linux"/>
46	<property name="ws" value="photon"/>	53	<property name="ws" value="gtk"/>
47	</ant>	54	</ant>
48	+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.resources.freebsd" target="${target}">	55	+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.resources.freebsd" target="${target}">
49	+ <property name="arch" value="x86"/>	56	+ <property name="arch" value="x86"/>
50	+ <property name="os" value="freebsd"/>	57	+ <property name="os" value="freebsd"/>
51	+ <property name="ws" value="motif"/>	58	+ <property name="ws" value="gtk"/>
52	+ </ant>	59	+ </ant>
53	<ant antfile="build.xml" dir="../../plugins/org.eclipse.core.resources.linux" target="${target}">	60	<ant antfile="build.xml" dir="../../plugins/org.eclipse.team.core" target="${target}">
54	<property name="arch" value="x86"/>	61	<property name="arch" value="x86"/>
55	<property name="os" value="linux"/>	62	<property name="os" value="win32"/>
56	@@ -449,7 +474,7 @@	63	@@ -450,7 +475,7 @@
57	<copy todir="${feature.base}/features/org.eclipse.platform_3.1.0" failonerror="true">	64	<copy todir="${feature.base}/features/org.eclipse.platform_3.1.0" failonerror="true" overwrite="false">
58	<fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html" />	65	<fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html" />
59	</copy>	66	</copy>
60	- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.0/feature.xml" selfVersion="3.1.0" featureIds="" pluginIds="org.apache.ant,1.6.2,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.0,org.eclipse.compare,3.1.0,org.eclipse.core.boot,3.0.0,org.eclipse.core.commands,3.1.0,org.eclipse.core.filebuffers,3.1.0,org.eclipse.core.expressions,3.1.0,org.eclipse.core.resources,3.1.0,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi,3.1.0,org.eclipse.osgi.services,3.0.0,org.eclipse.osgi.util,3.0.0,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.0,org.eclipse.debug.ui,3.1.0,org.eclipse.help,3.1.0,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.0,org.eclipse.help.appserver,3.1.0,org.eclipse.platform,3.1.0,org.eclipse.platform.doc.user,3.1.0,org.eclipse.search,3.1.0,org.eclipse.swt,3.1.0,org.eclipse.team.core,3.1.0,org!
61	.eclipse.team.cvs.core,3.1.0,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.0,org.eclipse.team.ui,3.1.0,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.0,org.eclipse.jface,3.1.0,org.eclipse.jface.text,3.1.0,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.0,org.eclipse.ui.cheatsheets,3.0.0,org.eclipse.ui.browser,3.1.0,org.eclipse.ui.workbench,3.1.0,org.eclipse.ui.workbench.texteditor,3.1.0,org.eclipse.ui.views,3.1.0,org.eclipse.ui.editors,3.1.0,org.eclipse.ui.forms,3.1.0,org.eclipse.ui,3.1.0,org.eclipse.ui.externaltools,3.1.0,org.eclipse.ui.ide,3.1.0,org.eclipse.update.configurator,3.1.0,org.eclipse.update.core,3.1.0,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.0,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.swt.motif,3.1.0,org.eclipse.swt.motif,3.1.0,org.eclipse.core.resources.hpux,3.0.0,org.eclipse.swt.gtk,3.1.0,org.eclipse.swt.gtk,3.1.0,org.eclipse.core.res!	67	.eclipse.team.cvs.core,3.1.0,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.0,org.eclipse.team.ui,3.1.0,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.0,org.eclipse.jface,3.1.0,org.eclipse.jface.text,3.1.0,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.0,org.eclipse.ui.cheatsheets,3.0.0,org.eclipse.ui.browser,3.1.0,org.eclipse.ui.workbench,3.1.0,org.eclipse.ui.workbench.texteditor,3.1.0,org.eclipse.ui.views,3.1.0,org.eclipse.ui.editors,3.1.0,org.eclipse.ui.forms,3.1.0,org.eclipse.ui,3.1.0,org.eclipse.ui.externaltools,3.1.0,org.eclipse.ui.ide,3.1.0,org.eclipse.update.configurator,3.1.0,org.eclipse.update.core,3.1.0,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.0,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.swt.motif,3.1.0,org.eclipse.swt.motif,3.1.0,org.eclipse.core.resources.hpux,3.0.0,org.eclipse.swt.gtk,3.1.0,org.eclipse.swt.gtk,3.1.0,org.eclipse.core.res!
62	ources.linux,3.0.0,org.eclipse.update.core.linux,3.1.0,org.ecl!	68	ources.linux,3.0.0,org.eclipse.update.core.linux,3.1.0,org.ecl!
63	ipse.swt	69	ipse.swt
64	+ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.0/feature.xml" selfVersion="3.1.0" featureIds="" pluginIds="org.apache.ant,1.6.2,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.0,org.eclipse.compare,3.1.0,org.eclipse.core.boot,3.0.0,org.eclipse.core.commands,3.1.0,org.eclipse.core.filebuffers,3.1.0,org.eclipse.core.expressions,3.1.0,org.eclipse.core.resources,3.1.0,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi,3.1.0,org.eclipse.osgi.services,3.0.0,org.eclipse.osgi.util,3.0.0,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.0,org.eclipse.debug.ui,3.1.0,org.eclipse.help,3.1.0,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.0,org.eclipse.help.appserver,3.1.0,org.eclipse.platform,3.1.0,org.eclipse.platform.doc.user,3.1.0,org.eclipse.search,3.1.0,org.eclipse.swt,3.1.0,org.eclipse.team.core,3.1.0,org!
65	.eclipse.team.cvs.core,3.1.0,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.0,org.eclipse.team.ui,3.1.0,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.0,org.eclipse.jface,3.1.0,org.eclipse.jface.text,3.1.0,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.0,org.eclipse.ui.cheatsheets,3.0.0,org.eclipse.ui.browser,3.1.0,org.eclipse.ui.workbench,3.1.0,org.eclipse.ui.workbench.texteditor,3.1.0,org.eclipse.ui.views,3.1.0,org.eclipse.ui.editors,3.1.0,org.eclipse.ui.forms,3.1.0,org.eclipse.ui,3.1.0,org.eclipse.ui.externaltools,3.1.0,org.eclipse.ui.ide,3.1.0,org.eclipse.update.configurator,3.1.0,org.eclipse.update.core,3.1.0,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.0,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.swt.motif,3.1.0,org.eclipse.swt.motif,3.1.0,org.eclipse.core.resources.hpux,3.0.0,org.eclipse.swt.gtk,3.1.0,org.eclipse.swt.gtk,3.1.0,org.eclipse.core.res!	70	.eclipse.team.cvs.core,3.1.0,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.0,org.eclipse.team.ui,3.1.0,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.0,org.eclipse.jface,3.1.0,org.eclipse.jface.text,3.1.0,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.0,org.eclipse.ui.cheatsheets,3.0.0,org.eclipse.ui.browser,3.1.0,org.eclipse.ui.workbench,3.1.0,org.eclipse.ui.workbench.texteditor,3.1.0,org.eclipse.ui.views,3.1.0,org.eclipse.ui.editors,3.1.0,org.eclipse.ui.forms,3.1.0,org.eclipse.ui,3.1.0,org.eclipse.ui.externaltools,3.1.0,org.eclipse.ui.ide,3.1.0,org.eclipse.update.configurator,3.1.0,org.eclipse.update.core,3.1.0,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.0,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.swt.motif,3.1.0,org.eclipse.swt.motif,3.1.0,org.eclipse.core.resources.hpux,3.0.0,org.eclipse.swt.gtk,3.1.0,org.eclipse.swt.gtk,3.1.0,org.eclipse.core.res!
66	ources.linux,3.0.0,org.eclipse.core.resources.freebsd,3.0.0,or!	71	ources.linux,3.0.0,org.eclipse.core.resources.freebsd,3.0.0,or!
67	g.eclips	72	g.eclips
		73	- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.0/feature.xml" selfVersion="3.1.0" featureIds="" pluginIds="org.apache.ant,1.6.3,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.0,org.eclipse.compare,3.1.0,org.eclipse.core.boot,3.0.0,org.eclipse.core.commands,3.1.0,org.eclipse.core.expressions,3.1.0,org.eclipse.core.filebuffers,3.1.0,org.eclipse.core.resources,3.1.0,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi,3.1.0,org.eclipse.osgi.services,3.0.0,org.eclipse.osgi.util,3.0.0,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.0,org.eclipse.debug.ui,3.1.0,org.eclipse.help,3.1.0,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.0,org.eclipse.help.appserver,3.1.0,org.eclipse.jface,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.0,org.eclipse.platform,3.1.0,org.eclipse.pl!
68	atform.doc.user,3.1.0,org.eclipse.search,3.1.0,org.eclipse.swt,3.1.0,org.eclipse.team.core,3.1.0,org.eclipse.team.cvs.core,3.1.0,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.0,org.eclipse.team.ui,3.1.0,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.0,org.eclipse.jface.text,3.1.0,org.eclipse.ui,3.1.0,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.0,org.eclipse.ui.cheatsheets,3.1.0,org.eclipse.ui.browser,3.1.0,org.eclipse.ui.workbench,3.1.0,org.eclipse.ui.workbench.texteditor,3.1.0,org.eclipse.ui.views,3.1.0,org.eclipse.ui.editors,3.1.0,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.0,org.eclipse.ui.ide,3.1.0,org.eclipse.update.configurator,3.1.0,org.eclipse.update.core,3.1.0,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.0,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.c!	74	atform.doc.user,3.1.0,org.eclipse.search,3.1.0,org.eclipse.swt,3.1.0,org.eclipse.team.core,3.1.0,org.eclipse.team.cvs.core,3.1.0,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.0,org.eclipse.team.ui,3.1.0,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.0,org.eclipse.jface.text,3.1.0,org.eclipse.ui,3.1.0,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.0,org.eclipse.ui.cheatsheets,3.1.0,org.eclipse.ui.browser,3.1.0,org.eclipse.ui.workbench,3.1.0,org.eclipse.ui.workbench.texteditor,3.1.0,org.eclipse.ui.views,3.1.0,org.eclipse.ui.editors,3.1.0,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.0,org.eclipse.ui.ide,3.1.0,org.eclipse.update.configurator,3.1.0,org.eclipse.update.core,3.1.0,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.0,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.c!
69	ore.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.!	75	ore.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.!
70	0,org.ec	76	0,org.ec
		77	+ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.0/feature.xml" selfVersion="3.1.0" featureIds="" pluginIds="org.apache.ant,1.6.3,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.0,org.eclipse.compare,3.1.0,org.eclipse.core.boot,3.0.0,org.eclipse.core.commands,3.1.0,org.eclipse.core.expressions,3.1.0,org.eclipse.core.filebuffers,3.1.0,org.eclipse.core.resources,3.1.0,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi,3.1.0,org.eclipse.osgi.services,3.0.0,org.eclipse.osgi.util,3.0.0,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.0,org.eclipse.debug.ui,3.1.0,org.eclipse.help,3.1.0,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.0,org.eclipse.help.appserver,3.1.0,org.eclipse.jface,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.0,org.eclipse.platform,3.1.0,org.eclipse.pl!
71	atform.doc.user,3.1.0,org.eclipse.search,3.1.0,org.eclipse.swt,3.1.0,org.eclipse.team.core,3.1.0,org.eclipse.team.cvs.core,3.1.0,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.0,org.eclipse.team.ui,3.1.0,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.0,org.eclipse.jface.text,3.1.0,org.eclipse.ui,3.1.0,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.0,org.eclipse.ui.cheatsheets,3.1.0,org.eclipse.ui.browser,3.1.0,org.eclipse.ui.workbench,3.1.0,org.eclipse.ui.workbench.texteditor,3.1.0,org.eclipse.ui.views,3.1.0,org.eclipse.ui.editors,3.1.0,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.0,org.eclipse.ui.ide,3.1.0,org.eclipse.update.configurator,3.1.0,org.eclipse.update.core,3.1.0,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.0,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.c!	78	atform.doc.user,3.1.0,org.eclipse.search,3.1.0,org.eclipse.swt,3.1.0,org.eclipse.team.core,3.1.0,org.eclipse.team.cvs.core,3.1.0,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.0,org.eclipse.team.ui,3.1.0,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.0,org.eclipse.jface.text,3.1.0,org.eclipse.ui,3.1.0,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.0,org.eclipse.ui.cheatsheets,3.1.0,org.eclipse.ui.browser,3.1.0,org.eclipse.ui.workbench,3.1.0,org.eclipse.ui.workbench.texteditor,3.1.0,org.eclipse.ui.views,3.1.0,org.eclipse.ui.editors,3.1.0,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.0,org.eclipse.ui.ide,3.1.0,org.eclipse.update.configurator,3.1.0,org.eclipse.update.core,3.1.0,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.0,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.c!
72	ore.resources.freebsd,3.1.0,org.eclipse.core.resources.macosx,!	79	ore.resources.freebsd,3.1.0,org.eclipse.core.resources.macosx,!
73	3.1.0,or	80	3.1.0,or
74	<antcall target="rootFiles${os}_${ws}_${arch}"/>	81	<antcall target="rootFiles${os}_${ws}_${arch}"/>
75	</target>	82	</target>
76	<target name="rootFileswin32_win32_x86">	83	<target name="rootFileswin32_win32_x86">
77	@@ -472,6 +497,16 @@	84	@@ -473,6 +498,16 @@
78	</copy>	85	</copy>
79	<chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="eclipse" />	86	<chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="eclipse" />
80	</target>	87	</target>
81	+ <target name="rootFilesfreebsd_gtk_x86">	88	+ <target name="rootFilesfreebsd_gtk_x86">
82	+ <mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}"/>	89	+ <mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}"/>
83	+ <copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" failonerror="true">	90	+ <copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" failonerror="true" overwrite="true">
84	+ <fileset dir="${basedir}/../../features/org.eclipse.launchers/bin/gtk/freebsd/x86" includes="**" />	91	+ <fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/gtk/freebsd/x86" includes="**" />
85	+ <fileset dir="${basedir}/gtk" includes="**" />	92	+ <fileset dir="${basedir}/gtk" includes="**" />
86	+ <fileset dir="${basedir}/rootfiles" includes="**" />	93	+ <fileset dir="${basedir}/rootfiles" includes="**" />
87	+ <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />	94	+ <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
Lines 78-92 Link Here
78	+ </target>	85	+ </target>
79	<target name="rootFileslinux_gtk_ppc">	86	<target name="rootFileslinux_gtk_ppc">
80	<mkdir dir="${feature.base}/linux.gtk.ppc/${collectingFolder}"/>	87	<mkdir dir="${feature.base}/linux.gtk.ppc/${collectingFolder}"/>
81	<copy todir="${feature.base}/linux.gtk.ppc/${collectingFolder}" failonerror="true">	88	<copy todir="${feature.base}/linux.gtk.ppc/${collectingFolder}" failonerror="true" overwrite="true">
82	@@ -512,6 +547,16 @@	89	@@ -503,6 +538,16 @@
83	</copy>	90	</copy>
84	<chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="eclipse" />	91	<chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="eclipse" />
85	</target>	92	</target>
86	+ <target name="rootFilesfreebsd_gtk_amd64">	93	+ <target name="rootFilesfreebsd_gtk_amd64">
87	+ <mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}"/>	94	+ <mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}"/>
88	+ <copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" failonerror="true">	95	+ <copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" failonerror="true" overwrite="true">
89	+ <fileset dir="${basedir}/../../features/org.eclipse.launchers/bin/gtk/freebsd/amd64" includes="**" />	96	+ <fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/gtk/freebsd/amd64" includes="**" />
90	+ <fileset dir="${basedir}/gtk" includes="**" />	97	+ <fileset dir="${basedir}/gtk" includes="**" />
91	+ <fileset dir="${basedir}/rootfiles" includes="**" />	98	+ <fileset dir="${basedir}/rootfiles" includes="**" />
92	+ <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />	99	+ <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
Lines 95-126 Link Here
95	+ </target>	102	+ </target>
96	<target name="rootFileslinux_motif_x86">	103	<target name="rootFileslinux_motif_x86">
97	<mkdir dir="${feature.base}/linux.motif.x86/${collectingFolder}"/>	104	<mkdir dir="${feature.base}/linux.motif.x86/${collectingFolder}"/>
98	<copy todir="${feature.base}/linux.motif.x86/${collectingFolder}" failonerror="true">	105	<copy todir="${feature.base}/linux.motif.x86/${collectingFolder}" failonerror="true" overwrite="true">
99	@@ -523,6 +568,28 @@	106	@@ -515,6 +560,19 @@
100	</copy>	107	</copy>
101	<chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="eclipse" />	108	<chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="eclipse" />
102	<chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes=".so" />	109	<chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes=".so" />
103	+ </target>	110	+ </target>
104	+ <target name="rootFilesfreebsd_motif_x86">	111	+ <target name="rootFilesfreebsd_motif_x86">
105	+ <mkdir dir="${feature.base}/freebsd.motif.x86/${collectingFolder}"/>	112	+ <mkdir dir="${feature.base}/freebsd.motif.x86/${collectingFolder}"/>
106	+ <copy todir="${feature.base}/freebsd.motif.x86/${collectingFolder}" failonerror="true">	113	+ <copy todir="${feature.base}/freebsd.motif.x86/${collectingFolder}" failonerror="true" overwrite="true">
107	+ <fileset dir="${basedir}/../../features/org.eclipse.launchers/bin/motif/freebsd/x86" includes="**" />	114	+ <fileset dir="${basedir}/freebsd.motif" includes="**" />
108	+ <fileset dir="${basedir}/../../plugins/org.eclipse.swt.motif/os/freebsd/x86" includes="libXm.so.2.1" />	115	+ <fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/motif/freebsd/x86" includes="**" />
		116	+ <fileset dir="${basedir}/../../plugins/org.eclipse.swt.motif.freebsd.x86" includes="libXm.so.2" />
109	+ <fileset dir="${basedir}/motif" includes="**" />	117	+ <fileset dir="${basedir}/motif" includes="**" />
110	+ <fileset dir="${basedir}/rootfiles" includes="**" />	118	+ <fileset dir="${basedir}/rootfiles" includes="**" />
111	+ <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />	119	+ <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
112	+ </copy>	120	+ </copy>
113	+ <chmod perm="755" dir="${feature.base}/freebsd.motif.x86/${collectingFolder}" includes="eclipse" />	121	+ <chmod perm="755" dir="${feature.base}/freebsd.motif.x86/${collectingFolder}" includes="eclipse" />
114	+ <exec executable="ln" dir="${feature.base}/freebsd.motif.x86/${collectingFolder}" os="FreeBSD">
115	+ <arg line="-s"/>
116	+ <arg line="libXm.so.2.1"/>
117	+ <arg line="libXm.so.2"/>
118	+ </exec>
119	+ <exec executable="ln" dir="${feature.base}/freebsd.motif.x86/${collectingFolder}" os="FreeBSD">
120	+ <arg line="-s"/>
121	+ <arg line="libXm.so.2.1"/>
122	+ <arg line="libXm.so"/>
123	+ </exec>
124	+ <chmod perm="755" dir="${feature.base}/freebsd.motif.x86/${collectingFolder}" includes=".so" />	122	+ <chmod perm="755" dir="${feature.base}/freebsd.motif.x86/${collectingFolder}" includes=".so" />
125	</target>	123	</target>
126	<target name="rootFilessolaris_motif_sparc">	124	<target name="rootFilessolaris_motif_sparc">




--- features/org.eclipse.platform.source/build.xml.orig	Fri May 13 11:34:53 2005
+++ features/org.eclipse.platform.source/build.xml	Sat May 14 18:51:56 2005
@@ -27,6 +27,11 @@
 			<property name="os" value="qnx"/>
 			<property name="ws" value="photon"/>
 		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.freebsd.gtk.amd64" target="${target}">
+			<property name="arch" value="amd64"/>

 		<ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.linux.motif.x86" target="${target}">
 			<property name="arch" value="x86"/>
 			<property name="os" value="linux"/>
@@ -42,6 +47,16 @@
 			<property name="os" value="hpux"/>
 			<property name="ws" value="motif"/>
 		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.freebsd.gtk.x86" target="${target}">
+			<property name="arch" value="x86"/>

 		<ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.macosx.carbon.ppc" target="${target}">
 			<property name="arch" value="ppc"/>
 			<property name="os" value="macosx"/>
@@ -140,7 +155,7 @@
 		<copy todir="${feature.base}/features/org.eclipse.platform.source_3.1.0" failonerror="true" overwrite="false">
 			<fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html"			/>
 		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform.source_3.1.0/feature.xml"  selfVersion="3.1.0" featureIds="" pluginIds="org.eclipse.platform.doc.isv,3.1.0,org.eclipse.platform.source,3.1.0,org.eclipse.platform.source.linux.gtk.ia64,3.1.0,org.eclipse.platform.source.qnx.photon.x86,3.1.0,org.eclipse.platform.source.linux.gtk.ppc,3.1.0,org.eclipse.platform.source.hpux.motif.PA_RISC,3.1.0,org.eclipse.platform.source.hpux.motif.ia64,3.1.0,org.eclipse.platform.source.linux.gtk.x86_64,3.1.0,org.eclipse.platform.source.linux.gtk.ppc64,3.1.0,org.eclipse.platform.source.solaris.gtk.sparc,3.1.0,org.eclipse.platform.source.macosx.carbon.ppc,3.1.0,org.eclipse.platform.source.linux.gtk.x86,3.1.0,org.eclipse.platform.source.aix.motif.ppc,3.1.0,org.eclipse.platform.source.win32.win32.x86,3.1.0,org.eclipse.platform.source.solaris.motif.sparc,3.1.0,org.eclipse.platform.source.linux.motif.x86,3.1.0,"/>
+		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform.source_3.1.0/feature.xml"  selfVersion="3.1.0" featureIds="" pluginIds="org.eclipse.platform.doc.isv,3.1.0,org.eclipse.platform.source,3.1.0,org.eclipse.platform.source.linux.gtk.ia64,3.1.0,org.eclipse.platform.source.qnx.photon.x86,3.1.0,org.eclipse.platform.source.linux.gtk.ppc,3.1.0,org.eclipse.platform.source.hpux.motif.PA_RISC,3.1.0,org.eclipse.platform.source.hpux.motif.ia64,3.1.0,org.eclipse.platform.source.linux.gtk.x86_64,3.1.0,org.eclipse.platform.source.freebsd.gtk.amd64,3.1.0,org.eclipse.platform.source.linux.gtk.ppc64,3.1.0,org.eclipse.platform.source.solaris.gtk.sparc,3.1.0,org.eclipse.platform.source.macosx.carbon.ppc,3.1.0,org.eclipse.platform.source.linux.gtk.x86,3.1.0,org.eclipse.platform.source.freebsd.gtk.x86,3.0.1,org.eclipse.platform.source.aix.motif.ppc,3.1.0,org.eclipse.platform.source.win32.win32.x86,3.1.0,org.eclipse.platform.source.solaris.motif.sparc,3.1.0,org.e!
clipse.platform.source.linux.motif.x86,3.1.0,org.eclipse.platform.source.freebsd.motif.x86,3.0.1,"/>
-		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform.source_3.1.0/feature.xml"  selfVersion="3.1.0" featureIds="" pluginIds="org.eclipse.platform.doc.isv,3.1.0,org.eclipse.platform.source,3.1.0,org.eclipse.platform.source.linux.gtk.ppc,3.1.0,org.eclipse.platform.source.qnx.photon.x86,3.1.0,org.eclipse.platform.source.hpux.motif.PA_RISC,3.1.0,org.eclipse.platform.source.hpux.motif.ia64,3.1.0,org.eclipse.platform.source.linux.gtk.x86_64,3.1.0,org.eclipse.platform.source.linux.gtk.ppc64,3.1.0,org.eclipse.platform.source.solaris.gtk.sparc,3.1.0,org.eclipse.platform.source.macosx.carbon.ppc,3.1.0,org.eclipse.platform.source.linux.gtk.x86,3.1.0,org.eclipse.platform.source.aix.motif.ppc,3.1.0,org.eclipse.platform.source.win32.win32.x86,3.1.0,org.eclipse.platform.source.solaris.motif.sparc,3.1.0,org.eclipse.platform.source.linux.motif.x86,3.1.0,"/>
+		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform.source_3.1.0/feature.xml"  selfVersion="3.1.0" featureIds="" pluginIds="org.eclipse.platform.doc.isv,3.1.0,org.eclipse.platform.source,3.1.0,org.eclipse.platform.source.linux.gtk.ppc,3.1.0,org.eclipse.platform.source.qnx.photon.x86,3.1.0,org.eclipse.platform.source.hpux.motif.PA_RISC,3.1.0,org.eclipse.platform.source.hpux.motif.ia64,3.1.0,org.eclipse.platform.source.linux.gtk.x86_64,3.1.0,org.eclipse.platform.source.freebsd.gtk.amd64,3.1.0,org.eclipse.platform.source.linux.gtk.ppc64,3.1.0,org.eclipse.platform.source.solaris.gtk.sparc,3.1.0,org.eclipse.platform.source.macosx.carbon.ppc,3.1.0,org.eclipse.platform.source.linux.gtk.x86,3.1.0,org.eclipse.platform.source.freebsd.gtk.x86,3.1.0,org.eclipse.platform.source.aix.motif.ppc,3.1.0,org.eclipse.platform.source.win32.win32.x86,3.1.0,org.eclipse.platform.source.solaris.motif.sparc,3.1.0,org.eclipse.platform.source.linux.motif.x86,3.1.0,org.!
eclipse.platform.source.freebsd.motif.x86,3.1.0,"/>
 		<antcall target="rootFiles${os}_${ws}_${arch}"/>
 	</target>
 	<target name="rootFileswin32_win32_x86">
@@ -153,6 +168,8 @@
 	</target>
 	<target name="rootFileslinux_gtk_x86_64">
 	</target>

 	<target name="rootFileslinux_motif_x86">
 	</target>
 	<target name="rootFilessolaris_motif_sparc">
@@ -169,6 +186,11 @@
 	</target>
 	<target name="rootFilesqnx_photon_x86">
 	</target>




--- jdtcoresrc/compilejdtcore.xml~	Fri May 13 11:34:19 2005
+++ jdtcoresrc/compilejdtcore.xml	Sun May 15 10:08:14 2005
@@ -37,9 +37,9 @@
                 <property name="javacTarget" value="1.2" />
                 <property name="javacDebugInfo" value="true" />
                 <property name="javacFailOnError" value="true" />
-                <record name="../compilelog.txt" action="start" />
+                <record name="compilelog.txt" action="start" />
                 <javac verbose="true" srcdir="${srcdir}" destdir="${destdir}"/>
-                <record name="../compilelog.txt" action="stop" />                                                                                                                  
+                <record name="compilelog.txt" action="stop" />                                                                                                                  
             
                 <echo message="UPDATE ecj.jar" />
                 <copy todir="${destdir}">
--- jdtcoresrc/compilejdtcorewithjavac.xml~	Fri May 13 11:34:19 2005
+++ jdtcoresrc/compilejdtcorewithjavac.xml	Sun May 15 10:08:28 2005
@@ -22,9 +22,9 @@
         <property name="javacDebugInfo" value="true" />
         <property name="javacFailOnError" value="true" />
 
-        <record name="../compilelog.txt" action="start" />
+        <record name="compilelog.txt" action="start" />
         <javac verbose="true" srcdir="${srcdir}" destdir="${destdir}"/>
-        <record name="../compilelog.txt" action="stop" />   
+        <record name="compilelog.txt" action="stop" />   
 
         <echo message="UPDATE ecj.jar" />
              <copy todir="${destdir}">

Removed Link Here

(-)files/patch-plugins-swt-gtk-build.xml (-11 lines)
1	--- plugins/org.eclipse.swt.gtk/build.xml.orig Wed Apr 21 00:24:26 2004
2	+++ plugins/org.eclipse.swt.gtk/build.xml Wed Apr 21 00:24:39 2004
3	@@ -10,7 +10,7 @@
4	<property name="build.result.folder" value="${basedir}"/>
5	<property name="plugindir" value="../org.eclipse.swt"/>
6	<property name="destination" value="${basedir}"/>
7	- <property name="os" value="linux"/>
8	+ <property name="os" value="${os}"/>
9	<property name="ws" value="gtk"/>
10	<property name="arch" value="x86"/>
11	<property name="bootclasspath" value=""/>




--- plugins/org.eclipse.swt.gtk64/build.xml.orig	Fri Apr  1 13:54:42 2005
+++ plugins/org.eclipse.swt.gtk64/build.xml	Mon Apr  4 00:11:23 2005
@@ -11,9 +11,9 @@
 		<property name="build.result.folder" value="${basedir}"/>
 		<property name="plugindir" value="../org.eclipse.swt"/>
 		<property name="destination" value="${basedir}"/>
-		<property name="os" value="linux"/>
-		<property name="ws" value="gtk"/>
-		<property name="arch" value="x86_64"/>
+		<property name="os" value="${os}"/>
+		<property name="ws" value="${ws}"/>
+		<property name="arch" value="${arch}"/>
 		<property name="bootclasspath" value=""/>
 		<property name="toolsplugindir" value="../org.eclipse.swt.tools"/>		
 	</target>




--- plugins/org.eclipse.update.core.linux/src/update.c.orig	Fri May 13 11:37:58 2005
+++ plugins/org.eclipse.update.core.linux/src/update.c	Sat May 14 19:01:31 2005
@@ -12,7 +12,12 @@
 /* bug 82520 : need to include stdlib.h */
 # include <stdlib.h>
 # include <sys/types.h>
+#ifdef __FreeBSD__
+# include <stdlib.h>
+# include <sys/param.h>
+# include <sys/mount.h>
+# include "update.h"
+#else
 # include <sys/statfs.h>
 # include <update.h>
+#endif
 # include <update.h>
 
 /*
  * Class:     org_eclipse_update_configuration_LocalSystemInfo





prepare_files()
{
	mkdir ${WRKSRC}/features/org.eclipse.platform.launchers/bin/gtk/freebsd

	# Copy the files and rename/change them appropriately
	for src in $COPY_LIST

assemble.org.eclipse.sdk.linux.gtk.x86.xml
assemble.org.eclipse.sdk.linux.gtk.x86_64.xml
assemble.org.eclipse.sdk.linux.motif.x86.xml
features/org.eclipse.platform.launchers/bin/gtk/linux/x86
features/org.eclipse.platform.launchers/bin/gtk/linux/x86_64
features/org.eclipse.platform.launchers/bin/motif/linux
features/org.eclipse.platform.launchers/library/gtk/make_linux.mak
features/org.eclipse.platform.launchers/library/motif/make_linux.mak
plugins/org.eclipse.core.resources.linux
plugins/org.eclipse.core.resources.linux/os/linux
plugins/org.eclipse.jdt.source.linux.gtk.x86

plugins/org.eclipse.platform.source.linux.gtk.x86
plugins/org.eclipse.platform.source.linux.gtk.x86_64
plugins/org.eclipse.platform.source.linux.motif.x86
plugins/org.eclipse.swt.gtk.linux.x86
plugins/org.eclipse.swt.gtk.linux.x86_64
plugins/org.eclipse.swt.motif.linux.x86
plugins/org.eclipse.swt.motif/os/linux
plugins/org.eclipse.update.core.linux
plugins/org.eclipse.update.core.linux/os/linux
"

Return to bug 81076

Lines 6-15 Link Here

(-)Makefile (-3 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= eclipse	8	PORTNAME= eclipse
9	PORTVERSION= 3.1M6	9	PORTVERSION= 3.1M7
10	CATEGORIES= java devel	10	CATEGORIES= java devel
11	MASTER_SITES= ${MASTER_SITE_ECLIPSE}	11	MASTER_SITES= ${MASTER_SITE_ECLIPSE}
12	MASTER_SITE_SUBDIR= S-${PORTVERSION}-200504011645	12	MASTER_SITE_SUBDIR= S-${PORTVERSION}-200505131415
13	DISTNAME= ${PORTNAME}-sourceBuild-srcIncluded-${PORTVERSION}	13	DISTNAME= ${PORTNAME}-sourceBuild-srcIncluded-${PORTVERSION}
14	DIST_SUBDIR= eclipse	14	DIST_SUBDIR= eclipse
15		15
Lines 44-50 Link Here
44	USE_MOTIF= yes	44	USE_MOTIF= yes
45	.else	45	.else
46	ECLIPSE_WS= gtk	46	ECLIPSE_WS= gtk
47	.if defined(WITH_MOZILLA)	47	.if defined(WITH_MOZILLA)
48	BROWSER= ${WITH_MOZILLA}	48	BROWSER= ${WITH_MOZILLA}
49	BUILD_DEPENDS+= ${BROWSER}:${PORTSDIR}/www/${BROWSER}	49	BUILD_DEPENDS+= ${BROWSER}:${PORTSDIR}/www/${BROWSER}
50	.else	50	.else

Lines 1-6 Link Here

(-)files/manualpatch-plugins-swt-gtk-build.sh (-19 / +7 lines)
1	--- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig Fri Apr 1 13:56:58 2005	1	--- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig Fri May 13 11:37:09 2005
2	+++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh Sat Apr 9 16:27:29 2005	2	+++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh Sat May 14 21:02:00 2005
3	@@ -110,6 +110,36 @@	3	@@ -100,6 +100,33 @@
4	;;	4	;;
5	esac	5	esac
6	;;	6	;;
Lines 8-16 Link Here
8	+ CC=gcc	8	+ CC=gcc
9	+ LD=gcc	9	+ LD=gcc
10	+ XTEST_LIB_PATH=$X11BASE/lib	10	+ XTEST_LIB_PATH=$X11BASE/lib
11	+ KDE_LIB_PATH=$PREFIX/lib
12	+ KDE_INCLUDE_PATH=$PREFIX/include
13	+ QT_HOME=$X11BASE
14	+ GECKO_I=${X11BASE}/include/${BROWSER}	11	+ GECKO_I=${X11BASE}/include/${BROWSER}
15	+ GECKO_INCLUDES="-I${GECKO_I} -I${GECKO_I}/nspr -I${GECKO_I}/xpcom -I${GECKO_I}/string -I${GECKO_I}/embed_base -I${GECKO_I}/embedstring"	12	+ GECKO_INCLUDES="-I${GECKO_I} -I${GECKO_I}/nspr -I${GECKO_I}/xpcom -I${GECKO_I}/string -I${GECKO_I}/embed_base -I${GECKO_I}/embedstring"
16	+ GECKO_L=${X11BASE}/lib/${BROWSER}	13	+ GECKO_L=${X11BASE}/lib/${BROWSER}
Lines 19-31 Link Here
19	+ "amd64")	16	+ "amd64")
20	+ AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64	17	+ AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64
21	+ SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64	18	+ SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64
22	+ OUTPUT_DIR=../../../org.eclipse.swt.gtk64/os/freebsd/amd64	19	+ OUTPUT_DIR=../../../org.eclipse.swt.gtk.freebsd.amd64
23	+ makefile="make_freebsd.mak"	20	+ makefile="make_freebsd.mak"
24	+ echo "Building FreeBSD GTK AMD64 version of SWT"	21	+ echo "Building FreeBSD GTK AMD64 version of SWT"
25	+ ;;	22	+ ;;
26	+ i?86)	23	+ i?86)
27	+ AWT_LIB_PATH=$JAVA_HOME/jre/lib/i386	24	+ AWT_LIB_PATH=$JAVA_HOME/jre/lib/i386
28	+ OUTPUT_DIR=../../../org.eclipse.swt.gtk/os/freebsd/x86	25	+ OUTPUT_DIR=../../../org.eclipse.swt.gtk.freebsd.x86
29	+ makefile="make_freebsd.mak"	26	+ makefile="make_freebsd.mak"
30	+ echo "Building FreeBSD GTK x86 version of SWT"	27	+ echo "Building FreeBSD GTK x86 version of SWT"
31	+ ;;	28	+ ;;
Lines 37-54 Link Here
37	"SunOS")	34	"SunOS")
38	CC=gcc	35	CC=gcc
39	LD=gcc	36	LD=gcc
40	@@ -138,4 +168,13 @@	37	@@ -128,4 +155,4 @@
41		38
42	export CC LD JAVA_HOME QT_HOME AWT_LIB_PATH XTEST_LIB_PATH GECKO_SDK GECKO_INCLUDES GECKO_LIBS SWT_PTR_CFLAGS CDE_HOME KDE_LIB_PATH KDE_INCLUDE_PATH OUTPUT_DIR	39	export CC LD JAVA_HOME AWT_LIB_PATH XTEST_LIB_PATH GECKO_SDK GECKO_INCLUDES GECKO_LIBS SWT_PTR_CFLAGS CDE_HOME OUTPUT_DIR
43		40
44	-make -f $makefile ${1} ${2} ${3} ${4}	41	-make -f $makefile ${1} ${2} ${3} ${4}
45	+gmake -f $makefile ${1} ${2} ${3} ${4}	42	+gmake -f $makefile ${1} ${2} ${3} ${4}
46	+
47	+build_kde=`pkg_info -xc kdebase \| grep "no packages match"`
48	+if [ "$build_kde" != "" ]; then
49	+ echo "Building FreeBSD version of KDE DLL."
50	+ gmake -f $makefile make_kde
51	+fi
52	+
53	+cp -p library/xpcom* .
54	+gmake -f $makefile make_mozilla

Lines 1-40 Link Here

(-)files/manualpatch-plugins-swt-gtk-make_freebsd.mak (-28 / +10 lines)
1	--- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak Fri Apr 1 13:55:11 2005	1	--- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak.orig Sat May 14 19:50:23 2005
2	+++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak Sat Apr 9 13:48:50 2005	2	+++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak Sat May 14 21:24:34 2005
3	@@ -49,8 +49,8 @@	3	@@ -78,15 +78,16 @@
4	GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`
5	GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2
6
7	-KDE_LIBS = -shared -L$(KDE_LIB_PATH) -lkdecore -lkparts -L$(QT_HOME)/lib -lqt
8	-KDE_CFLAGS = -fno-rtti -c -O -I$(KDE_INCLUDE_PATH) -I$(QT_HOME)/include -I$(JAVA_HOME)/include
9	+KDE_LIBS = -shared -L$(KDE_LIB_PATH) -lkdecore -lkparts -L$(QT_HOME)/lib -lqt-mt
10	+KDE_CFLAGS = -fno-rtti -c -O -I$(KDE_INCLUDE_PATH) -I$(QT_HOME)/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd
11
12	# Uncomment for Native Stats tool
13	#NATIVE_STATS = -DNATIVE_STATS
14	@@ -65,6 +65,7 @@
15	-Wno-non-virtual-dtor \
16	-fPIC \
17	-I./ \
18	+ -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd \
19	${GECKO_INCLUDES} \
20	${SWT_PTR_CFLAGS}
21
22	@@ -82,14 +83,14 @@
23	CFLAGS = -O -Wall \	4	CFLAGS = -O -Wall \
24	-DSWT_VERSION=$(SWT_VERSION) \	5	-DSWT_VERSION=$(SWT_VERSION) \
25	$(NATIVE_STATS) \	6	$(NATIVE_STATS) \
26	- -DLINUX -DGTK \	7	- -DLINUX -DGTK \
27	- -I$(JAVA_HOME)/include \
28	- -fpic \
29	+ -DFREEBSD -DGTK \	8	+ -DFREEBSD -DGTK \
30	+ -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd -I$(X11BASE)/include \	9	-I$(JAVA_HOME)/include \
		10	-I$(JAVA_HOME)/include/freebsd \
		11	- -fpic \
		12	+ -I$(X11BASE)/include \
31	+ -fpic -fPIC \	13	+ -fpic -fPIC \
32	${SWT_PTR_CFLAGS}	14	${SWT_PTR_CFLAGS}
33	-LIBS = -shared -fpic	15	-LIBS = -shared -fpic -s
34	+LIBS = -shared -fpic -fPIC	16	+LIBS = -shared -fpic -fPIC -s
35		17
36		18
37	-all: make_swt make_atk make_gnome make_awt make_kde	19	-all: make_swt make_atk make_gnome make_awt
38	+all: make_swt make_atk $(MAKE_GNOME) make_awt	20	+all: make_swt make_atk $(MAKE_GNOME) make_awt
39		21
40	#	22	#

Lines 1-13 Link Here

(-)files/manualpatch-plugins-swt-motif-build.sh (-4 / +11 lines)
1	--- plugins/org.eclipse.swt/Eclipse SWT PI/motif/library/build.sh Fri Apr 1 13:55:27 2005	1	--- plugins/org.eclipse.swt/Eclipse SWT PI/motif/library/build.sh.orig Fri May 13 11:37:09 2005
2	+++ ../files/plugins-swt-motif-build.sh Sun Apr 3 16:38:13 2005	2	+++ plugins/org.eclipse.swt/Eclipse SWT PI/motif/library/build.sh Sat May 14 21:03:05 2005
3	@@ -57,6 +57,18 @@	3	@@ -54,6 +54,18 @@
4	echo "Building Linux motif x86 version of SWT"	4	echo "Building Linux motif x86 version of SWT"
5	esac	5	esac
6	;;	6	;;
7	+ "FreeBSD")	7	+ "FreeBSD")
8	+ case $MODEL in	8	+ case $MODEL in
9	+ i?86)	9	+ i?86)
10	+ OUTPUT_DIR=../../../org.eclipse.swt.motif/os/freebsd/x86	10	+ OUTPUT_DIR=../../../org.eclipse.swt.motif.freebsd.x86
11	+ makefile="make_freebsd.mak"	11	+ makefile="make_freebsd.mak"
12	+ echo "Building FreeBSD motif x86 version of SWT"	12	+ echo "Building FreeBSD motif x86 version of SWT"
13	+ ;;	13	+ ;;
Lines 19-21 Link Here
19	"SunOS")	19	"SunOS")
20	case $MODEL in	20	case $MODEL in
21	*)	21	*)
		22	@@ -113,4 +125,4 @@
		23
		24	export JAVA_HOME MOTIF_HOME CDE_HOME OUTPUT_DIR
		25
		26	-make -f $makefile $1 $2 $3 $4
		27	\ No newline at end of file
		28	+gmake -f $makefile $1 $2 $3 $4

Lines 1-6 Link Here

(-)files/manualpatch-plugins-swt-motif-make_freebsd.mak (-40 / +11 lines)
1	--- plugins/org.eclipse.swt/Eclipse SWT PI/motif/library/make_linux.mak.orig Fri Apr 1 13:57:23 2005	1	--- plugins/org.eclipse.swt/Eclipse SWT PI/motif/library/make_freebsd.mak~ Sat May 14 19:38:40 2005
2	+++ plugins/org.eclipse.swt/Eclipse SWT PI/motif/library/make_linux.mak Sat Apr 9 14:20:28 2005	2	+++ plugins/org.eclipse.swt/Eclipse SWT PI/motif/library/make_freebsd.mak Sat May 14 19:43:29 2005
3	@@ -26,32 +26,32 @@	3	@@ -25,26 +25,26 @@
4	WS_PREFIX = motif	4	WS_PREFIX = motif
5	SWT_LIB = lib$(SWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so	5	SWT_LIB = lib$(SWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
6	SWT_OBJS = swt.o callback.o os.o os_structs.o os_custom.o os_stats.o	6	SWT_OBJS = swt.o callback.o os.o os_structs.o os_custom.o os_stats.o
Lines 12-38 Link Here
12	# Uncomment for Native Stats tool	12	# Uncomment for Native Stats tool
13	#NATIVE_STATS = -DNATIVE_STATS	13	#NATIVE_STATS = -DNATIVE_STATS
14		14
15	-CFLAGS = -O -s -Wall -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) -DLINUX -DMOTIF -fpic -I./ \	15	-CFLAGS = -O -s -Wall -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) -DLINUX -DMOTIF -fpic \
16	- -I$(JAVA_HOME)/include -I$(MOTIF_HOME)/include -I/usr/X11R6/include	16	- -I$(JAVA_HOME)/include -I$(MOTIF_HOME)/include -I/usr/X11R6/include
17	+CFLAGS = -O -g -s -Wall -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) -DFREEBSD -DMOTIF -fpic -fPIC -I./ \	17	+CFLAGS = -O -s -Wall -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) -DFREEBSD -DMOTIF -fpic -fPIC \
18	+ -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd -I$(MOTIF_HOME)/include -I$(X11BASE)/include -I$(PREFIX)/include	18	+ -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd -I$(MOTIF_HOME)/include -I$(X11BASE)/include -I$(PREFIX)/include
19		19
20	# Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0)	20	# Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0)
21	GNOME_PREFIX = swt-gnome	21	GNOME_PREFIX = swt-gnome
22	GNOME_LIB = lib$(GNOME_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so	22	GNOME_LIB = lib$(GNOME_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
23	GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o	23	GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o
24	-GNOME_CFLAGS = -O -Wall -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) -DLINUX -DGTK -I$(JAVA_HOME)/include `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`	24	-GNOME_CFLAGS = -O -Wall -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) -DLINUX -DGTK -I$(JAVA_HOME)/include `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`
25	+GNOME_CFLAGS = -O -g -Wall -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) -DFREEBSD -DGTK -fpic -fPIC -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`	25	+GNOME_CFLAGS = -O -Wall -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) -DFREEBSD -DGTK -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd -fpic -fPIC `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`
26	GNOME_LIBS = -shared -fpic -fPIC `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2	26	GNOME_LIBS = -shared -fpic -fPIC `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2
27		27
28	KDE_PREFIX = swt-kde
29	KDE_LIB = lib$(KDE_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
30	KDE_OBJS = swt.o kde.o kde_stats.o
31	-KDE_LIBS = -L/usr/lib -L$(QT_HOME)/lib -shared -lkdecore -lqt -lkparts
32	-KDE_CFLAGS = -fno-rtti -c -O -I/usr/include/kde -I$(QT_HOME)/include -I$(JAVA_HOME)/include
33	+KDE_LIBS = -L$(PREFIX)/lib -L$(QT_HOME)/lib -shared -lkdecore -lqt -lkparts
34	+KDE_CFLAGS = -fno-rtti -c -O -I/usr/include/kde -I$(QT_HOME)/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd
35
36	AWT_PREFIX = swt-awt	28	AWT_PREFIX = swt-awt
37	AWT_LIB = lib$(AWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so	29	AWT_LIB = lib$(AWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
38	AWT_OBJS = swt_awt.o	30	AWT_OBJS = swt_awt.o
Lines 41-73 Link Here
41		33
42	GTK_PREFIX = swt-gtk	34	GTK_PREFIX = swt-gtk
43	GTK_LIB = lib$(GTK_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so	35	GTK_LIB = lib$(GTK_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
44	@@ -59,7 +59,7 @@	36	@@ -58,7 +58,7 @@
45	GTK_CFLAGS = `pkg-config --cflags gtk+-2.0`	37	CAIROCFLAGS = `pkg-config --cflags cairo`
46	GTK_LIBS = -x -shared `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0	38	CAIROLIBS = -shared -fpic -fPIC -s `pkg-config --libs-only-L cairo` -lcairo
47		39
48	-all: make_swt make_awt make_gnome make_gtk make_kde	40	-all: make_swt make_awt make_gnome make_gtk
49	+all: make_swt make_awt $(MAKE_GNOME) make_gtk	41	+all: make_swt make_awt $(MAKE_GNOME) make_gtk
50		42
51	make_swt: $(SWT_LIB)	43	make_swt: $(SWT_LIB)
52		44
53	@@ -80,16 +80,16 @@
54	make_gnome: $(GNOME_LIB)
55
56	$(GNOME_LIB): $(GNOME_OBJECTS)
57	- gcc -o $@ $(GNOME_OBJECTS) $(GNOME_LIBS)
58	+ $(CC) -o $@ $(GNOME_OBJECTS) $(GNOME_LIBS)
59
60	gnome.o: gnome.c
61	- gcc $(GNOME_CFLAGS) -c -o gnome.o gnome.c
62	+ $(CC) $(GNOME_CFLAGS) -c -o gnome.o gnome.c
63
64	gnome_structs.o: gnome_structs.c
65	- gcc $(GNOME_CFLAGS) -c -o gnome_structs.o gnome_structs.c
66	+ $(CC) $(GNOME_CFLAGS) -c -o gnome_structs.o gnome_structs.c
67
68	gnome_stats.o: gnome_stats.c
69	- gcc $(GNOME_CFLAGS) -c -o gnome_stats.o gnome_stats.c
70	+ $(CC) $(GNOME_CFLAGS) -c -o gnome_stats.o gnome_stats.c
71
72	make_kde: $(KDE_LIB)
73

Removed Link Here

(-)files/patch-browser-src-ExternalBrowserInstance.java (-13 lines)
1	--- plugins/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/ExternalBrowserInstance.java.orig Sun Apr 3 15:44:23 2005
2	+++ plugins/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/ExternalBrowserInstance.java Sun Apr 3 15:44:47 2005
3
4	@@ -74,7 +74,7 @@
5	public void run() {
6	try {
7	process.waitFor();
8	- DefaultBrowserSupport.getInstance().removeBrowser(getId());
9	+ DefaultBrowserSupport.getInstance().removeBrowser(ExternalBrowserInstance.this.getId());
10	} catch (Exception e) {
11	// ignore
12	}
13

Lines 1-27 Link Here

(-)files/patch-build.xml (-25 / +13 lines)
1	--- build.xml.orig Fri Apr 1 13:58:26 2005	1	--- build.xml.orig Fri May 13 11:38:39 2005
2	+++ build.xml Sat Apr 9 17:03:28 2005	2	+++ build.xml Sat May 14 23:42:22 2005
3	@@ -48,17 +48,20 @@	3	@@ -53,7 +53,7 @@
4	<equals arg1="${installOs}-${installWs}-${installArch}" arg2="linux-gtk-ppc64"/>	4	<exec dir="${swtlibs}/" executable="sh" failonerror="true">
5	<equals arg1="${installOs}-${installWs}-${installArch}" arg2="linux-gtk-ia64"/>	5	<arg line="build.sh"/>
6	<equals arg1="${installOs}-${installWs}-${installArch}" arg2="linux-gtk-x86_64"/>	6	</exec>
7	+ <equals arg1="${installOs}-${installWs}-${installArch}" arg2="freebsd-gtk-amd64"/>	7	- <property name="swtdir" value="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.{installOs}.{installArch}"/>
8	</or>	8	+ <property name="swtdir" value="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}"/>
9	</condition>	9	<mkdir dir="${swtdir}"/>
10	<condition property="wsType" value="gtk">	10	<move todir="${swtdir}/">
11	<or>	11	<fileset dir="${swtlibs}">
12	<equals arg1="${installOs}-${installWs}-${installArch}" arg2="linux-gtk-ppc"/>	12	@@ -63,12 +63,12 @@
13	<equals arg1="${installOs}-${installWs}-${installArch}" arg2="linux-gtk-x86"/>
14	+ <equals arg1="${installOs}-${installWs}-${installArch}" arg2="freebsd-gtk-x86"/>
15	</or>
16	</condition>
17	<condition property="wsType" value="motif">
18	<or>
19	<equals arg1="${installOs}-${installWs}-${installArch}" arg2="linux-motif-x86"/>
20	+ <equals arg1="${installOs}-${installWs}-${installArch}" arg2="freebsd-motif-x86"/>
21	<equals arg1="${installOs}-${installWs}-${installArch}" arg2="hpux-motif-ia64"/>
22	</or>
23	</condition>
24	@@ -82,12 +85,12 @@
25	<!--unzip launcher -->	13	<!--unzip launcher -->
26	<property name="launcherlibs" value="${buildDirectory}/launchertmp"/>	14	<property name="launcherlibs" value="${buildDirectory}/launchertmp"/>
27	<mkdir dir="${launcherlibs}"/>	15	<mkdir dir="${launcherlibs}"/>
Lines 29-35 Link Here
29	- <fileset dir="${buildDirectory}/plugins/org.eclipse.platform.source/src/">	17	- <fileset dir="${buildDirectory}/plugins/org.eclipse.platform.source/src/">
30	- <include name ="org.eclipse.platform_*/launchersrc.zip"/>	18	- <include name ="org.eclipse.platform_*/launchersrc.zip"/>
31	+ <copy todir="${launcherlibs}">	19	+ <copy todir="${launcherlibs}">
32	+ <fileset dir="${buildDirectory}/features/org.eclipse.launchers">	20	+ <fileset dir="${buildDirectory}/features/org.eclipse.platform.launchers">
33	+ <include name ="**"/>	21	+ <include name ="**"/>
34	</fileset>	22	</fileset>
35	- </unzip>	23	- </unzip>

Lines 1-27 Link Here

(-)files/patch-features-jdt-build.xml (-7 / +7 lines)
1	--- features/org.eclipse.jdt/build.xml.orig Sat Feb 19 12:09:29 2005	1	--- features/org.eclipse.jdt/build.xml.orig Fri May 13 11:34:52 2005
2	+++ features/org.eclipse.jdt/build.xml Sat Mar 26 18:30:33 2005	2	+++ features/org.eclipse.jdt/build.xml Sat May 14 18:42:27 2005
3	@@ -179,6 +179,24 @@	3	@@ -164,6 +164,24 @@
4	<fileset dir="${basedir}/rootfiles" includes="**" />	4	<fileset dir="${basedir}/rootfiles" includes="**" />
5	</copy>	5	</copy>
6	</target>	6	</target>
7	+ <target name="rootFilesfreebsd_gtk_amd64">	7	+ <target name="rootFilesfreebsd_gtk_amd64">
8	+ <mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}"/>	8	+ <mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}"/>
9	+ <copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" failonerror="true">	9	+ <copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" failonerror="true" overwrite="true">
10	+ <fileset dir="${basedir}/rootfiles" includes="**" />	10	+ <fileset dir="${basedir}/rootfiles" includes="**" />
11	+ </copy>	11	+ </copy>
12	+ </target>	12	+ </target>
13	+ <target name="rootFilesfreebsd_gtk_x86">	13	+ <target name="rootFilesfreebsd_gtk_x86">
14	+ <mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}"/>	14	+ <mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}"/>
15	+ <copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" failonerror="true">	15	+ <copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" failonerror="true" overwrite="true">
16	+ <fileset dir="${basedir}/rootfiles" includes="**" />	16	+ <fileset dir="${basedir}/rootfiles" includes="**" />
17	+ </copy>	17	+ </copy>
18	+ </target>	18	+ </target>
19	+ <target name="rootFilesfreebsd_motif_x86">	19	+ <target name="rootFilesfreebsd_motif_x86">
20	+ <mkdir dir="${feature.base}/freebsd.motif.x86/${collectingFolder}"/>	20	+ <mkdir dir="${feature.base}/freebsd.motif.x86/${collectingFolder}"/>
21	+ <copy todir="${feature.base}/freebsd.motif.x86/${collectingFolder}" failonerror="true">	21	+ <copy todir="${feature.base}/freebsd.motif.x86/${collectingFolder}" failonerror="true" overwrite="true">
22	+ <fileset dir="${basedir}/rootfiles" includes="**" />	22	+ <fileset dir="${basedir}/rootfiles" includes="**" />
23	+ </copy>	23	+ </copy>
24	+ </target>	24	+ </target>
25	<target name="rootFilessolaris_motif_sparc">	25	<target name="rootFilessolaris_motif_sparc">
26	<mkdir dir="${feature.base}/solaris.motif.sparc/${collectingFolder}"/>	26	<mkdir dir="${feature.base}/solaris.motif.sparc/${collectingFolder}"/>
27	<copy todir="${feature.base}/solaris.motif.sparc/${collectingFolder}" failonerror="true">	27	<copy todir="${feature.base}/solaris.motif.sparc/${collectingFolder}" failonerror="true" overwrite="true">

Lines 1-8 Link Here

(-)files/patch-features-platform-source-build.xml (-14 / +14 lines)
1	--- features/org.eclipse.platform.source/build.xml.orig Fri Apr 1 13:54:41 2005	1	--- features/org.eclipse.platform.source/build.xml.orig Fri May 13 11:34:53 2005
2	+++ features/org.eclipse.platform.source/build.xml Sat Apr 2 14:33:00 2005	2	+++ features/org.eclipse.platform.source/build.xml Sat May 14 18:51:56 2005
3	@@ -42,6 +42,11 @@	3	@@ -27,6 +27,11 @@
4	<property name="os" value="linux"/>	4	<property name="os" value="qnx"/>
5	<property name="ws" value="gtk"/>	5	<property name="ws" value="photon"/>
6	</ant>	6	</ant>
7	+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.freebsd.gtk.amd64" target="${target}">	7	+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.freebsd.gtk.amd64" target="${target}">
8	+ <property name="arch" value="amd64"/>	8	+ <property name="arch" value="amd64"/>
Lines 12-20 Link Here
12	<ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.linux.motif.x86" target="${target}">	12	<ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.linux.motif.x86" target="${target}">
13	<property name="arch" value="x86"/>	13	<property name="arch" value="x86"/>
14	<property name="os" value="linux"/>	14	<property name="os" value="linux"/>
15	@@ -72,6 +77,16 @@	15	@@ -42,6 +47,16 @@
16	<property name="os" value="linux"/>	16	<property name="os" value="hpux"/>
17	<property name="ws" value="gtk"/>	17	<property name="ws" value="motif"/>
18	</ant>	18	</ant>
19	+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.freebsd.gtk.x86" target="${target}">	19	+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.freebsd.gtk.x86" target="${target}">
20	+ <property name="arch" value="x86"/>	20	+ <property name="arch" value="x86"/>
Lines 29-44 Link Here
29	<ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.macosx.carbon.ppc" target="${target}">	29	<ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.macosx.carbon.ppc" target="${target}">
30	<property name="arch" value="ppc"/>	30	<property name="arch" value="ppc"/>
31	<property name="os" value="macosx"/>	31	<property name="os" value="macosx"/>
32	@@ -144,7 +159,7 @@	32	@@ -140,7 +155,7 @@
33	<copy todir="${feature.base}/features/org.eclipse.platform.source_3.1.0" failonerror="true">	33	<copy todir="${feature.base}/features/org.eclipse.platform.source_3.1.0" failonerror="true" overwrite="false">
34	<fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html" />	34	<fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html" />
35	</copy>	35	</copy>
36	- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform.source_3.1.0/feature.xml" selfVersion="3.1.0" featureIds="" pluginIds="org.eclipse.platform.doc.isv,3.1.0,org.eclipse.platform.source,3.1.0,org.eclipse.platform.source.linux.gtk.ia64,3.1.0,org.eclipse.platform.source.qnx.photon.x86,3.1.0,org.eclipse.platform.source.linux.gtk.ppc,3.1.0,org.eclipse.platform.source.hpux.motif.PA_RISC,3.1.0,org.eclipse.platform.source.hpux.motif.ia64,3.1.0,org.eclipse.platform.source.linux.gtk.x86_64,3.1.0,org.eclipse.platform.source.linux.gtk.ppc64,3.1.0,org.eclipse.platform.source.solaris.gtk.sparc,3.1.0,org.eclipse.platform.source.macosx.carbon.ppc,3.1.0,org.eclipse.platform.source.linux.gtk.x86,3.1.0,org.eclipse.platform.source.aix.motif.ppc,3.1.0,org.eclipse.platform.source.win32.win32.x86,3.1.0,org.eclipse.platform.source.solaris.motif.sparc,3.1.0,org.eclipse.platform.source.linux.motif.x86,3.1.0,"/>
37	+ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform.source_3.1.0/feature.xml" selfVersion="3.1.0" featureIds="" pluginIds="org.eclipse.platform.doc.isv,3.1.0,org.eclipse.platform.source,3.1.0,org.eclipse.platform.source.linux.gtk.ia64,3.1.0,org.eclipse.platform.source.qnx.photon.x86,3.1.0,org.eclipse.platform.source.linux.gtk.ppc,3.1.0,org.eclipse.platform.source.hpux.motif.PA_RISC,3.1.0,org.eclipse.platform.source.hpux.motif.ia64,3.1.0,org.eclipse.platform.source.linux.gtk.x86_64,3.1.0,org.eclipse.platform.source.freebsd.gtk.amd64,3.1.0,org.eclipse.platform.source.linux.gtk.ppc64,3.1.0,org.eclipse.platform.source.solaris.gtk.sparc,3.1.0,org.eclipse.platform.source.macosx.carbon.ppc,3.1.0,org.eclipse.platform.source.linux.gtk.x86,3.1.0,org.eclipse.platform.source.freebsd.gtk.x86,3.0.1,org.eclipse.platform.source.aix.motif.ppc,3.1.0,org.eclipse.platform.source.win32.win32.x86,3.1.0,org.eclipse.platform.source.solaris.motif.sparc,3.1.0,org.e!
38	clipse.platform.source.linux.motif.x86,3.1.0,org.eclipse.platform.source.freebsd.motif.x86,3.0.1,"/>	36	clipse.platform.source.linux.motif.x86,3.1.0,org.eclipse.platform.source.freebsd.motif.x86,3.0.1,"/>
		37	- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform.source_3.1.0/feature.xml" selfVersion="3.1.0" featureIds="" pluginIds="org.eclipse.platform.doc.isv,3.1.0,org.eclipse.platform.source,3.1.0,org.eclipse.platform.source.linux.gtk.ppc,3.1.0,org.eclipse.platform.source.qnx.photon.x86,3.1.0,org.eclipse.platform.source.hpux.motif.PA_RISC,3.1.0,org.eclipse.platform.source.hpux.motif.ia64,3.1.0,org.eclipse.platform.source.linux.gtk.x86_64,3.1.0,org.eclipse.platform.source.linux.gtk.ppc64,3.1.0,org.eclipse.platform.source.solaris.gtk.sparc,3.1.0,org.eclipse.platform.source.macosx.carbon.ppc,3.1.0,org.eclipse.platform.source.linux.gtk.x86,3.1.0,org.eclipse.platform.source.aix.motif.ppc,3.1.0,org.eclipse.platform.source.win32.win32.x86,3.1.0,org.eclipse.platform.source.solaris.motif.sparc,3.1.0,org.eclipse.platform.source.linux.motif.x86,3.1.0,"/>
		38	+ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform.source_3.1.0/feature.xml" selfVersion="3.1.0" featureIds="" pluginIds="org.eclipse.platform.doc.isv,3.1.0,org.eclipse.platform.source,3.1.0,org.eclipse.platform.source.linux.gtk.ppc,3.1.0,org.eclipse.platform.source.qnx.photon.x86,3.1.0,org.eclipse.platform.source.hpux.motif.PA_RISC,3.1.0,org.eclipse.platform.source.hpux.motif.ia64,3.1.0,org.eclipse.platform.source.linux.gtk.x86_64,3.1.0,org.eclipse.platform.source.freebsd.gtk.amd64,3.1.0,org.eclipse.platform.source.linux.gtk.ppc64,3.1.0,org.eclipse.platform.source.solaris.gtk.sparc,3.1.0,org.eclipse.platform.source.macosx.carbon.ppc,3.1.0,org.eclipse.platform.source.linux.gtk.x86,3.1.0,org.eclipse.platform.source.freebsd.gtk.x86,3.1.0,org.eclipse.platform.source.aix.motif.ppc,3.1.0,org.eclipse.platform.source.win32.win32.x86,3.1.0,org.eclipse.platform.source.solaris.motif.sparc,3.1.0,org.eclipse.platform.source.linux.motif.x86,3.1.0,org.!
39	eclipse.platform.source.freebsd.motif.x86,3.1.0,"/>	39	eclipse.platform.source.freebsd.motif.x86,3.1.0,"/>
40	<antcall target="rootFiles${os}_${ws}_${arch}"/>	40	<antcall target="rootFiles${os}_${ws}_${arch}"/>
41	</target>	41	</target>
42	<target name="rootFileswin32_win32_x86">	42	<target name="rootFileswin32_win32_x86">
43	@@ -159,6 +174,8 @@	43	@@ -153,6 +168,8 @@
44	</target>	44	</target>
45	<target name="rootFileslinux_gtk_x86_64">	45	<target name="rootFileslinux_gtk_x86_64">
46	</target>	46	</target>
Lines 47-53 Link Here
47	<target name="rootFileslinux_motif_x86">	47	<target name="rootFileslinux_motif_x86">
48	</target>	48	</target>
49	<target name="rootFilessolaris_motif_sparc">	49	<target name="rootFilessolaris_motif_sparc">
50	@@ -175,6 +192,11 @@	50	@@ -169,6 +186,11 @@
51	</target>	51	</target>
52	<target name="rootFilesqnx_photon_x86">	52	<target name="rootFilesqnx_photon_x86">
53	</target>	53	</target>

Added Link Here

(-)files/patch-jdtcoresrc-compilejdtcore.xml (+28 lines)
1	--- jdtcoresrc/compilejdtcore.xml~ Fri May 13 11:34:19 2005
2	+++ jdtcoresrc/compilejdtcore.xml Sun May 15 10:08:14 2005
3	@@ -37,9 +37,9 @@
4	<property name="javacTarget" value="1.2" />
5	<property name="javacDebugInfo" value="true" />
6	<property name="javacFailOnError" value="true" />
7	- <record name="../compilelog.txt" action="start" />
8	+ <record name="compilelog.txt" action="start" />
9	<javac verbose="true" srcdir="${srcdir}" destdir="${destdir}"/>
10	- <record name="../compilelog.txt" action="stop" />
11	+ <record name="compilelog.txt" action="stop" />
12
13	<echo message="UPDATE ecj.jar" />
14	<copy todir="${destdir}">
15	--- jdtcoresrc/compilejdtcorewithjavac.xml~ Fri May 13 11:34:19 2005
16	+++ jdtcoresrc/compilejdtcorewithjavac.xml Sun May 15 10:08:28 2005
17	@@ -22,9 +22,9 @@
18	<property name="javacDebugInfo" value="true" />
19	<property name="javacFailOnError" value="true" />
20
21	- <record name="../compilelog.txt" action="start" />
22	+ <record name="compilelog.txt" action="start" />
23	<javac verbose="true" srcdir="${srcdir}" destdir="${destdir}"/>
24	- <record name="../compilelog.txt" action="stop" />
25	+ <record name="compilelog.txt" action="stop" />
26
27	<echo message="UPDATE ecj.jar" />
28	<copy todir="${destdir}">

Removed Link Here

(-)files/patch-plugins-swt-gtk64-build.xml (-15 lines)
1	--- plugins/org.eclipse.swt.gtk64/build.xml.orig Fri Apr 1 13:54:42 2005
2	+++ plugins/org.eclipse.swt.gtk64/build.xml Mon Apr 4 00:11:23 2005
3	@@ -11,9 +11,9 @@
4	<property name="build.result.folder" value="${basedir}"/>
5	<property name="plugindir" value="../org.eclipse.swt"/>
6	<property name="destination" value="${basedir}"/>
7	- <property name="os" value="linux"/>
8	- <property name="ws" value="gtk"/>
9	- <property name="arch" value="x86_64"/>
10	+ <property name="os" value="${os}"/>
11	+ <property name="ws" value="${ws}"/>
12	+ <property name="arch" value="${arch}"/>
13	<property name="bootclasspath" value=""/>
14	<property name="toolsplugindir" value="../org.eclipse.swt.tools"/>
15	</target>

Lines 1-18 Link Here

(-)files/patch-plugins-update-src-update.c (-9 / +6 lines)
1	--- plugins/org.eclipse.update.core.linux/src/update.c.orig Thu Sep 16 08:48:27 2004	1	--- plugins/org.eclipse.update.core.linux/src/update.c.orig Fri May 13 11:37:58 2005
2	+++ plugins/org.eclipse.update.core.linux/src/update.c Fri Feb 18 20:27:34 2005	2	+++ plugins/org.eclipse.update.core.linux/src/update.c Sat May 14 19:01:31 2005
3	@@ -10,8 +10,15 @@	3	@@ -12,7 +12,12 @@
4	*******************************************************************************/	4	/* bug 82520 : need to include stdlib.h */
5		5	# include <stdlib.h>
6	# include <sys/types.h>	6	# include <sys/types.h>
7	+#ifdef __FreeBSD__	7	+#ifdef __FreeBSD__
8	+# include <stdlib.h>
9	+# include <sys/param.h>	8	+# include <sys/param.h>
10	+# include <sys/mount.h>	9	+# include <sys/mount.h>
11	+# include "update.h"
12	+#else	10	+#else
13	# include <sys/statfs.h>	11	# include <sys/statfs.h>
14	# include <update.h>
15	+#endif	12	+#endif
		13	# include <update.h>
16		14
17	/*	15	/*
18	* Class: org_eclipse_update_configuration_LocalSystemInfo

Lines 30-36 Link Here

(-)scripts/pre-patch (-10 / +9 lines)
30		30
31	prepare_files()	31	prepare_files()
32	{	32	{
33	mkdir ${WRKSRC}/features/org.eclipse.launchers/bin/gtk/freebsd	33	mkdir ${WRKSRC}/features/org.eclipse.platform.launchers/bin/gtk/freebsd
34		34
35	# Copy the files and rename/change them appropriately	35	# Copy the files and rename/change them appropriately
36	for src in $COPY_LIST	36	for src in $COPY_LIST
Lines 64-74 Link Here
64	assemble.org.eclipse.sdk.linux.gtk.x86.xml	64	assemble.org.eclipse.sdk.linux.gtk.x86.xml
65	assemble.org.eclipse.sdk.linux.gtk.x86_64.xml	65	assemble.org.eclipse.sdk.linux.gtk.x86_64.xml
66	assemble.org.eclipse.sdk.linux.motif.x86.xml	66	assemble.org.eclipse.sdk.linux.motif.x86.xml
67	features/org.eclipse.launchers/bin/gtk/linux/x86	67	features/org.eclipse.platform.launchers/bin/gtk/linux/x86
68	features/org.eclipse.launchers/bin/gtk/linux/x86_64	68	features/org.eclipse.platform.launchers/bin/gtk/linux/x86_64
69	features/org.eclipse.launchers/bin/motif/linux	69	features/org.eclipse.platform.launchers/bin/motif/linux
70	features/org.eclipse.launchers/library/gtk/make_linux.mak	70	features/org.eclipse.platform.launchers/library/gtk/make_linux.mak
71	features/org.eclipse.launchers/library/motif/make_linux.mak	71	features/org.eclipse.platform.launchers/library/motif/make_linux.mak
72	plugins/org.eclipse.core.resources.linux	72	plugins/org.eclipse.core.resources.linux
73	plugins/org.eclipse.core.resources.linux/os/linux	73	plugins/org.eclipse.core.resources.linux/os/linux
74	plugins/org.eclipse.jdt.source.linux.gtk.x86	74	plugins/org.eclipse.jdt.source.linux.gtk.x86
Lines 82-91 Link Here
82	plugins/org.eclipse.platform.source.linux.gtk.x86	82	plugins/org.eclipse.platform.source.linux.gtk.x86
83	plugins/org.eclipse.platform.source.linux.gtk.x86_64	83	plugins/org.eclipse.platform.source.linux.gtk.x86_64
84	plugins/org.eclipse.platform.source.linux.motif.x86	84	plugins/org.eclipse.platform.source.linux.motif.x86
85	plugins/org.eclipse.swt.gtk/os/linux	85	plugins/org.eclipse.swt.gtk.linux.x86
86	plugins/org.eclipse.swt.gtk64/os/linux	86	plugins/org.eclipse.swt.gtk.linux.x86_64
87	plugins/org.eclipse.swt.motif/os/linux	87	plugins/org.eclipse.swt.motif.linux.x86
88	plugins/org.eclipse.swt.motif/os/linux
89	plugins/org.eclipse.update.core.linux	88	plugins/org.eclipse.update.core.linux
90	plugins/org.eclipse.update.core.linux/os/linux	89	plugins/org.eclipse.update.core.linux/os/linux
91	"	90	"