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

6 files changed, 13 insertions, 13 deletions

diff --git a/java/jdk14/files/patch-common::Defs-bsd.gmk b/java/jdk14/files/patch-common::Defs-bsd.gmk
index 62700f5e915d..9961a41e5476 100644
--- a/java/jdk14/files/patch-common::Defs-bsd.gmk
+++ b/java/jdk14/files/patch-common::Defs-bsd.gmk
@@ -35,7 +35,7 @@ $FreeBSD$
  override MOOT_PRIORITIES         = true
  override NO_INTERRUPTIBLE_IO     = false
 -override OPENWIN_HOME            = /usr/X11R6
-+override OPENWIN_HOME            = $(X11BASE)
++override OPENWIN_HOME            = $(LOCALBASE)
  override OPENWIN_LIB             = $(OPENWIN_HOME)/lib
  override OTHER_M4FLAGS           = -DGNU_ASSEMBLER
  override SUN_CMM_SUBDIR          =
diff --git a/java/jdk14/files/patch-deploy::common::Defs-bsd.gmk b/java/jdk14/files/patch-deploy::common::Defs-bsd.gmk
index f1e910795a6c..6d002d730646 100644
--- a/java/jdk14/files/patch-deploy::common::Defs-bsd.gmk
+++ b/java/jdk14/files/patch-deploy::common::Defs-bsd.gmk
@@ -7,7 +7,7 @@ $FreeBSD$
  CLASSPATH_SEP  = $(CLASSPATH_SEPARATOR)
  PATH_SEP       = /
 -X11DIR         = /usr/X11R6
-+X11DIR         = $(X11BASE)
++X11DIR         = $(LOCALBASE)
  ifneq (,$(filter-out NetBSD DragonFly,$(TRUE_PLATFORM)))
  LIBS           = -L$(X11DIR)/lib -lX11
  else
diff --git a/java/jdk14/files/patch-j2se::awt::fontpath.c b/java/jdk14/files/patch-j2se::awt::fontpath.c
index 0c940b145a94..502c7a751375 100644
--- a/java/jdk14/files/patch-j2se::awt::fontpath.c
+++ b/java/jdk14/files/patch-j2se::awt::fontpath.c
@@ -10,10 +10,10 @@ $FreeBSD$
 -          "/usr/X11R6/lib/X11/fonts/TrueType:"
 -          "/usr/X11R6/lib/X11/fonts/tt:"
 -          "/usr/share/fonts/ja/TrueType";
-+    ptr = "%%X11BASE%%/lib/X11/fonts/Type1:"
-+          "%%X11BASE%%/lib/X11/fonts/TrueType:"
-+          "%%X11BASE%%/lib/X11/fonts/tt:"
-+          "%%X11BASE%%/fonts/ja/TrueType";
++    ptr = "%%LOCALBASE%%/lib/X11/fonts/Type1:"
++          "%%LOCALBASE%%/lib/X11/fonts/TrueType:"
++          "%%LOCALBASE%%/lib/X11/fonts/tt:"
++          "%%LOCALBASE%%/fonts/ja/TrueType";
  #elif defined( HEADLESS )
      ptr = getSolarisFontLocations(env, (int) (noType1==JNI_TRUE));
  #elif SCAN_FONT_DIRS
diff --git a/java/jdk14/files/patch-plugin::common::config.gmk b/java/jdk14/files/patch-plugin::common::config.gmk
index d8a025a8d336..95e1c36717aa 100644
--- a/java/jdk14/files/patch-plugin::common::config.gmk
+++ b/java/jdk14/files/patch-plugin::common::config.gmk
@@ -6,16 +6,16 @@ $FreeBSD$
  
  ifeq ($(PLATFORM), bsd)
    PLUGIN_PLATFORM_SRC := $(PLUGIN_TOP)/src/plugin/src/solaris
--  X11BASE = /usr/X11R6
-   OTHER_LDFLAGS = -L$(X11BASE)/lib
+-  LOCALBASE = /usr/X11R6
+   OTHER_LDFLAGS = -L$(LOCALBASE)/lib
    ifeq (,$(filter-out DragonFly NetBSD,$(TRUE_PLATFORM)))
-     OTHER_LDFLAGS += -Wl,-R$(X11BASE)/lib
+     OTHER_LDFLAGS += -Wl,-R$(LOCALBASE)/lib
 @@ -61,7 +60,7 @@
  
    # include search paths
    # XXXBSD: these should be defined in other place
--  CPPFLAGS1 += -I$(X11BASE)/include -I/usr/local/include
-+  CPPFLAGS1 += -I$(X11BASE)/include -I${LOCALBASE}/include
+-  CPPFLAGS1 += -I$(LOCALBASE)/include -I/usr/local/include
++  CPPFLAGS1 += -I$(LOCALBASE)/include -I${LOCALBASE}/include
  
    ifeq ($(TRUE_PLATFORM), FreeBSD)
        LDFLAGS_COMMON += -pthread
diff --git a/java/jdk14/files/pkg-deinstall.in b/java/jdk14/files/pkg-deinstall.in
index 54724931d7b1..94214557e4d9 100644
--- a/java/jdk14/files/pkg-deinstall.in
+++ b/java/jdk14/files/pkg-deinstall.in
@@ -12,7 +12,7 @@ fi
 # Remove the plugin
 
 # Plugin location variables
-BROWSERPLUGINDIR="%%X11BASE%%/lib/browser_plugins"
+BROWSERPLUGINDIR="%%LOCALBASE%%/lib/browser_plugins"
 JAVAPLUGINDIR="%%JRE_HOME%%/plugin/%%ARCH%%/ns610"
 PLUGIN=libjavaplugin_oji.so
 
diff --git a/java/jdk14/files/pkg-install.in b/java/jdk14/files/pkg-install.in
index 53fd8ef1b97c..a57551b91504 100644
--- a/java/jdk14/files/pkg-install.in
+++ b/java/jdk14/files/pkg-install.in
@@ -20,7 +20,7 @@ if [ "$2" = "POST-INSTALL" ]; then
 	fi
 
 	# Install the plugin
-	BROWSERPLUGINDIR="%%X11BASE%%/lib/browser_plugins"
+	BROWSERPLUGINDIR="%%LOCALBASE%%/lib/browser_plugins"
 	JAVAPLUGINDIR="${JRE_HOME}/plugin/%%ARCH%%/ns610"
 	PLUGIN=libjavaplugin_oji.so