[82091] trunk/dports/aqua/emacs-app

[css at macports.org]

Revision: 82091
          http://trac.macports.org/changeset/82091
Author:   css at macports.org
Date:     2011-08-07 12:38:12 -0700 (Sun, 07 Aug 2011)
Log Message:
-----------
emacs-app: fix to use the latest distfile (23.3a), which still reports as version 23.3. Added a Lion variant with patches proposed in #30268.

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

Added Paths:
-----------
    trunk/dports/aqua/emacs-app/files/patch-fix-title-bar.diff
    trunk/dports/aqua/emacs-app/files/patch-src_darwin.h.diff

Modified: trunk/dports/aqua/emacs-app/Portfile
===================================================================
--- trunk/dports/aqua/emacs-app/Portfile	2011-08-07 19:36:52 UTC (rev 82090)
+++ trunk/dports/aqua/emacs-app/Portfile	2011-08-07 19:38:12 UTC (rev 82091)
@@ -5,7 +5,7 @@
 
 name		emacs-app
 version		23.3
-revision	0
+revision	1
 categories	aqua editors
 maintainers	css
 description	The GNU Emacs text editor (Cocoa version)
@@ -23,11 +23,12 @@
 platforms	darwin
 homepage	http://www.gnu.org/software/emacs/
 master_sites	gnu:emacs
-distname	emacs-${version}
+distname	emacs-${version}a
+worksrcdir	emacs-${version}
 use_bzip2	yes
-checksums           md5     a673c163b4714362b94ff6096e4d784a \
-                    sha1    de2c924655f0f4e012cc119840cd341a1d40e32c \
-                    rmd160  bddaba77f543b41a91d133c6700078a9b41b0bf8
+checksums           md5     f2cf8dc6f28f8ae59bc695b4ddda339c \
+                    sha1    795bdfa372e42b9589a80f6dcb2ad8fed65b90e4 \
+                    rmd160  21f201714bca420c3a8fed8c92058cec786e724e
 
 depends_lib     port:ncurses
 use_parallel_build      yes
@@ -40,6 +41,12 @@
     patchfiles-append patch-fullscreen.diff
 }
 
+platform darwin 11 {
+   patchfiles-append	patch-fix-title-bar.diff patch-src_darwin.h.diff
+   configure.cflags-append	-fno-pie -O2
+   configure.ldflags-append	-fno-pie
+}
+
 destroot {
         system "cd ${worksrcpath} && make install"
 	xinstall -m 755 -d ${destroot}${applications_dir}

Added: trunk/dports/aqua/emacs-app/files/patch-fix-title-bar.diff
===================================================================
--- trunk/dports/aqua/emacs-app/files/patch-fix-title-bar.diff	                        (rev 0)
+++ trunk/dports/aqua/emacs-app/files/patch-fix-title-bar.diff	2011-08-07 19:38:12 UTC (rev 82091)
@@ -0,0 +1,24 @@
+--- src/ChangeLog.orig	2011-07-23 12:31:39.000000000 -0400
++++ src/ChangeLog	2011-07-23 12:31:39.000000000 -0400
+@@ -1,3 +1,9 @@
++2011-07-11  Bob Halley  <rthalley at gmail.com>
++
++	* nsterm.m (initFrameFromEmacs): In OS X 10.7, a title bar
++	is no longer implied by NSResizableWindowMask and must be
++	requested with NSTitledWindowMask.
++
+ 2011-03-07  Chong Yidong  <cyd at stupidchicken.com>
+ 
+ 	* Version 23.3 released.
+--- src/nsterm.m.orig	2011-07-23 12:31:39.000000000 -0400
++++ src/nsterm.m	2011-07-23 12:31:39.000000000 -0400
+@@ -5106,7 +5106,8 @@
+ 
+   win = [[EmacsWindow alloc]
+             initWithContentRect: r
+-                      styleMask: (NSResizableWindowMask |
++                      styleMask: (NSTitledWindowMask |
++                                  NSResizableWindowMask |
+                                   NSMiniaturizableWindowMask |
+                                   NSClosableWindowMask)
+                         backing: NSBackingStoreBuffered

Added: trunk/dports/aqua/emacs-app/files/patch-src_darwin.h.diff
===================================================================
--- trunk/dports/aqua/emacs-app/files/patch-src_darwin.h.diff	                        (rev 0)
+++ trunk/dports/aqua/emacs-app/files/patch-src_darwin.h.diff	2011-08-07 19:38:12 UTC (rev 82091)
@@ -0,0 +1,11 @@
+--- src/s/darwin.h.orig	2011-07-23 12:31:39.000000000 -0400
++++ src/s/darwin.h	2011-07-23 12:31:39.000000000 -0400
+@@ -181,7 +181,7 @@
+    end of the header for adding load commands.  Needed for dumping.
+    0x690 is the total size of 30 segment load commands (at 56
+    each); under Cocoa 31 commands are required.  */
+-#define LD_SWITCH_SYSTEM_TEMACS -prebind LIBS_NSGUI -Xlinker -headerpad -Xlinker HEADERPAD_EXTRA
++#define LD_SWITCH_SYSTEM_TEMACS -fno-pie -prebind LIBS_NSGUI -Xlinker -headerpad -Xlinker HEADERPAD_EXTRA
+ 
+ #define C_SWITCH_SYSTEM_TEMACS -Dtemacs
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110807/06c0aeba/attachment.html>