From owner-dev-commits-ports-all@freebsd.org Sun Jun 27 05:41:10 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 85432660ACC; Sun, 27 Jun 2021 05:41:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GCKNQ1dzMz3DZH; Sun, 27 Jun 2021 05:41:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2151A49CD; Sun, 27 Jun 2021 05:41:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15R5fAum097024; Sun, 27 Jun 2021 05:41:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15R5fA68097023; Sun, 27 Jun 2021 05:41:10 GMT (envelope-from git) Date: Sun, 27 Jun 2021 05:41:10 GMT Message-Id: <202106270541.15R5fA68097023@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tobias Kortkamp Subject: git: 59b13a1837a6 - main - x11-themes/slim-themes: Simplify MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tobik X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 59b13a1837a6df79a9d936ae87631e53b944e0a3 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jun 2021 05:41:10 -0000 The branch main has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=59b13a1837a6df79a9d936ae87631e53b944e0a3 commit 59b13a1837a6df79a9d936ae87631e53b944e0a3 Author: Tobias Kortkamp AuthorDate: 2021-06-27 05:08:45 +0000 Commit: Tobias Kortkamp CommitDate: 2021-06-27 05:39:45 +0000 x11-themes/slim-themes: Simplify --- x11-themes/slim-themes/Makefile | 51 +++++++++-------------------------------- 1 file changed, 11 insertions(+), 40 deletions(-) diff --git a/x11-themes/slim-themes/Makefile b/x11-themes/slim-themes/Makefile index 026473e174d0..b2ae6efbcdc2 100644 --- a/x11-themes/slim-themes/Makefile +++ b/x11-themes/slim-themes/Makefile @@ -7,13 +7,13 @@ 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 \ SF/slim.berlios/:old_themes -DISTFILES= MAINTAINER= d.oriented@gmail.com COMMENT= Theme pack for SLiM login app RUN_DEPENDS= slim>=0:x11/slim +NO_ARCH= yes NO_BUILD= yes NO_WRKSUBDIR= yes SHAREMODE= 644 @@ -21,16 +21,12 @@ THEMEDIR_REL= share/slim/themes THEMEDIR= ${PREFIX}/${THEMEDIR_REL} PLIST_SUB+= THEMEDIR=${THEMEDIR_REL} -OPTIONS_DEFINE= # empty -OPTIONS_MULTI= THEME # enforces at least one choice +OPTIONS_MULTI= THEME 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 -# catch quoted strings with spaces. 7.x and 8.x are fine with this, so -# once 6.x will be deorbited, we could switch just to spaces. THEMELIST= GENTOO_SIMPLE%Gentoo+simple+theme%slim-gentoo-simple.tar.bz2%slim-gentoo-simple%gentoo-simple%old_themes \ ARCHLINUX_SIMPLE%ArchLinux+simple+theme%slim-archlinux-simple.tar.gz%slim-archlinux-simple%archlinux-simple%old_themes \ DEBIAN_MOREBLUE%Debian+moreblue+theme%slim-debian-moreblue.tar.bz2%debian-moreblue%debian-moreblue%old_themes \ @@ -51,42 +47,18 @@ THEMELIST= GENTOO_SIMPLE%Gentoo+simple+theme%slim-gentoo-simple.tar.bz2%slim-gen FREEBSD%FreeBSD+theme%fbsd-slim-theme.tar.bz2%fbsd%fbsd%new_themes \ GNEWSENSE%gNewSense+theme%slim-gnewsense-1.1.tar.bz2%slim-gnewsense-1.1%gnewsense%new_themes -# Pollute OPTIONS and DISTFILES. Cool magic ;)) -# We're using immediate assignment and two variables, because there is -# no addition (+=) operator with immediate assignment. - -.for t in ${THEMELIST} -n= ${t:C/^([^%]*)%.*$/\\1/1} -d= ${t:C/^[^%]*%[^%]*%([^%]*)%.*$/\\1/1} -desc= ${t:C/^[^%]*%([^%]*)%.*$/\\1/1:C/\+/ /g} -sdir= ${t:C/^[^%]*%[^%]*%[^%]*%([^%]*)%.*$/\\1/1} -ddir= ${t:C/^[^%]*%[^%]*%[^%]*%[^%]*%([^%]*)%.*$/\\1/1} -mtag= ${t:C/^[^%]*%[^%]*%[^%]*%[^%]*%[^%]*%([^%]*)$/\\1/1} -.if ${mtag} == "" -${n}_DIST:= ${d} -.else -${n}_DIST:= ${d}:${mtag} -.endif -${n}_SDIR:= ${sdir} -${n}_DDIR:= ${ddir} -OPTIONS_MULTI_THEME:= ${OPTIONS_MULTI_THEME} ${n} -A+= ${n} -${n}_DESC:= ${desc} -NEWTHEMES:= ${ALLTHEMES} ${n} -ALLTHEMES:= ${NEWTHEMES} -.endfor # t in ${THEMELIST} +.for n desc d sdir ddir mtag in ${THEMELIST:S/%/ /g} +${n}_DISTFILES= ${d}:${mtag} +${n}_SDIR= ${sdir} +${n}_DDIR= ${ddir} +OPTIONS_MULTI_THEME+= ${n} +${n}_DESC= ${desc:S/+/ /g} +.endfor OPTIONS_DEFAULT= ${OPTIONS_MULTI_THEME} .include -.for n in ${ALLTHEMES} -. if ${PORT_OPTIONS:M${n}} -NEWDISTFILES:= ${DISTFILES} ${${n}_DIST} -DISTFILES:= ${NEWDISTFILES} -. endif -.endfor - .if ${PORT_OPTIONS:MPARALLEL_DIMS} EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-parallel-dimensions-slim.theme @@ -94,15 +66,14 @@ post-patch: @${RM} ${WRKSRC}/parallel-dimensions/slim.theme.orig .endif # ${PORT_OPTIONS:MPARALLEL_DIMS} -# Install selected themes. Another regexp voodoo, yay! \o/ do-install: ${MKDIR} ${STAGEDIR}${THEMEDIR} -.for n in ${ALLTHEMES} +.for n in ${OPTIONS_MULTI_THEME} .if ${PORT_OPTIONS:M${n}} ${MKDIR} ${STAGEDIR}${THEMEDIR}/${${n}_DDIR} cd "${WRKSRC}/${${n}_SDIR}" && \ ${COPYTREE_SHARE} . ${STAGEDIR}${THEMEDIR}/${${n}_DDIR} .endif # ${PORT_OPTIONS:M${n}} -.endfor # t in ${THEMELIST} +.endfor .include