From 0bc453c3e644edfc1514f310a3360766f95d0fb2 Mon Sep 17 00:00:00 2001 From: Norikatsu Shigemura Date: Sat, 7 May 2005 05:00:40 +0000 Subject: Add eclipse-devel 3.1M6, an open extensible IDE for anything and nothing in particular. PR: ports/79917 Submitted by: various members of freebsd-java --- java/eclipse-devel/files/eclipse.in | 49 ++++++++ .../files/manualpatch-plugins-swt-gtk-build.sh | 54 +++++++++ .../manualpatch-plugins-swt-gtk-make_freebsd.mak | 41 +++++++ .../files/manualpatch-plugins-swt-gtk-os_custom.h | 57 +++++++++ .../files/manualpatch-plugins-swt-motif-build.sh | 21 ++++ .../manualpatch-plugins-swt-motif-make_freebsd.mak | 73 ++++++++++++ java/eclipse-devel/files/patch-assemble | 39 +++++++ .../patch-browser-src-ExternalBrowserInstance.java | 13 +++ java/eclipse-devel/files/patch-build | 11 ++ java/eclipse-devel/files/patch-build.xml | 41 +++++++ .../files/patch-features-jdt-build.xml | 27 +++++ .../files/patch-features-jdt-source-build.xml | 15 +++ .../files/patch-features-launchers-gtk-build.sh | 41 +++++++ .../patch-features-launchers-gtk-make_freebsd.mak | 11 ++ .../patch-features-launchers-library-eclipseShm.c | 17 +++ .../files/patch-features-launchers-motif-build.sh | 33 ++++++ .../files/patch-features-pde-build.xml | 15 +++ .../files/patch-features-pde-source-build.xml | 15 +++ .../files/patch-features-platform-build.xml | 127 +++++++++++++++++++++ .../files/patch-features-platform-source-build.xml | 61 ++++++++++ .../patch-features-platform-source-feature.xml | 17 +++ .../files/patch-features-sdk-build.xml | 15 +++ .../files/patch-plugins-swt-gtk-build.xml | 11 ++ .../files/patch-plugins-swt-gtk64-build.xml | 15 +++ .../files/patch-plugins-update-src-build.xml | 31 +++++ .../files/patch-plugins-update-src-update.c | 18 +++ 26 files changed, 868 insertions(+) create mode 100644 java/eclipse-devel/files/eclipse.in create mode 100644 java/eclipse-devel/files/manualpatch-plugins-swt-gtk-build.sh create mode 100644 java/eclipse-devel/files/manualpatch-plugins-swt-gtk-make_freebsd.mak create mode 100644 java/eclipse-devel/files/manualpatch-plugins-swt-gtk-os_custom.h create mode 100644 java/eclipse-devel/files/manualpatch-plugins-swt-motif-build.sh create mode 100644 java/eclipse-devel/files/manualpatch-plugins-swt-motif-make_freebsd.mak create mode 100644 java/eclipse-devel/files/patch-assemble create mode 100644 java/eclipse-devel/files/patch-browser-src-ExternalBrowserInstance.java create mode 100644 java/eclipse-devel/files/patch-build create mode 100644 java/eclipse-devel/files/patch-build.xml create mode 100644 java/eclipse-devel/files/patch-features-jdt-build.xml create mode 100644 java/eclipse-devel/files/patch-features-jdt-source-build.xml create mode 100644 java/eclipse-devel/files/patch-features-launchers-gtk-build.sh create mode 100644 java/eclipse-devel/files/patch-features-launchers-gtk-make_freebsd.mak create mode 100644 java/eclipse-devel/files/patch-features-launchers-library-eclipseShm.c create mode 100644 java/eclipse-devel/files/patch-features-launchers-motif-build.sh create mode 100644 java/eclipse-devel/files/patch-features-pde-build.xml create mode 100644 java/eclipse-devel/files/patch-features-pde-source-build.xml create mode 100644 java/eclipse-devel/files/patch-features-platform-build.xml create mode 100644 java/eclipse-devel/files/patch-features-platform-source-build.xml create mode 100644 java/eclipse-devel/files/patch-features-platform-source-feature.xml create mode 100644 java/eclipse-devel/files/patch-features-sdk-build.xml create mode 100644 java/eclipse-devel/files/patch-plugins-swt-gtk-build.xml create mode 100644 java/eclipse-devel/files/patch-plugins-swt-gtk64-build.xml create mode 100644 java/eclipse-devel/files/patch-plugins-update-src-build.xml create mode 100644 java/eclipse-devel/files/patch-plugins-update-src-update.c (limited to 'java/eclipse-devel/files') diff --git a/java/eclipse-devel/files/eclipse.in b/java/eclipse-devel/files/eclipse.in new file mode 100644 index 000000000000..1edf7be3bdbb --- /dev/null +++ b/java/eclipse-devel/files/eclipse.in @@ -0,0 +1,49 @@ +#!/bin/sh +# +# FreeBSD-specific startup script for Eclipse Platform +# +# See: http://www.eclipse.org +# +# $FreeBSD$ +# + +DEFAULT_JAVA_HOME=%%JAVA_HOME%% +ECLIPSE_HOME=%%ECLIPSE_HOME%% +DEFAULT_JAVA_CMD=java +MOZILLA_FIVE_HOME=%%X11BASE%%/lib/%%BROWSER%% +LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$LD_LIBRARY_PATH + + +#----------------------------------------------------------------------------- +# Determine configuration settings +#----------------------------------------------------------------------------- + +# Determine the JDK home directory +if [ -z "${JAVA_HOME}" ]; then + JAVA_HOME=${DEFAULT_JAVA_HOME} +fi + +# Determine 'java' executable +if [ -z "${JAVACMD}" ]; then + if [ -n "${JAVA_HOME}" ]; then + JAVACMD="${JAVA_HOME}/bin/java" + else + JAVACMD=${DEFAULT_JAVACMD} + fi +fi + +# Check if 'java' executable can be found +if [ ! -x "$JAVACMD" ]; then + echo "Error: JAVA_HOME is not defined correctly: ${JAVA_HOME}" + echo " Unable to find ${JAVACMD}" + exit 1 +fi + +# Check if 'eclipse' executable can be found +if [ ! -x "${ECLIPSE_HOME}/eclipse" ]; then + echo "Error: ECLIPSE_HOME is not defined correctly: ${ECLIPSE_HOME}" + echo " Unable to find eclipse launcher binary" + exit 1 +fi + +PATH=${JAVA_HOME}/bin:$PATH exec "${ECLIPSE_HOME}/eclipse" $@ diff --git a/java/eclipse-devel/files/manualpatch-plugins-swt-gtk-build.sh b/java/eclipse-devel/files/manualpatch-plugins-swt-gtk-build.sh new file mode 100644 index 000000000000..0f69a64d40ee --- /dev/null +++ b/java/eclipse-devel/files/manualpatch-plugins-swt-gtk-build.sh @@ -0,0 +1,54 @@ +--- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig Fri Apr 1 13:56:58 2005 ++++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh Sat Apr 9 16:27:29 2005 +@@ -110,6 +110,36 @@ + ;; + esac + ;; ++ "FreeBSD") ++ 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} ++ GECKO_LIBS="-L${GECKO_L} -lxpcom -lnspr4 -lplds4 -lplc4 -lgtkembedmoz" ++ case $MODEL in ++ "amd64") ++ AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64 ++ SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64 ++ OUTPUT_DIR=../../../org.eclipse.swt.gtk64/os/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/os/freebsd/x86 ++ makefile="make_freebsd.mak" ++ echo "Building FreeBSD GTK x86 version of SWT" ++ ;; ++ *) ++ echo "*** Unknown MODEL <${MODEL}>" ++ ;; ++ esac ++ ;; + "SunOS") + CC=gcc + LD=gcc +@@ -138,4 +168,13 @@ + + 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 + +-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 diff --git a/java/eclipse-devel/files/manualpatch-plugins-swt-gtk-make_freebsd.mak b/java/eclipse-devel/files/manualpatch-plugins-swt-gtk-make_freebsd.mak new file mode 100644 index 000000000000..2aeab21323ce --- /dev/null +++ b/java/eclipse-devel/files/manualpatch-plugins-swt-gtk-make_freebsd.mak @@ -0,0 +1,41 @@ +--- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak Fri Apr 1 13:55:11 2005 ++++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak Sat Apr 9 13:48:50 2005 +@@ -49,8 +49,8 @@ + 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 -I$(X11BASE)/include \ ++ -fpic -fPIC \ + ${SWT_PTR_CFLAGS} +-LIBS = -shared -fpic ++LIBS = -shared -fpic -fPIC + + +-all: make_swt make_atk make_gnome make_awt make_kde ++all: make_swt make_atk $(MAKE_GNOME) make_awt + + # + # SWT libs diff --git a/java/eclipse-devel/files/manualpatch-plugins-swt-gtk-os_custom.h b/java/eclipse-devel/files/manualpatch-plugins-swt-gtk-os_custom.h new file mode 100644 index 000000000000..525c5ccdc80f --- /dev/null +++ b/java/eclipse-devel/files/manualpatch-plugins-swt-gtk-os_custom.h @@ -0,0 +1,57 @@ +--- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h Fri Apr 1 13:55:23 2005 ++++ ../files/plugins-swt-gtk-os_custom.h Wed Mar 30 22:55:24 2005 +@@ -21,30 +23,30 @@ + #define PTR_sizeof() sizeof(void *) + + /* Libraries for dynamic loaded functions */ +-#define gtk_file_chooser_add_filter_LIB "libgtk-x11-2.0.so.0" +-#define gtk_file_chooser_dialog_new_LIB "libgtk-x11-2.0.so.0" +-#define gtk_file_chooser_get_current_folder_LIB "libgtk-x11-2.0.so.0" +-#define gtk_file_chooser_get_filename_LIB "libgtk-x11-2.0.so.0" +-#define gtk_file_chooser_get_filenames_LIB "libgtk-x11-2.0.so.0" +-#define gtk_file_chooser_set_current_folder_LIB "libgtk-x11-2.0.so.0" +-#define gtk_file_chooser_set_current_name_LIB "libgtk-x11-2.0.so.0" +-#define gtk_file_chooser_set_extra_widget_LIB "libgtk-x11-2.0.so.0" +-#define gtk_file_chooser_set_filename_LIB "libgtk-x11-2.0.so.0" +-#define gtk_file_chooser_set_select_multiple_LIB "libgtk-x11-2.0.so.0" +-#define gtk_file_filter_add_pattern_LIB "libgtk-x11-2.0.so.0" +-#define gtk_file_filter_new_LIB "libgtk-x11-2.0.so.0" +-#define gtk_file_filter_set_name_LIB "libgtk-x11-2.0.so.0" +-#define gtk_tree_selection_get_selected_rows_LIB "libgtk-x11-2.0.so.0" +-#define gtk_tree_view_column_cell_get_position_LIB "libgtk-x11-2.0.so.0" +-#define gtk_entry_set_alignment_LIB "libgtk-x11-2.0.so.0" +-#define gdk_draw_pixbuf_LIB "libgdk-x11-2.0.so.0" +-#define gdk_screen_get_default_LIB "libgdk-x11-2.0.so.0" +-#define gdk_screen_get_monitor_at_window_LIB "libgdk-x11-2.0.so.0" +-#define gdk_screen_get_monitor_geometry_LIB "libgdk-x11-2.0.so.0" +-#define gdk_screen_get_n_monitors_LIB "libgdk-x11-2.0.so.0" +-#define gdk_screen_get_number_LIB "libgdk-x11-2.0.so.0" +-#define gdk_window_set_keep_above_LIB "libgdk-x11-2.0.so.0" +-#define gdk_window_set_accept_focus_LIB "libgdk-x11-2.0.so.0" ++#define gtk_file_chooser_add_filter_LIB "libgtk-x11-2.0.so" ++#define gtk_file_chooser_dialog_new_LIB "libgtk-x11-2.0.so" ++#define gtk_file_chooser_get_current_folder_LIB "libgtk-x11-2.0.so" ++#define gtk_file_chooser_get_filename_LIB "libgtk-x11-2.0.so" ++#define gtk_file_chooser_get_filenames_LIB "libgtk-x11-2.0.so" ++#define gtk_file_chooser_set_current_folder_LIB "libgtk-x11-2.0.so" ++#define gtk_file_chooser_set_current_name_LIB "libgtk-x11-2.0.so" ++#define gtk_file_chooser_set_extra_widget_LIB "libgtk-x11-2.0.so" ++#define gtk_file_chooser_set_filename_LIB "libgtk-x11-2.0.so" ++#define gtk_file_chooser_set_select_multiple_LIB "libgtk-x11-2.0.so" ++#define gtk_file_filter_add_pattern_LIB "libgtk-x11-2.0.so" ++#define gtk_file_filter_new_LIB "libgtk-x11-2.0.so" ++#define gtk_file_filter_set_name_LIB "libgtk-x11-2.0.so" ++#define gtk_tree_selection_get_selected_rows_LIB "libgtk-x11-2.0.so" ++#define gtk_tree_view_column_cell_get_position_LIB "libgtk-x11-2.0.so" ++#define gtk_entry_set_alignment_LIB "libgtk-x11-2.0.so" ++#define gdk_draw_pixbuf_LIB "libgdk-x11-2.0.so" ++#define gdk_screen_get_default_LIB "libgdk-x11-2.0.so" ++#define gdk_screen_get_monitor_at_window_LIB "libgdk-x11-2.0.so" ++#define gdk_screen_get_monitor_geometry_LIB "libgdk-x11-2.0.so" ++#define gdk_screen_get_n_monitors_LIB "libgdk-x11-2.0.so" ++#define gdk_screen_get_number_LIB "libgdk-x11-2.0.so" ++#define gdk_window_set_keep_above_LIB "libgdk-x11-2.0.so" ++#define gdk_window_set_accept_focus_LIB "libgdk-x11-2.0.so" + + /* Field accessors */ + #define GTK_ACCEL_LABEL_SET_ACCEL_STRING(arg0, arg1) (arg0)->accel_string = arg1 diff --git a/java/eclipse-devel/files/manualpatch-plugins-swt-motif-build.sh b/java/eclipse-devel/files/manualpatch-plugins-swt-motif-build.sh new file mode 100644 index 000000000000..bfc5582b1349 --- /dev/null +++ b/java/eclipse-devel/files/manualpatch-plugins-swt-motif-build.sh @@ -0,0 +1,21 @@ +--- plugins/org.eclipse.swt/Eclipse SWT PI/motif/library/build.sh Fri Apr 1 13:55:27 2005 ++++ ../files/plugins-swt-motif-build.sh Sun Apr 3 16:38:13 2005 +@@ -57,6 +57,18 @@ + echo "Building Linux motif x86 version of SWT" + esac + ;; ++ "FreeBSD") ++ case $MODEL in ++ i?86) ++ OUTPUT_DIR=../../../org.eclipse.swt.motif/os/freebsd/x86 ++ makefile="make_freebsd.mak" ++ echo "Building FreeBSD motif x86 version of SWT" ++ ;; ++ *) ++ echo "*** Unknown MODEL <${MODEL}>" ++ ;; ++ esac ++ ;; + "SunOS") + case $MODEL in + *) diff --git a/java/eclipse-devel/files/manualpatch-plugins-swt-motif-make_freebsd.mak b/java/eclipse-devel/files/manualpatch-plugins-swt-motif-make_freebsd.mak new file mode 100644 index 000000000000..24d68e89db03 --- /dev/null +++ b/java/eclipse-devel/files/manualpatch-plugins-swt-motif-make_freebsd.mak @@ -0,0 +1,73 @@ +--- plugins/org.eclipse.swt/Eclipse SWT PI/motif/library/make_linux.mak.orig Fri Apr 1 13:57:23 2005 ++++ plugins/org.eclipse.swt/Eclipse SWT PI/motif/library/make_linux.mak Sat Apr 9 14:20:28 2005 +@@ -26,32 +26,32 @@ + 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 +-SWT_LIBS = -L$(MOTIF_HOME)/lib -lXm -L/usr/lib -L/usr/X11R6/lib \ +- -rpath . -x -shared -lX11 -lm -lXext -lXt -lXp -ldl -lXinerama -lXtst ++SWT_LIBS = -L$(MOTIF_HOME)/lib -lXm -L$(PREFIX)/lib -L$(X11BASE)/lib \ ++ -rpath . -x -shared -lX11 -lm -lXext -lXt -lXp -lXinerama + + # Uncomment for Native Stats tool + #NATIVE_STATS = -DNATIVE_STATS + +-CFLAGS = -O -s -Wall -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) -DLINUX -DMOTIF -fpic -I./ \ +- -I$(JAVA_HOME)/include -I$(MOTIF_HOME)/include -I/usr/X11R6/include ++CFLAGS = -O -g -s -Wall -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) -DFREEBSD -DMOTIF -fpic -fPIC -I./ \ ++ -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 -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` + 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 +-AWT_LIBS = -L$(JAVA_HOME)/jre/bin -ljawt -shared ++AWT_LIBS = -L$(JAVA_HOME)/jre/lib/$(MACHINE_ARCH) -ljawt -shared + + GTK_PREFIX = swt-gtk + GTK_LIB = lib$(GTK_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so +@@ -59,7 +59,7 @@ + GTK_CFLAGS = `pkg-config --cflags gtk+-2.0` + GTK_LIBS = -x -shared `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 + +-all: make_swt make_awt make_gnome make_gtk make_kde ++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) + diff --git a/java/eclipse-devel/files/patch-assemble b/java/eclipse-devel/files/patch-assemble new file mode 100644 index 000000000000..6226a7416af8 --- /dev/null +++ b/java/eclipse-devel/files/patch-assemble @@ -0,0 +1,39 @@ +--- assemble.org.eclipse.sdk.freebsd.motif.x86.xml~ Sat Apr 9 14:40:56 2005 ++++ assemble.org.eclipse.sdk.freebsd.motif.x86.xml Sat Apr 9 15:05:35 2005 +@@ -419,10 +419,5 @@ + + + +- +- +- +- +- + + +--- assemble.org.eclipse.sdk.freebsd.gtk.x86.xml~ Sat Apr 9 14:40:56 2005 ++++ assemble.org.eclipse.sdk.freebsd.gtk.x86.xml Sat Apr 9 15:05:42 2005 +@@ -419,10 +419,5 @@ + + + +- +- +- +- +- + + +--- assemble.org.eclipse.sdk.freebsd.gtk.amd64.xml~ Sat Apr 9 14:40:56 2005 ++++ assemble.org.eclipse.sdk.freebsd.gtk.amd64.xml Sat Apr 9 15:04:59 2005 +@@ -419,10 +419,5 @@ + + + +- +- +- +- +- + + diff --git a/java/eclipse-devel/files/patch-browser-src-ExternalBrowserInstance.java b/java/eclipse-devel/files/patch-browser-src-ExternalBrowserInstance.java new file mode 100644 index 000000000000..7cf29b859995 --- /dev/null +++ b/java/eclipse-devel/files/patch-browser-src-ExternalBrowserInstance.java @@ -0,0 +1,13 @@ +--- 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 + } + diff --git a/java/eclipse-devel/files/patch-build b/java/eclipse-devel/files/patch-build new file mode 100644 index 000000000000..0b3ac7f120a0 --- /dev/null +++ b/java/eclipse-devel/files/patch-build @@ -0,0 +1,11 @@ +--- build.orig Fri Apr 1 13:58:26 2005 ++++ build Sun Apr 3 23:33:46 2005 +@@ -52,7 +52,7 @@ + exit 1 + fi + +-if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ia64" ] || [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc64" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64" ] ++if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ia64" ] || [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc64" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64" ] || [ "$os-$ws-$arch" = "freebsd-gtk-x86" ] || [ "$os-$ws-$arch" = "freebsd-motif-x86" ] || [ "$os-$ws-$arch" = "freebsd-gtk-amd64" ] + then + ORIGCLASSPATH=$CLASSPATH;export ORIGCLASSPATH + ant -q -buildfile jdtcoresrc/compilejdtcorewithjavac.xml diff --git a/java/eclipse-devel/files/patch-build.xml b/java/eclipse-devel/files/patch-build.xml new file mode 100644 index 000000000000..a2419ca04c7b --- /dev/null +++ b/java/eclipse-devel/files/patch-build.xml @@ -0,0 +1,41 @@ +--- build.xml.orig Fri Apr 1 13:58:26 2005 ++++ build.xml Sat Apr 9 17:03:28 2005 +@@ -48,17 +48,20 @@ + + + ++ + + + + + + ++ + + + + + ++ + + + +@@ -82,12 +85,12 @@ + + + +- +- +- ++ ++ ++ + +- +- ++ ++ + + + diff --git a/java/eclipse-devel/files/patch-features-jdt-build.xml b/java/eclipse-devel/files/patch-features-jdt-build.xml new file mode 100644 index 000000000000..34f2074cc7b1 --- /dev/null +++ b/java/eclipse-devel/files/patch-features-jdt-build.xml @@ -0,0 +1,27 @@ +--- features/org.eclipse.jdt/build.xml.orig Sat Feb 19 12:09:29 2005 ++++ features/org.eclipse.jdt/build.xml Sat Mar 26 18:30:33 2005 +@@ -179,6 +179,24 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + diff --git a/java/eclipse-devel/files/patch-features-jdt-source-build.xml b/java/eclipse-devel/files/patch-features-jdt-source-build.xml new file mode 100644 index 000000000000..28af8014b52f --- /dev/null +++ b/java/eclipse-devel/files/patch-features-jdt-source-build.xml @@ -0,0 +1,15 @@ +--- features/org.eclipse.jdt.source/build.xml.orig Sat Feb 19 12:09:34 2005 ++++ features/org.eclipse.jdt.source/build.xml Sat Mar 26 18:31:36 2005 +@@ -96,6 +96,12 @@ + + + ++ ++ ++ ++ ++ ++ + + + diff --git a/java/eclipse-devel/files/patch-features-launchers-gtk-build.sh b/java/eclipse-devel/files/patch-features-launchers-gtk-build.sh new file mode 100644 index 000000000000..64ddeff2cf81 --- /dev/null +++ b/java/eclipse-devel/files/patch-features-launchers-gtk-build.sh @@ -0,0 +1,41 @@ +--- features/org.eclipse.launchers/library/gtk/build.sh.orig Fri Apr 1 13:57:19 2005 ++++ features/org.eclipse.launchers/library/gtk/build.sh Sun Apr 3 11:37:51 2005 +@@ -67,6 +67,23 @@ + ;; + esac + ;; ++ "FreeBSD") ++ makefile="make_freebsd.mak" ++ defaultOS="freebsd" ++ case $MODEL in ++ amd64) ++ defaultOSArch="amd64" ++ OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" ++ ;; ++ i?86) ++ defaultOSArch="x86" ++ OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" ++ ;; ++ *) ++ echo "*** Unknown MODEL <${MODEL}>" ++ ;; ++ esac ++ ;; + "SunOS") + makefile="make_solaris.mak" + defaultOS="solaris" +@@ -112,11 +129,11 @@ + # If the OS is supported (a makefile exists) + if [ "$makefile" != "" ]; then + if [ "$extraArgs" != "" ]; then +- make -f $makefile $extraArgs ++ gmake -f $makefile $extraArgs + else + echo "Building $OS launcher. Defaults: -os $DEFAULT_OS -arch $DEFAULT_OS_ARCH -ws $DEFAULT_WS" +- make -f $makefile clean +- make -f $makefile all ++ gmake -f $makefile clean ++ gmake -f $makefile all + fi + else + echo "Unknown OS ($OS) -- build aborted" diff --git a/java/eclipse-devel/files/patch-features-launchers-gtk-make_freebsd.mak b/java/eclipse-devel/files/patch-features-launchers-gtk-make_freebsd.mak new file mode 100644 index 000000000000..ad80cd3542ee --- /dev/null +++ b/java/eclipse-devel/files/patch-features-launchers-gtk-make_freebsd.mak @@ -0,0 +1,11 @@ +--- features/org.eclipse.launchers/library/gtk/make_freebsd.mak.orig Sun Apr 17 20:24:58 2005 ++++ features/org.eclipse.launchers/library/gtk/make_freebsd.mak Sun Apr 17 20:25:45 2005 +@@ -26,7 +26,7 @@ + CC=gcc + OBJS = eclipse.o eclipseUtil.o eclipseShm.o eclipseConfig.o eclipseGtk.o + EXEC = $(PROGRAM_OUTPUT) +-LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0 ++LIBS = `pkg-config --libs gtk+-2.0` + CFLAGS = -O -s \ + -fpic \ + -DMOZILLA_FIX \ diff --git a/java/eclipse-devel/files/patch-features-launchers-library-eclipseShm.c b/java/eclipse-devel/files/patch-features-launchers-library-eclipseShm.c new file mode 100644 index 000000000000..735606309168 --- /dev/null +++ b/java/eclipse-devel/files/patch-features-launchers-library-eclipseShm.c @@ -0,0 +1,17 @@ +--- features/org.eclipse.launchers/library/eclipseShm.c.orig Fri Apr 1 13:55:58 2005 ++++ features/org.eclipse.launchers/library/eclipseShm.c Sun Apr 3 11:34:02 2005 +@@ -182,11 +182,13 @@ + + #else /* Unix like platforms */ + ++#include ++#include ++#include + #include + #include + #include + #include +-#include + #include + + int createSharedData(char** id, int size) { diff --git a/java/eclipse-devel/files/patch-features-launchers-motif-build.sh b/java/eclipse-devel/files/patch-features-launchers-motif-build.sh new file mode 100644 index 000000000000..ffa0d5301234 --- /dev/null +++ b/java/eclipse-devel/files/patch-features-launchers-motif-build.sh @@ -0,0 +1,33 @@ +--- features/org.eclipse.launchers/library/motif/build.sh~ Sat Feb 19 12:13:49 2005 ++++ features/org.eclipse.launchers/library/motif/build.sh Sun Mar 20 15:27:04 2005 +@@ -55,6 +55,15 @@ + MOTIF_HOME=/bluebird/teamswt/swt-builddir/motif21 + OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" + ;; ++ "FreeBSD") ++ makefile="make_freebsd.mak" ++ defaultOS="freebsd" ++ defaultOSArch="x86" ++ defaultWS="motif" ++ X11_HOME=$X11BASE ++ MOTIF_HOME=$X11BASE ++ OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" ++ ;; + "SunOS") + makefile="make_solaris.mak" + defaultOS="solaris" +@@ -122,11 +131,11 @@ + # If the OS is supported (a makefile exists) + if [ "$makefile" != "" ]; then + if [ "$extraArgs" != "" ]; then +- make -f $makefile $extraArgs ++ gmake -f $makefile $extraArgs + else + echo "Building $OS launcher. Defaults: -os $DEFAULT_OS -arch $DEFAULT_OS_ARCH -ws $DEFAULT_WS" +- make -f $makefile clean +- make -f $makefile all ++ gmake -f $makefile clean ++ gmake -f $makefile all + fi + else + echo "Unknown OS ($OS) -- build aborted" diff --git a/java/eclipse-devel/files/patch-features-pde-build.xml b/java/eclipse-devel/files/patch-features-pde-build.xml new file mode 100644 index 000000000000..9e18780543c7 --- /dev/null +++ b/java/eclipse-devel/files/patch-features-pde-build.xml @@ -0,0 +1,15 @@ +--- features/org.eclipse.pde/build.xml.orig Sat Feb 19 12:09:30 2005 ++++ features/org.eclipse.pde/build.xml Sat Mar 26 18:33:49 2005 +@@ -116,6 +116,12 @@ + + + ++ ++ ++ ++ ++ ++ + + + diff --git a/java/eclipse-devel/files/patch-features-pde-source-build.xml b/java/eclipse-devel/files/patch-features-pde-source-build.xml new file mode 100644 index 000000000000..7318f68c0dee --- /dev/null +++ b/java/eclipse-devel/files/patch-features-pde-source-build.xml @@ -0,0 +1,15 @@ +--- features/org.eclipse.pde.source/build.xml.orig Sat Feb 19 12:09:29 2005 ++++ features/org.eclipse.pde.source/build.xml Sat Mar 26 18:34:22 2005 +@@ -86,6 +86,12 @@ + + + ++ ++ ++ ++ ++ ++ + + + diff --git a/java/eclipse-devel/files/patch-features-platform-build.xml b/java/eclipse-devel/files/patch-features-platform-build.xml new file mode 100644 index 000000000000..62ac0573f2bd --- /dev/null +++ b/java/eclipse-devel/files/patch-features-platform-build.xml @@ -0,0 +1,127 @@ +--- features/org.eclipse.platform/build.xml.orig Fri Apr 1 13:54:42 2005 ++++ features/org.eclipse.platform/build.xml Sat Apr 2 13:43:10 2005 +@@ -44,6 +44,16 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -63,6 +73,11 @@ + + + ++ ++ ++ ++ ++ + + + +@@ -182,6 +197,11 @@ + + + ++ ++ ++ ++ ++ + + + +@@ -222,6 +242,11 @@ + + + ++ ++ ++ ++ ++ + + + +@@ -449,7 +474,7 @@ + + + +- ++ + + + +@@ -472,6 +497,16 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -512,6 +547,16 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -523,6 +568,28 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + diff --git a/java/eclipse-devel/files/patch-features-platform-source-build.xml b/java/eclipse-devel/files/patch-features-platform-source-build.xml new file mode 100644 index 000000000000..143ff8f73e79 --- /dev/null +++ b/java/eclipse-devel/files/patch-features-platform-source-build.xml @@ -0,0 +1,61 @@ +--- features/org.eclipse.platform.source/build.xml.orig Fri Apr 1 13:54:41 2005 ++++ features/org.eclipse.platform.source/build.xml Sat Apr 2 14:33:00 2005 +@@ -42,6 +42,11 @@ + + + ++ ++ ++ ++ ++ + + + +@@ -72,6 +77,16 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -144,7 +159,7 @@ + + + +- ++ + + + +@@ -159,6 +174,8 @@ + + + ++ ++ + + + +@@ -175,6 +192,11 @@ + + + ++ ++ ++ ++ ++ + + + diff --git a/java/eclipse-devel/files/patch-features-platform-source-feature.xml b/java/eclipse-devel/files/patch-features-platform-source-feature.xml new file mode 100644 index 000000000000..39639fecd988 --- /dev/null +++ b/java/eclipse-devel/files/patch-features-platform-source-feature.xml @@ -0,0 +1,17 @@ +--- features/org.eclipse.platform.source/feature.xml.orig Sat Feb 19 12:09:25 2005 ++++ features/org.eclipse.platform.source/feature.xml Sat Mar 26 18:40:15 2005 +@@ -18,11 +18,14 @@ + + + ++ + + + + + ++ ++ + + + diff --git a/java/eclipse-devel/files/patch-features-sdk-build.xml b/java/eclipse-devel/files/patch-features-sdk-build.xml new file mode 100644 index 000000000000..2217569febc1 --- /dev/null +++ b/java/eclipse-devel/files/patch-features-sdk-build.xml @@ -0,0 +1,15 @@ +--- features/org.eclipse.sdk/build.xml.orig Sat Feb 19 12:09:35 2005 ++++ features/org.eclipse.sdk/build.xml Sat Mar 26 18:40:52 2005 +@@ -90,6 +90,12 @@ + + + ++ ++ ++ ++ ++ ++ + + + diff --git a/java/eclipse-devel/files/patch-plugins-swt-gtk-build.xml b/java/eclipse-devel/files/patch-plugins-swt-gtk-build.xml new file mode 100644 index 000000000000..0ccbb4cba94b --- /dev/null +++ b/java/eclipse-devel/files/patch-plugins-swt-gtk-build.xml @@ -0,0 +1,11 @@ +--- plugins/org.eclipse.swt.gtk/build.xml.orig Wed Apr 21 00:24:26 2004 ++++ plugins/org.eclipse.swt.gtk/build.xml Wed Apr 21 00:24:39 2004 +@@ -10,7 +10,7 @@ + + + +- ++ + + + diff --git a/java/eclipse-devel/files/patch-plugins-swt-gtk64-build.xml b/java/eclipse-devel/files/patch-plugins-swt-gtk64-build.xml new file mode 100644 index 000000000000..c5a5da0cfd57 --- /dev/null +++ b/java/eclipse-devel/files/patch-plugins-swt-gtk64-build.xml @@ -0,0 +1,15 @@ +--- 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 @@ + + + +- +- +- ++ ++ ++ + + + diff --git a/java/eclipse-devel/files/patch-plugins-update-src-build.xml b/java/eclipse-devel/files/patch-plugins-update-src-build.xml new file mode 100644 index 000000000000..1fa5cb7ccbd2 --- /dev/null +++ b/java/eclipse-devel/files/patch-plugins-update-src-build.xml @@ -0,0 +1,31 @@ +--- plugins/org.eclipse.update.core.freebsd/src/build.xml Sat Apr 9 14:03:21 2005 ++++ ../files/plugins-update-src-build.xml Tue Feb 15 23:41:47 2005 +@@ -6,7 +6,7 @@ + + + +- ++ + + + +@@ -44,15 +44,16 @@ + + + +- ++ + + +- ++ + +- ++ + + + ++ + + + diff --git a/java/eclipse-devel/files/patch-plugins-update-src-update.c b/java/eclipse-devel/files/patch-plugins-update-src-update.c new file mode 100644 index 000000000000..532fbdb5758e --- /dev/null +++ b/java/eclipse-devel/files/patch-plugins-update-src-update.c @@ -0,0 +1,18 @@ +--- plugins/org.eclipse.update.core.linux/src/update.c.orig Thu Sep 16 08:48:27 2004 ++++ plugins/org.eclipse.update.core.linux/src/update.c Fri Feb 18 20:27:34 2005 +@@ -10,8 +10,15 @@ + *******************************************************************************/ + + # include ++#ifdef __FreeBSD__ ++# include ++# include ++# include ++# include "update.h" ++#else + # include + # include ++#endif + + /* + * Class: org_eclipse_update_configuration_LocalSystemInfo -- cgit v1.2.3