threadlib.h has been deprecated from -current, so now I get a build error
from openoffice:

/usr/pkgsrc/misc/openoffice/work.i386/.x11-buildlink/include/X11/Xthreads.h:204:23: threadlib.h: No such file or directory


This is this morning's pkgsrc cvs - in Xthread.h there is:

#ifdef USE_NBSD_THREADLIB 
/*
 * NetBSD threadlib support is intended for thread safe libraries.
 * This should not be used for general client programming.
 */ 
#include <threadlib.h>
typedef thr_t xthread_t; 
...

so does it seem that USE_NBSD_THREADLIB should no longer be defined?
.. but I can't spot where it is defined.. not in pkgsrc/mk anyway..
yet it does appear in work.i386/.work.log

work.i386/.work.log:[*] /usr/pkgsrc/misc/openoffice/work.i386/.wrapper/bin/gcc -M -I../../include -I/usr/X11R6/include -DCSRG_BASED -DFUNCPROTO=15 -DNARROWPROTO -DXTHREADS -D_REENTRANT -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI -DUSE_NBSD_THREADLIB -D_NO_LONGLONG -D_STRINGS_H AlibAsync.c Alibint.c AuErrDes.c AuFreeEData.c CloseSvr.c ConnSvr.c CrFlow.c DesFlow.c Flush.c HandleEv.c IDOfEvent.c KillClient.c NextEvent.c OpenSvr.c ReqEvent.c ScanEvents.c ScanTEvent.c SetElState.c GetElState.c SetElement.c GetElement.c SvrName.c Sync.c ReadEl.c WriteEl.c Util.c SetElParms.c GetDevAttr.c SetDevAttr.c CrBucket.c DesBucket.c GetBucAttr.c ListBucket.c ListDevice.c GetSvrTime.c SetClsDwnMd.c GetClsDwnMd.c convutil.c fileutil.c monitor.c bcache.c globals.c Astreams.c ErrHndlr.c snd.c wave.c voc.c aiff.c 8svx.c sound.c soundlib.c mutex.c
work.i386/.work.log:    (arg-source) push: -DUSE_NBSD_THREADLIB
work.i386/.work.log:    (logic) pop:  -DUSE_NBSD_THREADLIB
work.i386/.work.log:    (logic) to:   -DUSE_NBSD_THREADLIB
work.i386/.work.log:    (logic) push: -DUSE_NBSD_THREADLIB
work.i386/.work.log:    (cmd-sink) pop: -DUSE_NBSD_THREADLIB


Thoughts?

Cheers,

Patrick