diff options
| author | Rong-En Fan <rafan@FreeBSD.org> | 2006-12-12 07:38:50 +0000 |
|---|---|---|
| committer | Rong-En Fan <rafan@FreeBSD.org> | 2006-12-12 07:38:50 +0000 |
| commit | d1f0b59040a59dbfd369d1eff2d1f22a9a50ddf2 (patch) | |
| tree | 374adcd442802340e89af9f13349edc8408c121e /java | |
| parent | - Respect X11BASE (diff) | |
- Respect X11BASE
This is the same fix as I did for x11-toolkits/swt
Reported by: pointyhat
Approved by: portmgr (linimon)
Notes
Notes:
svn path=/head/; revision=179539
Diffstat (limited to 'java')
| -rw-r--r-- | java/eclipse/files/post-patch-plugins-swt-gtk-make_freebsd.mak | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/java/eclipse/files/post-patch-plugins-swt-gtk-make_freebsd.mak b/java/eclipse/files/post-patch-plugins-swt-gtk-make_freebsd.mak index 8fd9bd272332..ed565f244462 100644 --- a/java/eclipse/files/post-patch-plugins-swt-gtk-make_freebsd.mak +++ b/java/eclipse/files/post-patch-plugins-swt-gtk-make_freebsd.mak @@ -1,5 +1,23 @@ --- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak.orig Mon Oct 9 16:06:20 2006 +++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak Mon Oct 9 16:27:59 2006 +@@ -48,7 +48,7 @@ + + # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0) + GTKCFLAGS = `pkg-config --cflags gtk+-2.0` +-GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L/usr/X11R6/lib $(XLIB64) -lXtst ++GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L$(X11BASE)/lib $(XLIB64) -lXtst + + CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc + +@@ -61,7 +61,7 @@ + GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2 + + GLXCFLAGS = +-GLXLIBS = -shared -fPIC -L/usr/X11R6/lib -lGL -lGLU -lm ++GLXLIBS = -shared -fPIC -L$(X11BASE)/lib -lGL -lGLU -lm + + # Uncomment for Native Stats tool + #NATIVE_STATS = -DNATIVE_STATS @@ -79,6 +79,10 @@ -I. \ -I$(JAVA_HOME)/include \ |