Index: head/deskutils/gcalcli/files/patch-gcalcli =================================================================== --- head/deskutils/gcalcli/files/patch-gcalcli (revision 480873) +++ head/deskutils/gcalcli/files/patch-gcalcli (nonexistent) @@ -1,33 +0,0 @@ -# ERROR: Missing module - cannot import name run (revisit #204) -# https://github.com/insanum/gcalcli/issues/229 - ---- gcalcli.orig 2014-12-17 01:50:24 UTC -+++ gcalcli -@@ -185,7 +185,8 @@ try: - from apiclient.discovery import build - from oauth2client.file import Storage - from oauth2client.client import OAuth2WebServerFlow -- from oauth2client.tools import run -+ from oauth2client.tools import run_flow -+ from oauth2client.tools import argparser - except ImportError as e: - print "ERROR: Missing module - %s" % e.args[0] - sys.exit(1) -@@ -627,14 +628,15 @@ class gcalcli: - credentials = storage.get() - - if credentials is None or credentials.invalid: -- credentials = run( -+ args, unknown = argparser.parse_known_args(sys.argv) -+ credentials = run_flow( - OAuth2WebServerFlow( - client_id=self.client_id, - client_secret=self.client_secret, - scope=['https://www.googleapis.com/auth/calendar', - 'https://www.googleapis.com/auth/urlshortener'], - user_agent=__program__+'/'+__version__), -- storage) -+ storage, args) - - self.authHttp = credentials.authorize(httplib2.Http()) - Property changes on: head/deskutils/gcalcli/files/patch-gcalcli ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/deskutils/gcalcli/Makefile =================================================================== --- head/deskutils/gcalcli/Makefile (revision 480873) +++ head/deskutils/gcalcli/Makefile (revision 480874) @@ -1,52 +1,56 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= gcalcli -PORTVERSION= 3.2 +PORTVERSION= 3.4.0 DISTVERSIONPREFIX= v -PORTREVISION= 3 CATEGORIES= deskutils python MAINTAINER= ports@thelanman.net COMMENT= Google Calendar Command Line Interface LICENSE= MIT RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gdata>=0:devel/py-gdata@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}google-api-python-client>=0:www/py-google-api-python-client@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py-httplib2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}python-gflags>=0:devel/py-python-gflags@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}python-gflags>=0:devel/py-python-gflags@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oauth2client>0:security/py-oauth2client@${PY_FLAVOR} USES= python:-2.7 shebangfix USE_GITHUB= yes SHEBANG_FILES= gcalcli GH_ACCOUNT= insanum OPTIONS_DEFINE= DOCS FUZZYDATES ICS_VCAL SIMPLEJSON OPTIONS_DEFAULT= ICS_VCAL ICS_VCAL_DESC= Enable importing of ics/vcal files SIMPLEJSON_DESC= Use simplejson for url shortening FUZZYDATES_DESC= Use parsedatetime for fuzzy date parsing ICS_VCAL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:deskutils/py-vobject@${PY_FLAVOR} SIMPLEJSON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${PY_FLAVOR} FUZZYDATES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}parsedatetime>=0:devel/py-parsedatetime@${PY_FLAVOR} NO_BUILD= yes NO_ARCH= yes PORTDOCS= README.md gcalcli_?.png PLIST_FILES= bin/gcalcli + +pre-install: + @${REINPLACE_CMD} -e '197s|run|run_flow|' \ + -e '676s|run|run_flow|' ${WRKSRC}/gcalcli do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin do-install-DOCS-on: ${MKDIR} ${STAGEDIR}/${DOCSDIR} (cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .include Index: head/deskutils/gcalcli/distinfo =================================================================== --- head/deskutils/gcalcli/distinfo (revision 480873) +++ head/deskutils/gcalcli/distinfo (revision 480874) @@ -1,2 +1,3 @@ -SHA256 (insanum-gcalcli-v3.2_GH0.tar.gz) = 9b3465be8e64c291ffe4582f8cb779a7025c700e6a83aae74722d87a3b88d55a -SIZE (insanum-gcalcli-v3.2_GH0.tar.gz) = 1672457 +TIMESTAMP = 1534035958 +SHA256 (insanum-gcalcli-v3.4.0_GH0.tar.gz) = 1297f7082b4d33ac6d5ea3edfc11bdd329b8a6f28926aeda412806d45b7afdd1 +SIZE (insanum-gcalcli-v3.4.0_GH0.tar.gz) = 1675456