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

[css at macports.org]

Revision: 55596
          http://trac.macports.org/changeset/55596
Author:   css at macports.org
Date:     2009-08-14 05:14:17 -0700 (Fri, 14 Aug 2009)
Log Message:
-----------
Update emacs-app to the 23.1 release, removing the need for the old custom compile script patch. refs #20536

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

Removed Paths:
-------------
    trunk/dports/aqua/emacs-app/files/patch-compile.diff

Modified: trunk/dports/aqua/emacs-app/Portfile
===================================================================
--- trunk/dports/aqua/emacs-app/Portfile	2009-08-14 11:29:07 UTC (rev 55595)
+++ trunk/dports/aqua/emacs-app/Portfile	2009-08-14 12:14:17 UTC (rev 55596)
@@ -2,8 +2,7 @@
 
 PortSystem 1.0
 name		emacs-app
-version		23.0.0_NS-9.0rc3
-revision	1
+version		23.1
 categories	aqua editors
 maintainers	css
 description	The GNU Emacs text editor (Cocoa version)
@@ -20,55 +19,22 @@
 
 platforms	darwin
 homepage	http://emacs-app.sourceforge.net/
-master_sites	sourceforge
+master_sites	ftp://ftp.gnu.org/gnu/emacs/
 distname	emacs-${version}
 extract.suffix	.tar.bz2
 use_bzip2	yes
-checksums	md5 b080af75ab03cfe49aa3bf00695cdab8 \
-		sha1 5a19b28cd4d2e66c7639e0130ef6d6351d7fbf35
+checksums	md5 17f7f0ba68a0432d58fa69d05a2225be \
+		sha1 5f2d5dfcc17e7627ea752f675c605fe37c9c145c
 
-depends_build	port:pkgconfig \
-		port:texinfo
+depends_lib     port:ncurses
+use_parallel_build      yes
 
-# The current distribution contains its own build script, so use that
-# rather than trying to manually manage the various steps of the build
-# process. Perhaps a future version of this Portfile could handle the
-# compile script's commands directly.
+configure.args	--with-ns --without-x
 
-use_automake	no
-use_autoconf	no
-use_configure	no
-
-# Eventually build the port without the provided script...
-# configure.args	--with-ns --without-x --prefix=${destroot}/Applications/MacPorts/Emacs.app/Contents/Resources
-
-# Don't attempt to build universal on darwin 7, so apply a patch
-# to modify the compile script.
-platform darwin 7 {
-	patchfiles-append	patch-compile.diff
-}
-
-platform darwin 8 {
-	if {$xcodeversion == "2.1"} {
-		set xcodebuilddir build/Deployment
-	}
-}
-
-build.dir	${worksrcpath}/nextstep
-build.cmd	./compile
-build.target
-
-# Due to the fact that the script compiles and installs everything
-# into the source directory, the destroot phase must manually copy the
-# resulting application package.
-
-#pre-configure {
-#	reinplace "s|--with-ns|--with-ns --without-freetype|g" ${worksrcpath}/nextstep/compile
-#}
-
 destroot {
+        system "cd ${worksrcpath} && make install"
 	xinstall -m 755 -d ${destroot}${applications_dir}
-	file copy ${worksrcpath}/nextstep/build/Emacs.app \
+	file copy ${worksrcpath}/nextstep/Emacs.app \
 		${destroot}${applications_dir}
 	file copy ${filespath}/site-start.el \
 		${destroot}${applications_dir}/Emacs.app/Contents/Resources/site-lisp

Deleted: trunk/dports/aqua/emacs-app/files/patch-compile.diff
===================================================================
--- trunk/dports/aqua/emacs-app/files/patch-compile.diff	2009-08-14 11:29:07 UTC (rev 55595)
+++ trunk/dports/aqua/emacs-app/files/patch-compile.diff	2009-08-14 12:14:17 UTC (rev 55596)
@@ -1,11 +0,0 @@
---- nextstep/compile.orig	Sun Oct 21 19:06:46 2007
-+++ nextstep/compile	Sun Oct 21 19:12:42 2007
-@@ -56,7 +56,7 @@
-     NS_CFG_OPTS="--with-ns --without-x --prefix=${PREFIX} --exec_prefix=${BASEDIR}/MacOS --libexecdir=${BASEDIR}/MacOS/libexec --with-pop --enable-font-backend --without-freetype"
- # --enable-cocoa-experimental-ctrl-g
-     MAKE="make -j3"
--    export CC=gcc-4.0
-+    export CC=gcc
-     export MACOSX_DEPLOYMENT_TARGET=10.3
-     export MACOSX_DEPLOYMENT_TARGET_ppc=10.3
-     export MACOSX_DEPLOYMENT_TARGET_i386=10.4
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090814/9c45470a/attachment.html>