merging Emacs.app (NeXTstep port)

ChangeLog

@@ -1,3 +1,15 @@
+2008-07-15  Adrian Robert <Adrian.B.Robert@gmail.com>
+
+	Changes and additions for NeXTstep windowing system (Cocoa and
+	GNUstep) support.
+
+	* configure.in: Add support for NS window system: --with-ns (default
+	off), --enable-ns-app, --enable-cocoa-experimental-ctrl-g; improve add
+	sparc detection for FreeBSD variants, checks for Cocoa and GNUstep,
+	disable font backend if window system is "none", not if !HAVE_X11.
+	* Makefile.in: Add ns-emacs to INFO_FILES, add ns_appdir variable.
+	(install-arch-dep): Add commands to assemble NS .app package.
+
 2008-07-10  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* configure.in: Use macppc for Darwin.  Remove references to

Makefile.in

@@ -137,7 +137,7 @@ man1dir=$(mandir)/man1
 infodir=@infodir@
 INFO_FILES=ada-mode autotype calc ccmode cl dbus dired-x ebrowse ediff	\
            efaq eintr elisp emacs emacs-mime epa erc eshell eudc	\
-           flymake forms gnus idlwave info message mh-e newsticker	\
+           flymake forms gnus idlwave info message mh-e newsticker ns-emacs \
            nxml-mode org pcl-cvs pgg rcirc reftex remember sasl sc ses	\
            sieve speedbar tramp vip viper widget woman smtpmail url
 
@@ -167,6 +167,9 @@ x_default_search_path=@x_default_search_path@
 # Location to install Emacs.app on Mac OS X
 carbon_appdir=@carbon_appdir@
 
+# Location to install Emacs.app under NeXT/Open/GNUstep / Cocoa
+ns_appdir=@ns_appdir@
+
 # Where the etc/emacs.desktop file is to be installed.
 desktopdir=$(datarootdir)/applications
 
@@ -411,6 +414,14 @@ install-arch-dep: mkdir
 		(cd $(DESTDIR)${carbon_appdir}/Emacs.app; umask 022; tar -xvf - \
 			&& cat > /dev/null))) || exit 1; \
 	fi
+	if test "${ns_appdir}" != ""; then \
+	  umask 022; mkdir -p ${ns_appdir}/Emacs.app; \
+	  (cd nextstep/build/Emacs.app; (tar -chf - . | \
+		(cd ${ns_appdir}/Emacs.app; umask 022; tar -xvf - \
+			&& cat > /dev/null))) || exit 1; \
+	  ( cd site-lisp ; tar chf - . ) | \
+	      ( cd ${datadir}/$(EMACSFULL)/site-lisp ; tar xf - ) \
+	fi
 
 ## http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01672.html
 ## Needs to be the user running install, so configure can't set it.

admin/CPP-DEFINES

@@ -3,7 +3,6 @@ of their use.  Feel free to add more macros and more categories.
 
 ** Distinguishing OSes **
 
-MAC_OS		Compiling for the `mac' window-system.
 MAC_OS8		Compiling for Mac OS Classic (v8 or v9). No longer supported, all code using it can be removed.
 MAC_OSX		Compiling for Mac OS X.  Not bare Darwin.
 CYGWIN		Compiling the Cygwin port.
@@ -23,7 +22,11 @@ USE_LISP_UNION_TYPE Define it in lisp.h to make Lisp_Object be a union type inst
 ** Distinguishing GUIs **
 
 HAVE_NTGUI	Use the native W32 GUI for windows, frames, menus&scrollbars.
+MAC_OS		Compiling for the `mac' window-system.
 HAVE_CARBON	Compile support for the Carbon GUI.  Requires MAC_OS?
+HAVE_NS	Use the NeXT/OpenStep/Cocoa UI under Mac OS X or GNUstep.
+NS_IMPL_GNUSTEP	Compile support for GNUSTEP implementation of NS GUI API.
+NS_IMPL_COCOA	Compile support for Cocoa (Apple) implementation of NS GUI API.
 HAVE_X11	Compile support for the X11 GUI.
 HAVE_X_WINDOWS	Compile support for X Window system
 X11		??  Makefile.in suggests it's equivalent to HAVE_X11

admin/ChangeLog

@@ -1,3 +1,7 @@
+2008-07-15  Adrian Robert <Adrian.B.Robert@gmail.com>
+
+	* CPP_DEFINES: Add NS port related defines.
+
 2008-06-16  Glenn Morris  <rgm@gnu.org>
 
 	* admin.el (set-version): Add doc/lispref/vol1.texi,vol2.texi,