Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 12 Nov 2020 10:01:48 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r554942 - in head/devel/git-cinnabar: . files
Message-ID:  <202011121001.0ACA1mmw096785@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Thu Nov 12 10:01:48 2020
New Revision: 554942
URL: https://svnweb.freebsd.org/changeset/ports/554942

Log:
  devel/git-cinnabar: update to 0.5.6
  
  Changes:	https://github.com/glandium/git-cinnabar/releases/tag/0.5.6
  Reported by:	GitHub (watch releases)

Deleted:
  head/devel/git-cinnabar/files/patch-git-2.27
  head/devel/git-cinnabar/files/patch-git-2.29
Modified:
  head/devel/git-cinnabar/Makefile   (contents, props changed)
  head/devel/git-cinnabar/distinfo   (contents, props changed)
  head/devel/git-cinnabar/files/patch-no-wrapper   (contents, props changed)

Modified: head/devel/git-cinnabar/Makefile
==============================================================================
--- head/devel/git-cinnabar/Makefile	Thu Nov 12 08:59:10 2020	(r554941)
+++ head/devel/git-cinnabar/Makefile	Thu Nov 12 10:01:48 2020	(r554942)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	git-cinnabar
-DISTVERSION=	0.5.5
-PORTREVISION=	5
+DISTVERSION=	0.5.6
 CATEGORIES=	devel
 PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX:N-py27}
 

Modified: head/devel/git-cinnabar/distinfo
==============================================================================
--- head/devel/git-cinnabar/distinfo	Thu Nov 12 08:59:10 2020	(r554941)
+++ head/devel/git-cinnabar/distinfo	Thu Nov 12 10:01:48 2020	(r554942)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1587622573
-SHA256 (glandium-git-cinnabar-0.5.5_GH0.tar.gz) = 7e0a935966ab5b434f4c60335808be167e4b300d8cb0b0feb987adb7fc562521
-SIZE (glandium-git-cinnabar-0.5.5_GH0.tar.gz) = 175208
+TIMESTAMP = 1605147574
+SHA256 (glandium-git-cinnabar-0.5.6_GH0.tar.gz) = 64c483e93eea5ec9ef142988e272f949428db2ef685aecc31ce112e24f55f3c9
+SIZE (glandium-git-cinnabar-0.5.6_GH0.tar.gz) = 176409

Modified: head/devel/git-cinnabar/files/patch-no-wrapper
==============================================================================
--- head/devel/git-cinnabar/files/patch-no-wrapper	Thu Nov 12 08:59:10 2020	(r554941)
+++ head/devel/git-cinnabar/files/patch-no-wrapper	Thu Nov 12 10:01:48 2020	(r554942)
@@ -1,8 +1,8 @@
 Disable wrappers as Python version is controlled by FLAVORS
 
---- README.md.orig	2020-04-23 06:16:13 UTC
+--- README.md.orig	2020-11-12 02:19:34 UTC
 +++ README.md
-@@ -53,18 +53,6 @@ Setup:
+@@ -53,21 +53,6 @@ Setup:
  
    If you want to build git along the helper, you can run `make git`.
  
@@ -18,21 +18,32 @@ Disable wrappers as Python version is controlled by FL
 -It has been tested mainly with python 3.5 and 3.7. Corner cases may not work
 -properly.
 -
+-It is also possible to replace `python3` in either `GIT_CINNABAR_EXPERIMENTS`
+-or `cinnabar.experiments` with `python=/path/to/python`.
+-
  Usage:
  ------
  
---- git-cinnabar.orig	2020-04-23 06:16:13 UTC
+--- git-cinnabar.orig	2020-11-12 02:19:34 UTC
 +++ git-cinnabar
-@@ -1,17 +1,4 @@
+@@ -1,25 +1,4 @@
 -#!/bin/sh
 -''':'
--experiments=${GIT_CINNABAR_EXPERIMENTS-$(git config cinnabar.experiments)}
--case ",$experiments," in
+-experiments=",${GIT_CINNABAR_EXPERIMENTS-$(git config cinnabar.experiments)},"
+-case "$experiments" in
 -*,python3,*)
 -  PYTHON=python3
 -  ;;
+-*,python=*,*)
+-  PYTHON=${experiments#*,python=}
+-  PYTHON=${PYTHON%%,*}
+-  ;;
 -*)
--  PYTHON=python2.7
+-  if command -v python2.7 > /dev/null; then
+-    PYTHON=python2.7
+-  else
+-    PYTHON=python2
+-  fi
 -  ;;
 -esac
 -exec $PYTHON $0 "$@"
@@ -42,18 +53,26 @@ Disable wrappers as Python version is controlled by FL
  
  import os
  import sys
---- git-remote-hg.orig	2020-04-23 06:16:13 UTC
+--- git-remote-hg.orig	2020-11-12 02:19:34 UTC
 +++ git-remote-hg
-@@ -1,17 +1,4 @@
+@@ -1,25 +1,4 @@
 -#!/bin/sh
 -''':'
--experiments=${GIT_CINNABAR_EXPERIMENTS-$(git config cinnabar.experiments)}
--case ",$experiments," in
+-experiments=",${GIT_CINNABAR_EXPERIMENTS-$(git config cinnabar.experiments)},"
+-case "$experiments" in
 -*,python3,*)
 -  PYTHON=python3
 -  ;;
+-*,python=*,*)
+-  PYTHON=${experiments#*,python=}
+-  PYTHON=${PYTHON%%,*}
+-  ;;
 -*)
--  PYTHON=python2.7
+-  if command -v python2.7 > /dev/null; then
+-    PYTHON=python2.7
+-  else
+-    PYTHON=python2
+-  fi
 -  ;;
 -esac
 -exec $PYTHON $0 "$@"



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