. Replace some hardwired /usr/X11R6 instances with X11BASE. [1]

. Replace one hardwired /usr/local instance with LOCALBASE.  This wasn't
  a problem since the port Makefile overrode that variable anyway.
. Small Makefile restructure to keep related variables in one place.

Pointed out by:	pointyhat (via kris) [1]

4 files changed, 73 insertions, 13 deletions

diff --git a/java/jdk13/Makefile b/java/jdk13/Makefile
index 46459bebf0dd..0366ce84bb32 100644
--- a/java/jdk13/Makefile
+++ b/java/jdk13/Makefile
@@ -106,8 +106,17 @@ HOTSPOT_TARGETS=compiler1 compiler2
 PLIST_SUB+=	HOTSPOT:="@comment "
 .endif
 
-LD_LIBRARY_PATH_FILES=	../src/solaris/javavm/runtime/javai_md.c \
-			../../hotspot1.3.1/src/os/linux/vm/os_linux.cpp
+LOCAL_FILES=	../src/solaris/javavm/runtime/javai_md.c \
+		../../hotspot1.3.1/src/os/linux/vm/os_linux.cpp
+PTHREAD_FILES=	common/Defs.gmk \
+		common/Program.gmk \
+		java/hpi/native/Makefile \
+		sun/cmm/Makefile \
+		../ext/plugin/build/solaris/GNUmakefile \
+		../../hotspot1.3.1/build/linux/platform_i486 \
+		../../hotspot1.3.1/build/bsd/makefiles/gcc.make \
+		../../hotspot1.3.1/build/linux/makefiles/vm.make
+X11_FILES=	../src/solaris/native/sun/awt/font/fontpath.c
 
 .include <bsd.port.pre.mk>
 
@@ -126,14 +135,6 @@ BUILD_DEPENDS+=	${JDK13DIR}/bin/javac:${PORTSDIR}/java/jbootstrap
 .endif
 .endif
 
-PTHREAD_FILES=	common/Defs.gmk \
-	common/Program.gmk \
-	java/hpi/native/Makefile \
-	sun/cmm/Makefile \
-	../ext/plugin/build/solaris/GNUmakefile \
-	../../hotspot1.3.1/build/linux/platform_i486 \
-	../../hotspot1.3.1/build/bsd/makefiles/gcc.make \
-	../../hotspot1.3.1/build/linux/makefiles/vm.make
 
 .if ${OSVERSION} < 460101 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500038 )
 EXTRACT_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
@@ -198,7 +199,7 @@ pre-patch:
 
 post-patch:
 	@${FIND} -d ${WRKDIR} -name SCCS -exec ${RM} -rf {} \;
-	@for file in ${LD_LIBRARY_PATH_FILES}; do \
+	@for file in ${LOCAL_FILES}; do \
 		${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:" \
 			${WRKSRC}/$${file}; \
 	done
@@ -208,6 +209,10 @@ post-patch:
 			-e "s:-lpthread:${PTHREAD_LIBS}:g" \
 			${WRKSRC}/$${file}; \
 	done
+	@for file in ${X11_FILES}; do \
+		${REINPLACE_CMD} -e "s:%%X11BASE%%:${X11BASE}:" \
+			${WRKSRC}/$${file}; \
+	done
 
 pre-build:
 .if defined(WITH_LINUX_BOOTSTRAP)
diff --git a/java/jdk13/files/patch-common::Defs-bsd.gmk b/java/jdk13/files/patch-common::Defs-bsd.gmk
index 67e497d01c5f..686183aca934 100644
--- a/java/jdk13/files/patch-common::Defs-bsd.gmk
+++ b/java/jdk13/files/patch-common::Defs-bsd.gmk
@@ -1,7 +1,7 @@
 $FreeBSD$
 
---- common/Defs-bsd.gmk.orig	Thu Dec 18 22:33:22 2003
-+++ common/Defs-bsd.gmk	Thu Dec 18 22:36:46 2003
+--- common/Defs-bsd.gmk.orig	Fri Dec  8 09:17:41 2006
++++ common/Defs-bsd.gmk	Fri Dec  8 10:53:36 2006
 @@ -32,9 +32,10 @@
  AR             = $(USRBIN_PATH)ar
  AS             = $(USRBIN_PATH)as
@@ -37,3 +37,21 @@ $FreeBSD$
  CXXFLAGS_DBG	= -g3 $(POPT)
  
  CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -DSOLARIS2 $(VERSION_DEFINES) \
+@@ -372,7 +373,7 @@
+ override LIBTHREAD               =
+ override MOOT_PRIORITIES         = true
+ override NO_INTERRUPTIBLE_IO     = true
+-override OPENWINHOME             = /usr/X11R6
++override OPENWINHOME             = $(X11BASE)
+ override OTHER_M4FLAGS           = -D__GLIBC__ -DGNU_ASSEMBLER
+ override PREPROCESS_BEFORE_AS    = true
+ override PRIVATIZE_JVM_SYMBOLS   = false
+@@ -416,7 +417,7 @@
+     CPPFLAGS_COMMON += -I$(MOTIF_DIR)/include
+     LDFLAGS_COMMON += -L$(MOTIF_DIR)/lib -L/usr/X11R6/lib # for libXp
+   else
+-    MOTIF_DIR=/usr/X11R6
++    MOTIF_DIR=$(X11BASE)
+   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
new file mode 100644
index 000000000000..625ddf294d3a
--- /dev/null
+++ b/java/jdk13/files/patch-j2sdk1.3.1-font-fontpath.c
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- ../src/solaris/native/sun/awt/font/fontpath.c.orig	Fri Dec  8 10:52:19 2006
++++ ../src/solaris/native/sun/awt/font/fontpath.c	Fri Dec  8 10:54:02 2006
+@@ -426,7 +426,7 @@
+ JNIEXPORT jstring JNICALL Java_sun_awt_font_NativeFontWrapper_getFontPath(JNIEnv *env, jclass obj, jboolean noType1)
+ {
+ #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";
+ #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
new file mode 100644
index 000000000000..48d25a056617
--- /dev/null
+++ b/java/jdk13/files/patch-j2sdk1.3.1-solaris-GNUmakefile
@@ -0,0 +1,24 @@
+$FreeBSD$
+
+--- ../ext/plugin/build/solaris/GNUmakefile.orig	Fri Dec  8 10:52:26 2006
++++ ../ext/plugin/build/solaris/GNUmakefile	Fri Dec  8 10:54:44 2006
+@@ -139,7 +139,7 @@
+ 
+ ifeq ($(findstring BSD,$(OS)), BSD)
+ 
+-INTL_DIR ?= /usr/local
++INTL_DIR ?= $(LOCALBASE)
+ 
+ OSDIR=solaris
+ OS_INCLUDE_DIR=bsd
+@@ -148,8 +148,8 @@
+ 
+ SVR4_DEFINE=
+ 
+-X11_INCLUDE=/usr/X11R6/include
+-X11_LIB=/usr/X11R6/lib
++X11_INCLUDE=$(X11BASE)/include
++X11_LIB=$(X11BASE)/lib
+ MOTIF_INCLUDE = $(MOTIF_DIR)/include
+ MOTIF_LIB     = $(MOTIF_DIR)/lib
+ INTL_INCLUDE  = $(INTL_DIR)/include