Date: Sat, 30 Apr 2011 16:58:41 +0400 From: Pan Tsu <inyaoo@gmail.com> To: Ashish SHUKLA <ashish@FreeBSD.org> Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/editors/emacs-devel Makefile distinfo ports/editors/emacs-devel/files patch-Makefile.in patch-configure patch-configure.in patch-doc-emacs-Makefile.in patch-doc-lispintro-Makefile.in patch-doc-lispref-Makefile.in patch-doc-misc-Makefile.in patch-src_config.in Message-ID: <86tydfnbem.fsf@gmail.com> In-Reply-To: <201104281508.p3SF8PjS068074@repoman.freebsd.org> (Ashish SHUKLA's message of "Thu, 28 Apr 2011 15:08:25 %2B0000 (UTC)") References: <201104281508.p3SF8PjS068074@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Ashish SHUKLA <ashish@FreeBSD.org> writes: > ashish 2011-04-28 15:08:25 UTC > > FreeBSD ports repository > > Modified files: > editors/emacs-devel Makefile distinfo > editors/emacs-devel/files patch-Makefile.in > patch-doc-emacs-Makefile.in > patch-doc-lispintro-Makefile.in > patch-doc-lispref-Makefile.in > patch-doc-misc-Makefile.in > Added files: > editors/emacs-devel/files patch-configure.in > Removed files: > editors/emacs-devel/files patch-configure patch-src_config.in > Log: > - Update to bzr revision 104000. - Any reason to use autogen.sh instead of relying on AUTOTOOLS? - Why patch-src_config.in was lost and not converted to patch-configure.in? - No love for IMAGEMAGICK knob since http://docs.freebsd.org/cgi/mid.cgi?86y6ahzpjp.fsf %% Index: editors/emacs-devel/Makefile =================================================================== RCS file: /a/.cvsup/ports/editors/emacs-devel/Makefile,v retrieving revision 1.46 diff -u -p -r1.46 Makefile --- editors/emacs-devel/Makefile 28 Apr 2011 15:08:25 -0000 1.46 +++ editors/emacs-devel/Makefile 30 Apr 2011 12:43:07 -0000 @@ -26,8 +26,10 @@ CONFLICTS= emacs-19.* emacs-21.* emacs-2 EMACS_VER= 24.0.50 EMACS_REV= 104000 -GNU_CONFIGURE= yes +USE_AUTOTOOLS= autoconf autoheader aclocal automake +ACLOCAL_ARGS= -Im4 +AUTOMAKE_ARGS= --add-missing USE_GMAKE= yes USE_XZ= yes CPPFLAGS+= -I${LOCALBASE}/include @@ -35,7 +37,6 @@ 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} @@ -256,9 +257,6 @@ 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="" Index: editors/emacs-devel/files/patch-configure.in =================================================================== RCS file: /a/.cvsup/ports/editors/emacs-devel/files/patch-configure.in,v retrieving revision 1.6 diff -u -p -r1.6 patch-configure.in --- editors/emacs-devel/files/patch-configure.in 28 Apr 2011 15:08:25 -0000 1.6 +++ editors/emacs-devel/files/patch-configure.in 30 Apr 2011 12:49:52 -0000 @@ -44,3 +44,12 @@ $FreeBSD: ports/editors/emacs-devel/file 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 %%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86tydfnbem.fsf>