I've meanwhile switched to ubuntu, and I had to install javacc, which was easy.
Then I still had to apply the attached patch for javacc to common-build.xml, and put the following line in ~/build.properties:
After that, these worked fine with Luis' patch applied from contrib/surround:
Since the patch does not change the tests of the surround parser the change to the .jj file still passed all the tests.
From the top directory:
also worked fine.
So, in all, this was a very nice excuse to reinstall javacc