From owner-cvs-all@FreeBSD.ORG Sat Apr 30 13:24:53 2011 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0AA52106566B; Sat, 30 Apr 2011 13:24:53 +0000 (UTC) (envelope-from inyaoo@gmail.com) Received: from mail-wy0-f182.google.com (mail-wy0-f182.google.com [74.125.82.182]) by mx1.freebsd.org (Postfix) with ESMTP id 191188FC13; Sat, 30 Apr 2011 13:24:51 +0000 (UTC) Received: by wyf23 with SMTP id 23so4402015wyf.13 for ; Sat, 30 Apr 2011 06:24:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-type; bh=Q8z5qfwgQA1aDXo0li8/rU+mNz547U3at88NRoHVMoc=; b=fC/Hcag3dRP4S++/GqJY2hU97S7umGFqV1umqNAQ6CQa4W6Ytd1TqURIH6mdi6B7w1 syqiZfkAQcTMUIS4efREz8y5xE0BBRtpmkVlb0nWtUNgV6pn9vSYrkUrSdQMsbF8OeXt lwZ6/7tEjLuti1lReDLhlQhaqmPNxy2qIJdZE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; b=SpKbZMZuHvLHvdaO7+LFe/2EDk4OYl3iS533cUj5e0BRlY7ZZFk9yXT038ZW88KyOY UgngEkih1sLEMG6dAPqGhH63w+rp04jUx3R73u/W1sW+b/LBJZZptBAjFKD5Qy5LVeeo 4U7r7q0BRyyHYAvmc0AWqiVP+M9Dtw4MfL3CY= Received: by 10.216.134.207 with SMTP id s57mr953927wei.25.1304168334157; Sat, 30 Apr 2011 05:58:54 -0700 (PDT) Received: from localhost (94-23-158-115.kimsufi.com [94.23.158.115]) by mx.google.com with ESMTPS id g32sm1790793wej.27.2011.04.30.05.58.46 (version=SSLv3 cipher=OTHER); Sat, 30 Apr 2011 05:58:52 -0700 (PDT) From: Pan Tsu To: Ashish SHUKLA References: <201104281508.p3SF8PjS068074@repoman.freebsd.org> Date: Sat, 30 Apr 2011 16:58:41 +0400 In-Reply-To: <201104281508.p3SF8PjS068074@repoman.freebsd.org> (Ashish SHUKLA's message of "Thu, 28 Apr 2011 15:08:25 +0000 (UTC)") Message-ID: <86tydfnbem.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain 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 X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Apr 2011 13:24:53 -0000 Ashish SHUKLA 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 ++#elif defined __FreeBSD__ ++#include + #elif defined __GNUC__ + # define alloca __builtin_alloca + #elif defined _AIX %%