Hi Patrick On Mon, 15 Jul 2019 11:03:54 -0400 Patrick Marchand <m...@patrickmarchand.com> wrote:
> [snip] > > Here's a new diff, I messed up the previous one and it did not > include the deletion of the web patch, that has been upstreamed > since the last port upgrade. I applied your patch, but a hunk for the patch-INSALL file does not apply cleanly. Inline, the content of patch-INSTALL.rej @@ -1,37 +1,14 @@ $OpenBSD: patch-INSTALL,v 1.6 2017/02/28 02:27:41 gsoares Exp $ ---- INSTALL.orig Wed Nov 2 20:17:40 2016 -+++ INSTALL Mon Feb 27 21:57:58 2017 -@@ -128,7 +128,7 @@ fi +Index: INSTALL +--- INSTALL.orig ++++ INSTALL +@@ -134,7 +134,7 @@ fi if [ `uname` != Darwin ]; then # Determine whether fontsrv X11 files are available. rm -f a.out -- gcc -o a.out -c -Iinclude -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/local/include/freetype2 \ +- cc -o a.out -c -Iinclude -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/local/include/freetype2 \ + ${CC} -o a.out -c -Iinclude -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/local/include/freetype2 \ -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 src/cmd/fontsrv/x11.c >/dev/null 2>&1 if [ -f a.out ]; then echo " fontsrv dependencies found." -@@ -151,7 +151,7 @@ cd src - if $dobuild; then - if [ ! -x ../bin/mk ]; then - echo "* Building mk..." -- ../dist/buildmk 2>&1 | sed 's/^[+] //' -+ ../dist/buildmk 2>&1 - fi - if [ ! -x ../bin/mk ]; then - echo "* Error: mk failed to build." -@@ -159,7 +159,6 @@ if $dobuild; then - fi - - echo "* Building everything (be patient)..." -- mk clean - mk libs-nuke - mk all || exit 1 - if [ ! -x $PLAN9/src/cmd/o.cleanname -o ! -x $PLAN9/src/cmd/acme/o.acme ]; then -@@ -218,5 +217,5 @@ if $doinstall; then - echo " PLAN9=$PLAN9 export PLAN9" - echo ' PATH=$PATH:$PLAN9/bin export PATH' - fi --) 2>&1 | tee install.log | $awk -f $PLAN9/dist/isum.awk -v 'copy='install.sum -+) 2>&1 | tee install.log - The patch command output, for the patch command is: -------------------------- |Index: patches/patch-INSTALL |=================================================================== |RCS file: /cvs/ports/plan9/plan9port/patches/patch-INSTALL,v |retrieving revision 1.6 |diff -u -p -u -p -r1.6 patch-INSTALL |--- patches/patch-INSTALL 28 Feb 2017 02:27:41 -0000 1.6 |+++ patches/patch-INSTALL 15 Jul 2019 14:37:14 -0000 -------------------------- Patching file patches/patch-INSTALL using Plan A... Hunk #1 failed at 1. 1 out of 1 hunks failed--saving rejects to patches/patch-INSTALL.rej -- Andrea