Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 12 Oct 2020 20:22:02 +0200
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        Renato Botelho <garga@FreeBSD.org>
Cc:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   Re: svn commit: r552136 - in head: . devel devel/git devel/git-gui devel/git-lite
Message-ID:  <20201012182202.y4cjabiasyfkbhlg@ivaldir.net>
In-Reply-To: <202010121603.09CG3imD069975@repo.freebsd.org>
References:  <202010121603.09CG3imD069975@repo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help

--tldhfe72rja6ufwd
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

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
>=20
> Log:
>   Convert git slave ports to flavors
>  =20
>   Create git@lite and git@gui flavors to replace slave ports
>  =20
>   PR:		250281
>   Submitted by:	Yasuhiro KIMURA <yasu@utahime.org>
>   Sponsored by:	Rubicon Communications, LLC (Netgate)
>=20
> 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
>=20
> Modified: head/MOVED
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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-0=
1|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 b=
e 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@gui|2020-10-12|Replaced by a flavor
> +devel/git-lite|devel/git@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
>=20
> Modified: head/devel/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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 +=3D git-cola
>      SUBDIR +=3D git-delta
>      SUBDIR +=3D git-extras
> -    SUBDIR +=3D git-gui
>      SUBDIR +=3D git-lfs
> -    SUBDIR +=3D git-lite
>      SUBDIR +=3D git-merge-changelog
>      SUBDIR +=3D git-modes
>      SUBDIR +=3D git-review
>=20
> Modified: head/devel/git/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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=3D	${DISTNAME}${EXTRACT_SUFX} \
>  		${PORTNAME}-manpages-${DISTVERSION}${EXTRACT_SUFX}
> =20
>  MAINTAINER=3D	garga@FreeBSD.org
> -COMMENT?=3D	Distributed source code management tool
> +.if ${FLAVOR:U} =3D=3D default
> +COMMENT=3D	Distributed source code management tool
> +.elif ${FLAVOR:U} =3D=3D gui
> +COMMENT=3D	Distributed source code management tool (GUI enabled flavor)
> +.elif ${FLAVOR:U} =3D=3D lite
> +COMMENT=3D	Distributed source code management tool (lite flavor)
> +.endif

This block can be written a simpler way:

COMMENT=3DDistributed source code management tool
=2Eif ${FLAVOR:U} =3D=3D gui
COMMENT+=3D (GUI enabled flavor)
=2Eelif ${FLAVOR:U} =3D=3D lite
COMMENT+=3D (lite flavor)
=2Eendif

Note that the :U is not necessary btw.

Best regards,
Bapt

--tldhfe72rja6ufwd
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEgOTj3suS2urGXVU3Y4mL3PG3PloFAl+EnscACgkQY4mL3PG3
PlppHg/+KjOcDAzq0Acz9xvxdCp6JRqxDMe9T1NWgk3vqyWcOd5mvpBswO5vSNqB
WaUYls9xqYZIvZeEDVNde3jEnFgSbCeivpkfT2thclJC9tsIgzcnP8La22oNXbLc
ErXWTtV1WC4BNxfx8St0PUDWPKy4xQpzx6J/LSMCNXV3HCXIqRBNCMqKb05ZEciY
J64S4LHEIiGCz5SujVBNi0s20WbZpCXKXyP0SBIc07fqF6u+g8d1TgxtaGB3dy92
U+snldVQlm0n9NTxYp9Jgdyrl2N6ojtaPuNwh0li02Zl3NKOP2d63Pn11s3KjVZY
fUh49ysUEO2ayFtWcfK2FDkTcBflf03WQEwH5jqADyg6yZynQdOWSQ7PjNiwWPZY
mL9SWQSLZdwiTo17F/bjynsA6aB4uirj7V8pVtgsDMR3dWRc+WCccE0wht11RvUH
sKlHz8kwfvCM//Jg94Cb1aLAJht880L/9w7Vf4HoDPe+tQgGSgx7QClakwhTynTt
l+2xIk36WjYQbvXVcGyIf3YioKuSEXRAaA3X2TrHWdtkh2WGk/8leQPBlibpXNjj
KVmRALf5YnUYvZqMTiH5NAiBYefmFqOjvhI3tRhcI4cVa1DY0AoLn0kYXCKaJ4+C
L9fMpbknjK7Ygkbm2cRcNNS2cVSPu2b1lT0uTcHpHwRsHzn/o+8=
=sVkb
-----END PGP SIGNATURE-----

--tldhfe72rja6ufwd--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20201012182202.y4cjabiasyfkbhlg>