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

4 files changed, 13 insertions, 13 deletions

diff --git a/java/jdk13/Makefile b/java/jdk13/Makefile
index 4b5e54b7293b..c63b3a82cf2a 100644
--- a/java/jdk13/Makefile
+++ b/java/jdk13/Makefile
@@ -20,21 +20,21 @@ COMMENT=	Java Development Kit 1.3
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		zip:${PORTSDIR}/archivers/zip \
-		${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif
+		${LOCALBASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif
 .if defined(WITH_PLUGIN)
 FORBIDDEN=	Vulnerabilities in the browser plugin
 USE_GNOME+=	gtk12
 LIB_DEPENDS=	nspr4.1:$(PORTSDIR)/devel/nspr
 .endif
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper \
-		${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif \
-		${X11BASE}/lib/X11/fonts/URW/fonts.dir:${PORTSDIR}/x11-fonts/urwfonts
+		${LOCALBASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif \
+		${LOCALBASE}/lib/X11/fonts/URW/fonts.dir:${PORTSDIR}/x11-fonts/urwfonts
 
 .if defined(WITH_JAPANESE_FONTS)
-RUN_DEPENDS+=	${X11BASE}/lib/X11/fonts/TrueType/fonts.dir.kochi:${PORTSDIR}/japanese/kochi-ttfonts
+RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/TrueType/fonts.dir.kochi:${PORTSDIR}/japanese/kochi-ttfonts
 .endif
 .if defined(WITH_RUSSIAN_FONTS)
-RUN_DEPENDS+=	${X11BASE}/lib/X11/fonts/webfonts/fonts.dir:${PORTSDIR}/x11-fonts/webfonts
+RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/webfonts/fonts.dir:${PORTSDIR}/x11-fonts/webfonts
 .endif
 .if defined(WITH_CHINESE_FONTS)
 RUN_DEPENDS+=	${LOCALBASE}/share/fonts/TrueType/arphic:${PORTSDIR}/chinese/arphicttf
@@ -53,8 +53,8 @@ USE_XORG=	ice sm x11 xext xp xt xtst
 RESTRICTED=	"Redistribution of pre-compiled binaries is not permitted"
 NO_CDROM=	"Redistribution of pre-compiled binaries is not permitted"
 MAKE_ENV=	ALT_BOOTDIR="${JDK13DIR}" \
-		ALT_MOTIF_DIR="${X11BASE}" \
-		OPENWINHOME="${X11BASE}" \
+		ALT_MOTIF_DIR="${LOCALBASE}" \
+		OPENWINHOME="${LOCALBASE}" \
 		SYS_CFLAGS="${CFLAGS}" \
 		CLASSPATH="" \
 		LD_LIBRARY_PATH="" \
@@ -204,7 +204,7 @@ post-patch:
 			${WRKSRC}/$${file}; \
 	done
 	@for file in ${X11_FILES}; do \
-		${REINPLACE_CMD} -e "s:%%X11BASE%%:${X11BASE}:" \
+		${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:" \
 			${WRKSRC}/$${file}; \
 	done
 
diff --git a/java/jdk13/files/patch-common::Defs-bsd.gmk b/java/jdk13/files/patch-common::Defs-bsd.gmk
index 686183aca934..218f8124fc5d 100644
--- a/java/jdk13/files/patch-common::Defs-bsd.gmk
+++ b/java/jdk13/files/patch-common::Defs-bsd.gmk
@@ -42,7 +42,7 @@ $FreeBSD$
  override MOOT_PRIORITIES         = true
  override NO_INTERRUPTIBLE_IO     = true
 -override OPENWINHOME             = /usr/X11R6
-+override OPENWINHOME             = $(X11BASE)
++override OPENWINHOME             = $(LOCALBASE)
  override OTHER_M4FLAGS           = -D__GLIBC__ -DGNU_ASSEMBLER
  override PREPROCESS_BEFORE_AS    = true
  override PRIVATIZE_JVM_SYMBOLS   = false
@@ -51,7 +51,7 @@ $FreeBSD$
      LDFLAGS_COMMON += -L$(MOTIF_DIR)/lib -L/usr/X11R6/lib # for libXp
    else
 -    MOTIF_DIR=/usr/X11R6
-+    MOTIF_DIR=$(X11BASE)
++    MOTIF_DIR=$(LOCALBASE)
    endif
  endif
  ifdef ALT_MOTIF_DIR
diff --git a/java/jdk13/files/patch-j2sdk1.3.1-font-fontpath.c b/java/jdk13/files/patch-j2sdk1.3.1-font-fontpath.c
index 625ddf294d3a..c946715d313a 100644
--- a/java/jdk13/files/patch-j2sdk1.3.1-font-fontpath.c
+++ b/java/jdk13/files/patch-j2sdk1.3.1-font-fontpath.c
@@ -7,7 +7,7 @@ $FreeBSD$
  {
  #ifndef __solaris__
 -   char *ptr   = "/usr/X11R6/lib/X11/fonts/Type1:/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/tt";
-+   char *ptr   = "%%X11BASE%%/lib/X11/fonts/Type1:%%X11BASE%%/lib/X11/fonts/TrueType:%%X11BASE%%/lib/X11/fonts/tt";
++   char *ptr   = "%%LOCALBASE%%/lib/X11/fonts/Type1:%%LOCALBASE%%/lib/X11/fonts/TrueType:%%LOCALBASE%%/lib/X11/fonts/tt";
  #else
      char *ptr   = getSolarisFontLocations((int) (noType1==JNI_TRUE));
  #endif
diff --git a/java/jdk13/files/patch-j2sdk1.3.1-solaris-GNUmakefile b/java/jdk13/files/patch-j2sdk1.3.1-solaris-GNUmakefile
index 48d25a056617..2b1f220208e2 100644
--- a/java/jdk13/files/patch-j2sdk1.3.1-solaris-GNUmakefile
+++ b/java/jdk13/files/patch-j2sdk1.3.1-solaris-GNUmakefile
@@ -17,8 +17,8 @@ $FreeBSD$
  
 -X11_INCLUDE=/usr/X11R6/include
 -X11_LIB=/usr/X11R6/lib
-+X11_INCLUDE=$(X11BASE)/include
-+X11_LIB=$(X11BASE)/lib
++X11_INCLUDE=$(LOCALBASE)/include
++X11_LIB=$(LOCALBASE)/lib
  MOTIF_INCLUDE = $(MOTIF_DIR)/include
  MOTIF_LIB     = $(MOTIF_DIR)/lib
  INTL_INCLUDE  = $(INTL_DIR)/include