/[gentoo-alt]/trunk/sys-apps/freebsd-usbin/files/freebsd-usbin-fixmakefiles.patch
Gentoo

Contents of /trunk/sys-apps/freebsd-usbin/files/freebsd-usbin-fixmakefiles.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 341 - (show annotations) (download)
Fri May 6 16:57:01 2005 UTC (9 years, 2 months ago) by flameeyes
File size: 10126 byte(s)
Added 5.4_rc4 ebuild.. doesn't work for now.

1 diff -ur usr.sbin.orig/acpi/Makefile.inc usr.sbin/acpi/Makefile.inc
2 --- usr.sbin.orig/acpi/Makefile.inc Thu Apr 7 22:01:53 2005
3 +++ usr.sbin/acpi/Makefile.inc Thu Apr 7 22:03:25 2005
4 @@ -1,8 +1,8 @@
5 # $Id$
6 # $FreeBSD: src/usr.sbin/acpi/Makefile.inc,v 1.8 2003/08/07 16:51:50 njl Exp $
7
8 -ACPICA_DIR= ${.CURDIR}/../../../sys/contrib/dev/acpica
9 -CFLAGS+= -I${.CURDIR}/../../../sys -I${ACPICA_DIR} -I${ACPICA_DIR}/compiler
10 +ACPICA_DIR= /usr/src/sys/contrib/dev/acpica
11 +CFLAGS+= -I/usr/src/sys -I${ACPICA_DIR} -I${ACPICA_DIR}/compiler
12
13 .if exists(${.CURDIR}/../../Makefile.inc)
14 .include "${.CURDIR}/../../Makefile.inc"
15 Only in usr.sbin/acpi: Makefile.inc.orig
16 diff -ur usr.sbin.orig/arlcontrol/Makefile usr.sbin/arlcontrol/Makefile
17 --- usr.sbin.orig/arlcontrol/Makefile Thu Apr 7 22:01:53 2005
18 +++ usr.sbin/arlcontrol/Makefile Thu Apr 7 22:03:38 2005
19 @@ -5,7 +5,7 @@
20
21 PROG= arlcontrol
22 SRCS= arlcontrol.c
23 -CFLAGS= -I${.CURDIR}/../../sys -DARLCACHE
24 +CFLAGS= -I/usr/src/sys -DARLCACHE
25 MAN= arlcontrol.8
26
27 .include <bsd.prog.mk>
28 Only in usr.sbin/arlcontrol: Makefile.orig
29 diff -ur usr.sbin.orig/dconschat/Makefile usr.sbin/dconschat/Makefile
30 --- usr.sbin.orig/dconschat/Makefile Thu Apr 7 22:01:54 2005
31 +++ usr.sbin/dconschat/Makefile Thu Apr 7 22:03:45 2005
32 @@ -4,7 +4,7 @@
33 SRCS= dconschat.c
34 MAN= dconschat.8
35
36 -CFLAGS+= -I${.CURDIR}/../../sys
37 +CFLAGS+= -I/usr/src/sys
38
39 DPADD= ${LIBKVM}
40 LDADD= -lkvm
41 Only in usr.sbin/dconschat: Makefile.orig
42 diff -ur usr.sbin.orig/fwcontrol/Makefile usr.sbin/fwcontrol/Makefile
43 --- usr.sbin.orig/fwcontrol/Makefile Thu Apr 7 22:01:54 2005
44 +++ usr.sbin/fwcontrol/Makefile Thu Apr 7 22:03:53 2005
45 @@ -4,9 +4,9 @@
46 SRCS= fwcontrol.c fwcrom.c fwdv.c
47 MAN= fwcontrol.8
48
49 -.PATH: ${.CURDIR}/../../sys/dev/firewire
50 +.PATH: /usr/src/sys/dev/firewire
51
52 -SDIR= ${.CURDIR}/../../sys
53 +SDIR= /usr/src/sys
54 CFLAGS+=-I${.CURDIR} -I${SDIR}
55
56 .include <bsd.prog.mk>
57 Only in usr.sbin/fwcontrol: Makefile.orig
58 diff -ur usr.sbin.orig/ipftest/Makefile usr.sbin/ipftest/Makefile
59 --- usr.sbin.orig/ipftest/Makefile Thu Apr 7 22:01:54 2005
60 +++ usr.sbin/ipftest/Makefile Thu Apr 7 22:04:00 2005
61 @@ -2,7 +2,7 @@
62
63 MAINTAINER= darrenr@freebsd.org
64
65 -.PATH: ${.CURDIR}/../../sys/contrib/ipfilter/netinet \
66 +.PATH: /usr/src/sys/contrib/ipfilter/netinet \
67 ${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
68
69 PROG= ipftest
70 @@ -12,8 +12,8 @@
71 printstate.c printnat.c
72
73 CFLAGS+= -DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -DIPFILTER_LOG
74 -CFLAGS+= -I${.CURDIR}/../../sys/contrib/ipfilter/netinet
75 -CFLAGS+= -I${.CURDIR}/../../sys/contrib/ipfilter
76 +CFLAGS+= -I/usr/src/sys/contrib/ipfilter/netinet
77 +CFLAGS+= -I/usr/src/sys/contrib/ipfilter
78 CFLAGS+= -I${.CURDIR}/../../contrib/ipfilter
79
80 .include <bsd.prog.mk>
81 Only in usr.sbin/ipftest: Makefile.orig
82 diff -ur usr.sbin.orig/ipresend/Makefile usr.sbin/ipresend/Makefile
83 --- usr.sbin.orig/ipresend/Makefile Thu Apr 7 22:01:54 2005
84 +++ usr.sbin/ipresend/Makefile Thu Apr 7 22:04:09 2005
85 @@ -10,7 +10,7 @@
86 ipft_tx.c sbpf.c 44arp.c ipft_pc.c
87
88 CFLAGS+= -DDOSOCKET -DIPL_NAME=\"/dev/ipl\" -DUSE_INET6
89 -CFLAGS+= -I${.CURDIR}/../../sys/contrib/ipfilter/netinet
90 +CFLAGS+= -I/usr/src/sys/contrib/ipfilter/netinet
91 CFLAGS+= -I${.CURDIR}/../../contrib/ipfilter/ipsend \
92 -I${.CURDIR}/../../contrib/ipfilter
93
94 Only in usr.sbin/ipresend: Makefile.orig
95 diff -ur usr.sbin.orig/ipsend/Makefile usr.sbin/ipsend/Makefile
96 --- usr.sbin.orig/ipsend/Makefile Thu Apr 7 22:01:54 2005
97 +++ usr.sbin/ipsend/Makefile Thu Apr 7 22:04:17 2005
98 @@ -12,7 +12,7 @@
99 y.tab.h
100
101 CFLAGS+= -DDOSOCKET -DIPL_NAME=\"/dev/ipl\" -DUSE_INET6
102 -CFLAGS+= -I${.CURDIR}/../../sys/contrib/ipfilter/netinet
103 +CFLAGS+= -I/usr/src/sys/contrib/ipfilter/netinet
104 CFLAGS+= -I. -I${.CURDIR}/../../contrib/ipfilter/ipsend \
105 -I${.CURDIR}/../../contrib/ipfilter/iplang \
106 -I${.CURDIR}/../../contrib/ipfilter
107 Only in usr.sbin/ipsend: Makefile.orig
108 diff -ur usr.sbin.orig/iptest/Makefile usr.sbin/iptest/Makefile
109 --- usr.sbin.orig/iptest/Makefile Thu Apr 7 22:01:54 2005
110 +++ usr.sbin/iptest/Makefile Thu Apr 7 22:04:24 2005
111 @@ -9,7 +9,7 @@
112 SRCS= iptest.c iptests.c ip.c sbpf.c 44arp.c sock.c
113
114 CFLAGS+= -DDOSOCKET -DIPL_NAME=\"/dev/ipl\" -DUSE_INET6
115 -CFLAGS+= -I${.CURDIR}/../../sys/contrib/ipfilter/netinet
116 +CFLAGS+= -I/usr/src/sys/contrib/ipfilter/netinet
117 CFLAGS+= -I${.CURDIR}/../../contrib/ipfilter/ipsend \
118 -I${.CURDIR}/../../contrib/ipfilter
119
120 Only in usr.sbin/iptest: Makefile.orig
121 diff -ur usr.sbin.orig/mlxcontrol/Makefile usr.sbin/mlxcontrol/Makefile
122 --- usr.sbin.orig/mlxcontrol/Makefile Thu Apr 7 22:01:55 2005
123 +++ usr.sbin/mlxcontrol/Makefile Thu Apr 7 22:04:32 2005
124 @@ -4,6 +4,6 @@
125 MAN= mlxcontrol.8
126 SRCS= command.c config.c interface.c util.c
127
128 -CFLAGS+= -I${.CURDIR}/../../sys
129 +CFLAGS+= -I/usr/src/sys
130
131 .include <bsd.prog.mk>
132 Only in usr.sbin/mlxcontrol: Makefile.orig
133 diff -ur usr.sbin.orig/ndiscvt/Makefile usr.sbin/ndiscvt/Makefile
134 --- usr.sbin.orig/ndiscvt/Makefile Thu Apr 7 22:01:55 2005
135 +++ usr.sbin/ndiscvt/Makefile Thu Apr 7 22:05:17 2005
136 @@ -1,6 +1,6 @@
137 # $FreeBSD: src/usr.sbin/ndiscvt/Makefile,v 1.5 2004/02/23 20:21:21 johan Exp $
138
139 -.PATH: ${.CURDIR}/../../sys/compat/ndis
140 +.PATH: /usr/src/sys/compat/ndis
141
142 PROG= ndiscvt
143 SRCS= ndiscvt.c
144 @@ -16,7 +16,7 @@
145
146 YFLAGS+=-v
147
148 -CFLAGS+=-I. -I${.CURDIR} -I${.CURDIR}/../../sys
149 +CFLAGS+=-I. -I${.CURDIR} -I/usr/src/sys
150
151 CLEANFILES= y.output
152
153 Only in usr.sbin/ndiscvt: Makefile.orig
154 diff -ur usr.sbin.orig/pciconf/Makefile usr.sbin/pciconf/Makefile
155 --- usr.sbin.orig/pciconf/Makefile Thu Apr 7 22:01:55 2005
156 +++ usr.sbin/pciconf/Makefile Thu Apr 7 22:04:43 2005
157 @@ -4,6 +4,6 @@
158 PROG= pciconf
159 MAN= pciconf.8
160
161 -CFLAGS+= -I${.CURDIR}/../../sys
162 +CFLAGS+= -I/usr/src/sys
163
164 .include <bsd.prog.mk>
165 Only in usr.sbin/pciconf: Makefile.orig
166 diff -ur usr.sbin.orig/pcvt/keycap/Makefile usr.sbin/pcvt/keycap/Makefile
167 --- usr.sbin.orig/pcvt/keycap/Makefile Thu Apr 7 22:01:55 2005
168 +++ usr.sbin/pcvt/keycap/Makefile Thu Apr 7 22:07:37 2005
169 @@ -18,6 +18,7 @@
170 #CLEANFILES+= keycap.0 man5/keycap.0
171
172 beforeinstall:
173 + ${INSTALL} -d ${DESTDIR}${CAPPATH}
174 ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
175 ${.CURDIR}/${KEYCAPSRC} ${DESTDIR}${CAPPATH}
176
177 Only in usr.sbin/pcvt/keycap: Makefile.orig
178 diff -ur usr.sbin.orig/pnpinfo/Makefile usr.sbin/pnpinfo/Makefile
179 --- usr.sbin.orig/pnpinfo/Makefile Thu Apr 7 22:01:55 2005
180 +++ usr.sbin/pnpinfo/Makefile Thu Apr 7 22:05:00 2005
181 @@ -6,7 +6,7 @@
182 MAN= pnpinfo.8
183 SRCS= pnpinfo.c
184
185 -CFLAGS+= -I${.CURDIR}/../../sys
186 +CFLAGS+= -I/usr/src/sys
187
188 .if ${MACHINE} == "pc98"
189 CFLAGS+= -DPC98
190 Only in usr.sbin/pnpinfo: Makefile.orig
191 diff -ur usr.sbin.orig/raycontrol/Makefile usr.sbin/raycontrol/Makefile
192 --- usr.sbin.orig/raycontrol/Makefile Thu Apr 7 22:01:56 2005
193 +++ usr.sbin/raycontrol/Makefile Thu Apr 7 22:04:53 2005
194 @@ -3,6 +3,6 @@
195 PROG= raycontrol
196 MAN= raycontrol.8
197
198 -CFLAGS+= -I${.CURDIR}/../../sys
199 +CFLAGS+= -I/usr/src/sys
200
201 .include <bsd.prog.mk>
202 Only in usr.sbin/raycontrol: Makefile.orig
203 diff -ur usr.sbin.orig/rpc.ypxfrd/Makefile usr.sbin/rpc.ypxfrd/Makefile
204 --- usr.sbin.orig/rpc.ypxfrd/Makefile Thu Apr 7 22:01:56 2005
205 +++ usr.sbin/rpc.ypxfrd/Makefile Thu Apr 7 22:05:48 2005
206 @@ -14,7 +14,7 @@
207
208 CLEANFILES= ypxfrd_svc.c ypxfrd.h
209
210 -RPCDIR= ${.CURDIR}/../../include/rpcsvc
211 +RPCDIR= /usr/include/rpcsvc
212 RPCGEN= rpcgen -I -C
213
214 # We need to remove the 'static' keyword from _rpcsvcstate so that
215 Only in usr.sbin/rpc.ypxfrd: Makefile.orig
216 diff -ur usr.sbin.orig/setkey/Makefile usr.sbin/setkey/Makefile
217 --- usr.sbin.orig/setkey/Makefile Thu Apr 7 22:01:56 2005
218 +++ usr.sbin/setkey/Makefile Thu Apr 7 22:05:26 2005
219 @@ -41,9 +41,9 @@
220
221 # libpfkey
222 # ipsec_strerror.c is for avoiding shlib reference to non-exported function.
223 -.PATH: ${.CURDIR}/../../lib/libipsec ${.CURDIR}/../../sys/netkey
224 +.PATH: ${.CURDIR}/../../lib/libipsec /usr/src/sys/netkey
225 SRCS+= pfkey.c pfkey_dump.c key_debug.c ipsec_strerror.c
226 -CFLAGS+= -I${.CURDIR}/../../lib/libipsec -I${.CURDIR}/../../sys/netkey
227 +CFLAGS+= -I${.CURDIR}/../../lib/libipsec -I/usr/src/sys/netkey
228
229 SRCS+= y.tab.h
230 y.tab.h: parse.y
231 Only in usr.sbin/setkey: Makefile.orig
232 diff -ur usr.sbin.orig/sicontrol/Makefile usr.sbin/sicontrol/Makefile
233 --- usr.sbin.orig/sicontrol/Makefile Thu Apr 7 22:01:56 2005
234 +++ usr.sbin/sicontrol/Makefile Thu Apr 7 22:05:11 2005
235 @@ -3,6 +3,6 @@
236 PROG= sicontrol
237 MAN= sicontrol.8
238
239 -CFLAGS+= -I${.CURDIR}/../../sys
240 +CFLAGS+= -I/usr/src/sys
241
242 .include <bsd.prog.mk>
243 Only in usr.sbin/sicontrol: Makefile.orig
244 diff -ur usr.sbin.orig/sysinstall/Makefile usr.sbin/sysinstall/Makefile
245 --- usr.sbin.orig/sysinstall/Makefile Thu Apr 7 22:01:56 2005
246 +++ usr.sbin/sysinstall/Makefile Thu Apr 7 22:05:33 2005
247 @@ -84,7 +84,7 @@
248 keymap.h:
249 rm -f keymap.tmp
250 for map in ${KEYMAPS} ; do \
251 - KEYMAP_PATH=${.CURDIR}/../../share/syscons/keymaps \
252 + KEYMAP_PATH=/usr/share/syscons/keymaps \
253 kbdcontrol -L $$map | \
254 sed -e '/^static accentmap_t/,$$d' >> keymap.tmp ; \
255 done
256 Only in usr.sbin/sysinstall: Makefile.orig
257 diff -ur usr.sbin.orig/yppush/Makefile usr.sbin/yppush/Makefile
258 --- usr.sbin.orig/yppush/Makefile Thu Apr 7 22:01:55 2005
259 +++ usr.sbin/yppush/Makefile Thu Apr 7 22:05:56 2005
260 @@ -1,6 +1,6 @@
261 # $FreeBSD: src/usr.sbin/yppush/Makefile,v 1.9 2001/07/20 06:20:30 obrien Exp $
262
263 -RPCDIR= ${.CURDIR}/../../include/rpcsvc
264 +RPCDIR= /usr/include/rpcsvc
265 .PATH: ${RPCDIR} ${.CURDIR}/../../usr.sbin/ypserv \
266 ${.CURDIR}/../../libexec/ypxfr
267
268 Only in usr.sbin/yppush: Makefile.orig
269 diff -ur usr.sbin.orig/ypserv/Makefile usr.sbin/ypserv/Makefile
270 --- usr.sbin.orig/ypserv/Makefile Thu Apr 7 22:01:55 2005
271 +++ usr.sbin/ypserv/Makefile Thu Apr 7 22:06:07 2005
272 @@ -1,6 +1,6 @@
273 # $FreeBSD: src/usr.sbin/ypserv/Makefile,v 1.23 2003/04/04 17:49:20 obrien Exp $
274
275 -RPCDIR= ${.CURDIR}/../../include/rpcsvc
276 +RPCDIR= /usr/include/rpcsvc
277 .PATH: ${RPCDIR}
278
279 PROG= ypserv
280 @@ -31,6 +31,7 @@
281 ${RPCGEN} -h -o ${.TARGET} ${RPCDIR}/yp.x
282
283 afterinstall:
284 + ${INSTALL} -d ${DESTDIR}/var/yp
285 ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
286 ${.CURDIR}/Makefile.yp \
287 ${DESTDIR}/var/yp/Makefile.dist
288 Only in usr.sbin/ypserv: Makefile.orig

Properties

Name Value
svn:eol-style native
svn:keywords Author Date Id Revision

  ViewVC Help
Powered by ViewVC 1.1.20