Hi This updates devel/src to version 1.8
- use -f with ln in pre-test to prevent 'make test' from failing on consecutive runs - run srctest with bash to allow substitutions that our sh does wrong - patch srctest to initialize git and add dummy user and email to make a test succeed The testsuite shows no errors with this. OK ? Index: Makefile =================================================================== RCS file: /cvs/ports/devel/src/Makefile,v retrieving revision 1.14 diff -u -p -p -u -r1.14 Makefile --- Makefile 27 Dec 2017 10:34:53 -0000 1.14 +++ Makefile 5 May 2018 12:14:42 -0000 @@ -2,7 +2,7 @@ COMMENT = Simple Revision Control -DISTNAME = src-1.17 +DISTNAME = src-1.18 CATEGORIES = devel @@ -41,6 +41,7 @@ do-install: # Disable sscs and python 3.x tests. pre-test: sed -i -e '/srctest -b sccs/d ' -e '/p python3/d' ${WRKSRC}/Makefile - ln -s ${LOCALBASE}/bin/gdiff ${WRKDIR}/bin/diff + sed -i '1s,^#!/bin/sh,#!/usr/local/bin/bash,' ${WRKSRC}/srctest + ln -sf ${LOCALBASE}/bin/gdiff ${WRKDIR}/bin/diff .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/devel/src/distinfo,v retrieving revision 1.14 diff -u -p -p -u -r1.14 distinfo --- distinfo 27 Dec 2017 10:34:53 -0000 1.14 +++ distinfo 5 May 2018 12:14:42 -0000 @@ -1,2 +1,2 @@ -SHA256 (src-1.17.tar.gz) = E2IGi0bANajRnK/RLjsjuCUcZnvZgkL5x7BbhC8sCJ0= -SIZE (src-1.17.tar.gz) = 49873 +SHA256 (src-1.18.tar.gz) = zAiXwXY/V+Zif9kSoxXeVVTku1P6CVjIV4Ij5TecGlg= +SIZE (src-1.18.tar.gz) = 52692 Index: patches/patch-srctest =================================================================== RCS file: patches/patch-srctest diff -N patches/patch-srctest --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-srctest 5 May 2018 12:14:42 -0000 @@ -0,0 +1,19 @@ +$OpenBSD$ + +See upstream merge request https://gitlab.com/esr/src/merge_requests/20 + +Index: srctest +--- srctest.orig ++++ srctest +@@ -1492,7 +1492,10 @@ author Eric Sunshine <sunsh...@sunshineco.com> 1509732 + committer Roy G. Biv <spect...@color.com> 1511228715 +0000 + EOF + +- $src ${TESTOPTS#-T} fast-export 1 tiebreak | ++ git init --quiet && ++ git config user.name user_name && ++ git config user.email user_email && ++ $src ${TESTOPTS#-T} fast-export 1 tiebreak | + grep -E 'author|committer' >rfc822export.actual + diff rfc822export.expect rfc822export.actual + check "fast-export: consult RFC 822 headers" =================================================================== Stats: --- 4 lines 173 chars Stats: +++ 19 lines 700 chars Stats: 15 lines Stats: 527 chars