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

. Small Makefile restructure to keep related variables in one place.
. Trim the ancient bootstrapping options.
. Add ipv6 to CATEGORIES if its enabled. [2]

PR:		106129 [2]
Submitted by:	Janos Mohacsi <janos.mohacsi@bsd.hu> [2]
Pointed out by:	pointyhat (via kris) [1]

java/jdk14/Makefile

@@ -54,20 +54,17 @@ LATEST_LINK=	jdk14
 SUN_LINUX_JDK_VERSION=  1.4.2
 
 .if !defined(WITH_LINUX_BOOTSTRAP)
-NATIVE_BOOTSTRAP_JDKS=	${LOCALBASE}/jdk1.4.2 \
-			${LOCALBASE}/jdk1.4.1
+NATIVE_BOOTSTRAP_JDKS=	${LOCALBASE}/jdk1.4.2
 .endif
 
-LINUX_BOOTSTRAP_JDKS=	${LOCALBASE}/linux-sun-jdk1.4.2_03 \
-			${LOCALBASE}/linux-sun-jdk1.4.2_02 \
-			${LOCALBASE}/linux-sun-jdk1.4.2_01 \
-			${LOCALBASE}/linux-sun-jdk1.4.2 \
-			${LOCALBASE}/linux-sun-jdk1.4.1_02 \
-			${LOCALBASE}/linux-sun-jdk1.4.1_01 \
-			${LOCALBASE}/linux-sun-jdk1.4.1
+LINUX_BOOTSTRAP_JDKS=	${LOCALBASE}/linux-sun-jdk1.4.2
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_IPV6)
+CATEGORIES+=	ipv6
+.endif
+
 .if defined(WITH_POLICY)
 DISTFILES+=	${POLICYFILE}
 EXTRACT_ONLY+=	${POLICYFILE}
@@ -147,6 +144,7 @@ EXTRA_PATCHES+=	${PATCHDIR}/disable-ipv6.patch
 PKGNAMESUFFIX=	-minimal
 .endif
 
+LOCAL_FILES=	../../hotspot/src/os/bsd/vm/os_bsd.cpp
 PTHREAD_FILES=	../../hotspot/build/bsd/makefiles/vm.make \
 		../../j2se/make/common/Defs.gmk	\
 		../../j2se/make/common/Program.gmk \
@@ -156,8 +154,7 @@ PTHREAD_FILES=	../../hotspot/build/bsd/makefiles/vm.make \
 		../../j2se/make/java/net/Makefile \
 		../../deploy/make/common/Defs-bsd.gmk \
 		../../deploy/make/plugin/common/config.gmk
-
-LD_LIBRARY_PATH_FILES=	../../hotspot/src/os/bsd/vm/os_bsd.cpp
+X11_FILES=	../../j2se/src/solaris/native/sun/awt/fontpath.c
 
 # Check for JDK sources and patch file
 .if !defined(PACKAGE_BUILDING) && (!exists(${DISTDIR}/${SCSL_SRCFILE}) || !exists(${DISTDIR}/${SCSL_BINFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})) || !exists(${DISTDIR}/${PATCHSETFILE}))#{
@@ -244,7 +241,7 @@ pre-patch:
 		${PATCH} -p0 < ${WRKDIR}/jdk14.patches
 
 post-patch:
-	@for file in ${LD_LIBRARY_PATH_FILES}; do \
+	@for file in ${LOCAL_FILES}; do \
 		${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:" \
 			${WRKSRC}/$${file}; \
 	done
@@ -252,6 +249,10 @@ post-patch:
 		${REINPLACE_CMD} -e "s:-lkse:${PTHREAD_LIBS}:g" \
 			${WRKSRC}/$${file}; \
 	done
+	@for file in ${X11_FILES}; do \
+		${REINPLACE_CMD} -e "s:%%X11BASE%%:${X11BASE}:" \
+			${WRKSRC}/$${file}; \
+	done
 
 pre-build-linuxcheck:
 .if defined(WITH_LINUX_BOOTSTRAP)

java/jdk14/files/patch-common::Defs-bsd.gmk

@@ -1,8 +1,8 @@
 $FreeBSD$
 
---- ../../j2se/make/common/Defs-bsd.gmk.orig	Fri Oct 10 09:50:48 2003
-+++ ../../j2se/make/common/Defs-bsd.gmk	Fri Oct 10 09:54:35 2003
-@@ -162,7 +162,7 @@
+--- ../../j2se/make/common/Defs-bsd.gmk.orig	Fri Dec  8 11:50:23 2006
++++ ../../j2se/make/common/Defs-bsd.gmk	Fri Dec  8 11:58:29 2006
+@@ -192,7 +192,7 @@
  ifeq ($(TRUE_PLATFORM), NetBSD)
  DEVTOOLS_PATH = /usr/pkg/bin/
  else
@@ -11,3 +11,12 @@ $FreeBSD$
  endif
  # Allow the user to override the default value...
  ifdef ALT_DEVTOOLS_PATH
+@@ -443,7 +443,7 @@
+ override LIBTHREAD               =
+ override MOOT_PRIORITIES         = true
+ override NO_INTERRUPTIBLE_IO     = false
+-override OPENWIN_HOME            = /usr/X11R6
++override OPENWIN_HOME            = $(X11BASE)
+ override OPENWIN_LIB             = $(OPENWIN_HOME)/lib
+ override OTHER_M4FLAGS           = -DGNU_ASSEMBLER
+ override SUN_CMM_SUBDIR          =

java/jdk14/files/patch-deploy::common::Defs-bsd.gmk

@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- ../../deploy/make/common/Defs-bsd.gmk.orig	Fri Dec  8 11:55:05 2006
++++ ../../deploy/make/common/Defs-bsd.gmk	Fri Dec  8 11:55:28 2006
+@@ -14,7 +14,7 @@
+ JUMP_EXE       = $(PROTO_DIR)/javawsbin$(SUFFIX)
+ CLASSPATH_SEP  = $(CLASSPATH_SEPARATOR)
+ PATH_SEP       = /
+-X11DIR         = /usr/X11R6
++X11DIR         = $(X11BASE)
+ ifneq (,$(filter-out NetBSD DragonFly,$(TRUE_PLATFORM)))
+ LIBS           = -L$(X11DIR)/lib -lX11
+ else

java/jdk14/files/patch-j2se::awt::fontpath.c

@@ -0,0 +1,19 @@
+$FreeBSD$
+
+--- ../../j2se/src/solaris/native/sun/awt/fontpath.c.orig	Fri Dec  8 11:59:25 2006
++++ ../../j2se/src/solaris/native/sun/awt/fontpath.c	Fri Dec  8 12:00:06 2006
+@@ -495,10 +495,10 @@
+     char *ptr;
+ 
+ #if defined(__linux__) || defined(_ALLBSD_SOURCE)
+-    ptr = "/usr/X11R6/lib/X11/fonts/Type1:"
+-          "/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";
+ #elif defined( HEADLESS )
+     ptr = getSolarisFontLocations(env, (int) (noType1==JNI_TRUE));
+ #elif SCAN_FONT_DIRS