svn commit: r479894 - head/textproc/pootle

[Mathieu Arnold]

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
> 
> Log:
>   textproc/pootle: cleanup option handling:
>   
>   - 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
> 
> Modified: head/textproc/pootle/Makefile
> ==============================================================================
> --- 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+=	PYTHON_CMD="${PYTHON_CMD}"
>  
>  PORTDOCS=	CREDITS INSTALL LICENSE
>  
> -OPTIONS_DEFINE=	DOCS LDAP MEMCACHED MYSQL PGSQL
> +OPTIONS_DEFINE=	DOCS LDAP MEMCACHED
> +OPTIONS_SINGLE=	DB
> +DB_DESC=	Database backend
> +OPTIONS_SINGLE_DB=MYSQL PGSQL
>  OPTIONS_DEFAULT=MEMCACHED MYSQL
>  
>  MEMCACHED_DESC=	Use memcached to improve performance
> @@ -54,17 +57,11 @@ LDAP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap2>0:devel
>  MEMCACHED_LIB_DEPENDS=	libmemcached.so:databases/libmemcached
>  MEMCACHED_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-memcached>=1.45:databases/py-python-memcached@${PY_FLAVOR}
>  
> +MYSQL_USES=		mysql:client
>  MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb@${PY_FLAVOR}
>  
>  PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR}
>  
> -SUBVERSION_RUN_DEPENDS=	svn:devel/subversion
> -
> -.include <bsd.port.pre.mk>
> -.if ${PORT_OPTIONS:MMYSQL}
> -USES+=	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
>  
> -.include <bsd.port.post.mk>
> +.include <bsd.port.mk>
> 
> 

-- 
Mathieu Arnold
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 963 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-head/attachments/20180916/23905ec6/attachment.sig>