py-matrix-synapse: Add missing dependencies & Fix pkglint warnings

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: py-matrix-synapse: Add missing dependencies & Fix pkglint warnings
From: Angel M. Adames <angelmadames%gmail.com@localhost>
Date: Tue, 10 Oct 2017 17:08:11 +0000
Module Name:	pkgsrc-wip
Committed By:	Angel M. Adames <angelmadames%gmail.com@localhost>
Pushed By:	angelmadames
Date:		Tue Oct 10 13:08:11 2017 -0400
Changeset:	caaca559c6de3291b45de75c8356fb2b41a2a02a

Modified Files:
	py-matrix-synapse/Makefile
	py-matrix-synapse/options.mk

Log Message:
py-matrix-synapse: Add missing dependencies & Fix pkglint warnings

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=caaca559c6de3291b45de75c8356fb2b41a2a02a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 py-matrix-synapse/Makefile   | 100 +++++++++++++++++++++++--------------------
 py-matrix-synapse/options.mk |  15 +++----
 2 files changed, 60 insertions(+), 55 deletions(-)

diffs:
diff --git a/py-matrix-synapse/Makefile b/py-matrix-synapse/Makefile
index c2ca6efd5e..dd4992d0fd 100644
--- a/py-matrix-synapse/Makefile
+++ b/py-matrix-synapse/Makefile
@@ -4,8 +4,8 @@ DISTNAME=	synapse-0.22.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	chat
 GITHUB_PROJECT=	synapse
-MASTER_SITES=   ${MASTER_SITE_GITHUB:=matrix-org/}
-GITHUB_TAG=     v${PKGVERSION_NOREV}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=matrix-org/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	kethzer.dr%gmail.com@localhost
@@ -15,59 +15,65 @@ LICENSE=	apache-2.0
 
 BUILD_DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 
-DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
-DEPENDS+= ${PYPKGPREFIX}-jsonschema-[0-9]*:../../textproc/py-jsonschema
-DEPENDS+= ${PYPKGPREFIX}-service_identity-[0-9]*:../../security/py-service_identity
-DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
-DEPENDS+= ${PYPKGPREFIX}-asn1-[0-9]*:../../security/py-asn1
-DEPENDS+= ${PYPKGPREFIX}-daemonize-[0-9]*:../../devel/py-daemonize
-DEPENDS+= ${PYPKGPREFIX}-bcrypt-[0-9]*:../../security/py-bcrypt
-DEPENDS+= ${PYPKGPREFIX}-ujson-[0-9]*:../../textproc/py-ujson
-DEPENDS+= ${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack
-DEPENDS+= ${PYPKGPREFIX}-phonenumbers-[0-9]*:../../textproc/py-phonenumbers
-DEPENDS+= ${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL
-DEPENDS+= ${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow
-DEPENDS+= ${PYPKGPREFIX}-frozendict-[0-9]*:../../wip/py-frozendict
-DEPENDS+= ${PYPKGPREFIX}-unpaddedbase64-[0-9]*:../../wip/py-unpaddedbase64
-DEPENDS+= ${PYPKGPREFIX}-canonicaljson-[0-9]*:../../wip/py-canonicaljson
-DEPENDS+= ${PYPKGPREFIX}-pymacaroons-[0-9]*:../../wip/py-macaroons
-DEPENDS+= ${PYPKGPREFIX}-cryptodomex-[0-9]*:../../wip/py-pycryptodomex
-DEPENDS+= ${PYPKGPREFIX}-matrix-angular-sdk-[0-9]*:../../wip/py-matrix-angular-sdk
-DEPENDS+= ${PYPKGPREFIX}-pydenticon-[0-9]*:../../wip/py-pydenticon
-DEPENDS+= ${PYPKGPREFIX}-pysaml2-[0-9]*:../../wip/py-pysaml2
-DEPENDS+= ${PYPKGPREFIX}-repoze.who-[0-9]*:../../wip/py-repoze.who
-DEPENDS+= ${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml
-DEPENDS+= ${PYPKGPREFIX}-netaddr-[0-9]*:../../net/py-netaddr
-DEPENDS+= ${PYPKGPREFIX}-simplejson-[0-9]*:../../converters/py-simplejson
+DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
+DEPENDS+=	${PYPKGPREFIX}-jsonschema-[0-9]*:../../textproc/py-jsonschema
+DEPENDS+=	${PYPKGPREFIX}-service_identity-[0-9]*:../../security/py-service_identity
+DEPENDS+=	${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
+DEPENDS+=	${PYPKGPREFIX}-asn1-[0-9]*:../../security/py-asn1
+DEPENDS+=	${PYPKGPREFIX}-daemonize-[0-9]*:../../devel/py-daemonize
+DEPENDS+=	${PYPKGPREFIX}-bcrypt-[0-9]*:../../security/py-bcrypt
+DEPENDS+=	${PYPKGPREFIX}-ujson-[0-9]*:../../textproc/py-ujson
+DEPENDS+=	${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack
+DEPENDS+=	${PYPKGPREFIX}-phonenumbers-[0-9]*:../../textproc/py-phonenumbers
+DEPENDS+=	${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL
+DEPENDS+=	${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow
+DEPENDS+=	${PYPKGPREFIX}-frozendict-[0-9]*:../../wip/py-frozendict
+DEPENDS+=	${PYPKGPREFIX}-unpaddedbase64-[0-9]*:../../wip/py-unpaddedbase64
+DEPENDS+=	${PYPKGPREFIX}-canonicaljson-[0-9]*:../../wip/py-canonicaljson
+DEPENDS+=	${PYPKGPREFIX}-pymacaroons-[0-9]*:../../wip/py-macaroons
+DEPENDS+=	${PYPKGPREFIX}-cryptodomex-[0-9]*:../../wip/py-pycryptodomex
+DEPENDS+=	${PYPKGPREFIX}-matrix-angular-sdk-[0-9]*:../../wip/py-matrix-angular-sdk
+DEPENDS+=	${PYPKGPREFIX}-pydenticon-[0-9]*:../../wip/py-pydenticon
+DEPENDS+=	${PYPKGPREFIX}-pysaml2-[0-9]*:../../wip/py-pysaml2
+DEPENDS+=	${PYPKGPREFIX}-repoze.who-[0-9]*:../../wip/py-repoze.who
+DEPENDS+=	${PYPKGPREFIX}-PyNaCl-[0-9]*:../../wip/py-PyNaCl
+DEPENDS+=	${PYPKGPREFIX}-signedjson-[0-9]*:../../wip/py-signedjson
+DEPENDS+=	${PYPKGPREFIX}-blist-[0-9]*:../../wip/py-blist
+DEPENDS+=	${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml
+DEPENDS+=	${PYPKGPREFIX}-netaddr-[0-9]*:../../net/py-netaddr
+DEPENDS+=	${PYPKGPREFIX}-simplejson-[0-9]*:../../converters/py-simplejson
+DEPENDS+=	${PYPKGPREFIX}-jsonschema-[0-9]*:../../textproc/py-jsonschema
 
-DEPENDS+=       zip>=3.0:../../archivers/zip
-DEPENDS+=       freetype>=1.5:../../graphics/freetype
+DEPENDS+=	zip>=3.0:../../archivers/zip
+DEPENDS+=	freetype>=1.5:../../graphics/freetype
 
-WRKSRC=         ${WRKDIR}/${DISTNAME}
+WRKSRC=		${WRKDIR}/${DISTNAME}
 
-SYNAPSE_USER?=            synapse
-SYNAPSE_GROUP?=           synapse
-SYNAPSE_DATADIR?=         ${VARBASE}/db/synapse
-SYNAPSE_LOGDIR?=          ${VARBASE}/log/synapse
-SYNAPSE_PIDDIR?=          ${VARBASE}/run
+.include "../../mk/bsd.prefs.mk"
+
+SYNAPSE_USER?=		synapse
+SYNAPSE_GROUP?=		synapse
+SYNAPSE_DATADIR?=	${VARBASE}/db/synapse
+SYNAPSE_LOGDIR?=	${VARBASE}/log/synapse
+SYNAPSE_PIDDIR?=	${VARBASE}/run
 
-BUILD_DEFS+=            SYNAPSE_DATADIR SYNAPSE_LOGDIR SYNAPSE_PIDDIR VARBASE
+BUILD_DEFS+=		SYNAPSE_DATADIR SYNAPSE_LOGDIR SYNAPSE_PIDDIR VARBASE
 
-PKG_USERS_VARS+=        SYNAPSE_USER
-PKG_GROUPS_VARS+=       SYNAPSE_GROUP
-PKG_GROUPS=             ${SYNAPSE_GROUP}
-PKG_USERS=              ${SYNAPSE_USER}:${SYNAPSE_GROUP}
+PKG_USERS_VARS=		SYNAPSE_USER
+PKG_GROUPS_VARS+=	SYNAPSE_GROUP
+PKG_GROUPS=		${SYNAPSE_GROUP}
+PKG_USERS=		${SYNAPSE_USER}:${SYNAPSE_GROUP}
 
-PKG_GECOS.${SYNAPSE_USER}=SYNAPSE chat server user
-PKG_HOME.${SYNAPSE_USER}= ${SYNAPSE_DATADIR}
-PKG_SHELL.${SYNAPSE_USER}=${NOLOGIN}
+PKG_GECOS.${SYNAPSE_USER}=	SYNAPSE chat server user
+PKG_HOME.${SYNAPSE_USER}=	${SYNAPSE_DATADIR}
+PKG_SHELL.${SYNAPSE_USER}=	${NOLOGIN}
 
-RCD_SCRIPTS=           	synapse
-INSTALLATION_DIRS=      bin ${PYSITELIB}
+RCD_SCRIPTS=		synapse
+INSTALLATION_DIRS=	bin ${PYSITELIB}
 
-MAKE_DIRS+=             ${SYNAPSE_PIDDIR}
-OWN_DIRS=               ${SYNAPSE_LOGDIR}
-OWN_DIRS_PERMS+=        ${SYNAPSE_DATADIR} ${SYNAPSE_USER} ${SYNAPSE_GROUP} 0700
+MAKE_DIRS+=		${SYNAPSE_PIDDIR}
+OWN_DIRS=		${SYNAPSE_LOGDIR}
+OWN_DIRS_PERMS+=	${SYNAPSE_DATADIR} ${SYNAPSE_USER} ${SYNAPSE_GROUP} 0700
 
 .include "options.mk"
 
diff --git a/py-matrix-synapse/options.mk b/py-matrix-synapse/options.mk
index 1fda5b3bb2..4255b16cae 100644
--- a/py-matrix-synapse/options.mk
+++ b/py-matrix-synapse/options.mk
@@ -1,25 +1,24 @@
 # $NetBSD$
 
-PKG_OPTIONS_VAR=		PKG_OPTIONS.synapse
-PKG_SUPPORTED_OPTIONS=		email ldap pgsql sqlite
-
+PKG_OPTIONS_VAR=	PKG_OPTIONS.synapse
+PKG_SUPPORTED_OPTIONS=	email ldap pgsql sqlite
 PKG_SUGGESTED_OPTIONS=	email sqlite
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Memail)
-DEPENDS+= ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
-DEPENDS+= ${PYPKGPREFIX}-bleach-[0-9]*:../../www/py-bleach
+DEPENDS+=	${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
+DEPENDS+=	${PYPKGPREFIX}-bleach-[0-9]*:../../www/py-bleach
 .endif
 
 .if !empty(PKG_OPTIONS:Mldap)
-DEPENDS+= ${PYPKGPREFIX}-asn1-[0-9]*:../../security/py-asn1
+DEPENDS+=	${PYPKGPREFIX}-asn1-[0-9]*:../../security/py-asn1
 .endif
 
 .if !empty(PKG_OPTIONS:Mpgsql)
-DEPENDS+= ${PYPKGPREFIX}-psycopg2-[0-9]*:../../databases/py-psycopg2
+DEPENDS+=	${PYPKGPREFIX}-psycopg2-[0-9]*:../../databases/py-psycopg2
 .endif
 
 .if !empty(PKG_OPTIONS:Msqlite)
-DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
+DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 .endif
Prev by Date: coccinelle: Reuse devel/menhir and also depends on pcre-ocaml
Next by Date: syncthing-{discosrv,relaysrv}: 0.14.38 -> 0.14.39
Previous by Thread: coccinelle: Reuse devel/menhir and also depends on pcre-ocaml
Next by Thread: syncthing-{discosrv,relaysrv}: 0.14.38 -> 0.14.39
Indexes:
Home | Main Index | Thread Index | Old Index