Swedish/Finnish XFree86 keymap for iMac rev.D?

[Martin-Éric Racine <q-funk@pp.fishpool.fi>]

Greetings,

I'm having problems finding the proper keymap for my iMac rev.D (with the
original, narrow USB keyboard) to use XFree.  

I already found the exact right keymap for virtual consoles in console-data
(/usr/share/keymaps/i386/qwerty/mac-usb-fi-latin1.kmap.gz) and this works well,
but the following settings fail on XFree:

Section "InputDevice"
        Identifier      "Generic Keyboard"
        Driver          "keyboard"
        Option          "CoreKeyboard"
        Option          "XkbRules"      "xfree86"
        Option          "XkbModel"      "macintosh"
        Option          "XkbLayout"     "fi"
EndSection

Of what I can tell, this is because these rules assume that I would be using a
full-size Pro keyboard, which is why AltGr is missing and the overall keymap
conflicts with the one from console-data, for all meta keys except CTRL, and
several deadkeys appear to be missing.

Does anyone have a solution for this?  Thanks!

-- 
Martin-Éric Racine
http://www.pp.fishpool.fi/~q-funk/