GNU Emacs updates

editors/emacs
- Update to v. 24.1[1]
- Update CANNA patch to v. 24.1[2]
- Convert OPTIONS to OptionsNG
- Remove patch to VC to make it work with Subversion 1.7
- Add patch to implement process support for FreeBSD from Emacs bug# 5243
- Add patch to fix segfault on Terminal (from NetBSD emacs port)[2]

editors/emacs23
- Convert OPTIONS to OptionsNG
- Bump PORTREVISION of editors/emacs23 port
- Remove PORTEPOCH, as port needs to be explicitly installed/upgraded
- Connect repocopied editors/emacs23 to build

editors/emacs-devel
- Update to bzr revision 109364
- Convert OPTIONS to OptionsNG
- Remove redundant patches
- Add patch to add openpty support for 10-CURRENT from Emacs bug# 12040[3]

Mk/bsd.emacs.mk
- Add EMACS_PORT_NAME block for Emacs 24 to bsd.emacs.mk
- Update major version for emacs-devel port
- Take maintainership of bsd.emacs.mk

Thanks to everyone who tested these updates, and provided their feedback.

Submitted by:	http://www.gnu.org/software/emacs/NEWS.24.1[1]
Submitted by:	Yuji TAKANO[2] (via private email), Jan Beich[3]

3 files changed, 26 insertions, 73 deletions

diff --git a/editors/emacs-devel/files/patch-Makefile.in b/editors/emacs-devel/files/patch-Makefile.in
deleted file mode 100644
index 1f96cbac47c3..000000000000
--- a/editors/emacs-devel/files/patch-Makefile.in
+++ /dev/null
@@ -1,42 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in.orig
-+++ Makefile.in
-@@ -517,14 +517,6 @@
- 
- install-arch-indep: mkdir info install-etc
- 	-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; \
-@@ -624,9 +616,9 @@
- 	   cd ${srcdir}/info ; \
- 	   for elt in $(INFO_FILES); do \
- 	      test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$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; \
-+	      for f in `ls $$elt 2>/dev/null`; do \
-+	        ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f.info; \
-+	        chmod a+r $(DESTDIR)${infodir}/$$f.info; \
- 	        if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \
- 	          rm -f $(DESTDIR)${infodir}/$$f.gz; \
- 	          ${GZIP_PROG} -9n $(DESTDIR)${infodir}/$$f; \
-@@ -641,7 +633,7 @@
- 	  for elt in $(INFO_FILES); do \
- 	    test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
- 	    (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} ${COPYDESTS}
diff --git a/editors/emacs-devel/files/patch-configure.in b/editors/emacs-devel/files/patch-configure.ac
index 05dbf8d39a9a..38a808a6bffb 100644
--- a/editors/emacs-devel/files/patch-configure.in
+++ b/editors/emacs-devel/files/patch-configure.ac
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.in.orig
-+++ configure.in
-@@ -1169,39 +1169,10 @@
+--- configure.ac.orig
++++ configure.ac
+@@ -1166,39 +1166,10 @@
    AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=)
    AC_SUBST(LIBSOUND)
  
@@ -44,12 +44,30 @@ $FreeBSD$
       case "$opsys" in
         dnl defined __FreeBSD__ || defined __NetBSD__ || defined __linux__
         gnu-linux|freebsd|netbsd)
-@@ -1218,7 +1189,7 @@
-   linux/version.h sys/systeminfo.h \
-   stdio_ext.h fcntl.h coff.h pty.h sys/mman.h \
-   sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \
+@@ -1215,7 +1186,7 @@
+   linux/version.h sys/systeminfo.h
+   stdio_ext.h fcntl.h coff.h pty.h
+   sys/vlimit.h sys/resource.h
 -  sys/utsname.h pwd.h utmp.h dirent.h util.h)
 +  sys/utsname.h pwd.h utmp.h dirent.h util.h libutil.h)
-
+ 
  AC_MSG_CHECKING(if personality LINUX32 can be set)
  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/personality.h>]], [[personality (PER_LINUX32)]])],
+@@ -3378,7 +3349,7 @@
+     AC_DEFINE(PTY_TTY_NAME_SPRINTF, [] )
+     ;;
+ 
+-  darwin )
++  darwin | freebsd )
+     AC_DEFINE(PTY_ITERATION, [int i; for (i = 0; i < 1; i++)] )
+     dnl Not used, because PTY_ITERATION is defined.
+     AC_DEFINE(FIRST_PTY_LETTER, ['p'])
+@@ -3390,7 +3361,7 @@
+     AC_DEFINE(PTY_TTY_NAME_SPRINTF, [] )
+     ;;
+ 
+-  gnu | freebsd | netbsd | openbsd )
++  gnu | netbsd | openbsd )
+     AC_DEFINE(FIRST_PTY_LETTER, ['p'])
+     ;;
+ 
diff --git a/editors/emacs-devel/files/patch-src_s_freebsd.h b/editors/emacs-devel/files/patch-src_s_freebsd.h
deleted file mode 100644
index a53230309c40..000000000000
--- a/editors/emacs-devel/files/patch-src_s_freebsd.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- src/s/freebsd.h.orig
-+++ src/s/freebsd.h
-@@ -61,3 +61,17 @@
- 
- /* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the stack.  */
- #define GC_MARK_STACK 	GC_MAKE_GCPROS_NOOPS
-+
-+#define PTY_ITERATION	int i; for (i = 0; i < 1; i++)
-+#define PTY_NAME_SPRINTF	/* none */
-+#define PTY_TTY_NAME_SPRINTF	/* none */
-+#define PTY_OPEN						\
-+  do								\
-+    {								\
-+      int slave;						\
-+      if (openpty (&fd, &slave, pty_name, NULL, NULL) == -1)	\
-+	fd = -1;						\
-+      else							\
-+	emacs_close (slave);					\
-+    }								\
-+  while (0)