did the format of xorg.mk change?

[Hisashi T Fujinaka <htodd%twofifty.com@localhost>]

I'm having all sorts of trouble building on i386-current:

sudo pkg_chk -u
pkg_install-20060418: version mismatch - pkg_install-20060313
make: "/usr/pkgsrc/pkgtools/x11-links/xorg.mk" line 43: Malformed conditional 
(!empty(IS_BUILTIN.xproto:M[yY][eE][sS]))
make: "/usr/pkgsrc/pkgtools/x11-links/Makefile" line 42: if-less else
make: "/usr/pkgsrc/pkgtools/x11-links/Makefile" line 42: Need an operator
make: "../../x11/compositeproto/../../x11/compositeproto/builtin.mk" line 67: 
warning: duplicate script for target "compositeext-symlink-pc" ignored
make: "../../x11/compositeproto/../../x11/compositeproto/builtin.mk" line 67: 
warning: using previous script for "compositeext-symlink-pc" defined here
make: "../../x11/fixesproto/../../x11/fixesproto/builtin.mk" line 68: warning: 
duplicate script for target "fixesext-symlink-pc" ignored
make: "../../x11/fixesproto/../../x11/fixesproto/builtin.mk" line 68: warning: 
using previous script for "fixesext-symlink-pc" defined here
make: "/usr/pkgsrc/pkgtools/x11-links/Makefile" line 44: if-less endif
make: "/usr/pkgsrc/pkgtools/x11-links/Makefile" line 44: Need an operator
make: 
"../../mk/wrapper/../../mk/buildlink3/../../x11/compositeproto/../../mk/wrapper/../../mk/buildlink3/../../x11/compositeproto/builtin.mk" 
line 67: warning: duplicate script for target "compositeext-symlink-pc" ignored
make: 
"../../mk/wrapper/../../mk/buildlink3/../../x11/compositeproto/../../x11/compositeproto/builtin.mk" 
line 67: warning: using previous script for "compositeext-symlink-pc" defined 
here
make: 
"../../mk/wrapper/../../mk/buildlink3/../../x11/fixesproto/../../mk/wrapper/../../mk/buildlink3/../../x11/fixesproto/builtin.mk" 
line 68: warning: duplicate script for target "fixesext-symlink-pc" ignored
make: 
"../../mk/wrapper/../../mk/buildlink3/../../x11/fixesproto/../../x11/fixesproto/builtin.mk" 
line 68: warning: using previous script for "fixesext-symlink-pc" defined here
make: Fatal errors encountered -- cannot continue
eval:  make: stopped in /usr/pkgsrc/pkgtools/x11-links: not found


--
Hisashi T Fujinaka - htodd%twofifty.com@localhost
BSEE(6/86) + BSChem(3/95) + BAEnglish(8/95) + MSCS(8/03) + $2.50 = latte