Correct way to install apache on OpenBSD 3.1

Hello everyone,
I wanted to install apache 1.3.26 (latest version) on OpenBSD 3.1. Since the default version that comes with the OS is 1.3.24, I downloaded the sources from apache.org and installed as follows. Since OpenBSD comes with apache by default and since I didn't want two versions of httpd, apachectl, conf files etc. lying around my file system, I used:

./configure --with-layout=OpenBSD \
... rest of options

instead of what I normally do:
./ configure --prefix=/usr/local \
... rest of options

This way, I figured that it would keep only one copy of all the files and I could start up the httpd daemon in rc.conf instead of rc.local. However, in retrospect, there is a problem with this approach. The next time I upgrade the system (make build), won't the latest apache get overwritten by the version that comes with OpenBSD?

So I'm wondering what the best solution to this problem would be:
(a) Keep apache installed with OpenBSD layout. From now on, upgrade the system by using patch files only instead of cvsup (I don't really want to do this)
(b) Keep apache installed with OpenBSD layout. Upgrade the system and then reinstall apache. I have all the apache files compiled and ready, so it's probably just a matter of typing make install from /usr/local/src/apache after upgrading the system.
(c) Install apache using a custom layout, where I put all the binaries and libexecs under the /usr/local tree, but keep the conf, htdocs, cgi-bin etc as per the layout of OpenBSD. This will keep two versions of binaries, libs etc. on the system though.
(d) Anything you can suggest.

I'm tending to lean towards option (c) now, since I'd like to follow the file hierarchy standards, but I was wondering what anyone else thinks. Bear in mind that I'm just starting with OpenBSD, so if I'm doing something wrong, don't hesitate to plant a swift kick and tell me what I just screwed up .

Choose B because next time you upgrade your system a newer version is probably available, who knows, maybe 1.3.28 by that time.
If you choose C make sure your custom layout doesn't conflict with OpenBSD layout.

Cool, thanks. Right now I'm running with option B and I think I'll continue to do so. I'll just add it to my list of things to do, the next time I do a make build .