Attachment 171621 Details for Bug 210414 – Adds explicit IMPLIES between dependencies and simplifies option handling.

[patch] Adds explicit IMPLIES between dependencies and simplifies option handling.

conky-1.9.0_7.diff (text/plain), 2.24 KB, created by Fernando Herrero Carrón on 2016-06-20 18:45:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fernando Herrero Carrón

Created: 2016-06-20 18:45:03 UTC

Size: 2.24 KB

patch

obsolete

>--- /usr/ports/sysutils/conky/Makefile	2016-04-26 13:32:20.000000000 +0200
>+++ /usr/local/poudriere/ports/default/sysutils/conky/Makefile	2016-06-11 11:45:10.707332118 +0200
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	conky
> PORTVERSION=	1.9.0
>-PORTREVISION=	6
>+PORTREVISION=	7
> CATEGORIES=	sysutils
> MASTER_SITES=	SF
> 
>@@ -48,10 +48,17 @@
> DOUBLE_BUFFER_DESC=	Enable X11 double buffering
> DOUBLE_BUFFER_CONFIGURE_ENABLE=double-buffer
> 
>+IMLIB2_CONFIGURE_ENABLE=	imlib2
>+IMLIB2_LIB_DEPENDS+=		libImlib2.so:graphics/imlib2
>+
> INOTIFY_DESC=		Monitor file changes via Inotify
> INOTIFY_CONFIGURE_ENABLE=inotify
> INOTIFY_LIB_DEPENDS=	libinotify.so:devel/libinotify
> 
>+LUA_USES=		lua:51
>+LUA_CONFIGURE_ENABLE=	lua
>+LUA_LIB_DEPENDS=	libtolua++-5.1.so:lang/tolua++
>+
> LUA_CAIRO_DESC=		Lua-Cairo binding
> LUA_CAIRO_CONFIGURE_ENABLE=lua-cairo
> LUA_CAIRO_LIB_DEPENDS=	libcairo.so:graphics/cairo
>@@ -90,34 +97,29 @@
> XOAP_LIB_DEPENDS=	libcurl.so:ftp/curl \
> 			libxml2.so:textproc/libxml2
> 
>+X11_USE= xorg=x11,xext,xdamage
>+X11_CONFIGURE_ENABLE= x11 own-window
>+
>+ARGB_IMPLIES= X11
>+DOUBLE_BUFFER_IMPLIES= X11
>+IMLIB2_IMPLIES= X11
>+XFT_IMPLIES= X11
>+LUA_CAIRO_IMPLIES= X11
>+LUA_IMLIB2_IMPLIES= X11
>+
>+LUA_IMLIB2_IMPLIES= LUA IMLIB2
>+LUA_CAIRO_IMPLIES= LUA
>+
>+
> .include <bsd.port.options.mk>
> 
>-.if ${PORT_OPTIONS:MARGB} || ${PORT_OPTIONS:MDOUBLE_BUFFER} || ${PORT_OPTIONS:MIMLIB2} || ${PORT_OPTIONS:MLUA_CAIRO} || ${PORT_OPTIONS:MLUA_IMLIB2} || ${PORT_OPTIONS:MXFT} || ${PORT_OPTIONS:MX11}
>-USE_XORG=	x11 xext xdamage
>-CONFIGURE_ARGS+=	--enable-x11 --enable-own-window
>+.if ${PORT_OPTIONS:MX11}
> EXAMPLE_CONF_FILE=	${WRKSRC}/data/conky.conf
> .else
>-CONFIGURE_ARGS+=	--disable-x11 --disable-own-window
> EXAMPLE_CONF_FILE=	${WRKSRC}/data/conky_no_x11.conf
> .endif
> 
>-.if ${PORT_OPTIONS:MIMLIB2} || ${PORT_OPTIONS:MLUA_IMLIB2}
>-LIB_DEPENDS+=		libImlib2.so:graphics/imlib2
>-CONFIGURE_ARGS+=	--enable-imlib2
>-.else
>-CONFIGURE_ARGS+=	--disable-imlib2
>-.endif
>-
>-.if ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MLUA_CAIRO} || ${PORT_OPTIONS:MLUA_IMLIB2}
>-USES+=			lua:51
>-CONFIGURE_ARGS+=	--enable-lua
>-.else
>-CONFIGURE_ARGS+=	--disable-lua
>-.endif
> 
>-.if ${PORT_OPTIONS:MLUA_CAIRO} || ${PORT_OPTIONS:MLUA_IMLIB2}
>-LIB_DEPENDS+=		libtolua++-5.1.so:lang/tolua++
>-.endif
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's,lua5\.1,lua-5.1,g' \

Actions: View | Diff

Attachments on bug 210414: 171621