[98023] trunk/dports/aqua/emacs-app/Portfile

[hum at macports.org]

Revision: 98023
          http://trac.macports.org//changeset/98023
Author:   hum at macports.org
Date:     2012-09-22 23:00:27 -0700 (Sat, 22 Sep 2012)
Log Message:
-----------
emacs-app: add oldfullscreen variant to apply pre-lion fullscreen patch; reorder maintainers; modify descriptions of variants.

Modified Paths:
--------------
    trunk/dports/aqua/emacs-app/Portfile

Modified: trunk/dports/aqua/emacs-app/Portfile
===================================================================
--- trunk/dports/aqua/emacs-app/Portfile	2012-09-23 00:12:48 UTC (rev 98022)
+++ trunk/dports/aqua/emacs-app/Portfile	2012-09-23 06:00:27 UTC (rev 98023)
@@ -6,7 +6,7 @@
 name                emacs-app
 version             24.2
 categories          aqua editors
-maintainers         css hum openmaintainer
+maintainers         hum css openmaintainer
 
 description         The GNU Emacs text editor (Cocoa version)
 
@@ -55,21 +55,26 @@
         ${destroot}${applications_dir}/Emacs.app/Contents/Resources/site-lisp/site-start.el
 }
 
-variant fullscreen description {Add fullscreen patch} {
+variant fullscreen conflicts oldfullscreen description {Apply fullscreen patch} {
     if {${os.major} >= 11} {
         # patch-lion-fullscreen.diff
+        # http://techresearchinfo.blogspot.jp/2011/12/emacs-24-on-lion-mention-top-right.html
         # https://gist.github.com/1355895
-        # http://techresearchinfo.blogspot.jp/2011/12/emacs-24-on-lion-mention-top-right.html
+        # (modified for 'patch -p0')
         patchfiles-append   patch-lion-fullscreen.diff
     } else {
         # patch-fullscreen.diff
-        # http://cloud.github.com/downloads/hh/emacs/feature-fullscreen.patch
-        # http://untree.com/post/7649492902/building-a-fullscreen-enabled-emacs-24-on-mac-os-x-snow
+        # https://github.com/downloads/typester/emacs/feature-fullscreen.patch
+        # (modified for 'patch -p0')
         patchfiles-append   patch-fullscreen.diff
     }
 }
 
-variant inline description {Add inline patch from MacEmacsJP} {
+variant oldfullscreen conflicts fullscreen description {Apply pre-lion fullscreen patch} {
+    patchfiles-append   patch-fullscreen.diff
+}
+
+variant inline description {Apply inline patch from MacEmacsJP} {
     # inline patch fetched from MacEmacsJP.
     # patch-macemacsjp-inline.diff
     # http://svn.sourceforge.jp/svnroot/macemacsjp/inline_patch/trunk/emacs-inline.patch
@@ -82,7 +87,7 @@
 
 variant jpfont requires inline description {Obsolete compatibility variant} {}
 
-variant patches requires fullscreen inline description {Add all patches: fullscreen and inline} {}
+variant patches requires fullscreen inline description {Apply all patches: fullscreen and inline} {}
 
 default_variants    +patches
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120922/18fa42c7/attachment.html>