diff options
| author | rafan <rafan@FreeBSD.org> | 2006-12-12 14:41:03 +0800 |
|---|---|---|
| committer | rafan <rafan@FreeBSD.org> | 2006-12-12 14:41:03 +0800 |
| commit | 600803a4f098334b4d4013c4cbc0734d7dce80a4 (patch) | |
| tree | 83830c1678596b7bc1d23a412b641ba494a6382b /x11-toolkits | |
| parent | d90fd12fb9f36b219926840acaa48c2fa49fcc94 (diff) | |
| download | freebsd-ports-gnome-600803a4f098334b4d4013c4cbc0734d7dce80a4.tar.gz freebsd-ports-gnome-600803a4f098334b4d4013c4cbc0734d7dce80a4.tar.zst freebsd-ports-gnome-600803a4f098334b4d4013c4cbc0734d7dce80a4.zip | |
- Respect X11BASE
Reported by: pointyhat
Approved by: portmgr (linimon)
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/swt-devel/files/patch-make_freebsd.mak | 18 | ||||
| -rw-r--r-- | x11-toolkits/swt/files/patch-make_freebsd.mak | 22 |
2 files changed, 38 insertions, 2 deletions
diff --git a/x11-toolkits/swt-devel/files/patch-make_freebsd.mak b/x11-toolkits/swt-devel/files/patch-make_freebsd.mak index 122c936e0c3a..8cb796eac237 100644 --- a/x11-toolkits/swt-devel/files/patch-make_freebsd.mak +++ b/x11-toolkits/swt-devel/files/patch-make_freebsd.mak @@ -9,6 +9,24 @@ include make_common.mak +@@ -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 @@ -78,7 +78,7 @@ -fPIC \ -I. \ diff --git a/x11-toolkits/swt/files/patch-make_freebsd.mak b/x11-toolkits/swt/files/patch-make_freebsd.mak index 80b981ce1c23..ff86d4e46cfb 100644 --- a/x11-toolkits/swt/files/patch-make_freebsd.mak +++ b/x11-toolkits/swt/files/patch-make_freebsd.mak @@ -1,5 +1,5 @@ ---- make_freebsd.mak.orig Wed Nov 15 16:34:25 2006 -+++ make_freebsd.mak Wed Nov 15 16:36:53 2006 +--- make_freebsd.mak.orig Tue Dec 12 11:49:31 2006 ++++ make_freebsd.mak Tue Dec 12 11:50:20 2006 @@ -9,7 +9,7 @@ # IBM Corporation - initial API and implementation #******************************************************************************* @@ -9,6 +9,24 @@ include make_common.mak +@@ -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 @@ -78,7 +78,7 @@ -fPIC \ -I. \ |