java/143879: conflicting defines of SIGNORE in java/jdk1{5,6}

[Andriy Gapon]

Greg,

it looks like java/jdk15 should have an equivalent of this:
http://www.freebsd.org/cgi/cvsweb.cgi/ports/java/jdk16/files/patch-j2se-common-Defs-bsd.gmk?sortby=date

Differences between jdk15 and jdk16:
1. OS_VENDOR is spelled as !!! in jdk15
2. Not sure if the second hunk is needed in jdk15 (OPENWIN_HOME)

Without that, java/jdk15 build fails on recent stable/8 (amd64 if that matters) in
 interrupt_md.c with an error about conflicting definitions for sigignore (static
vs non-static).

So this is with what I ended up (sorry for the long lines):
--- /usr/obj/usr/ports/java/jdk15/work/j2se/make/common/Defs-bsd.gmk.bak
2010-02-13 12:40:09.777409660 +0200
+++ /usr/obj/usr/ports/java/jdk15/work/j2se/make/common/Defs-bsd.gmk	2010-02-15
18:09:26.281854411 +0200
@@ -423,6 +423,13 @@
 else
 override HAVE_SIGIGNORE          = false
 endif
+ifeq ($(TRUE_PLATFORM),FreeBSD)
+OS_RELDATE := $(shell sysctl kern.osreldate | cut -d' ' -f2)
+HAS_SIGIGNORE := $(shell if [ $(OS_RELDATE) -ge 800502 -a $(OS_RELDATE) -lt
900000 -o $(OS_RELDATE) -ge 900003 ]; then echo "1"; fi)
+ifeq ($(HAS_SIGIGNORE),1)
+override HAVE_SIGIGNORE          = true
+endif
+endif
 override LEX_LIBRARY             = -lfl
 ifeq ($(STATIC_CXX),true)
 override LIBCXX                  = -Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic

-- 
Andriy Gapon