Ticket #21496: Portfile.diff

Portfile

@@ -66 +66 @@
     --enable-unicode \
     --enable-display \
     --enable-monolithic
+    
+variant universal description {builds 32/64-bit Cocoa version} {
+        configure.args-delete --with-sdl
+        configure.args-append   --without-sdl
+        configure.args-delete   --with-mac
+        configure.args-append   --with-osx_cocoa
+        configure.args-append --with-macosx-version-min=10.5
+        
+        depends_lib-delete              port:libsdl
+        depends_lib-delete              port:libsdl_mixer
+}
 
 set installtype         release
 #set contrib            "gizmos stc ogl"
 
 build.target
 
+post-configure {
+        if {[variant_isset universal]} {
+                system "cd ${worksrcpath} && \
+                        patch < ${filespath}/patch_bk_make_pch.diff"
+                system "cd ${worksrcpath}/../src/osx/cocoa && \
+                        patch < ${filespath}/patch_textctrl_mm.diff"
+                reinplace -E "s|^(OBJCXXFLAGS =.*)|\\1 ${configure.universal_cflags}|" \
+                        ${worksrcpath}/Makefile
+        }
+}
+
 #post-build {
 #    foreach c { ${contrib} } {
 #       system "cd ${build.dir} && make -C contrib/src/${c}"
@@ -89 +111 @@
 #       readme-gtk.txt readme-mac.txt \
 #       readme-mgl.txt readme-motif.txt readme-x11.txt \
 #       ${destroot}${prefix}/share/doc/${name}
-    reinplace "s|-L${build.dir}/lib||" ${destroot}${prefix}/lib/${sub}/wx/config/osx_carbon-unicode-${installtype}-2.9
+    if {[variant_isset universal]} {
+        reinplace "s|-L${build.dir}/lib||" ${destroot}${prefix}/lib/${sub}/wx/config/osx_cocoa-unicode-${installtype}-2.9
+    } else {
+        reinplace "s|-L${build.dir}/lib||" ${destroot}${prefix}/lib/${sub}/wx/config/osx_carbon-unicode-${installtype}-2.9
+    }
 }
 
 variant nonmonolithic description {build libraries separately} {