- 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)

2 files changed, 4 insertions, 4 deletions

diff --git a/lang/caml-light/files/patch-ab b/lang/caml-light/files/patch-ab
index 6b5068407094..338db1e2cc21 100644
--- a/lang/caml-light/files/patch-ab
+++ b/lang/caml-light/files/patch-ab
@@ -51,14 +51,14 @@
  # (usually /usr/include; for SunOS with OpenLook, /usr/openwin/include)
  # Needed for the "libgraph" and "camltk" packages.
 -X11_INCLUDES=/usr/X11R6/include
-+X11_INCLUDES=${X11BASE}/include
++X11_INCLUDES=${LOCALBASE}/include
  #X11_INCLUDES=/usr/include/X11
  
  # The path to the directory containing the X11 libraries.
  # (usually /usr/lib; for SunOS with OpenLook, /usr/openwin/lib)
  # Needed for the "libgraph" and "camltk" packages.
 -X11_LIB=/usr/X11R6/lib
-+X11_LIB=${X11BASE}/lib
++X11_LIB=${LOCALBASE}/lib
  #X11_LIB=/usr/lib/X11
  
  # Name of the target architecture.
diff --git a/lang/caml-light/files/patch-contrib_libgraph_Makefile b/lang/caml-light/files/patch-contrib_libgraph_Makefile
index dfd6501e724c..705c0063f8ca 100644
--- a/lang/caml-light/files/patch-contrib_libgraph_Makefile
+++ b/lang/caml-light/files/patch-contrib_libgraph_Makefile
@@ -10,8 +10,8 @@
 -X11_INCLUDES=/usr/include
 -X11_LIB=/usr/lib
 -CPP=/lib/cpp -P
-+X11_INCLUDES=${X11BASE}
-+X11_LIB=${X11BASE}/lib
++X11_INCLUDES=${LOCALBASE}
++X11_LIB=${LOCALBASE}/lib
 +CPP=/usr/bin/cpp -P
  
 -BINDIR=/usr/local/bin