That's astonishing. I've been to Singapore dozens of times and never noticed the NAAFI building. I'm guessing you stare at it from the Swissotel Stamford?
wub,
That's the one. I'm currently staying at Swissôtel Stamford and I went across yesterday to have a look. Very nicely restored, along with the drill hall and two other military buildings. All four have been cleverly incorporated into the new South Beach complex covering the whole block.
I'll post some photos when I get back home and download them from my camera.