add patch 25


git-svn-id: http://svn.midnightbsd.org/svn/mports@17492 c872e0db-cc11-e311-ab8b-002590791c19
partially reapply the options patch


git-svn-id: http://svn.midnightbsd.org/svn/mports@17493 c872e0db-cc11-e311-ab8b-002590791c19