These are some patches I, Dr. Thomas Orgis , need to get working builds of pkgsrc on our systems at the University of Hamburg. I put them up here for anyone interested to grab, until they are integrated upstream.