cvs commit: ports/editors/emacs-devel Makefile distinfo pkg-plist ports/editors/emacs-devel/files patch-configure

[Ashish SHUKLA]

Anonymous  writes:
> Ashish SHUKLA <ashish at FreeBSD.org> 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 <bsd.port.pre.mk>
>> +.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 <bsd.port.options.mk>
 
> @@ -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
> %%

Thanks for the diffs.

I'll test and include these changes in the next update (in 8-10 days).

-- 
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 !!
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/cvs-all/attachments/20101002/c7782dcc/attachment.pgp