ports/java/jdk14/files/patch-common::Defs-bsd.gmk
Greg Lewis 4da04f5537 . 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]
2006-12-08 22:36:16 +00:00

22 lines
764 B
Text

$FreeBSD$
--- ../../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
-DEVTOOLS_PATH = /usr/local/bin/
+DEVTOOLS_PATH = ${LOCALBASE}/bin/
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 =