- Add autoheader to USE_AUTOTOOLS[1].

- Include 'alloca' fix[1].
- Fix ImageMagick dependency to depend on X11[2].

Submitted by:	Pan Tsu[1], swell.k@gmail.com[2]
Approved by:	pgj (implicit)

editors/emacs-devel/Makefile

@@ -35,7 +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
+USE_AUTOTOOLS=	autoconf:env automake:env aclocal:env autoheader:env
 
 EMACS_DIRS=	${DATADIR}/${EMACS_VER}/leim ${DATADIR}/${EMACS_VER}/lisp ${DATADIR}/${EMACS_VER}/src \
 		${PREFIX}/libexec/${PORTNAME}
@@ -176,6 +176,12 @@ USE_XORG+=	xft
 LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
 .endif
 
+.if defined(WITHOUT_IMAGEMAGICK)
+CONFIGURE_ARGS+=	--without-imagemagick
+.else
+LIB_DEPENDS+=		MagickCore.4:${PORTSDIR}/graphics/ImageMagick
+.endif
+
 .if defined(WITHOUT_M17N)
 CONFIGURE_ARGS+=	--without-m17n-flt
 .else
@@ -214,12 +220,6 @@ CONFIGURE_ARGS+=	--without-dbus
 LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus
 .endif
 
-.if defined(WITHOUT_IMAGEMAGICK)
-CONFIGURE_ARGS+=	--without-imagemagick
-.else
-LIB_DEPENDS+=		MagickCore.4:${PORTSDIR}/graphics/ImageMagick
-.endif
-
 .if defined(WITHOUT_XML)
 CONFIGURE_ARGS+=	--without-xml2
 .else

editors/emacs-devel/files/patch-configure.in

@@ -44,3 +44,12 @@ $FreeBSD$
       case "$opsys" in
         dnl defined __FreeBSD__ || defined __NetBSD__ || defined __linux__
         gnu-linux|freebsd|netbsd)
+@@ -3547,6 +3547,8 @@ AH_BOTTOM([
+
+ #ifdef HAVE_ALLOCA_H
+ # include <alloca.h>
++#elif defined __FreeBSD__
++#include <stdlib.h>
+ #elif defined __GNUC__
+ # define alloca __builtin_alloca
+ #elif defined _AIX