Fetch new cbits from upstream

PortMidi.cabal

@@ -1,6 +1,6 @@
 name:          PortMidi
 version:       0.2.0.0
-Cabal-Version: >= 1.6
+Cabal-Version: >= 1.8
 build-type:    Simple
 license:       BSD3
 license-file:  LICENSE
@@ -14,20 +14,24 @@ description:   A Haskell binding for PortMedia/PortMidi
 extra-source-files:
         README.txt
         CHANGELOG.md
-        portmidi/pm_common/portmidi.h
-        portmidi/pm_common/pmutil.h
         portmidi/pm_common/pminternal.h
+        portmidi/pm_common/pmutil.h
+        portmidi/pm_common/portmidi.h
         portmidi/pm_linux/pmlinux.h
         portmidi/pm_linux/pmlinuxalsa.h
-        portmidi/pm_mac/pmmac.h
+        portmidi/pm_linux/pmlinuxnull.h
         portmidi/pm_mac/pmmacosxcm.h
         portmidi/pm_win/pmwinmm.h
         portmidi/porttime/porttime.h
+
 Library
   exposed-modules: Sound.PortMidi
   other-modules:   Sound.PortMidi.DeviceInfo
   build-depends:   base >= 4.8 && < 5
   extensions:      CPP, ForeignFunctionInterface
+  if arch(i386) || arch(x86_64)
+      cc-options:   -msse2
+
   if os(linux) || os(freebsd)
     include-dirs: portmidi/pm_common portmidi/pm_linux portmidi/porttime
     cc-options: -DPMALSA
@@ -36,20 +40,20 @@ Library
           portmidi/pm_common/portmidi.c
           portmidi/pm_linux/pmlinux.c
           portmidi/pm_linux/pmlinuxalsa.c
+          portmidi/pm_linux/pmlinuxnull.c
           portmidi/porttime/porttime.c
           portmidi/porttime/ptlinux.c
    extra-libraries: asound
   else
     if os(darwin)
      include-dirs: portmidi/pm_common portmidi/pm_mac portmidi/porttime
-     cc-options:   -msse2
      c-sources:
           portmidi/pm_common/pmutil.c
           portmidi/pm_common/portmidi.c
           portmidi/pm_mac/pmmac.c
           portmidi/pm_mac/pmmacosxcm.c
           portmidi/porttime/porttime.c
-          portmidi/porttime/ptmacosx_mach.c
+          portmidi/porttime/ptmacosx_cf.c
      frameworks: CoreMIDI CoreFoundation CoreAudio
     else
       if os(mingw32)