From a40f6b4f7752009bd5f5063eb01d1fec681314dd Mon Sep 17 00:00:00 2001 From: Norikatsu Shigemura Date: Sun, 29 May 2005 03:41:42 +0000 Subject: o Update to 3.1M7. [1] o Add LATEST_LINK. [2] PR: ports/81076 [1] Submitted by: Alex Varju [1] Pointed out by: krisbot via kris [2] Tested by: java@ [1] --- .../manualpatch-plugins-swt-gtk-make_freebsd.mak | 38 ++++++---------------- 1 file changed, 10 insertions(+), 28 deletions(-) (limited to 'java/eclipse-devel/files/manualpatch-plugins-swt-gtk-make_freebsd.mak') 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 index 2aeab21323ce..0446c3be15ce 100644 --- a/java/eclipse-devel/files/manualpatch-plugins-swt-gtk-make_freebsd.mak +++ b/java/eclipse-devel/files/manualpatch-plugins-swt-gtk-make_freebsd.mak @@ -1,40 +1,22 @@ ---- 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 @@ +--- 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 @@ 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 \ + -I$(JAVA_HOME)/include \ + -I$(JAVA_HOME)/include/freebsd \ +- -fpic \ ++ -I$(X11BASE)/include \ + -fpic -fPIC \ ${SWT_PTR_CFLAGS} --LIBS = -shared -fpic -+LIBS = -shared -fpic -fPIC +-LIBS = -shared -fpic -s ++LIBS = -shared -fpic -fPIC -s --all: make_swt make_atk make_gnome make_awt make_kde +-all: make_swt make_atk make_gnome make_awt +all: make_swt make_atk $(MAKE_GNOME) make_awt # -- cgit v1.2.3