From 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Sat, 19 Apr 2008 17:56:05 +0000 Subject: - Remove unneeded dependency from gtk12/gtk20 [1] - Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG - Remove X11BASE support in favor of LOCALBASE or PREFIX - Use USE_LDCONFIG instead of INSTALLS_SHLIB - Remove unneeded USE_GCC 3.4+ Thanks to all Helpers: Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr, ehaupt, nox, itetcu, flz, pav PR: 116263 Tested on: pointyhat Approved by: portmgr (pav) --- x11-toolkits/swt/files/patch-make_freebsd.mak | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'x11-toolkits/swt/files/patch-make_freebsd.mak') diff --git a/x11-toolkits/swt/files/patch-make_freebsd.mak b/x11-toolkits/swt/files/patch-make_freebsd.mak index 4c61c9940da6..5c371d69a986 100644 --- a/x11-toolkits/swt/files/patch-make_freebsd.mak +++ b/x11-toolkits/swt/files/patch-make_freebsd.mak @@ -14,7 +14,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 ++GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L$(LOCALBASE)/lib $(XLIB64) -lXtst CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc @@ -23,7 +23,7 @@ GLXCFLAGS = -GLXLIBS = -shared -fPIC -L/usr/X11R6/lib -lGL -lGLU -lm -+GLXLIBS = -shared -fPIC -L$(X11BASE)/lib -lGL -lGLU -lm ++GLXLIBS = -shared -fPIC -L$(LOCALBASE)/lib -lGL -lGLU -lm # Uncomment for Native Stats tool #NATIVE_STATS = -DNATIVE_STATS @@ -31,7 +31,7 @@ -DFREEBSD -DGTK \ -I$(JAVA_HOME)/include \ -I$(JAVA_HOME)/include/freebsd \ -+ -I$(X11BASE)/include \ ++ -I$(LOCALBASE)/include \ -fPIC \ ${SWT_PTR_CFLAGS} LIBS = -shared -fPIC -- cgit v1.2.3