wine-devel,wine-staging: Fix msync & revbump

emulators/wine-devel/Portfile

@@ -12,7 +12,7 @@ github.tarball_from         archive
 name                        wine-devel
 conflicts                   wine-stable wine-staging wine-crossover
 set my_name                 wine
-revision                    0
+revision                    1
 platforms                   {darwin >= 19}
 set branch                  [lindex [split ${version} .] 0].x
 license                     LGPL-2.1+
@@ -67,7 +67,7 @@ patchfiles-append \
 
 # Some required hacks to make wine work better on macOS & Rosetta2
 patchfiles-append \
-    macos_hacks.diff
+    0002-macos_hacks.diff
 
 # wine requires the program specified in INSTALL to create intermediate
 # directories; /usr/bin/install doesn't.
@@ -116,7 +116,7 @@ configure.args \
     --without-wayland \
     --without-x
 
-configure.env.x86_64-append ac_cv_lib_soname_vulkan=
+configure.env-append        ac_cv_lib_soname_vulkan=
 
 # We need to tell the linker to add MacPorts to the rpath stack.
 configure.ldflags-append    -Wl,-rpath,${compiler.library_path}
@@ -153,7 +153,7 @@ subport wine-staging {
     # Applying staging after other patchfiles to avoid problems
     post-patch {
         system -W ${worksrcpath} \
-            "${workpath}/wine-staging-${staging_version}/staging/patchinstall.py --all -W ntdll-Syscall_Emulation -W winemac.drv-no-flicker-patch"
+            "${workpath}/wine-staging-${staging_version}/staging/patchinstall.py --all -W eventfd_synchronization -W ntdll-Syscall_Emulation -W winemac.drv-no-flicker-patch"
         system -W ${worksrcpath} \
             "patch -p1 < ${filespath}/1001-staging-msync.diff"
     }
@@ -212,10 +212,6 @@ configure.ldflags-delete    -L${compiler.library_path}
 configure.optflags          -g -O2
 configure.env-append        "CROSSCFLAGS=${configure.optflags}"
 
-# Needed due to commit
-# https://gitlab.winehq.org/wine/wine/-/commit/b21813fa135995449b7a4ba19b561d6faf087ee8
-configure.cflags-append     -Wno-error=incompatible-function-pointer-types
-
 # Were only installing wine not the development files
 destroot.target             install-lib