git: 7cb2d7c41368 - main - ipfilter userland: Path fixup no longer required

The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/src/commit/?id=7cb2d7c41368a662bb5e8db5e12420d4a8a190b1

commit 7cb2d7c41368a662bb5e8db5e12420d4a8a190b1
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2021-12-27 08:18:49 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2021-12-27 08:40:18 +0000

    ipfilter userland: Path fixup no longer required
    
    Since the move of ipfilter from contrib to sbin adjusting the source path
    is no longer required.
    
    Fixes:          41edb306f05651fcaf6c74f9e3557f59f80292e1
    MFC after:      1 month
---
 sbin/ipf/ipf/Makefile     | 1 -
 sbin/ipf/ipftest/Makefile | 3 ---
 sbin/ipf/ipmon/Makefile   | 1 -
 sbin/ipf/ipnat/Makefile   | 1 -
 sbin/ipf/ippool/Makefile  | 1 -
 5 files changed, 7 deletions(-)

diff --git a/sbin/ipf/ipf/Makefile b/sbin/ipf/ipf/Makefile
index 7e934ccc5984..f1b87ac20fae 100644
--- a/sbin/ipf/ipf/Makefile
+++ b/sbin/ipf/ipf/Makefile
@@ -13,7 +13,6 @@ CLEANFILES+=	${GENHDRS} ipf_y.c ipf_l.c
 ipf_y.c: ipf_y.y
 	${YACC} -d ${.ALLSRC}
 	sed -e 's/yy/ipf_yy/g' \
-	    -e 's/"ipf_y.y"/"..\/tools\/ipf_y.y"/' \
 	    y.tab.c > ${.TARGET}
 	sed -e 's/yy/ipf_yy/g' \
 	    y.tab.h > ${.TARGET:.c=.h}
diff --git a/sbin/ipf/ipftest/Makefile b/sbin/ipf/ipftest/Makefile
index f774c3197978..671d9eeb8046 100644
--- a/sbin/ipf/ipftest/Makefile
+++ b/sbin/ipf/ipftest/Makefile
@@ -38,7 +38,6 @@ ipnat.tab.c ipnat.tab.h: ipnat_y.y
 ipnat_y.c: ipnat.tab.c
 	sed -e 's/yy/ipnat_yy/g' \
 	    -e 's/y.tab.c/ipnat_y.c/' \
-	    -e s/\"ipnat_y.y\"/\"..\\/tools\\/ipnat_y.y\"/ \
 	    ipnat.tab.c > ${.TARGET}
 
 ipnat_y.h: ipnat.tab.h
@@ -63,7 +62,6 @@ ippool.tab.c ippool.tab.h: ippool_y.y
 
 ippool_y.c: ippool.tab.c
 	sed -e 's/yy/ippool_yy/g' \
-	    -e 's/"ippool_y.y"/"..\/tools\/ippool_y.y"/' \
 	    ippool.tab.c > ${.TARGET}
 
 ippool_y.h: ippool.tab.h
@@ -87,7 +85,6 @@ ipf.tab.c ipf.tab.h: ipf_y.y
 
 ipf_y.c: ipf.tab.c
 	sed -e 's/yy/ipf_yy/g' \
-	    -e 's/"ipf_y.y"/"..\/tools\/ipf_y.y"/' \
 		ipf.tab.c > ${.TARGET}
 
 ipf_y.h: ipf.tab.h
diff --git a/sbin/ipf/ipmon/Makefile b/sbin/ipf/ipmon/Makefile
index 8227811db2ad..7225f8c8bcb1 100644
--- a/sbin/ipf/ipmon/Makefile
+++ b/sbin/ipf/ipmon/Makefile
@@ -14,7 +14,6 @@ CLEANFILES+=	${GENHDRS} ipmon_y.c ipmon_l.c
 ipmon_y.c: ipmon_y.y
 	${YACC} -d ${.ALLSRC}
 	sed -e 's/yy/ipmon_yy/g' \
-	    -e 's/"ipmon_y.y"/"..\/tools\/ipmon_y.y"/' \
 	    y.tab.c > ${.TARGET}
 	sed -e 's/yy/ipmon_yy/g' \
 	    y.tab.h > ${.TARGET:.c=.h}
diff --git a/sbin/ipf/ipnat/Makefile b/sbin/ipf/ipnat/Makefile
index ba9c50ee70e3..1bdbe61235fb 100644
--- a/sbin/ipf/ipnat/Makefile
+++ b/sbin/ipf/ipnat/Makefile
@@ -14,7 +14,6 @@ ipnat_y.c: ipnat_y.y
 	${YACC} -d ${.ALLSRC}
 	sed -e 's/yy/ipnat_yy/g' \
 	    -e 's/y.tab.c/ipnat_y.c/' \
-	    -e s/\"ipnat_y.y\"/\"..\\/tools\\/ipnat_y.y\"/ \
 	    y.tab.c > ${.TARGET}
 	sed -e 's/yy/ipnat_yy/g' \
 	    -e 's/y.tab.h/ipnat_y.h/' \
diff --git a/sbin/ipf/ippool/Makefile b/sbin/ipf/ippool/Makefile
index 674978ed98c2..622952be0477 100644
--- a/sbin/ipf/ippool/Makefile
+++ b/sbin/ipf/ippool/Makefile
@@ -12,7 +12,6 @@ CLEANFILES+=	${GENHDRS} ippool_y.c ippool_l.c
 ippool_y.c: ippool_y.y
 	${YACC} -d ${.ALLSRC}
 	sed -e 's/yy/ippool_yy/g' \
-	    -e 's/"ippool_y.y"/"..\/tools\/ippool_y.y"/' \
 	    y.tab.c > ${.TARGET}
 	sed -e 's/yy/ippool_yy/g' \
 	    y.tab.h > ${.TARGET:.c=.h}