Date: Sat, 02 Oct 2010 13:21:20 +0530 From: ashish@FreeBSD.org (Ashish SHUKLA) To: Anonymous <swell.k@gmail.com> Cc: cvs-ports@FreeBSD.org, Ashish SHUKLA <ashish@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 Message-ID: <86zkuxdocn.fsf@chateau.d.if> In-Reply-To: <86y6ahzpjp.fsf@gmail.com> (Anonymous's message of "Fri, 01 Oct 2010 23:22:18 %2B0400") References: <201009270119.o8R1JVBC023352__7233.0727045939$1285550384$gmane$org@repoman.freebsd.org> <86y6ahzpjp.fsf@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
Anonymous writes:
> Ashish SHUKLA <ashish@FreeBSD.org> writes:
>> ashish 2010-09-27 01:19:31 UTC
>>=20
>> FreeBSD ports repository
>>=20
>> Modified files:
>> editors/emacs-devel Makefile distinfo pkg-plist=20
>> editors/emacs-devel/files patch-configure=20
>> Log:
>> - Update port to latest snapshot.
> [...]
>> @@ -206,24 +210,23 @@ CONFIGURE_ARGS+=3D --without-dbus
>> LIB_DEPENDS+=3D dbus-1.3:${PORTSDIR}/devel/dbus
>> .endif
>>=20
>> -.include <bsd.port.pre.mk>
>> +.if defined(WITH_IMAGEMAGICK)
>> +CONFIGURE_ARGS+=3D --with-imagemagick
>> +LIB_DEPENDS+=3D 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=3D 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
=20
> .include <bsd.port.options.mk>
=20
> @@ -159,8 +159,9 @@ CONFIGURE_ARGS+=3D --without-xpm
> USE_XORG+=3D xpm
> .endif
=20
> -.if defined(WITH_IMAGEMAGICK)
> -CONFIGURE_ARGS+=3D --with-imagemagick
> +.if defined(WITHOUT_IMAGEMAGICK)
> +CONFIGURE_ARGS+=3D --without-imagemagick
> +.else
> LIB_DEPENDS+=3D MagickCore.4:${PORTSDIR}/graphics/ImageMagick
> .endif
=20
> %%
> %% can be committed now
> Index: editors/emacs-devel/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> 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+=3D --without-xpm
> USE_XORG+=3D xpm
> .endif
=20
> +.if defined(WITH_IMAGEMAGICK)
> +CONFIGURE_ARGS+=3D --with-imagemagick
> +LIB_DEPENDS+=3D MagickCore.4:${PORTSDIR}/graphics/ImageMagick
> +.endif
> +
> .if defined(WITHOUT_XFT)
> .if defined(WITH_M17N)
> IGNORE=3D m17n support requires Xft. Please run 'make config'
> @@ -198,7 +203,7 @@ USE_GNOME+=3D gconf2
> CONFIGURE_ARGS+=3D --without-xim
> .endif
=20
> -.endif
> +.endif # WITHOUT_X11
=20
> .if defined(WITHOUT_SOUND)
> CONFIGURE_ARGS+=3D --without-sound
> @@ -210,11 +215,6 @@ CONFIGURE_ARGS+=3D --without-dbus
> LIB_DEPENDS+=3D dbus-1.3:${PORTSDIR}/devel/dbus
> .endif
=20
> -.if defined(WITH_IMAGEMAGICK)
> -CONFIGURE_ARGS+=3D --with-imagemagick
> -LIB_DEPENDS+=3D MagickCore.4:${PORTSDIR}/graphics/ImageMagick
> -.endif
> -
> .if defined(WITHOUT_XML)
> CONFIGURE_ARGS+=3D --without-xml2
> .else
> %%
Thanks for the diffs.
I'll test and include these changes in the next update (in 8-10 days).
=2D-=20
Ashish SHUKLA | GPG: F682 CDCC 39DC 0FEA E116 20B6 C746 CFA9 E74F A4B0
freebsd.org!ashish | http://people.freebsd.org/~ashish/
Avoid Success At All Costs !!
--=-=-=
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (FreeBSD)
iQIcBAEBCgAGBQJMpuR8AAoJEMdGz6nnT6SwBJMQALC6mg+h1f9SEyPdkKXnDTcf
lt/kIITz9gU/l3B2oteQfDNj+GquEbJfF333twnZ3iKheoa5+EpaKIEoy5LYexKz
/kPlU4LiLeWtDN6wuPGH4dQu8F2lI+N4oIbRiyQB8aULDfDE4Cm64MoK8ViEGr5D
GvMi+wVTuoWlVQBohPCTtfz1QA76uuT8/ycrDCwN8+Zlau7FnzkESmdQ0/WWw0PT
Vfz1IA3FwqOyhxCMKQORh6Iilx8BouyZyPVSE5UILN8loof4nSJpW+Vb67mBiSli
L3aY1fwDpJq8VIGI7vXXgSq4DPXmMDhLFzibnrLtJ/U1FnzSlGkZzLPBq1p0H7V8
QFLzNwldsTfL6A1p4TRc250RBvrG2d3rgfUkNP4tcbXK6Lt2EiJRmrvmfBBcsO5Q
L6DFzkTf2u5OPgD7LHgN6e/yLyl5WKXS0xzkzmsVTpqllvC6VZvi9RXZH3UkP4/E
CBySs3nJ1l3WLOmeJdHJlEXJ8TXhnFRNOQy61dYAU8IvVO4iSb8wsZDu63x19gLW
AfGCOmVqCQd82ZJkZ8Ek2vR7BtqDrdxvrlFZmSxs84Oxal7ndFhlCLy+aywaCCQ6
W+KMh03lJF355Aujot5wcaUP0UG3a+fWsohc1SGoAE+1j4DhakgbhiUINPc7kBpn
weCeUWfPyUJ61EtLnGjG
=k/OI
-----END PGP SIGNATURE-----
--=-=-=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86zkuxdocn.fsf>