Attachment 173303 Details for Bug 211569 – Fix slim-themes options

[patch] Fix slim-themes options

slim-themes.patch (text/plain), 2.32 KB, created by John Marino on 2016-08-05 01:16:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Marino

Created: 2016-08-05 01:16:39 UTC

Size: 2.32 KB

patch

obsolete

>Index: x11-themes/slim-themes/Makefile
>===================================================================
>--- x11-themes/slim-themes/Makefile	(revision 419607)
>+++ x11-themes/slim-themes/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	slim-themes
> PORTVERSION=	1.0.1
>+PORTREVISION=	1
> CATEGORIES=	x11-themes
> MASTER_SITES=	http://dist.codelabs.ru/fbsd/ports/slim-themes/:new_themes \
> 		http://dist.codelabs.ru/fbsd/ports/slim-themes/:old_themes \
>@@ -12,11 +13,6 @@
> MAINTAINER=	rea@FreeBSD.org
> COMMENT=	Theme pack for SLiM login app
> 
>-# But that's not all, see below.
>-OPTIONS_DEFINE=	ALL_THEMES
>-OPTIONS_DEFAULT=	ALL_THEMES
>-ALL_THEMES_DESC=	Include all themes
>-
> NO_BUILD=	yes
> NO_WRKSUBDIR=	yes
> SHAREMODE=	644
>@@ -24,6 +20,11 @@
> THEMEDIR=	${PREFIX}/${THEMEDIR_REL}
> PLIST_SUB+=	THEMEDIR=${THEMEDIR_REL}
> 
>+OPTIONS_DEFINE=	# empty
>+OPTIONS_MULTI=	THEME	# enforces at least one choice
>+OPTIONS_SUB=	yes
>+THEME_DESC=	Available SLiM Themes
>+
> # Format is 'variable name%description%archive name%unpacked dir%dest
> # dir%master site tag'
> # I am substituting ' ' -> '+' because make in 6.x isn't able to properly
>@@ -67,7 +68,7 @@
> .endif
> ${n}_SDIR:=	${sdir}
> ${n}_DDIR:=	${ddir}
>-OPTIONS_DEFINE:=	${OPTIONS_DEFINE} ${n}
>+OPTIONS_MULTI_THEME:=	${OPTIONS_MULTI_THEME} ${n}
> A+=		${n}
> ${n}_DESC:=	${desc}
> NEWTHEMES:=	${ALLTHEMES}	${n}
>@@ -74,28 +75,17 @@
> ALLTHEMES:=	${NEWTHEMES}
> .endfor # t in ${THEMELIST}
> 
>-.include <bsd.port.pre.mk>
>+OPTIONS_DEFAULT=	${OPTIONS_MULTI_THEME}
> 
>+.include <bsd.port.options.mk>
>+
> .for n in ${ALLTHEMES}
>-.if ${PORT_OPTIONS:MALL_THEMES} || ${PORT_OPTIONS:M${n}}
>-.if ! ${PORT_OPTIONS:M${n}}
>-PORT_OPTIONS+=	${n}
>-.endif
>+.  if ${PORT_OPTIONS:M${n}}
> NEWDISTFILES:=	${DISTFILES}	${${n}_DIST}
> DISTFILES:=	${NEWDISTFILES}
>-SEEN_THEMES=	yes
>-NEWPLIST_SUB:=	${PLIST_SUB}	${n}=""
>-PLIST_SUB:=	${NEWPLIST_SUB}
>-.else
>-NEWPLIST_SUB:=	${PLIST_SUB}	${n}="@comment "
>-PLIST_SUB:=	${NEWPLIST_SUB}
>-.endif # ${PORT_OPTIONS:MALL_THEMES} || ${PORT_OPTIONS:M${n}}
>-.endfor # n in ${THEMELIST}
>+.  endif
>+.endfor
> 
>-.if !defined(SEEN_THEMES)
>-IGNORE=		at least one theme must be selected
>-.endif
>-
> .if ${PORT_OPTIONS:MPARALLEL_DIMS}
> EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-parallel-dimensions-slim.theme
> 
>@@ -114,4 +104,4 @@
> .endif # ${PORT_OPTIONS:M${n}}
> .endfor # t in ${THEMELIST}
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>

Actions: View | Diff

Attachments on bug 211569: 173303