firefox build error after upgrade to 6.0_beta

[Mayuresh <mayuresh%acm.org@localhost>]

After upgrading to 6.0 BETA, existing firefox installation gives the
following error:
/usr/lib/librt.so.0: Undefined symbol "__cerror" (symnum = 12)

I see a PR for this already.


When trying to build firefox afresh get following error:
configure: error: Could not compile basic X program.

Checked config.log to investigate above error. 

configure:25535: gcc -c -Wall -W -Wno-unused -Wpointer-arith
-Wdeclaration-after-statement -Wcast-align -W -O2 -I/usr/include
-I/usr/pkg/include -I/usr/X11R7/include
-I/usr/X11R7/include/freetype2 -fno-strict-aliasing -Dunix -pthread
-ffunction-sections -fdata-sections -pipe
-I/usr/X11R7/include -I/usr/include -I/usr/pkg/include -I/usr/X11R7/include
-I/usr/X11R7/include/freetype2 conftest.c 1>&5
In file included from configure:25522:0:
/usr/pkgsrc/www/firefox/work/.buildlink/include/X11/extensions/XShm.h:33:32:
fatal error: X11/extensions/shm.h: No such file or directory


Actually smh.h is present:
-r--r--r--  1 root  wheel  1645 Feb 17 12:28
/usr/X11R7/include/X11/extensions/shm.h


So not sure why above error occurs.
Am I missing something?

Mayuresh.