Now that tools can build several versions of the same software, we
can have -devel depend on a different one than the release.  This
helps with prebuilt testing and easier testing for interested parties.

Should your manual upgrade break at the moment, the easiest solution is:

    # make upgrade CORE_OPENVPN=23