plconv: incorporate changes from subversion r94537

https://trac.macports.org/changeset/94537