update of OO to 2.0.4_m1

[Sean McNeil]

As many people have noticed and Maho has indicated, OO-2.0 was update
but apparently without much concern as to whether it actually builds.
So far, we have the following observations:

on i386 and amd64 platforms, it fails because patch-i* changes appear to
be obsolete and either need to be updated or removed if no longer
necessary.

on 6.1-STABLE as of 601103, the prototype for re-entrant routine
gethostbyname_r was added to netdb.h.  This requires changes to code
that look for -CURRENT 700015 to instead look for 601103.  There are
some emails about this already with a patch.

After removing patch-i* and adding 601103 changes, OO still fails to
build on amd64.  It looks like a problem with the sleepycat JNI
interface.  I get

java.lang.IllegalArgumentException: Invalid argument
        at com.sleepycat.db.db_javaJNI.Db_open0(Native Method)
        at com.sleepycat.db.Db.open0(Db.java:4499)
        at com.sleepycat.db.Db.open(Db.java:491)
        at com.sun.star.help.HelpLinker.link(HelpLinker.java:370)
        at com.sun.star.help.HelpLinker.main(HelpLinker.java:228)
dmake:  Error code 1, while making
'../../unxfbsdx.pro/bin/sbasic_en-US.zip'
'---* tg_merge.mk *---'

ERROR: Error 65280 occurred while
making /usr/ports/editors/openoffice.org-2.0/work/OOD680_m1/helpcontent2/util/sbasic


IMHO, OO-2.0 should not have been updated without first verifying that
it (at a minimum) builds on both supported platforms (i.e. i386 and
amd64).  It takes forever for OO to build and causes some consternation
when doing a portupgrade.

Cheers,
Sean