Ticket #32288: Portfile.diff

Portfile

@@ -43 +43 @@
     patchfiles-append   patch-clang.diff
 }
 
-variant fullscreen description {Add fullscreen patch from http://gist.github.com/291150 as mentioned in http://www.sanityinc.com/full-screen-support-for-cocoa-emacs-on-osx} {
+# patch-fullscreen.diff
+#   http://gist.github.com/291150
+#   http://www.sanityinc.com/full-screen-support-for-cocoa-emacs-on-osx
+variant fullscreen description {Add fullscreen patch} {
     patchfiles-append patch-fullscreen.diff
 }
 
-# inline and font patches are fetched from MacEmacsJP http://svn.sourceforge.jp/svnroot/macemacsjp/inline_patch/trunk/, revision 574.
+# inline and font patches are fetched from MacEmacsJP.
+#   http://svn.sourceforge.jp/svnroot/macemacsjp/inline_patch/trunk/
+#   revision 574.
 # patch-macemacsjp-inline.diff <= emacs-inline.patch
 # patch-macemacsjp-jpfont.diff <= font.patch
 
@@ -59 +64 @@
     patchfiles-append patch-macemacsjp-jpfont.diff
 }
 
-variant patches conflicts fullscreen inline jpfont description {Add all patches: fullscreen, inline and jpfont} {
-    patchfiles-append patch-fullscreen.diff \
-                      patch-macemacsjp-jpfont.diff \
-                      patch-macemacsjp-inline.diff
-}
+variant patches requires fullscreen inline jpfont description {Add all patches: fullscreen, inline and jpfont} {}
 
 platform darwin 11 {
    patchfiles-append    patch-fix-title-bar.diff patch-src_darwin.h.diff
+   # patch-lion-fullscreen.diff
+   #   https://github.com/downloads/typester/emacs/emacs-23-lion-fullscreen-test.patch
+   if {[variant_isset fullscreen]} {
+       patchfiles-append    patch-lion-fullscreen.diff
+   }
    configure.cflags-append      -fno-pie -O2
    configure.ldflags-append     -fno-pie
 }