svn commit: r552136 - in head: . devel devel/git devel/git-gui devel/git-lite

[Baptiste Daroussin]

On Mon, Oct 12, 2020 at 04:03:44PM +0000, Renato Botelho wrote:
> Author: garga
> Date: Mon Oct 12 16:03:44 2020
> New Revision: 552136
> URL: https://svnweb.freebsd.org/changeset/ports/552136
> 
> Log:
>   Convert git slave ports to flavors
>   
>   Create git at lite and git at gui flavors to replace slave ports
>   
>   PR:		250281
>   Submitted by:	Yasuhiro KIMURA <yasu at utahime.org>
>   Sponsored by:	Rubicon Communications, LLC (Netgate)
> 
> Added:
>   head/devel/git/pkg-descr-gui
>      - copied unchanged from r552135, head/devel/git-gui/pkg-descr
>   head/devel/git/pkg-descr-lite
>      - copied unchanged from r552135, head/devel/git-lite/pkg-descr
> Deleted:
>   head/devel/git-gui/
>   head/devel/git-lite/
> Modified:
>   head/MOVED
>   head/devel/Makefile
>   head/devel/git/Makefile
> 
> Modified: head/MOVED
> ==============================================================================
> --- head/MOVED	Mon Oct 12 15:33:45 2020	(r552135)
> +++ head/MOVED	Mon Oct 12 16:03:44 2020	(r552136)
> @@ -15640,6 +15640,8 @@ lang/spidermonkey68|lang/spidermonkey78|2020-10-01|Rep
>  audio/zinf||2020-10-02|Has expired: Does not build, no upstream
>  emulators/qemu-sbruno|emulators/qemu|2020-10-02|Has expired: Port will be removed in favor of emulators/qemu
>  dns/knot2-lib|dns/knot3-lib|2020-10-04|Replaced by a more recent version
> +devel/git-gui|devel/git at gui|2020-10-12|Replaced by a flavor
> +devel/git-lite|devel/git at lite|2020-10-12|Replaced by a flavor
>  graphics/libxatracker|graphics/mesa-gallium-xa|2020-10-12|Rename to have all gallium driver properly named
>  sysutils/gnome-mount||2020-10-12|Replaced by gio/gvfs
>  sysutils/syslog-ng322|sysutils/syslog-ng|2020-10-12|Has expired: Agreed upon upstream one year deprecation policy
> 
> Modified: head/devel/Makefile
> ==============================================================================
> --- head/devel/Makefile	Mon Oct 12 15:33:45 2020	(r552135)
> +++ head/devel/Makefile	Mon Oct 12 16:03:44 2020	(r552136)
> @@ -784,9 +784,7 @@
>      SUBDIR += git-cola
>      SUBDIR += git-delta
>      SUBDIR += git-extras
> -    SUBDIR += git-gui
>      SUBDIR += git-lfs
> -    SUBDIR += git-lite
>      SUBDIR += git-merge-changelog
>      SUBDIR += git-modes
>      SUBDIR += git-review
> 
> Modified: head/devel/git/Makefile
> ==============================================================================
> --- head/devel/git/Makefile	Mon Oct 12 15:33:45 2020	(r552135)
> +++ head/devel/git/Makefile	Mon Oct 12 16:03:44 2020	(r552136)
> @@ -12,15 +12,28 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
>  		${PORTNAME}-manpages-${DISTVERSION}${EXTRACT_SUFX}
>  
>  MAINTAINER=	garga at FreeBSD.org
> -COMMENT?=	Distributed source code management tool
> +.if ${FLAVOR:U} == default
> +COMMENT=	Distributed source code management tool
> +.elif ${FLAVOR:U} == gui
> +COMMENT=	Distributed source code management tool (GUI enabled flavor)
> +.elif ${FLAVOR:U} == lite
> +COMMENT=	Distributed source code management tool (lite flavor)
> +.endif

This block can be written a simpler way:

COMMENT=Distributed source code management tool
.if ${FLAVOR:U} == gui
COMMENT+= (GUI enabled flavor)
.elif ${FLAVOR:U} == lite
COMMENT+= (lite flavor)
.endif

Note that the :U is not necessary btw.

Best regards,
Bapt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20201012/ca8cf949/attachment.sig>