- Remove editors/emacs21, and editors/emacs22 as they're no longer maintained

  upstream
- Also remove dependent ports
- Add UPDATING entry informing users of the same
- Add MOVED entries

Approved by:	portmgr (bapt)

8 files changed, 0 insertions, 306 deletions

diff --git a/editors/emacs22/files/patch-Makefile.in b/editors/emacs22/files/patch-Makefile.in
deleted file mode 100644
index e9bba5c55c8a..000000000000
--- a/editors/emacs22/files/patch-Makefile.in
+++ /dev/null
@@ -1,39 +0,0 @@
---- 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
- 	-set ${COPYDESTS} ; \
--	unset CDPATH; \
--	for dir in ${COPYDIR} ; do \
--	  if [ `(cd $$1 && /bin/pwd)` != `(cd $${dir} && /bin/pwd)` ] ; then \
--	    rm -rf $$1 ; \
--	  fi ; \
--	  shift ; \
--	done
--	-set ${COPYDESTS} ; \
- 	mkdir ${COPYDESTS} ; \
- 	chmod ugo+rx ${COPYDESTS} ; \
- 	unset CDPATH; \
-@@ -513,9 +505,9 @@
- 	   fi; \
- 	   cd ${srcdir}/info ; \
- 	   for elt in $(INFO_FILES); do \
--	      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; \
-+	      for f in `ls $$elt 2>/dev/null`; do \
-+	        ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f.info; \
-+	        chmod a+r $(DESTDIR)${infodir}/$$f.info; \
- 	      done; \
- 	   done); \
- 	else true; fi
-@@ -525,7 +517,7 @@
- 	then \
- 	  for elt in $(INFO_FILES); do \
- 	    (cd $${thisdir}; \
--	     ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
-+	     ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt.info); \
- 	  done; \
- 	else true; fi
- 	-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} $(DESTDIR)${datadir}/emacs/site-lisp ${COPYDESTS} $(DESTDIR)${infodir}
diff --git a/editors/emacs22/files/patch-lispintro-Makefile.in b/editors/emacs22/files/patch-lispintro-Makefile.in
deleted file mode 100644
index cfc206bd4fba..000000000000
--- a/editors/emacs22/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/emacs22/files/patch-lispref-Makefile.in b/editors/emacs22/files/patch-lispref-Makefile.in
deleted file mode 100644
index c721452cd6e1..000000000000
--- a/editors/emacs22/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/emacs22/files/patch-man-Makefile.in b/editors/emacs22/files/patch-man-Makefile.in
deleted file mode 100644
index 3c3ab4cb91ef..000000000000
--- a/editors/emacs22/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/emacs22/files/patch-src-filelock.c b/editors/emacs22/files/patch-src-filelock.c
deleted file mode 100644
index 7ed56f40a81e..000000000000
--- a/editors/emacs22/files/patch-src-filelock.c
+++ /dev/null
@@ -1,86 +0,0 @@
-
-$FreeBSD$
-
---- src/filelock.c.orig
-+++ src/filelock.c
-@@ -64,7 +64,12 @@
- 
- #ifdef CLASH_DETECTION
- 
-+#if __FreeBSD_version >= 900007
-+#include <utmpx.h>
-+#define ut_time ut_tv.tv_sec
-+#else
- #include <utmp.h>
-+#endif
- 
- #if !defined (S_ISLNK) && defined (S_IFLNK)
- #define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
-@@ -253,13 +258,17 @@
-    the first reboot record otherwise.
-    Ignore all reboot records on or before BOOT_TIME.
-    Success is indicated by setting BOOT_TIME to a larger value.  */
--
- void
- get_boot_time_1 (filename, newest)
-      char *filename;
-      int newest;
- {
-+#if __FreeBSD_version >= 900007
-+  struct utmpx ut, *utp;
-+#else
-   struct utmp ut, *utp;
-+#endif
-+
-   int desc;
- 
-   if (filename)
-@@ -272,16 +281,28 @@
- 
-       emacs_close (desc);
- 
-+#if __FreeBSD_version >= 900007
-+	  setutxdb (UTXDB_ACTIVE, filename);
-+#else
-       utmpname (filename);
-+#endif
-     }
- 
-+#if __FreeBSD_version >= 900007
-+  setutxent ();
-+#else
-   setutent ();
-+#endif
- 
-   while (1)
-     {
-       /* Find the next reboot record.  */
-       ut.ut_type = BOOT_TIME;
-+#if __FreeBSD_version >= 900007
-+      utp = getutxid (&ut);
-+#else
-       utp = getutid (&ut);
-+#endif
-       if (! utp)
- 	break;
-       /* Compare reboot times and use the newest one.  */
-@@ -293,11 +314,19 @@
- 	}
-       /* Advance on element in the file
- 	 so that getutid won't repeat the same one.  */
-+#if __FreeBSD_version >= 900007
-+	  utp = getutxent ();
-+#else
-       utp = getutent ();
-+#endif
-       if (! utp)
- 	break;
-     }
-+#if __FreeBSD_version >= 900007
-+  endutxent();
-+#else
-   endutent ();
-+#endif
- }
- #endif /* BOOT_TIME */
- 
diff --git a/editors/emacs22/files/patch-src-image.c b/editors/emacs22/files/patch-src-image.c
deleted file mode 100644
index cf63c524c5a2..000000000000
--- a/editors/emacs22/files/patch-src-image.c
+++ /dev/null
@@ -1,65 +0,0 @@
---- src/image.c.orig	2008-08-26 00:18:33.000000000 +0200
-+++ src/image.c	2012-06-03 11:17:01.000000000 +0200
-@@ -6338,7 +6338,7 @@
- /* PNG library details.  */
- 
- DEF_IMGLIB_FN (png_get_io_ptr);
--DEF_IMGLIB_FN (png_check_sig);
-+DEF_IMGLIB_FN (png_sig_cmp);
- DEF_IMGLIB_FN (png_create_read_struct);
- DEF_IMGLIB_FN (png_create_info_struct);
- DEF_IMGLIB_FN (png_destroy_read_struct);
-@@ -6369,7 +6369,7 @@
-     return 0;
- 
-   LOAD_IMGLIB_FN (library, png_get_io_ptr);
--  LOAD_IMGLIB_FN (library, png_check_sig);
-+  LOAD_IMGLIB_FN (library, png_sig_cmp);
-   LOAD_IMGLIB_FN (library, png_create_read_struct);
-   LOAD_IMGLIB_FN (library, png_create_info_struct);
-   LOAD_IMGLIB_FN (library, png_destroy_read_struct);
-@@ -6394,7 +6394,7 @@
- #else
- 
- #define fn_png_get_io_ptr		png_get_io_ptr
--#define fn_png_check_sig		png_check_sig
-+#define fn_png_sig_cmp			png_sig_cmp
- #define fn_png_create_read_struct	png_create_read_struct
- #define fn_png_create_info_struct	png_create_info_struct
- #define fn_png_destroy_read_struct	png_destroy_read_struct
-@@ -6427,7 +6427,7 @@
- {
-   xassert (png_ptr != NULL);
-   image_error ("PNG error: %s", build_string (msg), Qnil);
--  longjmp (png_ptr->jmpbuf, 1);
-+  longjmp (png_jmpbuf(png_ptr), 1);
- }
- 
- 
-@@ -6541,7 +6541,7 @@
- 
-       /* Check PNG signature.  */
-       if (fread (sig, 1, sizeof sig, fp) != sizeof sig
--	  || !fn_png_check_sig (sig, sizeof sig))
-+	  || fn_png_sig_cmp (sig, 0, sizeof sig))
- 	{
- 	  image_error ("Not a PNG file: `%s'", file, Qnil);
- 	  UNGCPRO;
-@@ -6558,7 +6558,7 @@
- 
-       /* Check PNG signature.  */
-       if (tbr.len < sizeof sig
--	  || !fn_png_check_sig (tbr.bytes, sizeof sig))
-+	  || fn_png_sig_cmp (tbr.bytes, 0, sizeof sig))
- 	{
- 	  image_error ("Not a PNG image: `%s'", img->spec, Qnil);
- 	  UNGCPRO;
-@@ -6603,7 +6603,7 @@
- 
-   /* Set error jump-back.  We come back here when the PNG library
-      detects an error.  */
--  if (setjmp (png_ptr->jmpbuf))
-+  if (setjmp (png_jmpbuf(png_ptr)))
-     {
-     error:
-       if (png_ptr)
diff --git a/editors/emacs22/files/patch-src__alloc.c b/editors/emacs22/files/patch-src__alloc.c
deleted file mode 100644
index 17d8ed30d6c1..000000000000
--- a/editors/emacs22/files/patch-src__alloc.c
+++ /dev/null
@@ -1,45 +0,0 @@
---- src/alloc.c.orig	2008-08-12 20:35:44.000000000 +0200
-+++ src/alloc.c	2013-09-07 21:52:46.000000000 +0200
-@@ -1205,6 +1205,9 @@
- #endif /* GC_MALLOC_CHECK */
- 
-   __free_hook = old_free_hook;
-+#ifdef __GNUC__
-+  __asm __volatile ("" : : : "memory");
-+#endif
-   free (ptr);
- 
-   /* If we released our reserve (due to running out of memory),
-@@ -1236,6 +1239,9 @@
- 
-   BLOCK_INPUT_ALLOC;
-   __malloc_hook = old_malloc_hook;
-+#ifdef __GNUC__
-+  __asm __volatile ("" : : : "memory");
-+#endif
- #ifdef DOUG_LEA_MALLOC
-     mallopt (M_TOP_PAD, malloc_hysteresis * 4096);
- #else
-@@ -1285,6 +1291,9 @@
- 
-   BLOCK_INPUT_ALLOC;
-   __realloc_hook = old_realloc_hook;
-+#ifdef __GNUC__
-+  __asm __volatile ("" : : : "memory");
-+#endif
- 
- #ifdef GC_MALLOC_CHECK
-   if (ptr)
-@@ -4573,8 +4582,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
diff --git a/editors/emacs22/files/patch-src__m__intel386.h b/editors/emacs22/files/patch-src__m__intel386.h
deleted file mode 100644
index 9db1d7bdf584..000000000000
--- a/editors/emacs22/files/patch-src__m__intel386.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/m/intel386.h.orig	2008-02-28 00:32:04.000000000 +0100
-+++ src/m/intel386.h	2013-09-14 16:14:18.000000000 +0200
-@@ -58,7 +58,7 @@ NOTE-END */
- /* Define NO_ARG_ARRAY if you cannot take the address of the first of a
-  * group of arguments and treat it as an array of the arguments.  */
- 
--/* #define NO_ARG_ARRAY */
-+#define NO_ARG_ARRAY
- 
- /* Define WORD_MACHINE if addresses and such have
-  * to be corrected before they can be used as byte counts.  */