Changes to editors/emacs and Mk/bsd.emacs.mk were taken from

PR/137956 by Ashish SHUKLA (thanks!).  [1]

Those ports which define EMACS_PORT_NAME to be "emacs21" were
not touched (this time). They may be converted to the new
world order by removing the above mentioned assignment.

Four ports were marked as BROKEN with EMACS_PORT_NAME=emacs23
(they do not compile):
. lang/bigloo;
. mail/wanderlust;
. mail/wanderlust-devel;
. www/emacs-w3m.

Three ports were marked as IGNORE with EMACS_PORT_NAME=emacs23:
. japanese/egg-canna (the port version is dated as of 2001,
  does not compile with Emacs 23 and seems it cannot be fixed);
. deskutils/remember.el (was incorporated into Emacs 23);
. editors/nxml (was incorporated into Emacs 23).

Changes that were made after (and as a result of) exp run. For
those ports:
. japanese/migemo-emacs21;
. japanese/migemo-emacs22
EMACS_PORT_NAME?= was changed to EMACS_PORT_NAME= to the apropriate
emacs port name.

PR:		ports/137956 [1], ports/141369 [2]
Submitted by:	Ashish SHUKLA <wahjava at gmail.com>  [1],
		bsam (me)  [2]
Exp-run by: miwi

10 files changed, 81 insertions, 84 deletions

diff --git a/editors/emacs23/files/patch-Makefile.in b/editors/emacs23/files/patch-Makefile.in
index e9bba5c55c8a..fd303bd3a231 100644
--- a/editors/emacs23/files/patch-Makefile.in
+++ b/editors/emacs23/files/patch-Makefile.in
@@ -1,8 +1,8 @@
---- Makefile.in.orig	2008-09-07 05:23:59.000000000 +0300
-+++ Makefile.in	2008-09-07 05:23:59.000000000 +0300
-@@ -419,14 +419,6 @@
- ## That flag is also used in leim/Makefile.in
- install-arch-indep: mkdir info
+--- Makefile.in.orig	Tue Jun 23 07:41:36 2009 +0300
++++ Makefile.in	Tue Jun 23 07:39:33 2009 +0300
+@@ -461,14 +461,6 @@
+ 
+ install-arch-indep: mkdir info install-etc
  	-set ${COPYDESTS} ; \
 -	unset CDPATH; \
 -	for dir in ${COPYDIR} ; do \
@@ -15,10 +15,10 @@
  	mkdir ${COPYDESTS} ; \
  	chmod ugo+rx ${COPYDESTS} ; \
  	unset CDPATH; \
-@@ -513,9 +505,9 @@
- 	   fi; \
+@@ -570,9 +562,9 @@
  	   cd ${srcdir}/info ; \
  	   for elt in $(INFO_FILES); do \
+ 	      test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
 -	      for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
 -	        ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \
 -	        chmod a+r $(DESTDIR)${infodir}/$$f; \
@@ -28,9 +28,9 @@
  	      done; \
  	   done); \
  	else true; fi
-@@ -525,7 +517,7 @@
- 	then \
+@@ -583,7 +575,7 @@
  	  for elt in $(INFO_FILES); do \
+ 	    test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
  	    (cd $${thisdir}; \
 -	     ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
 +	     ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt.info); \
diff --git a/editors/emacs23/files/patch-doc-emacs-Makefile.in b/editors/emacs23/files/patch-doc-emacs-Makefile.in
new file mode 100644
index 000000000000..da2f5b8506b8
--- /dev/null
+++ b/editors/emacs23/files/patch-doc-emacs-Makefile.in
@@ -0,0 +1,20 @@
+--- doc/emacs/Makefile.in.orig	2008-12-09 19:27:59.000000000 +0200
++++ doc/emacs/Makefile.in	2008-12-09 19:25:19.000000000 +0200
+@@ -34,7 +34,7 @@
+ 
+ # The makeinfo program is part of the Texinfo distribution.
+ # Use --force so that it generates output even if there are errors.
+-MAKEINFO = makeinfo --force
++MAKEINFO = makeinfo --force --no-split
+ 
+ INFO_TARGETS = $(infodir)/emacs
+ DVI_TARGETS  = emacs.dvi
+@@ -144,7 +144,7 @@
+ #	rm -f Makefile
+ 
+ maintainer-clean: distclean
+-	for file in $(INFO_TARGETS); do rm -f $${file}*; done
++	for file in $(INFO_TARGETS); do rm -f $${file}; done
+ 
+ 
+ # Formerly this directory had texindex.c and getopt.c in it
diff --git a/editors/emacs23/files/patch-doc-lispintro-Makefile.in b/editors/emacs23/files/patch-doc-lispintro-Makefile.in
new file mode 100644
index 000000000000..a6266c3bef95
--- /dev/null
+++ b/editors/emacs23/files/patch-doc-lispintro-Makefile.in
@@ -0,0 +1,20 @@
+--- doc/lispintro/Makefile.in.orig	2008-12-09 19:27:59.000000000 +0200
++++ doc/lispintro/Makefile.in	2008-12-09 19:25:20.000000000 +0200
+@@ -33,7 +33,7 @@
+ INFO_TARGETS = ${infodir}/eintr
+ DVI_TARGETS = emacs-lisp-intro.dvi
+ 
+-MAKEINFO = makeinfo
++MAKEINFO = makeinfo --no-split
+ TEXI2DVI = texi2dvi
+ DVIPS = dvips
+ 
+@@ -65,7 +65,7 @@
+ 
+ maintainer-clean: distclean
+ 	rm -f *.aux *.cps *.fns *.kys *.pgs *.vrs *.toc
+-	cd $(infodir); rm -f eintr eintr-[1-9]
++	cd $(infodir); rm -f eintr
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/editors/emacs23/files/patch-doc-lispref-Makefile.in b/editors/emacs23/files/patch-doc-lispref-Makefile.in
new file mode 100644
index 000000000000..6d069939164d
--- /dev/null
+++ b/editors/emacs23/files/patch-doc-lispref-Makefile.in
@@ -0,0 +1,11 @@
+--- doc/lispref/Makefile.in.orig	2008-12-09 19:27:59.000000000 +0200
++++ doc/lispref/Makefile.in	2008-12-09 19:25:20.000000000 +0200
+@@ -32,7 +32,7 @@
+ TEXI2DVI = texi2dvi
+ SHELL = /bin/sh
+ INSTALL_INFO = install-info
+-MAKEINFO = makeinfo --force
++MAKEINFO = makeinfo --force --no-split
+ 
+ # List of all the texinfo files in the manual:
+ 
diff --git a/editors/emacs23/files/patch-doc-misc-Makefile.in b/editors/emacs23/files/patch-doc-misc-Makefile.in
new file mode 100644
index 000000000000..8626784b0f4e
--- /dev/null
+++ b/editors/emacs23/files/patch-doc-misc-Makefile.in
@@ -0,0 +1,11 @@
+--- doc/misc/Makefile.in.orig	Tue Jun 23 07:39:39 2009 +0300
++++ doc/misc/Makefile.in	Tue Jun 23 07:39:41 2009 +0300
+@@ -34,7 +34,7 @@
+ 
+ # The makeinfo program is part of the Texinfo distribution.
+ # Use --force so that it generates output even if there are errors.
+-MAKEINFO = makeinfo --force
++MAKEINFO = makeinfo --force --no-split
+ 
+ # Also add new entries to INFO_FILES in the top-level Makefile.in.
+ INFO_TARGETS = \
diff --git a/editors/emacs23/files/patch-lispintro-Makefile.in b/editors/emacs23/files/patch-lispintro-Makefile.in
deleted file mode 100644
index cfc206bd4fba..000000000000
--- a/editors/emacs23/files/patch-lispintro-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- lispintro/Makefile.in.orig	2008-09-07 05:24:38.000000000 +0300
-+++ lispintro/Makefile.in	2008-09-07 05:24:38.000000000 +0300
-@@ -34,7 +34,7 @@
- INFO_TARGETS = ${infodir}/eintr
- DVI_TARGETS = emacs-lisp-intro.dvi
- 
--MAKEINFO = makeinfo
-+MAKEINFO = makeinfo --no-split
- TEXI2DVI = texi2dvi
- DVIPS = dvips
- 
diff --git a/editors/emacs23/files/patch-lispref-Makefile.in b/editors/emacs23/files/patch-lispref-Makefile.in
deleted file mode 100644
index c721452cd6e1..000000000000
--- a/editors/emacs23/files/patch-lispref-Makefile.in
+++ /dev/null
@@ -1,38 +0,0 @@
---- lispref/Makefile.in.orig	2008-09-07 05:24:57.000000000 +0300
-+++ lispref/Makefile.in	2008-09-07 05:24:57.000000000 +0300
-@@ -33,7 +33,7 @@
- TEXI2DVI = texi2dvi
- SHELL = /bin/sh
- INSTALL_INFO = install-info
--MAKEINFO = makeinfo --force
-+MAKEINFO = makeinfo --force --no-split
- 
- # The name of the manual:
- VERSION=2.9
-@@ -110,7 +110,7 @@
- # This is for use in a separate distro of the Emacs Lisp manual.
- install: elisp
- 	$(srcdir)/mkinstalldirs $(infodir)
--	cp elisp elisp-[1-9] elisp-[1-9][0-9] $(infodir)
-+	cp elisp $(infodir)
- 	${INSTALL_INFO} --info-dir=${infodir} ${infodir}/elisp
- 
- # This is for use in a separate distro of the Emacs Lisp manual.
-@@ -126,7 +126,7 @@
- 
- maintainer-clean: clean
- 	rm -f elisp.dvi elisp.oaux
--	cd $(infodir); rm -f elisp elisp-[1-9] elisp-[1-9][0-9]
-+	cd $(infodir); rm -f elisp
- 
- dist: $(infodir)/elisp elisp.dvi
- 	-rm -rf temp
-@@ -136,7 +136,7 @@
-  $(srcdir)/Makefile.in $(srcs) \
-  $(srcdir)/../man/texinfo.tex \
-  elisp.dvi elisp.aux elisp.??s \
-- $(infodir)/elisp $(infodir)/elisp-[1-9] $(infodir)/elisp-[1-9][0-9] \
-+ $(infodir)/elisp \
-  temp/$(manual)
- 	-(cd temp/$(manual); rm -f mkinstalldirs)
- 	cp $(srcdir)/mkinstalldirs temp/$(manual)
diff --git a/editors/emacs23/files/patch-man-Makefile.in b/editors/emacs23/files/patch-man-Makefile.in
deleted file mode 100644
index 3c3ab4cb91ef..000000000000
--- a/editors/emacs23/files/patch-man-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./man/Makefile.in.orig	Sat May  6 18:54:21 2006
-+++ ./man/Makefile.in	Fri Sep  1 21:10:08 2006
-@@ -32,7 +32,7 @@
- 
- # The makeinfo program is part of the Texinfo distribution.
- # Use --force so that it generates output even if there are errors.
--MAKEINFO = makeinfo --force
-+MAKEINFO = makeinfo --force --no-split
- INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \
- 	        ../info/dired-x ../info/ediff ../info/forms ../info/gnus \
- 		../info/message ../info/sieve ../info/pgg ../info/emacs-mime \
diff --git a/editors/emacs23/files/patch-sources.el b/editors/emacs23/files/patch-sources.el
new file mode 100644
index 000000000000..659786ce208a
--- /dev/null
+++ b/editors/emacs23/files/patch-sources.el
@@ -0,0 +1,10 @@
+
+$FreeBSD: /tmp/pcvs/ports/editors/emacs23/files/patch-sources.el,v 1.3 2009-12-20 20:19:17 bsam Exp $
+
+--- /dev/null
++++ sources.el
+@@ -0,0 +1,4 @@
++;;; Path to Emacs C Sources.
++(when (string-match (regexp-quote "%%EMACS_VER%%") emacs-version)
++  (setq find-function-C-source-directory
++        "%%DATADIR%%/%%EMACS_VER%%/src"))
diff --git a/editors/emacs23/files/patch-src__alloc.c b/editors/emacs23/files/patch-src__alloc.c
deleted file mode 100644
index 80c226b6f778..000000000000
--- a/editors/emacs23/files/patch-src__alloc.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/alloc.c.orig	2008-09-07 05:25:27.000000000 +0300
-+++ src/alloc.c	2008-09-07 05:25:27.000000000 +0300
-@@ -4573,8 +4573,12 @@
-      needed on ia64 too.  See mach_dep.c, where it also says inline
-      assembler doesn't work with relevant proprietary compilers.  */
- #ifdef __sparc__
-+#ifdef __sparc64__
-+  asm ("flushw");
-+#else
-   asm ("ta 3");
- #endif
-+#endif
- 
-   /* Save registers that we need to see on the stack.  We need to see
-      registers used to hold register variables and registers used to