Cleaning up during uninstall and submitting Portfile

[David Osguthorpe]

> 
> Would you still care to send a patch? :-)
> 

patch sent as ticket 19176

note I kept as close as possible to the existing code and its variable names


David