From owner-cvs-all@FreeBSD.ORG Fri Oct 1 19:29:33 2010 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 5ACDF106564A; Fri, 1 Oct 2010 19:29:33 +0000 (UTC) (envelope-from swell.k@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 6E12B8FC08; Fri, 1 Oct 2010 19:29:32 +0000 (UTC) Received: by wyb29 with SMTP id 29so1988499wyb.13 for ; Fri, 01 Oct 2010 12:29:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:references :date:message-id:user-agent:mime-version:content-type; bh=jgGz+24Z/oUyuR5IM6XNvlr2D359GE2iSpDqXX27U3c=; b=Z8737+Dv3i1NvzFCaWHNBfDiqAlQ8YotoavMZiaLa5yIV6tB3aPdCzelL2adH4YqDp geIh86P1Rbcim+72NdklxSsyqiz7frUrDXo2RJ4Rwo8HeMr7hdxUogSTZ37InaC/Z0nk Y6Fhuz3Ec4Ij5wtz8PrMbenwcrSEfqaF9W5Lc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:references:date:message-id:user-agent :mime-version:content-type; b=s+Fvruylun8n05md+GWyFHVx3iZ6Tju0ZqsgwyvWMoTrKgc0bWOcap6SP1qt7GNRAb MmhbIRF1PCWlU66DmHt/vizJdsvnCmBjru8V4YyrIAVOuqMeUeBduUn0bkog9yfcMGRu C7oOfp3QikzAY2XNRmSjDtn9H/g6IdaCBtrXA= Received: by 10.216.3.19 with SMTP id 19mr2477607weg.108.1285961371241; Fri, 01 Oct 2010 12:29:31 -0700 (PDT) Received: from localhost (tor5.anonymizer.ccc.de [80.237.226.76]) by mx.google.com with ESMTPS id e56sm1038816wer.46.2010.10.01.12.29.28 (version=SSLv3 cipher=RC4-MD5); Fri, 01 Oct 2010 12:29:30 -0700 (PDT) From: Anonymous To: Ashish SHUKLA References: <201009270119.o8R1JVBC023352__7233.0727045939$1285550384$gmane$org@repoman.freebsd.org> Date: Fri, 01 Oct 2010 23:22:18 +0400 Message-ID: <86y6ahzpjp.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 pkg-plist ports/editors/emacs-devel/files patch-configure 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: Fri, 01 Oct 2010 19:29:33 -0000 Ashish SHUKLA writes: > ashish 2010-09-27 01:19:31 UTC > > FreeBSD ports repository > > Modified files: > editors/emacs-devel Makefile distinfo pkg-plist > editors/emacs-devel/files patch-configure > Log: > - Update port to latest snapshot. [...] > @@ -206,24 +210,23 @@ CONFIGURE_ARGS+= --without-dbus > LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus > .endif > > -.include > +.if defined(WITH_IMAGEMAGICK) > +CONFIGURE_ARGS+= --with-imagemagick > +LIB_DEPENDS+= MagickCore.4:${PORTSDIR}/graphics/ImageMagick > +.endif As of r101653 imagemagick support is enabled by default and as of r101682 it's hidden behind HAVE_X11. imagemagick knob didn't work without x11 even before those changes. And emacs doesn't seem to have a helper app like w3mimgdisplay to render images over terminal. %% for new snapshot, r101653 or newer @@ -76,7 +76,7 @@ OPTIONS= DBUS "DBus support" ON \ XIM "X Input Method support" ON \ XML "XML Parser support" ON \ XPM "XPM images support" ON \ - IMAGEMAGICK "ImageMagick support" OFF + IMAGEMAGICK "ImageMagick support" ON .include @@ -159,8 +159,9 @@ CONFIGURE_ARGS+= --without-xpm USE_XORG+= xpm .endif -.if defined(WITH_IMAGEMAGICK) -CONFIGURE_ARGS+= --with-imagemagick +.if defined(WITHOUT_IMAGEMAGICK) +CONFIGURE_ARGS+= --without-imagemagick +.else LIB_DEPENDS+= MagickCore.4:${PORTSDIR}/graphics/ImageMagick .endif %% %% can be committed now Index: editors/emacs-devel/Makefile =================================================================== RCS file: /a/.cvsup/ports/editors/emacs-devel/Makefile,v retrieving revision 1.44 diff -u -p -r1.44 Makefile --- editors/emacs-devel/Makefile 27 Sep 2010 01:19:31 -0000 1.44 +++ editors/emacs-devel/Makefile 1 Oct 2010 19:00:55 -0000 @@ -159,6 +159,11 @@ CONFIGURE_ARGS+= --without-xpm USE_XORG+= xpm .endif +.if defined(WITH_IMAGEMAGICK) +CONFIGURE_ARGS+= --with-imagemagick +LIB_DEPENDS+= MagickCore.4:${PORTSDIR}/graphics/ImageMagick +.endif + .if defined(WITHOUT_XFT) .if defined(WITH_M17N) IGNORE= m17n support requires Xft. Please run 'make config' @@ -198,7 +203,7 @@ USE_GNOME+= gconf2 CONFIGURE_ARGS+= --without-xim .endif -.endif +.endif # WITHOUT_X11 .if defined(WITHOUT_SOUND) CONFIGURE_ARGS+= --without-sound @@ -210,11 +215,6 @@ CONFIGURE_ARGS+= --without-dbus LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus .endif -.if defined(WITH_IMAGEMAGICK) -CONFIGURE_ARGS+= --with-imagemagick -LIB_DEPENDS+= MagickCore.4:${PORTSDIR}/graphics/ImageMagick -.endif - .if defined(WITHOUT_XML) CONFIGURE_ARGS+= --without-xml2 .else %%