Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 22 Mar 2020 18:36:34 GMT
From:      pkg-fallout@FreeBSD.org
To:        jbeich@FreeBSD.org
Cc:        pkg-fallout@FreeBSD.org
Subject:   [package - 113i386-default][devel/git-cinnabar] Failed for git-cinnabar-0.5.4 in build
Message-ID:  <202003221836.02MIaYf7002101@beefy10.nyi.freebsd.org>

next in thread | raw e-mail | index | archive | help
You are receiving this mail as a port that you maintain
is failing to build on the FreeBSD package build server.
Please investigate the failure and submit a PR to fix
build.

Maintainer:     jbeich@FreeBSD.org
Last committer: jbeich@FreeBSD.org
Ident:          $FreeBSD: head/devel/git-cinnabar/Makefile 525355 2020-02-06 00:54:16Z jbeich $
Log URL:        http://beefy10.nyi.freebsd.org/data/113i386-default/528817/logs/git-cinnabar-0.5.4.log
Build URL:      http://beefy10.nyi.freebsd.org/build.html?mastername=113i386-default&build=528817
Log:

=>> Building devel/git-cinnabar
build started at Sun Mar 22 18:36:09 UTC 2020
port directory: /usr/ports/devel/git-cinnabar
package name: git-cinnabar-0.5.4
building for: FreeBSD 113i386-default-job-02 11.3-RELEASE-p7 FreeBSD 11.3-RELEASE-p7 i386
maintained by: jbeich@FreeBSD.org
Makefile ident:      $FreeBSD: head/devel/git-cinnabar/Makefile 525355 2020-02-06 00:54:16Z jbeich $
Poudriere version: 3.2.8-5-gc81843e5
Host OSVERSION: 1300076
Jail OSVERSION: 1103000
Job Id: 02

---Begin Environment---
SHELL=/bin/csh
UNAME_p=i386
UNAME_m=i386
OSVERSION=1103000
UNAME_v=FreeBSD 11.3-RELEASE-p7
UNAME_r=11.3-RELEASE-p7
BLOCKSIZE=K
MAIL=/var/mail/root
STATUS=1
HOME=/root
PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/root/bin
LOCALBASE=/usr/local
USER=root
LIBEXECPREFIX=/usr/local/libexec/poudriere
POUDRIERE_VERSION=3.2.8-5-gc81843e5
MASTERMNT=/usr/local/poudriere/data/.m/113i386-default/ref
POUDRIERE_BUILD_TYPE=bulk
PACKAGE_BUILDING=yes
SAVED_TERM=
PWD=/usr/local/poudriere/data/.m/113i386-default/ref/.p/pool
P_PORTS_FEATURES=FLAVORS SELECTED_OPTIONS
MASTERNAME=113i386-default
SCRIPTPREFIX=/usr/local/share/poudriere
OLDPWD=/usr/local/poudriere/data/.m/113i386-default/ref/.p
SCRIPTPATH=/usr/local/share/poudriere/bulk.sh
POUDRIEREPATH=/usr/local/bin/poudriere
---End Environment---

---Begin Poudriere Port Flags/Env---
PORT_FLAGS=
PKGENV=
FLAVOR=
DEPENDS_ARGS=
MAKE_ARGS=
---End Poudriere Port Flags/Env---

---Begin OPTIONS List---
===> The following configuration options are available for git-cinnabar-0.5.4:
     DOCS=on: Build and/or install documentation
===> Use 'make config' to modify these settings
---End OPTIONS List---

--MAINTAINER--
jbeich@FreeBSD.org
--End MAINTAINER--

--CONFIGURE_ARGS--

--End CONFIGURE_ARGS--

--CONFIGURE_ENV--
MAKE=gmake PYTHON="/usr/local/bin/python2.7" XDG_DATA_HOME=/wrkdirs/usr/ports/devel/git-cinnabar/work  XDG_CONFIG_HOME=/wrkdirs/usr/ports/devel/git-cinnabar/work  HOME=/wrkdirs/usr/ports/devel/git-cinnabar/work TMPDIR="/tmp" SHELL=/bin/sh CONFIG_SHELL=/bin/sh
--End CONFIGURE_ENV--

--MAKE_ENV--
V=1 CURLDIR=/usr/local OPENSSLBASE=/usr OPENSSLDIR=/etc/ssl OPENSSLINC=/usr/include OPENSSLLIB=/usr/lib PERL_USE_UNSAFE_INC=1 XDG_DATA_HOME=/wrkdirs/usr/ports/devel/git/work  XDG_CONFIG_HOME=/wrkdirs/usr/ports/devel/git/work  HOME=/wrkdirs/usr/ports/devel/git/work TMPDIR="/tmp" PATH=/wrkdirs/usr/ports/devel/git/work/.bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/root/bin NO_PIE=yes MK_DEBUG_FILES=no MK_KERNEL_SYMBOLS=no SHELL=/bin/sh NO_LINT=YES PREFIX=/usr/local  LOCALBASE=/usr/local  CC="cc" CFLAGS="-O2 -pipe  -DLIBICONV_PLUG -fstack-protector-strong -fno-strict-aliasing "  CPP="cpp" CPPFLAGS="-isystem/usr/local/include -DLIBICONV_PLUG"  LDFLAGS=" -L/usr/local/lib  -fstack-protector-strong " LIBS=""  CXX="c++" CXXFLAGS="-O2 -pipe -DLIBICONV_PLUG -fstack-protector-strong -fno-strict-aliasing  -DLIBICONV_PLUG "  MANPREFIX="/usr/local" BSD_INSTALL_PROGRAM="install  -s -m 555"  BSD_INSTALL_LIB="install  -s -m 0644"  BSD_INSTALL_SCRIPT="install  -m 555"  BSD_INSTALL_
 DATA="install  -m 0644"  BSD_INSTALL_MAN="install  -m 444" PYTHON_PATH="/usr/local/bin/python2.7" XDG_DATA_HOME=/wrkdirs/usr/ports/devel/git-cinnabar/work  XDG_CONFIG_HOME=/wrkdirs/usr/ports/devel/git-cinnabar/work  HOME=/wrkdirs/usr/ports/devel/git-cinnabar/work TMPDIR="/tmp" NO_PIE=yes MK_DEBUG_FILES=no MK_KERNEL_SYMBOLS=no SHELL=/bin/sh NO_LINT=YES PREFIX=/usr/local  LOCALBASE=/usr/local  CC="cc" CFLAGS="-O2 -pipe  -fstack-protector-strong -fno-strict-aliasing "  CPP="cpp" CPPFLAGS=""  LDFLAGS=" -fstack-protector-strong " LIBS=""  CXX="c++" CXXFLAGS="-O2 -pipe -fstack-protector-strong -fno-strict-aliasing  "  MANPREFIX="/usr/local" BSD_INSTALL_PROGRAM="install  -s -m 555"  BSD_INSTALL_LIB="install  -s -m 0644"  BSD_INSTALL_SCRIPT="install  -m 555"  BSD_INSTALL_DATA="install  -m 0644"  BSD_INSTALL_MAN="install  -m 444"
--End MAKE_ENV--

--PLIST_SUB--
PORTDOCS="" PYTHON_INCLUDEDIR=include/python2.7  PYTHON_LIBDIR=lib/python2.7  PYTHON_PLATFORM=freebsd11  PYTHON_SITELIBDIR=lib/python2.7/site-packages  PYTHON_SUFFIX=27  PYTHON_VER=2.7  PYTHON_VERSION=python2.7 PYTHON2="" PYTHON3="@comment " OSREL=11.3 PREFIX=%D LOCALBASE=/usr/local  RESETPREFIX=/usr/local LIB32DIR=lib DOCSDIR="share/doc/git-cinnabar"  EXAMPLESDIR="share/examples/git-cinnabar"  DATADIR="libexec/git-core"  WWWDIR="www/git-cinnabar"  ETCDIR="etc/git-cinnabar"
--End PLIST_SUB--

--SUB_LIST--
PREFIX=/usr/local LOCALBASE=/usr/local  DATADIR=/usr/local/libexec/git-core DOCSDIR=/usr/local/share/doc/git-cinnabar EXAMPLESDIR=/usr/local/share/examples/git-cinnabar  WWWDIR=/usr/local/www/git-cinnabar ETCDIR=/usr/local/etc/git-cinnabar
--End SUB_LIST--

---Begin make.conf---
USE_PACKAGE_DEPENDS=yes
BATCH=yes
WRKDIRPREFIX=/wrkdirs
PORTSDIR=/usr/ports
PACKAGES=/packages
DISTDIR=/distfiles
PACKAGE_BUILDING=yes
PACKAGE_BUILDING_FLAVORS=yes
MACHINE=i386
MACHINE_ARCH=i386
ARCH=${MACHINE_ARCH}
#### /usr/local/etc/poudriere.d/make.conf ####
# XXX: We really need this but cannot use it while 'make checksum' does not
# try the next mirror on checksum failure.  It currently retries the same
# failed mirror and then fails rather then trying another.  It *does*
# try the next if the size is mismatched though.
#MASTER_SITE_FREEBSD=yes
# Build ALLOW_MAKE_JOBS_PACKAGES with 2 jobs
MAKE_JOBS_NUMBER=2
#### /usr/ports/Mk/Scripts/ports_env.sh ####
_CCVERSION_921dbbb2=FreeBSD clang version 8.0.0 (tags/RELEASE_800/final 356365) (based on LLVM 8.0.0) Target: i386-unknown-freebsd11.3 Thread model: posix InstalledDir: /usr/bin
_ALTCCVERSION_921dbbb2=none
_CXXINTERNAL_acaad9ca=FreeBSD clang version 8.0.0 (tags/RELEASE_800/final 356365) (based on LLVM 8.0.0) Target: i386-unknown-freebsd11.3 Thread model: posix InstalledDir: /usr/bin "/usr/bin/ld" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld-elf.so.1" "--hash-style=both" "--enable-new-dtags" "-m" "elf_i386_fbsd" "-o" "a.out" "/usr/lib/crt1.o" "/usr/lib/crti.o" "/usr/lib/crtbegin.o" "-L/usr/lib" "/dev/null" "-lc++" "-lm" "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed" "-lc" "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed" "/usr/lib/crtend.o" "/usr/lib/crtn.o"
CC_OUTPUT_921dbbb2_58173849=yes
CC_OUTPUT_921dbbb2_9bdba57c=yes
CC_OUTPUT_921dbbb2_6a4fe7f5=yes
CC_OUTPUT_921dbbb2_6bcac02b=yes
CC_OUTPUT_921dbbb2_67d20829=yes
CC_OUTPUT_921dbbb2_bfa62e83=yes
CC_OUTPUT_921dbbb2_f0b4d593=yes
CC_OUTPUT_921dbbb2_308abb44=yes
CC_OUTPUT_921dbbb2_f00456e5=yes
CC_OUTPUT_921dbbb2_65ad290d=yes
CC_OUTPUT_921dbbb2_f2776b26=yes
CC_OUTPUT_921dbbb2_b2657cc3=yes
CC_OUTPUT_921dbbb2_380987f7=yes
CC_OUTPUT_921dbbb2_160933ec=yes
CC_OUTPUT_921dbbb2_fb62803b=yes
_OBJC_CCVERSION_921dbbb2=FreeBSD clang version 8.0.0 (tags/RELEASE_800/final 356365) (based on LLVM 8.0.0) Target: i386-unknown-freebsd11.3 Thread model: posix InstalledDir: /usr/bin
_OBJC_ALTCCVERSION_921dbbb2=none
ARCH=i386
OPSYS=FreeBSD
_OSRELEASE=11.3-RELEASE-p7
OSREL=11.3
OSVERSION=1103000
PYTHONBASE=/usr/local
CONFIGURE_MAX_CMD_LEN=524288
HAVE_PORTS_ENV=1
#### Misc Poudriere ####
GID=0
UID=0
DISABLE_MAKE_JOBS=poudriere
---End make.conf---
--Resource limits--
cpu time               (seconds, -t)  unlimited
file size           (512-blocks, -f)  unlimited
data seg size           (kbytes, -d)  524288
stack size              (kbytes, -s)  65536
core file size      (512-blocks, -c)  unlimited
max memory size         (kbytes, -m)  unlimited
locked memory           (kbytes, -l)  unlimited
max user processes              (-u)  89999
open files                      (-n)  1024
virtual mem size        (kbytes, -v)  unlimited
swap limit              (kbytes, -w)  unlimited
socket buffer size       (bytes, -b)  unlimited
pseudo-terminals                (-p)  unlimited
kqueues                         (-k)  unlimited
umtx shared locks               (-o)  unlimited
--End resource limits--
=======================<phase: check-sanity   >============================
===>  License GPLv2 accepted by the user
===========================================================================
=======================<phase: pkg-depends    >============================
===>   git-cinnabar-0.5.4 depends on file: /usr/local/sbin/pkg - not found
===>   Installing existing package /packages/All/pkg-1.13.2.txz
[113i386-default-job-02] Installing pkg-1.13.2...
[113i386-default-job-02] Extracting pkg-1.13.2: .......... done
===>   git-cinnabar-0.5.4 depends on file: /usr/local/sbin/pkg - found
===>   Returning to build of git-cinnabar-0.5.4
===========================================================================
=======================<phase: fetch-depends  >============================
===========================================================================
=======================<phase: fetch          >============================
===>  License GPLv2 accepted by the user
===> Fetching all distfiles required by git-cinnabar-0.5.4 for building
===>  License GPLv2 accepted by the user
===> Fetching all distfiles required by git-2.25.2 for building
===========================================================================
=======================<phase: checksum       >============================
===>  License GPLv2 accepted by the user
===> Fetching all distfiles required by git-cinnabar-0.5.4 for building
===>  License GPLv2 accepted by the user
===> Fetching all distfiles required by git-2.25.2 for building
=> SHA256 Checksum OK for glandium-git-cinnabar-0.5.4_GH0.tar.gz.
===========================================================================
=======================<phase: extract-depends>============================
===========================================================================
=======================<phase: extract        >============================
===>  License GPLv2 accepted by the user
===> Fetching all distfiles required by git-cinnabar-0.5.4 for building
===>  License GPLv2 accepted by the user
===> Fetching all distfiles required by git-2.25.2 for building
===>  Extracting for git-cinnabar-0.5.4
=> SHA256 Checksum OK for glandium-git-cinnabar-0.5.4_GH0.tar.gz.
===========================================================================
=======================<phase: patch-depends  >============================
===========================================================================
=======================<phase: patch          >============================
===>  Patching for git-cinnabar-0.5.4
===========================================================================
=======================<phase: build-depends  >============================
===>  License GPLv2 accepted by the user
===>   git-2.25.2 depends on file: /usr/local/sbin/pkg - found
===> Fetching all distfiles required by git-2.25.2 for building
===>  Extracting for git-2.25.2
=> SHA256 Checksum OK for git-2.25.2.tar.xz.
=> SHA256 Checksum OK for git-manpages-2.25.2.tar.xz.
===>  Patching for git-2.25.2
<snip>
checking for strings.h... (cached) yes
checking for inttypes.h... (cached) yes
checking for stdint.h... (cached) yes
checking for unistd.h... (cached) yes
checking for size_t... (cached) yes
checking for working alloca.h... no
checking for alloca... yes
configure: Setting PERL_PATH to /usr/local/bin/perl
configure: Setting PYTHON_PATH to /usr/local/bin/python3.7
configure: CHECKS for programs
checking whether we are using the GNU C compiler... (cached) yes
checking whether cc accepts -g... (cached) yes
checking for cc option to accept ISO C89... (cached) none needed
checking for inline... inline
checking if linker supports -R... no
checking if linker supports -Wl,-rpath,... yes
checking for gar... no
checking for ar... ar
checking for gtar... no
checking for tar... tar
checking for gnudiff... no
checking for gdiff... no
checking for diff... diff
checking for asciidoc... asciidoc
checking for asciidoc version... asciidoc 8.6.10
Using 'grep -a' for sane_grep
configure: CHECKS for libraries
checking for SHA1_Init in -lcrypto... yes
checking for pcre_version in -lpcre... yes
checking for curl_global_init in -lcurl... yes
checking for curl-config... curl-config
configure: Setting CURL_LDFLAGS to '-L/usr/local/lib -lcurl'
checking for XML_ParserCreate in -lexpat... yes
checking for iconv in -lc... yes
checking for deflateBound in -lz... yes
checking for socket in -lc... yes
checking for inet_ntop... (cached) yes
checking for inet_pton... yes
checking for hstrerror... yes
checking for basename in -lc... yes
checking if libc contains libintl... no
checking libintl.h usability... yes
checking libintl.h presence... yes
checking for libintl.h... yes
configure: CHECKS for header files
checking for sys/select.h... (cached) yes
checking for poll.h... (cached) yes
checking for sys/poll.h... (cached) yes
checking for inttypes.h... (cached) yes
checking for old iconv()... no
checking whether iconv omits bom for utf-16 and utf-32... no
configure: CHECKS for typedefs, structures, and compiler characteristics
checking for socklen_t... (cached) yes
checking for struct itimerval... yes
checking for struct stat.st_mtimespec.tv_nsec... yes
checking for struct stat.st_mtim.tv_nsec... yes
checking for struct dirent.d_type... yes
checking for struct passwd.pw_gecos... yes
checking for struct sockaddr_storage... yes
checking for struct addrinfo... yes
checking for getaddrinfo... (cached) yes
checking for library containing getaddrinfo... none required
checking whether the platform regex supports REG_STARTEND... yes
checking whether system succeeds to read fopen'ed directory... yes
checking whether snprintf() and/or vsnprintf() return bogus value... no
checking whether the platform uses typical file type bits... yes
configure: CHECKS for library functions
checking for libgen.h... (cached) yes
checking for paths.h... (cached) yes
checking for libcharset.h... (cached) no
checking for strings.h... (cached) yes
checking for locale_charset in -liconv... no
checking for locale_charset in -lcharset... no
checking for clock_gettime... (cached) yes
checking for library containing clock_gettime... none required
checking for CLOCK_MONOTONIC... yes
checking for setitimer... yes
checking for library containing setitimer... none required
checking for strcasestr... (cached) yes
checking for library containing strcasestr... none required
checking for memmem... yes
checking for library containing memmem... none required
checking for strlcpy... (cached) yes
checking for library containing strlcpy... none required
checking for uintmax_t... yes
checking for strtoumax... yes
checking for library containing strtoumax... none required
checking for setenv... (cached) yes
checking for library containing setenv... none required
checking for unsetenv... (cached) yes
checking for library containing unsetenv... none required
checking for mkdtemp... (cached) yes
checking for library containing mkdtemp... none required
checking for initgroups... yes
checking for library containing initgroups... none required
checking for getdelim... (cached) yes
checking for library containing getdelim... none required
checking for BSD sysctl... yes
checking for POSIX Threads with '-pthread'... yes
configure: creating ./config.status
config.status: creating config.mak.autogen
config.status: executing config.mak.autogen commands
===>   Returning to build of git-cinnabar-0.5.4
===>   git-cinnabar-0.5.4 depends on executable: gmake - found
===========================================================================
=======================<phase: lib-depends    >============================
===========================================================================
=======================<phase: configure      >============================
===>  Configuring for git-cinnabar-0.5.4
===========================================================================
=======================<phase: build          >============================
===>  Building for git-cinnabar-0.5.4
gmake[1]: Entering directory '/wrkdirs/usr/ports/devel/git-cinnabar/work/git-cinnabar-0.5.4'
gmake[1]: git: Command not found
/bin/sh: git: not found
gmake[1]: git: Command not found
/bin/sh: git: not found
gmake -C /wrkdirs/usr/ports/devel/git-cinnabar/work/git-cinnabar-0.5.4/git-core -f /wrkdirs/usr/ports/devel/git-cinnabar/work/git-cinnabar-0.5.4/Makefile git-cinnabar-helper CINNABAR_RECURSE=1
gmake[2]: Entering directory '/wrkdirs/usr/ports/devel/git-cinnabar/work/git-cinnabar-0.5.4/git-core'
GIT_VERSION = 2.25.2
    * new build flags
(cd .. && patch -p1 -F0 -o helper/fast-import.patched.c /wrkdirs/usr/ports/devel/git-cinnabar/work/git-cinnabar-0.5.4/git-core/fast-import.c) < ../helper/fast-import.c.patch
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/fast-import.c b/fast-import.c
|index b44d6a467e..201b75a75f 100644
|--- a/fast-import.c
|+++ b/fast-import.c
--------------------------
Patching file /wrkdirs/usr/ports/devel/git-cinnabar/work/git-cinnabar-0.5.4/git-core/fast-import.c using Plan A...
Hunk #1 succeeded at 704 (offset 1 line).
Hunk #2 succeeded at 811 (offset 1 line).
Hunk #3 succeeded at 1612 (offset 1 line).
Hunk #4 succeeded at 2143 (offset 4 lines).
Hunk #5 succeeded at 2206 (offset 1 line).
done
cc -o cinnabar-fast-import.o -c -MF ./.depend/cinnabar-fast-import.o.d -MQ cinnabar-fast-import.o -MMD -MP  -isystem/usr/local/include -DLIBICONV_PLUG -O2 -pipe  -DLIBICONV_PLUG -fstack-protector-strong -fno-strict-aliasing  -I. -I/usr/local/include -DGIT_HOST_CPU="\"i386\"" -DUSE_LIBPCRE1 -I/usr/local/include -DUSE_CURL_FOR_IMAP_SEND -I/usr/include -DUSE_ST_TIMESPEC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK -pthread -DHAVE_PATHS_H -DHAVE_STRINGS_H -DGMTIME_UNRELIABLE_ERRORS -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_BSD_SYSCTL -DHAVE_BSD_KERN_PROC_SYSCTL -DHAVE_GETDELIM  -DFREAD_READS_DIRECTORIES -DDIR_HAS_BSD_GROUP_SEMANTICS -DFILENO_IS_A_MACRO -DSHELL_PATH='"/bin/sh"' -DPAGER_ENV='"LESS=FRX LV=-c MORE=FRX"'  ../helper/cinnabar-fast-import.c
(cd .. && patch -p1 -F0 -o helper/config.patched.c /wrkdirs/usr/ports/devel/git-cinnabar/work/git-cinnabar-0.5.4/git-core/config.c) < ../helper/config.c.patch
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/config.c b/config.c
|index 24ad1a9854..2be637e09d 100644
|--- a/config.c
|+++ b/config.c
--------------------------
Patching file /wrkdirs/usr/ports/devel/git-cinnabar/work/git-cinnabar-0.5.4/git-core/config.c using Plan A...
Hunk #1 succeeded at 1868 (offset 57 lines).
done
(cd .. && patch -p1 -F0 -o helper/tree-walk.patched.c /wrkdirs/usr/ports/devel/git-cinnabar/work/git-cinnabar-0.5.4/git-core/tree-walk.c) < ../helper/tree-walk.c.patch
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/tree-walk.c b/tree-walk.c
|index 1e4bbc8a0e..c4c7e7a931 100644
|--- a/tree-walk.c
|+++ b/tree-walk.c
--------------------------
Patching file /wrkdirs/usr/ports/devel/git-cinnabar/work/git-cinnabar-0.5.4/git-core/tree-walk.c using Plan A...
Hunk #1 succeeded at 47.
done
(cd .. && patch -p1 -F0 -o helper/packfile.patched.c /wrkdirs/usr/ports/devel/git-cinnabar/work/git-cinnabar-0.5.4/git-core/packfile.c) < ../helper/packfile.c.patch
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/packfile.c b/packfile.c
|index 16bcb75262..75871067b4 100644
|--- a/packfile.c
|+++ b/packfile.c
--------------------------
Patching file /wrkdirs/usr/ports/devel/git-cinnabar/work/git-cinnabar-0.5.4/git-core/packfile.c using Plan A...
Hunk #1 succeeded at 1900 (offset 6 lines).
done
(cd .. && patch -p1 -F0 -o helper/notes.patched.c /wrkdirs/usr/ports/devel/git-cinnabar/work/git-cinnabar-0.5.4/git-core/notes.c) < ../helper/notes.c.patch
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/notes.c b/notes.c
|index 75c028b300..24089afa8a 100644
|--- a/notes.c
|+++ b/notes.c
--------------------------
Patching file /wrkdirs/usr/ports/devel/git-cinnabar/work/git-cinnabar-0.5.4/git-core/notes.c using Plan A...
Hunk #1 succeeded at 419 (offset 2 lines).
Hunk #2 failed at 721.
Hunk #3 succeeded at 752 (offset 3 lines).
Hunk #4 succeeded at 1159 (offset 35 lines).
Hunk #5 failed at 1177.
Hunk #6 succeeded at 1159 (offset 4 lines).
2 out of 6 hunks failed--saving rejects to helper/notes.patched.c.rej
done
gmake[2]: *** [/wrkdirs/usr/ports/devel/git-cinnabar/work/git-cinnabar-0.5.4/Makefile:157: ../helper/notes.patched.c] Error 1
gmake[2]: Leaving directory '/wrkdirs/usr/ports/devel/git-cinnabar/work/git-cinnabar-0.5.4/git-core'
gmake[1]: *** [Makefile:82: git-cinnabar-helper] Error 2
gmake[1]: Leaving directory '/wrkdirs/usr/ports/devel/git-cinnabar/work/git-cinnabar-0.5.4'
*** Error code 1

Stop.
make: stopped in /usr/ports/devel/git-cinnabar



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