Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 16 Sep 2018 22:13:42 +0200
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        Rene Ladan <rene@FreeBSD.org>
Cc:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   Re: svn commit: r479894 - head/textproc/pootle
Message-ID:  <20180916201342.unhwsto2b62u4lhj@atuin.in.mat.cc>
In-Reply-To: <201809161403.w8GE3TYD059511@repo.freebsd.org>
References:  <201809161403.w8GE3TYD059511@repo.freebsd.org>

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

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

On Sun, Sep 16, 2018 at 02:03:29PM +0000, Rene Ladan wrote:
> Author: rene
> Date: Sun Sep 16 14:03:28 2018
> New Revision: 479894
> URL: https://svnweb.freebsd.org/changeset/ports/479894
>=20
> Log:
>   textproc/pootle: cleanup option handling:
>  =20
>   - use option helpers
>   - remove stale SUBVERSION option
>   - use SINGLE option to choose between MySQL and PostgresSQL

Why use SINGLE ? The options do not seem to be incompatible, nor
required.  OPTIONS_GROUP would probably be better. (OPTIONS_MULTI if one
is required.)

> Modified:
>   head/textproc/pootle/Makefile
>=20
> Modified: head/textproc/pootle/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/textproc/pootle/Makefile	Sun Sep 16 13:25:54 2018	(r479893)
> +++ head/textproc/pootle/Makefile	Sun Sep 16 14:03:28 2018	(r479894)
> @@ -44,7 +44,10 @@ SUB_LIST+=3D	PYTHON_CMD=3D"${PYTHON_CMD}"
> =20
>  PORTDOCS=3D	CREDITS INSTALL LICENSE
> =20
> -OPTIONS_DEFINE=3D	DOCS LDAP MEMCACHED MYSQL PGSQL
> +OPTIONS_DEFINE=3D	DOCS LDAP MEMCACHED
> +OPTIONS_SINGLE=3D	DB
> +DB_DESC=3D	Database backend
> +OPTIONS_SINGLE_DB=3DMYSQL PGSQL
>  OPTIONS_DEFAULT=3DMEMCACHED MYSQL
> =20
>  MEMCACHED_DESC=3D	Use memcached to improve performance
> @@ -54,17 +57,11 @@ LDAP_RUN_DEPENDS=3D	${PYTHON_PKGNAMEPREFIX}ldap2>0:de=
vel
>  MEMCACHED_LIB_DEPENDS=3D	libmemcached.so:databases/libmemcached
>  MEMCACHED_RUN_DEPENDS=3D	${PYTHON_PKGNAMEPREFIX}python-memcached>=3D1.45=
:databases/py-python-memcached@${PY_FLAVOR}
> =20
> +MYSQL_USES=3D		mysql:client
>  MYSQL_RUN_DEPENDS=3D	${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQL=
db@${PY_FLAVOR}
> =20
>  PGSQL_RUN_DEPENDS=3D	${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psyc=
opg2@${PY_FLAVOR}
> =20
> -SUBVERSION_RUN_DEPENDS=3D	svn:devel/subversion
> -
> -.include <bsd.port.pre.mk>
> -.if ${PORT_OPTIONS:MMYSQL}
> -USES+=3D	mysql:client
> -.endif
> -
>  pre-configure:
>  	@${REINPLACE_CMD} -e "s/,<0.11.2//g" \
>  		-e "s/,<0.8//g" \
> @@ -78,4 +75,4 @@ post-install-DOCS-on:
>  	${INSTALL_DATA} ${WRKSRC}/${docs} ${STAGEDIR}/${DOCSDIR}
>  .endfor
> =20
> -.include <bsd.port.post.mk>
> +.include <bsd.port.mk>
>=20
>=20

--=20
Mathieu Arnold

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

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

iQKTBAABCgB9FiEEOraXidLtEhBkQLpbOkUW81GDzkgFAlueuXZfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNB
QjY5Nzg5RDJFRDEyMTA2NDQwQkE1QjNBNDUxNkYzNTE4M0NFNDgACgkQOkUW81GD
zkjn8Q//UbrtOQKP5voZPYu6kY3ewY12O/V3eMSWfqToAs9s9GVgk+PMur3HyVQ7
b5e1hqkLPS/ObnqRquYqqqM6n+fvS4hP03CjxcoFwwJwkXFz1o+0z3hC3QxL+fE2
vvVAGD/XkL1cZUJt04bDC9kzTZkR7mtBz7VCUTv2WC5WM/bohg1uBw/wpeHxjt8Z
HGf9G5MY6rpfYCksD8Et3YRrBKOqd/fjymv77kZpMIeFeahXpiHYuIdnbqgLUoZi
maLJ9wBnzSckAtKNYIf3EBhBPLNBeTd5vzv9GGAJYP/A8LawvoIL6G+dUqTFcryo
sEva128uW3tqHUD2ghQgeMYwegKs5R0Dmn139EoV7KOxQYs/6O1sVO5YgBLDCdMG
l4ua57JFkKlOqzeTGcSDrzUIjRvhEOxDwP8BTZjcT5LNTALOQim0BzcxvOfFmyuS
vd8sDrzwtKbu47wAgatAOocZt3m7Cm3cbr4/EEUgBEySuTIVXJ0gSip8IRRsUWvH
Qa7Mo4OD+MEUeY7wV3hW0jqc6KmUtHg+LN9fiZtimm5ec3NIAafKTujKUZwSgvhd
rE/XxiTmcKhlRxQADZn5LikcwtbDpm5Qx35MjBW8jMg3inWjv2FM5w6kq93nNDdh
45kluEY42qX3SxSNOKSrSZSb+W40FJ2Ng5ZIfnJq323yq9bAgLk=
=r8CK
-----END PGP SIGNATURE-----

--wxgj2olpxdgpjcvh--



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