diff options
| author | Fernando Apesteguía <fernape@FreeBSD.org> | 2019-01-07 11:16:54 +0000 |
|---|---|---|
| committer | Fernando Apesteguía <fernape@FreeBSD.org> | 2019-01-07 11:16:54 +0000 |
| commit | 0b62d14c50a7723838a4df23c58f342dfcd3a37c (patch) | |
| tree | db53bf47d5c23492b4fc08cebb95b7cb75d19e56 /textproc/2bsd-diff/files/patch-Makefile | |
| parent | science/py-openpiv: Update to 0.21.0 (diff) | |
textproc/2bsd-diff: fix breakage on current
On FreeBSD 13 - current, the build failed with:
cc: error: unknown argument: '-i'
PR: 234362
Submitted by: risner@stdio.com (maintainer)
Notes
Notes:
svn path=/head/; revision=489572
Diffstat (limited to '')
| -rw-r--r-- | textproc/2bsd-diff/files/patch-Makefile | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/textproc/2bsd-diff/files/patch-Makefile b/textproc/2bsd-diff/files/patch-Makefile index c483bcbf9a09..5654c7da4c01 100644 --- a/textproc/2bsd-diff/files/patch-Makefile +++ b/textproc/2bsd-diff/files/patch-Makefile @@ -1,20 +1,26 @@ ---- ./Makefile.orig 1996-10-22 04:29:46.000000000 +0000 -+++ ./Makefile 2014-02-17 13:43:18.000000000 +0000 -@@ -1,9 +1,9 @@ +--- Makefile.orig 1996-10-22 04:29:46 UTC ++++ Makefile +@@ -1,10 +1,14 @@ # @(#)Makefile 4.1.1 1996/10/21 # -DIFF= /bin/diff -DIFFH= /usr/libexec/diffh -PR= /bin/pr -CFLAGS= -O -DDIFF='"${DIFF}"' -DDIFFH='"${DIFFH}"' -DPR='"${PR}"' +-SEPFLAG=-i +DIFF= ${PREFIX}/bin/2diff +DIFFH= ${PREFIX}/libexec/2diffh +PR= /usr/bin/pr +CFLAGS+=-DDIFF='"${DIFF}"' -DDIFFH='"${DIFFH}"' -DPR='"${PR}"' - SEPFLAG=-i ++# SEPFLAG should be: ++# not on a PDP-11: SEPFLAG = ++# PDP-11 with separate I&D: SEPFLAG = -i ++# PDP-11 without separate I&D: SEPFLAG = -n ++SEPFLAG= DESTDIR= -@@ -14,14 +14,15 @@ + SRCS= diff.c diffdir.c diffreg.c +@@ -14,14 +18,15 @@ OBJS= diff.o diffdir.o diffreg.o all: diff diffh diff: ${OBJS} |