Changeset 98893

Timestamp:

Oct 20, 2012, 8:22:03 AM (12 years ago)

Author:

hum@…

Message:

emacs-mac-app: fix post-extract to overwrite; move files into the app bundle; rename Emacs.app to EmacsMac.app to avoid a conflict with emacs-app; remove conflicts; modify homepage.

File:

• trunk/dports/aqua/emacs-mac-app/Portfile (modified) (5 diffs)

trunk/dports/aqua/emacs-mac-app/Portfile

@@ -14 +14 @@
                     GUI support for Mac OS X 10.4 - 10.8.
 
-homepage            http://www.gnu.org/software/emacs/
+homepage            http://lists.gnu.org/archive/html/emacs-devel/2012-08/msg00803.html
 platforms           darwin
 license             GPL-3+
@@ -36 +36 @@
                     sha256  5a887718c4576f74c26817d473ad6a6e37ceeb72056a7941cce9a689eb21b965
 
-conflicts           emacs emacs22 emacs23 emacs-snapshot xemacs emacs-app emacs-app-devel
-
 depends_lib         port:ncurses
 
@@ -47 +45 @@
     # merge mac port files into emacs distribution.
     copy ${mac_path}/mac ${worksrcpath}
-    copy ${worksrcpath}/nextstep/Cocoa/Emacs.base/Contents/Resources/Emacs.icns \
+    copy -force \
+         ${worksrcpath}/nextstep/Cocoa/Emacs.base/Contents/Resources/Emacs.icns \
          ${worksrcpath}/mac/Emacs.app/Contents/Resources/Emacs.icns
     foreach f [glob ${mac_path}/etc/images/*] {
@@ -68 +67 @@
 
 configure.args      --with-mac \
-                    --enable-mac-app=${applications_dir} \
-                    --prefix=${prefix}
+                    --enable-mac-app=${applications_dir}
 
 if {${os.major} >= 11 && ${os.platform} == "darwin"} {
@@ -76 +74 @@
 
 post-destroot {
+    # move files into the app bundle.
+    # https://github.com/railwaycat/emacs-mac-port/blob/master/build-emacs.app.sh
+    set app_dir ${destroot}${applications_dir}/Emacs.app/Contents/Resources
+    set compver [exec uname -m]-apple-darwin[exec uname -r]
+    foreach d [glob ${destroot}${prefix}/share/emacs/${emacs_version}/*] {
+        move ${d} ${app_dir}
+    }
+    move ${destroot}${prefix}/share/info ${app_dir}
+    move ${destroot}${prefix}/share/man  ${app_dir}
+    move ${destroot}${prefix}/var        ${app_dir}
+    move ${destroot}${prefix}/bin        ${app_dir}/../MacOS
+    move ${destroot}${prefix}/libexec/emacs/${emacs_version}/${compver} \
+                                         ${app_dir}/../MacOS/libexec
+    delete ${destroot}${prefix}
+    # make the application binary a hard link.
+    delete ${app_dir}/../MacOS/Emacs
+    file link -hard ${app_dir}/../MacOS/Emacs ${app_dir}/../MacOS/bin/emacs
+
     # install additional documents.
-    xinstall -d ${destroot}${prefix}/share/doc/${name}
+    set doc_dir ${destroot}${prefix}/share/doc/emacs-mac
+    xinstall -d ${doc_dir}
     xinstall -m 644 -W ${mac_path} \
         COPYING NEWS-mac README-mac \
-        ${destroot}${prefix}/share/doc/${name}
+        ${doc_dir}
     # install site-start.el.
-    file copy ${filespath}/site-start.el \
-        ${destroot}${applications_dir}/Emacs.app/Contents/Resources/site-lisp
-    reinplace "s|__PREFIX__|${prefix}|g" \
-        ${destroot}${applications_dir}/Emacs.app/Contents/Resources/site-lisp/site-start.el
+    set site_lisp ${destroot}${applications_dir}/Emacs.app/Contents/Resources/site-lisp
+    xinstall -d ${site_lisp}
+    file copy ${filespath}/site-start.el ${site_lisp}
+    reinplace "s|__PREFIX__|${prefix}|g" ${site_lisp}/site-start.el
+    # rename the app bundle to avoid a conflict with emacs-app.
+    move ${destroot}${applications_dir}/Emacs.app \
+         ${destroot}${applications_dir}/EmacsMac.app
 }