10 files changed, 78 insertions, 218 deletions

diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index 24bd1609f5df..5aaf6f1abf17 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -26,7 +26,7 @@ CONFLICTS=	emacs-19.* emacs-21.* emacs-22.* emacs-23.* \
 INSTALLS_ICONS=	yes
 
 EMACS_VER=	24.0.50
-EMACS_REV=	102364
+EMACS_REV=	104000
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_XZ=		yes
@@ -35,6 +35,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--localstatedir=/var
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+USE_AUTOTOOLS=	autoconf:env automake:env aclocal:env
 
 EMACS_DIRS=	${DATADIR}/${EMACS_VER}/leim ${DATADIR}/${EMACS_VER}/lisp ${DATADIR}/${EMACS_VER}/src \
 		${PREFIX}/libexec/${PORTNAME}
@@ -51,7 +52,7 @@ MAKE_ENV=	LC_ALL=C
 
 INFO=		ada-mode auth autotype calc ccmode cl dbus dired-x \
 		ebrowse ede ediff edt efaq eieio eintr elisp emacs-mime emacs epa \
-		erc eshell eudc flymake forms gnus idlwave info \
+		erc ert eshell eudc flymake forms gnus idlwave info \
 		mairix-el message mh-e newsticker nxml-mode \
 		org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve \
 		smtpmail speedbar tramp url vip viper widget woman
@@ -255,6 +256,9 @@ add-plist-data:
 .endfor
 	@${ECHO} "@unexec rmdir %D/${DATADIR_REL}/${EMACS_VER} 2>/dev/null || true" >>${TMPPLIST}
 
+pre-configure:
+	@cd ${WRKSRC} && ./autogen.sh
+
 .if defined(WITH_SOURCES)
 PLIST_SUB+=	SOURCES=""
 
diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo
index 0bad985a270f..f431cd3648a8 100644
--- a/editors/emacs-devel/distinfo
+++ b/editors/emacs-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (emacs-24.0.50.102364.tar.xz) = 7eb2e31c8aabbd130b8e8df03ef1892455cc7a97be6601f62322104e8bec546c
-SIZE (emacs-24.0.50.102364.tar.xz) = 22792292
+SHA256 (emacs-24.0.50.104000.tar.xz) = 6468383e33333a05ab98262508db96348f1928cdeeb9d377fcc20e373207cbb5
+SIZE (emacs-24.0.50.104000.tar.xz) = 23265108
diff --git a/editors/emacs-devel/files/patch-Makefile.in b/editors/emacs-devel/files/patch-Makefile.in
index 0ee2b02c88d7..a8a4726377e5 100644
--- a/editors/emacs-devel/files/patch-Makefile.in
+++ b/editors/emacs-devel/files/patch-Makefile.in
@@ -3,7 +3,7 @@ $FreeBSD$
 
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -472,14 +472,6 @@
+@@ -509,14 +509,6 @@
  
  install-arch-indep: mkdir info install-etc
  	-set ${COPYDESTS} ; \
@@ -18,22 +18,22 @@ $FreeBSD$
  	mkdir ${COPYDESTS} ; \
  	chmod ugo+rx ${COPYDESTS} ; \
  	unset CDPATH; \
-@@ -579,9 +571,9 @@
+@@ -616,9 +608,9 @@
  	   cd ${srcdir}/info ; \
  	   for elt in $(INFO_FILES); do \
- 	      test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
+ 	      test "$(HAVE_MAKEINFO)" = "no" && ! 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; \
-+ 	      for f in `ls $$elt 2>/dev/null`; do \
-+ 	        ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f.info; \
-+ 	        chmod a+r $(DESTDIR)${infodir}/$$f.info; \
++	      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; \
-@@ -596,7 +588,7 @@
+@@ -633,7 +625,7 @@
  	  for elt in $(INFO_FILES); do \
- 	    test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
+ 	    test "$(HAVE_MAKEINFO)" = "no" && ! 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/emacs-devel/files/patch-configure b/editors/emacs-devel/files/patch-configure
deleted file mode 100644
index ba34920b61f0..000000000000
--- a/editors/emacs-devel/files/patch-configure
+++ /dev/null
@@ -1,176 +0,0 @@
-
-$FreeBSD$
-
---- configure.orig
-+++ configure
-@@ -6055,170 +6055,6 @@
-   LIBSOUND=
- fi
- 
--
--
--  ALSA_REQUIRED=1.0.0
--  ALSA_MODULES="alsa >= $ALSA_REQUIRED"
--
--  succeeded=no
--
--  # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  case $PKG_CONFIG in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--  done
--IFS=$as_save_IFS
--
--  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
--  ;;
--esac
--fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--
--  if test "$PKG_CONFIG" = "no" ; then
--     HAVE_ALSA=no
--  else
--     PKG_CONFIG_MIN_VERSION=0.9.0
--     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
--        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ALSA_MODULES" >&5
--$as_echo_n "checking for $ALSA_MODULES... " >&6; }
--
--        if $PKG_CONFIG --exists "$ALSA_MODULES" 2>&5; then
--            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--            succeeded=yes
--
--            { $as_echo "$as_me:${as_lineno-$LINENO}: checking ALSA_CFLAGS" >&5
--$as_echo_n "checking ALSA_CFLAGS... " >&6; }
--            ALSA_CFLAGS=`$PKG_CONFIG --cflags "$ALSA_MODULES"|sed -e 's,///*,/,g'`
--            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ALSA_CFLAGS" >&5
--$as_echo "$ALSA_CFLAGS" >&6; }
--
--            { $as_echo "$as_me:${as_lineno-$LINENO}: checking ALSA_LIBS" >&5
--$as_echo_n "checking ALSA_LIBS... " >&6; }
--            ALSA_LIBS=`$PKG_CONFIG --libs "$ALSA_MODULES"|sed -e 's,///*,/,g'`
--            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ALSA_LIBS" >&5
--$as_echo "$ALSA_LIBS" >&6; }
--        else
--            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--            ALSA_CFLAGS=""
--            ALSA_LIBS=""
--            ## If we have a custom action on failure, don't print errors, but
--            ## do set a variable so people can do so.
--            ALSA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$ALSA_MODULES"`
--
--        fi
--
--
--
--     else
--        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
--        echo "*** See http://www.freedesktop.org/software/pkgconfig"
--     fi
--  fi
--
--  if test $succeeded = yes; then
--     HAVE_ALSA=yes
--  else
--     HAVE_ALSA=no
--  fi
--
--  if test $HAVE_ALSA = yes; then
--    SAVE_CFLAGS="$CFLAGS"
--    SAVE_LDFLAGS="$LDFLAGS"
--    CFLAGS="$ALSA_CFLAGS $CFLAGS"
--    LDFLAGS="$ALSA_LIBS $LDFLAGS"
--    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <asoundlib.h>
--int
--main ()
--{
--snd_lib_error_set_handler (0);
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_compile "$LINENO"; then :
--  emacs_alsa_normal=yes
--else
--  emacs_alsa_normal=no
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--    if test "$emacs_alsa_normal" != yes; then
--      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <alsa/asoundlib.h>
--int
--main ()
--{
--snd_lib_error_set_handler (0);
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_compile "$LINENO"; then :
--  emacs_alsa_subdir=yes
--else
--  emacs_alsa_subdir=no
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--      if test "$emacs_alsa_subdir" != yes; then
--        as_fn_error $? "pkg-config found alsa, but it does not compile.  See config.log for error messages." "$LINENO" 5
--      fi
--      ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE"
--    fi
--
--    CFLAGS="$SAVE_CFLAGS"
--    LDFLAGS="$SAVE_LDFLAGS"
--    LIBSOUND="$LIBSOUND $ALSA_LIBS"
--    CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS"
--
--$as_echo "#define HAVE_ALSA 1" >>confdefs.h
--
--  fi
--
--        if test x$have_sound_header = xyes || test $HAVE_ALSA = yes; then
--     case "$opsys" in
--              gnu-linux|freebsd|netbsd)
--
--$as_echo "#define HAVE_SOUND 1" >>confdefs.h
--
--         ;;
--     esac
--  fi
--
--
- fi
- 
- for ac_header in sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \
diff --git a/editors/emacs-devel/files/patch-configure.in b/editors/emacs-devel/files/patch-configure.in
new file mode 100644
index 000000000000..5d6d00b3beef
--- /dev/null
+++ b/editors/emacs-devel/files/patch-configure.in
@@ -0,0 +1,46 @@
+
+$FreeBSD$
+
+--- configure.in.orig
++++ configure.in
+@@ -1129,39 +1129,10 @@
+   AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=)
+   AC_SUBST(LIBSOUND)
+ 
+-  ALSA_REQUIRED=1.0.0
+-  ALSA_MODULES="alsa >= $ALSA_REQUIRED"
+-  PKG_CHECK_MODULES(ALSA, $ALSA_MODULES, HAVE_ALSA=yes, HAVE_ALSA=no)
+-  if test $HAVE_ALSA = yes; then
+-    SAVE_CFLAGS="$CFLAGS"
+-    SAVE_LDFLAGS="$LDFLAGS"
+-    CFLAGS="$ALSA_CFLAGS $CFLAGS"
+-    LDFLAGS="$ALSA_LIBS $LDFLAGS"
+-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <asoundlib.h>]], [[snd_lib_error_set_handler (0);]])],
+-                    emacs_alsa_normal=yes,
+-	            emacs_alsa_normal=no)
+-    if test "$emacs_alsa_normal" != yes; then
+-      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <alsa/asoundlib.h>]],
+-                     [[snd_lib_error_set_handler (0);]])],
+-                     emacs_alsa_subdir=yes,
+-	             emacs_alsa_subdir=no)
+-      if test "$emacs_alsa_subdir" != yes; then
+-        AC_MSG_ERROR([pkg-config found alsa, but it does not compile.  See config.log for error messages.])
+-      fi
+-      ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE"
+-    fi
+-
+-    CFLAGS="$SAVE_CFLAGS"
+-    LDFLAGS="$SAVE_LDFLAGS"
+-    LIBSOUND="$LIBSOUND $ALSA_LIBS"
+-    CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS"
+-    AC_DEFINE(HAVE_ALSA, 1, [Define to 1 if ALSA is available.])
+-  fi
+-
+   dnl Define HAVE_SOUND if we have sound support.  We know it works and
+   dnl compiles only on the specified platforms.  For others, it
+   dnl probably doesn't make sense to try.
+-  if test x$have_sound_header = xyes || test $HAVE_ALSA = yes; then
++  if test x$have_sound_header = xyes; then
+      case "$opsys" in
+        dnl defined __FreeBSD__ || defined __NetBSD__ || defined __linux__
+        gnu-linux|freebsd|netbsd)
diff --git a/editors/emacs-devel/files/patch-doc-emacs-Makefile.in b/editors/emacs-devel/files/patch-doc-emacs-Makefile.in
index 5faf9ad9aa7e..43c924fa9b65 100644
--- a/editors/emacs-devel/files/patch-doc-emacs-Makefile.in
+++ b/editors/emacs-devel/files/patch-doc-emacs-Makefile.in
@@ -3,12 +3,12 @@ $FreeBSD$
 
 --- doc/emacs/Makefile.in.orig
 +++ doc/emacs/Makefile.in
-@@ -39,7 +39,7 @@
- 
+@@ -38,7 +38,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 -I $(srcdir)
-+MAKEINFO = makeinfo --force --no-split -I $(srcdir)
+ MAKEINFO = @MAKEINFO@
+-MAKEINFO_OPTS = --force --enable-encoding -I $(srcdir)
++MAKEINFO_OPTS = --force --no-split --enable-encoding -I $(srcdir)
  
  TEXI2DVI = texi2dvi
  TEXI2PDF = texi2pdf
diff --git a/editors/emacs-devel/files/patch-doc-lispintro-Makefile.in b/editors/emacs-devel/files/patch-doc-lispintro-Makefile.in
index 86c190ca927a..ff0a5cddab52 100644
--- a/editors/emacs-devel/files/patch-doc-lispintro-Makefile.in
+++ b/editors/emacs-devel/files/patch-doc-lispintro-Makefile.in
@@ -3,12 +3,12 @@ $FreeBSD$
 
 --- doc/lispintro/Makefile.in.orig
 +++ doc/lispintro/Makefile.in
-@@ -28,7 +28,7 @@
- # Directory with the (customized) texinfo.tex file.
+@@ -27,7 +27,7 @@
  texinfodir = $(srcdir)/../misc
  
--MAKEINFO = makeinfo --force -I $(srcdir)
-+MAKEINFO = makeinfo --no-split --force -I $(srcdir)
+ MAKEINFO = @MAKEINFO@
+-MAKEINFO_OPTS = --force -I $(srcdir)
++MAKEINFO_OPTS = --force --no-split -I $(srcdir)
  TEXI2DVI = texi2dvi
  TEXI2PDF = texi2pdf
  DVIPS = dvips
diff --git a/editors/emacs-devel/files/patch-doc-lispref-Makefile.in b/editors/emacs-devel/files/patch-doc-lispref-Makefile.in
index 9ce0624ce29a..525d025916ca 100644
--- a/editors/emacs-devel/files/patch-doc-lispref-Makefile.in
+++ b/editors/emacs-devel/files/patch-doc-lispref-Makefile.in
@@ -3,12 +3,12 @@ $FreeBSD$
 
 --- doc/lispref/Makefile.in.orig
 +++ doc/lispref/Makefile.in
-@@ -32,7 +32,7 @@
- # Directory with emacsver.texi.
+@@ -31,7 +31,7 @@
  emacsdir =  $(srcdir)/../emacs
  
--MAKEINFO = makeinfo --force -I $(emacsdir) -I $(srcdir)
-+MAKEINFO = makeinfo --no-split --force -I $(emacsdir) -I $(srcdir)
+ MAKEINFO = @MAKEINFO@
+-MAKEINFO_OPTS = --force --enable-encoding -I $(emacsdir) -I $(srcdir)
++MAKEINFO_OPTS = --force --no-split --enable-encoding -I $(emacsdir) -I $(srcdir)
  TEXI2DVI = texi2dvi
  TEXI2PDF = texi2pdf
  DVIPS = dvips
diff --git a/editors/emacs-devel/files/patch-doc-misc-Makefile.in b/editors/emacs-devel/files/patch-doc-misc-Makefile.in
index 02c821e5f3c9..ebc245cc7f67 100644
--- a/editors/emacs-devel/files/patch-doc-misc-Makefile.in
+++ b/editors/emacs-devel/files/patch-doc-misc-Makefile.in
@@ -3,12 +3,12 @@ $FreeBSD$
 
 --- doc/misc/Makefile.in.orig
 +++ doc/misc/Makefile.in
-@@ -42,7 +42,7 @@
- 
+@@ -41,7 +41,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 -I$(emacsdir)
-+MAKEINFO = makeinfo --force --no-split -I$(emacsdir)
+ MAKEINFO = @MAKEINFO@
+-MAKEINFO_OPTS = --force -I$(emacsdir)
++MAKEINFO_OPTS = --force --no-split -I$(emacsdir)
  
  # Also add new entries to INFO_FILES in the top-level Makefile.in.
  INFO_TARGETS = \
diff --git a/editors/emacs-devel/files/patch-src_config.in b/editors/emacs-devel/files/patch-src_config.in
deleted file mode 100644
index b8fee6cc07d1..000000000000
--- a/editors/emacs-devel/files/patch-src_config.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/config.in.orig
-+++ src/config.in
-@@ -1171,6 +1171,8 @@
- 
- #ifdef HAVE_ALLOCA_H
- # include <alloca.h>
-+#elif __FreeBSD__
-+#include <stdlib.h>
- #elif defined __GNUC__
- # define alloca __builtin_alloca
- #elif defined _AIX