From owner-svn-ports-all@freebsd.org Sat Aug 17 13:32:42 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C3D83C7D2D; Sat, 17 Aug 2019 13:32:42 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 469h2L4r54z4NGB; Sat, 17 Aug 2019 13:32:42 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 87C3A1A6F0; Sat, 17 Aug 2019 13:32:42 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7HDWgK3025120; Sat, 17 Aug 2019 13:32:42 GMT (envelope-from jrm@FreeBSD.org) Received: (from jrm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7HDWfUm025113; Sat, 17 Aug 2019 13:32:41 GMT (envelope-from jrm@FreeBSD.org) Message-Id: <201908171332.x7HDWfUm025113@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jrm set sender to jrm@FreeBSD.org using -f From: Joseph Mingrone Date: Sat, 17 Aug 2019 13:32:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r509153 - in head: . devel devel/git-cola X-SVN-Group: ports-head X-SVN-Commit-Author: jrm X-SVN-Commit-Paths: in head: . devel devel/git-cola X-SVN-Commit-Revision: 509153 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Aug 2019 13:32:42 -0000 Author: jrm Date: Sat Aug 17 13:32:40 2019 New Revision: 509153 URL: https://svnweb.freebsd.org/changeset/ports/509153 Log: devel/git-cola: Revive after r495962 qt4 deprecation Submitted by: dch (with a few modifications) Reviewed by: tcberner, jonathan (slightly older version) Differential Revision: https://reviews.freebsd.org/D20460 Added: head/devel/git-cola/ - copied from r495961, head/devel/git-cola/ head/devel/git-cola/pkg-message (contents, props changed) Modified: head/MOVED head/devel/Makefile head/devel/git-cola/Makefile head/devel/git-cola/distinfo head/devel/git-cola/pkg-descr head/devel/git-cola/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Sat Aug 17 13:23:41 2019 (r509152) +++ head/MOVED Sat Aug 17 13:32:40 2019 (r509153) @@ -11676,7 +11676,6 @@ multimedia/phonon-designerplugin@qt4||2019-03-16|Qt4 d multimedia/phonon-designerplugin@qt5|multimedia/phonon-designerplugin|2019-03-16|Flavor has been removed multimedia/phonon-gstreamer@qt4||2019-03-16|Qt4 deprecation multimedia/phonon-gstreamer@qt5|multimedia/phonon-gstreamer|2019-03-16|Flavor has been removed -devel/git-cola||2019-03-16|Removed emulators/gns3||2019-03-16|Removed accessibility/qt4-accessible||2019-03-16|Has expired: Qt4 has been EOL since december 2015 astro/qlandkartegt||2019-03-16|Has expired: Qt4 has been EOL since december 2015 Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Sat Aug 17 13:23:41 2019 (r509152) +++ head/devel/Makefile Sat Aug 17 13:32:40 2019 (r509153) @@ -795,6 +795,7 @@ SUBDIR += git-bzr-ng SUBDIR += git-cinnabar SUBDIR += git-codereview + SUBDIR += git-cola SUBDIR += git-cvs SUBDIR += git-extras SUBDIR += git-gui Modified: head/devel/git-cola/Makefile ============================================================================== --- head/devel/git-cola/Makefile Sat Mar 16 21:32:52 2019 (r495961) +++ head/devel/git-cola/Makefile Sat Aug 17 13:32:40 2019 (r509153) @@ -1,30 +1,40 @@ # Created by: Jonathan Anderson # $FreeBSD$ -PORTNAME= git-cola -PORTVERSION= 2.6 +PORTNAME= git-cola DISTVERSIONPREFIX= v -PORTREVISION= 1 -CATEGORIES= devel +DISTVERSION= 3.4 +CATEGORIES= devel -MAINTAINER= jonathan@FreeBSD.org -COMMENT= Sleek and powerful Git GUI +MAINTAINER= dch@FreeBSD.org +COMMENT= Sleek and powerful Git GUI -LICENSE= GPLv2+ -LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:net/py-qt4-network@${PY_FLAVOR} \ - ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui@${PY_FLAVOR} \ +BUILD_DEPENDS= git>=0:devel/git +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}QtPy>=1.7.1:devel/py-QtPy@${PY_FLAVOR} -USE_GITHUB= yes +USES= desktop-file-utils gmake gnome python pyqt:5 qt:5 shebangfix +USE_GITHUB= yes +USE_PYQT= core gui network widgets -USES= desktop-file-utils gettext gmake python shebangfix -SHEBANG_FILES= share/git-cola/bin/git-xbase -INSTALLS_ICONS= yes -NO_ARCH= yes +SHEBANG_FILES= share/git-cola/bin/git-xbase +INSTALLS_ICONS= yes +NO_ARCH= yes -MAKE_ARGS= prefix=${PREFIX} PYTHON=${PYTHON_CMD} +# NO_VENDOR_LIBS ensures we use ports QtPy not embedded version +MAKE_ARGS= prefix=${PREFIX} PYTHON=${PYTHON_CMD} NO_VENDOR_LIBS=1 -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOCS NLS +OPTIONS_SUB= yes + +NLS_USES= gettext + +post-patch: + @${REINPLACE_CMD} -e 's|LN_S = $$(LN) -s -f|LN_S = ${RLN}|;\ +s|$$(LN_S) "$$(datadir)/icons/git-cola.svg"|$$(LN_S) \ +"$$(DESTDIR)$$(datadir)/icons/git-cola.svg"|' \ + ${WRKSRC}/Makefile .include Modified: head/devel/git-cola/distinfo ============================================================================== --- head/devel/git-cola/distinfo Sat Mar 16 21:32:52 2019 (r495961) +++ head/devel/git-cola/distinfo Sat Aug 17 13:32:40 2019 (r509153) @@ -1,3 +1,3 @@ -TIMESTAMP = 1463112676 -SHA256 (git-cola-git-cola-v2.6_GH0.tar.gz) = ed566548793b4905005528d5e612c41bea5b5f7602649c0eec0787fbb0ab9cd2 -SIZE (git-cola-git-cola-v2.6_GH0.tar.gz) = 1027026 +TIMESTAMP = 1565971621 +SHA256 (git-cola-git-cola-v3.4_GH0.tar.gz) = 763e382d8b32427539585d17ec6fe92026c073f6d31a864a5816ebe22cf245bc +SIZE (git-cola-git-cola-v3.4_GH0.tar.gz) = 963393 Modified: head/devel/git-cola/pkg-descr ============================================================================== --- head/devel/git-cola/pkg-descr Sat Mar 16 21:32:52 2019 (r495961) +++ head/devel/git-cola/pkg-descr Sat Aug 17 13:32:40 2019 (r509153) @@ -1,3 +1,13 @@ -git cola is a sleek and powerful Git GUI. +git-cola is a powerful Git GUI, with a slick and intuitive interface. + +It comes with excellent documentation https://git-cola.readthedocs.io/ +and a plethora of useful functionality, including: + +- direct integration with git subcommands +- git-tag, an interactive tree & commit history browser +- an integrated file browser to view any file at a given commit +- an interactive rebase and merge facility +- search comimits, and grep content +- partial file commit that is a delight to use WWW: https://git-cola.github.io/ Added: head/devel/git-cola/pkg-message ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/git-cola/pkg-message Sat Aug 17 13:32:40 2019 (r509153) @@ -0,0 +1,8 @@ +[ +{ type: install + message: <