diff options
Diffstat (limited to 'sys-freebsd/freebsd-sbin/files/freebsd-sbin-fixmakefiles.patch')
| -rw-r--r-- | sys-freebsd/freebsd-sbin/files/freebsd-sbin-fixmakefiles.patch | 233 |
1 files changed, 0 insertions, 233 deletions
diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-fixmakefiles.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-fixmakefiles.patch deleted file mode 100644 index 9db78a735083..000000000000 --- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-fixmakefiles.patch +++ /dev/null @@ -1,233 +0,0 @@ -Only in sbin: Makefile.orig -diff -ur sbin.orig/atm/atm/Makefile sbin/atm/atm/Makefile ---- sbin.orig/atm/atm/Makefile Thu Apr 7 20:27:57 2005 -+++ sbin/atm/atm/Makefile Thu Apr 7 20:28:33 2005 -@@ -34,7 +34,7 @@ - WARNS?= 6 - .endif - --CFLAGS+= -I${.CURDIR}/../../../sys -+CFLAGS+= -I/usr/src/sys - - DPADD= ${LIBATM} - LDADD= -latm -Only in sbin/atm/atm: Makefile.orig -diff -ur sbin.orig/atm/fore_dnld/Makefile sbin/atm/fore_dnld/Makefile ---- sbin.orig/atm/fore_dnld/Makefile Thu Apr 7 20:27:57 2005 -+++ sbin/atm/fore_dnld/Makefile Thu Apr 7 20:28:45 2005 -@@ -28,7 +28,7 @@ - SRCS= fore_dnld.c pca200e.c - - WARNS?= 6 --CFLAGS+= -I${.CURDIR}/../../../sys -+CFLAGS+= -I/usr/src/sys - - DPADD= ${LIBATM} - LDADD= -latm -Only in sbin/atm/fore_dnld: Makefile.orig -diff -ur sbin.orig/atm/ilmid/Makefile sbin/atm/ilmid/Makefile ---- sbin.orig/atm/ilmid/Makefile Thu Apr 7 20:27:57 2005 -+++ sbin/atm/ilmid/Makefile Thu Apr 7 20:28:58 2005 -@@ -32,7 +32,7 @@ - WARNS?= 6 - .endif - --CFLAGS+= -I${.CURDIR}/../../../sys -+CFLAGS+= -I/usr/src/sys - - DPADD= ${LIBATM} - LDADD= -latm -Only in sbin/atm/ilmid: Makefile.orig -diff -ur sbin.orig/bsdlabel/Makefile sbin/bsdlabel/Makefile ---- sbin.orig/bsdlabel/Makefile Thu Apr 7 20:27:57 2005 -+++ sbin/bsdlabel/Makefile Thu Apr 7 20:29:09 2005 -@@ -1,7 +1,7 @@ - # @(#)Makefile 8.2 (Berkeley) 3/17/94 - # $FreeBSD: src/sbin/bsdlabel/Makefile,v 1.19 2004/01/11 09:11:10 nyan Exp $ - --.PATH: ${.CURDIR}/../../sys/geom -+.PATH: /usr/src/sys/geom - - PROG= bsdlabel - SRCS= bsdlabel.c geom_bsd_enc.c -Only in sbin/bsdlabel: Makefile.orig -diff -ur sbin.orig/fdisk/Makefile sbin/fdisk/Makefile ---- sbin.orig/fdisk/Makefile Thu Apr 7 20:27:57 2005 -+++ sbin/fdisk/Makefile Thu Apr 7 20:29:18 2005 -@@ -5,7 +5,7 @@ - WARNS?= 4 - MAN= fdisk.8 - --.PATH: ${.CURDIR}/../../sys/geom -+.PATH: /usr/src/sys/geom - - .include <bsd.prog.mk> - -Only in sbin/fdisk: Makefile.orig -diff -ur sbin.orig/fsck_ffs/Makefile sbin/fsck_ffs/Makefile ---- sbin.orig/fsck_ffs/Makefile Thu Apr 7 20:27:57 2005 -+++ sbin/fsck_ffs/Makefile Thu Apr 7 20:29:34 2005 -@@ -11,6 +11,6 @@ - WARNS?= 2 - CFLAGS+= -I${.CURDIR} - --.PATH: ${.CURDIR}/../../sys/ufs/ffs -+.PATH: /usr/src/sys/ufs/ffs - - .include <bsd.prog.mk> -Only in sbin/fsck_ffs: Makefile.orig -diff -ur sbin.orig/fsdb/Makefile sbin/fsdb/Makefile ---- sbin.orig/fsdb/Makefile Thu Apr 7 20:27:57 2005 -+++ sbin/fsdb/Makefile Thu Apr 7 20:29:44 2005 -@@ -11,6 +11,6 @@ - WARNS?= 0 - LDADD= -ledit -ltermcap - DPADD= ${LIBEDIT} ${LIBTERMCAP} --.PATH: ${.CURDIR}/../fsck_ffs ${.CURDIR}/../../sys/ufs/ffs -+.PATH: ${.CURDIR}/../fsck_ffs /usr/src/sys/ufs/ffs - - .include <bsd.prog.mk> -Only in sbin/fsdb: Makefile.orig -diff -ur sbin.orig/gbde/Makefile sbin/gbde/Makefile ---- sbin.orig/gbde/Makefile Thu Apr 7 20:27:57 2005 -+++ sbin/gbde/Makefile Thu Apr 7 20:29:56 2005 -@@ -15,10 +15,10 @@ - WARNS?= 3 - .endif - --CFLAGS+= -I${.CURDIR}/../../sys --.PATH: ${.CURDIR}/../../sys/geom/bde \ -- ${.CURDIR}/../../sys/crypto/rijndael \ -- ${.CURDIR}/../../sys/crypto/sha2 -+CFLAGS+= -I/usr/src/sys -+.PATH: /usr/src/sys/geom/bde \ -+ /usr/src/sys/crypto/rijndael \ -+ /usr/src/sys/crypto/sha2 - - CLEANFILES+= template.c - -Only in sbin/gbde: Makefile.orig -diff -ur sbin.orig/gvinum/Makefile sbin/gvinum/Makefile ---- sbin.orig/gvinum/Makefile Thu Apr 7 20:27:57 2005 -+++ sbin/gvinum/Makefile Thu Apr 7 20:30:05 2005 -@@ -4,11 +4,11 @@ - SRCS= gvinum.c gvinum.h geom_vinum_share.c - NOMAN= # not yet - --CFLAGS+= -I${.CURDIR}/../../sys -+CFLAGS+= -I/usr/src/sys - - DPADD= ${LIBREADLINE} ${LIBTERMCAP} ${LIBDEVSTAT} ${LIBKVM} ${LIBGEOM} - LDADD= -lreadline -ltermcap -ldevstat -lkvm -lgeom - --.PATH: ${.CURDIR}/../../sys/geom/vinum -+.PATH: /usr/src/sys/geom/vinum - - .include <bsd.prog.mk> -Only in sbin/gvinum: Makefile.orig -diff -ur sbin.orig/ipf/Makefile sbin/ipf/Makefile ---- sbin.orig/ipf/Makefile Thu Apr 7 20:27:57 2005 -+++ sbin/ipf/Makefile Thu Apr 7 20:30:20 2005 -@@ -6,9 +6,9 @@ - MAN= ipf.4 ipf.5 ipf.8 - SRCS= ipf.c parse.c opt.c facpri.c common.c - CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" --CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter/netinet --CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter --CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter -+CFLAGS+=-I/usr/src/sys/contrib/ipfilter/netinet -+CFLAGS+=-I/usr/src/sys/contrib/ipfilter -+CFLAGS+=-I/usr/src/contrib/ipfilter - WARNS?= 0 - - MAINTAINER= darrenr@freebsd.org -Only in sbin/ipf: Makefile.orig -diff -ur sbin.orig/ipfs/Makefile sbin/ipfs/Makefile ---- sbin.orig/ipfs/Makefile Thu Apr 7 20:27:57 2005 -+++ sbin/ipfs/Makefile Thu Apr 7 20:30:27 2005 -@@ -6,8 +6,8 @@ - MAN= ipfs.8 - SRCS= ipfs.c - CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" --CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter/netinet --CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter -+CFLAGS+=-I/usr/src/sys/contrib/ipfilter/netinet -+CFLAGS+=-I/usr/src/sys/contrib/ipfilter - CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter - WARNS?= 0 - -Only in sbin/ipfs: Makefile.orig -diff -ur sbin.orig/ipfstat/Makefile sbin/ipfstat/Makefile ---- sbin.orig/ipfstat/Makefile Thu Apr 7 20:27:57 2005 -+++ sbin/ipfstat/Makefile Thu Apr 7 20:30:32 2005 -@@ -6,8 +6,8 @@ - MAN= ipfstat.8 - SRCS= fils.c parse.c opt.c kmem.c facpri.c common.c printstate.c - CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -DSTATETOP --CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter/netinet --CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter -+CFLAGS+=-I/usr/src/sys/contrib/ipfilter/netinet -+CFLAGS+=-I/usr/src/sys/contrib/ipfilter - CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter - WARNS?= 0 - -Only in sbin/ipfstat: Makefile.orig -diff -ur sbin.orig/ipmon/Makefile sbin/ipmon/Makefile ---- sbin.orig/ipmon/Makefile Thu Apr 7 20:27:57 2005 -+++ sbin/ipmon/Makefile Thu Apr 7 20:30:46 2005 -@@ -7,7 +7,7 @@ - SRCS= ipmon.c - - CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -DLOGFAC=LOG_SECURITY --CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter -+CFLAGS+=-I/usr/src/sys/contrib/ipfilter - CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter - WARNS?= 0 - -Only in sbin/ipmon: Makefile.orig -diff -ur sbin.orig/ipnat/Makefile sbin/ipnat/Makefile ---- sbin.orig/ipnat/Makefile Thu Apr 7 20:27:57 2005 -+++ sbin/ipnat/Makefile Thu Apr 7 20:30:55 2005 -@@ -7,8 +7,8 @@ - MLINKS= ipnat.5 ipnat.conf.5 - SRCS= ipnat.c kmem.c natparse.c common.c printnat.c - CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" --CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter/netinet --CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter -+CFLAGS+=-I/usr/src/sys/contrib/ipfilter/netinet -+CFLAGS+=-I/usr/src/sys/contrib/ipfilter - CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter - WARNS?= 0 - -Only in sbin/ipnat: Makefile.orig -diff -ur sbin.orig/sunlabel/Makefile sbin/sunlabel/Makefile ---- sbin.orig/sunlabel/Makefile Thu Apr 7 20:27:57 2005 -+++ sbin/sunlabel/Makefile Thu Apr 7 20:31:02 2005 -@@ -1,6 +1,6 @@ - # $FreeBSD: src/sbin/sunlabel/Makefile,v 1.12 2004/02/01 13:09:26 ceri Exp $ - --.PATH: ${.CURDIR}/../../sys/geom -+.PATH: /usr/src/sys/geom - - PROG= sunlabel - SRCS= sunlabel.c geom_sunlabel_enc.c -Only in sbin/sunlabel: Makefile.orig -diff -ur sbin.orig/vinum/Makefile sbin/vinum/Makefile ---- sbin.orig/vinum/Makefile Thu Apr 7 20:27:57 2005 -+++ sbin/vinum/Makefile Thu Apr 7 20:31:25 2005 -@@ -4,12 +4,12 @@ - SRCS= v.c list.c vinumparser.c vinumutil.c vext.h commands.c - MAN= vinum.8 - --CFLAGS+= -I${.CURDIR}/../../sys -+CFLAGS+= -I/usr/src/sys - WARNS?= 0 - - DPADD= ${LIBREADLINE} ${LIBTERMCAP} ${LIBDEVSTAT} ${LIBKVM} - LDADD= -lreadline -ltermcap -ldevstat -lkvm - --.PATH: ${.CURDIR}/../../sys/dev/vinum -+.PATH: /usr/src/sys/dev/vinum - - .include <bsd.prog.mk> -Only in sbin/vinum: Makefile.orig |