Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/bird/files/
Date: Thu, 26 Jan 2017 22:37:22
Message-Id: 1485470191.180db639b2bb75dbbd172b62c53c8aedc5c91b75.soap@gentoo
1 commit: 180db639b2bb75dbbd172b62c53c8aedc5c91b75
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Tue Jan 24 16:41:39 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 26 22:36:31 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=180db639
7
8 net-misc/bird: remove unused patches/files
9
10 Closes: https://github.com/gentoo/gentoo/pull/3628
11
12 net-misc/bird/files/1.2.3-v4-v6-build.patch | 109 ----------------------------
13 net-misc/bird/files/1.2.4-v4-v6-build.patch | 109 ----------------------------
14 net-misc/bird/files/1.3.0-v4-v6-build.patch | 109 ----------------------------
15 net-misc/bird/files/1.3.1-v4-v6-build.patch | 109 ----------------------------
16 net-misc/bird/files/1.3.2-v4-v6-build.patch | 109 ----------------------------
17 net-misc/bird/files/initd-v4-bird-1.2.3 | 39 ----------
18 net-misc/bird/files/initd-v4-bird-1.2.4 | 39 ----------
19 net-misc/bird/files/initd-v4-bird-1.3.0 | 42 -----------
20 net-misc/bird/files/initd-v4-bird-1.3.1 | 42 -----------
21 net-misc/bird/files/initd-v4-bird-1.3.2 | 42 -----------
22 net-misc/bird/files/initd-v6-bird-1.2.3 | 39 ----------
23 net-misc/bird/files/initd-v6-bird-1.2.4 | 39 ----------
24 net-misc/bird/files/initd-v6-bird-1.3.0 | 42 -----------
25 net-misc/bird/files/initd-v6-bird-1.3.1 | 42 -----------
26 net-misc/bird/files/initd-v6-bird-1.3.2 | 42 -----------
27 15 files changed, 953 deletions(-)
28
29 diff --git a/net-misc/bird/files/1.2.3-v4-v6-build.patch b/net-misc/bird/files/1.2.3-v4-v6-build.patch
30 deleted file mode 100644
31 index 12f9e21..00000000
32 --- a/net-misc/bird/files/1.2.3-v4-v6-build.patch
33 +++ /dev/null
34 @@ -1,109 +0,0 @@
35 -diff -uNr bird-1.2.3.ORIG//tools/Makefile.in bird-1.2.3/tools/Makefile.in
36 ---- bird-1.2.3.ORIG//tools/Makefile.in 2010-06-07 14:15:41.000000000 +0100
37 -+++ bird-1.2.3/tools/Makefile.in 2010-06-07 14:15:58.000000000 +0100
38 -@@ -3,13 +3,13 @@
39 -
40 - include Rules
41 -
42 --.PHONY: all daemon client subdir depend clean distclean tags docs userdocs progdocs
43 -+.PHONY: all daemon client subdir depend clean distclean tags docs userdocs progdocs almost-clean
44 -
45 - all: sysdep/paths.h .dep-stamp subdir daemon @CLIENT@
46 -
47 --daemon: $(exedir)/bird
48 -+daemon: $(exedir)/bird@SUFFIX6@
49 -
50 --client: $(exedir)/birdc
51 -+client: $(exedir)/birdc@SUFFIX6@
52 -
53 - bird-dep := $(addsuffix /all.o, $(static-dirs)) conf/all.o lib/birdlib.a
54 -
55 -@@ -27,10 +27,10 @@
56 - set -e ; for a in $(dynamic-dirs) ; do $(MAKE) -C $$a $@ ; done
57 - set -e ; for a in $(static-dirs) $(client-dirs) ; do $(MAKE) -C $$a -f $(srcdir_abs)/$$a/Makefile $@ ; done
58 -
59 --$(exedir)/bird: $(bird-dep)
60 -+$(exedir)/bird@SUFFIX6@: $(bird-dep)
61 - $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
62 -
63 --$(exedir)/birdc: $(birdc-dep)
64 -+$(exedir)/birdc@SUFFIX6@: $(birdc-dep)
65 - $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(CLIENT_LIBS)
66 -
67 - .dir-stamp: sysdep/paths.h
68 -@@ -54,25 +54,42 @@
69 - tags:
70 - cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) $(client-dirs) -name *.[chY]`
71 -
72 --install: all
73 -+install-gen:
74 - $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(localstatedir)/run
75 -- $(INSTALL_PROGRAM) -s $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX6@
76 -+
77 -+install-bin: install-gen
78 -+ $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/
79 -+ if test -n "@CLIENT@" ; then \
80 -+ $(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/ ; \
81 -+ fi
82 -+ if ! test -f $(DESTDIR)/$(sysconfdir)/bird.conf ; then \
83 -+ $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird.conf ; \
84 -+ else \
85 -+ echo "Not overwriting old bird.conf" ; \
86 -+ fi
87 -+
88 -+install-bin6: install-gen
89 -+ $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/
90 - if test -n "@CLIENT@" ; then \
91 -- $(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX6@ ; \
92 -+ $(INSTALL_PROGRAM) $(exedir)/birdc6 $(DESTDIR)/$(sbindir)/birdc ; \
93 - fi
94 -- if ! test -f $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; then \
95 -- $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; \
96 -+ if ! test -f $(DESTDIR)/$(sysconfdir)/bird6.conf ; then \
97 -+ $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird6.conf ; \
98 - else \
99 -- echo "Not overwriting old bird@SUFFIX@.conf" ; \
100 -+ echo "Not overwriting old bird6.conf" ; \
101 - fi
102 -
103 -+install: all install-bin@SUFFIX6@
104 -+
105 - install-docs:
106 - $(INSTALL) -d $(DESTDIR)/$(docdir)
107 - $(INSTALL_DATA) $(srcdir)/doc/{bird,prog}{,-*}.html $(DESTDIR)/$(docdir)/
108 -
109 --clean:
110 -+almost-clean:
111 - find . -name "*.[oa]" -o -name core -o -name depend -o -name "*.html" | xargs rm -f
112 - rm -f conf/cf-lex.c conf/cf-parse.* conf/commands.h conf/keywords.h
113 -+
114 -+clean: almost-clean
115 - rm -f $(exedir)/bird $(exedir)/birdc $(exedir)/bird.ctl $(exedir)/bird6.ctl .dep-stamp
116 -
117 - distclean: clean
118 -diff -uNr bird-1.2.3.ORIG//tools/Makefile-top.in bird-1.2.3/tools/Makefile-top.in
119 ---- bird-1.2.3.ORIG//tools/Makefile-top.in 2010-06-07 14:15:41.000000000 +0100
120 -+++ bird-1.2.3/tools/Makefile-top.in 2010-06-07 14:15:58.000000000 +0100
121 -@@ -3,16 +3,19 @@
122 -
123 - objdir=@objdir@
124 -
125 --all depend tags install install-docs:
126 -+all depend tags install install-docs install-bin install-bin6:
127 - $(MAKE) -C $(objdir) $@
128 -
129 - docs userdocs progdocs:
130 - $(MAKE) -C doc $@
131 -
132 --clean:
133 -- $(MAKE) -C $(objdir) clean
134 -+almost-clean:
135 -+ $(MAKE) -C $(objdir) almost-clean
136 - find . -name "*~" -or -name "*.[oa]" -or -name "\#*\#" -or -name TAGS -or -name core -or -name depend -or -name ".#*" | xargs rm -f
137 -
138 -+clean: almost-clean
139 -+ $(MAKE) -C $(objdir) clean
140 -+
141 - distclean: clean
142 - $(MAKE) -C doc distclean
143 - rm -rf $(objdir) autom4te.cache
144
145 diff --git a/net-misc/bird/files/1.2.4-v4-v6-build.patch b/net-misc/bird/files/1.2.4-v4-v6-build.patch
146 deleted file mode 100644
147 index 83a2710..00000000
148 --- a/net-misc/bird/files/1.2.4-v4-v6-build.patch
149 +++ /dev/null
150 @@ -1,109 +0,0 @@
151 -diff -uNr bird-1.2.4.ORIG//tools/Makefile.in bird-1.2.4/tools/Makefile.in
152 ---- bird-1.2.4.ORIG//tools/Makefile.in 2010-09-06 15:38:39.000000000 +0100
153 -+++ bird-1.2.4/tools/Makefile.in 2010-09-06 15:38:56.000000000 +0100
154 -@@ -3,13 +3,13 @@
155 -
156 - include Rules
157 -
158 --.PHONY: all daemon client subdir depend clean distclean tags docs userdocs progdocs
159 -+.PHONY: all daemon client subdir depend clean distclean tags docs userdocs progdocs almost-clean
160 -
161 - all: sysdep/paths.h .dep-stamp subdir daemon @CLIENT@
162 -
163 --daemon: $(exedir)/bird
164 -+daemon: $(exedir)/bird@SUFFIX6@
165 -
166 --client: $(exedir)/birdc
167 -+client: $(exedir)/birdc@SUFFIX6@
168 -
169 - bird-dep := $(addsuffix /all.o, $(static-dirs)) conf/all.o lib/birdlib.a
170 -
171 -@@ -27,10 +27,10 @@
172 - set -e ; for a in $(dynamic-dirs) ; do $(MAKE) -C $$a $@ ; done
173 - set -e ; for a in $(static-dirs) $(client-dirs) ; do $(MAKE) -C $$a -f $(srcdir_abs)/$$a/Makefile $@ ; done
174 -
175 --$(exedir)/bird: $(bird-dep)
176 -+$(exedir)/bird@SUFFIX6@: $(bird-dep)
177 - $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
178 -
179 --$(exedir)/birdc: $(birdc-dep)
180 -+$(exedir)/birdc@SUFFIX6@: $(birdc-dep)
181 - $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(CLIENT_LIBS)
182 -
183 - .dir-stamp: sysdep/paths.h
184 -@@ -54,25 +54,42 @@
185 - tags:
186 - cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) $(client-dirs) -name *.[chY]`
187 -
188 --install: all
189 -+install-gen:
190 - $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(localstatedir)/run
191 -- $(INSTALL_PROGRAM) -s $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX6@
192 -+
193 -+install-bin: install-gen
194 -+ $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/
195 -+ if test -n "@CLIENT@" ; then \
196 -+ $(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/ ; \
197 -+ fi
198 -+ if ! test -f $(DESTDIR)/$(sysconfdir)/bird.conf ; then \
199 -+ $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird.conf ; \
200 -+ else \
201 -+ echo "Not overwriting old bird.conf" ; \
202 -+ fi
203 -+
204 -+install-bin6: install-gen
205 -+ $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/
206 - if test -n "@CLIENT@" ; then \
207 -- $(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX6@ ; \
208 -+ $(INSTALL_PROGRAM) $(exedir)/birdc6 $(DESTDIR)/$(sbindir)/birdc ; \
209 - fi
210 -- if ! test -f $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; then \
211 -- $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; \
212 -+ if ! test -f $(DESTDIR)/$(sysconfdir)/bird6.conf ; then \
213 -+ $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird6.conf ; \
214 - else \
215 -- echo "Not overwriting old bird@SUFFIX@.conf" ; \
216 -+ echo "Not overwriting old bird6.conf" ; \
217 - fi
218 -
219 -+install: all install-bin@SUFFIX6@
220 -+
221 - install-docs:
222 - $(INSTALL) -d $(DESTDIR)/$(docdir)
223 - $(INSTALL_DATA) $(srcdir)/doc/{bird,prog}{,-*}.html $(DESTDIR)/$(docdir)/
224 -
225 --clean:
226 -+almost-clean:
227 - find . -name "*.[oa]" -o -name core -o -name depend -o -name "*.html" | xargs rm -f
228 - rm -f conf/cf-lex.c conf/cf-parse.* conf/commands.h conf/keywords.h
229 -+
230 -+clean: almost-clean
231 - rm -f $(exedir)/bird $(exedir)/birdc $(exedir)/bird.ctl $(exedir)/bird6.ctl .dep-stamp
232 -
233 - distclean: clean
234 -diff -uNr bird-1.2.4.ORIG//tools/Makefile-top.in bird-1.2.4/tools/Makefile-top.in
235 ---- bird-1.2.4.ORIG//tools/Makefile-top.in 2010-09-06 15:38:39.000000000 +0100
236 -+++ bird-1.2.4/tools/Makefile-top.in 2010-09-06 15:38:56.000000000 +0100
237 -@@ -3,16 +3,19 @@
238 -
239 - objdir=@objdir@
240 -
241 --all depend tags install install-docs:
242 -+all depend tags install install-docs install-bin install-bin6:
243 - $(MAKE) -C $(objdir) $@
244 -
245 - docs userdocs progdocs:
246 - $(MAKE) -C doc $@
247 -
248 --clean:
249 -- $(MAKE) -C $(objdir) clean
250 -+almost-clean:
251 -+ $(MAKE) -C $(objdir) almost-clean
252 - find . -name "*~" -or -name "*.[oa]" -or -name "\#*\#" -or -name TAGS -or -name core -or -name depend -or -name ".#*" | xargs rm -f
253 -
254 -+clean: almost-clean
255 -+ $(MAKE) -C $(objdir) clean
256 -+
257 - distclean: clean
258 - $(MAKE) -C doc distclean
259 - rm -rf $(objdir) autom4te.cache
260
261 diff --git a/net-misc/bird/files/1.3.0-v4-v6-build.patch b/net-misc/bird/files/1.3.0-v4-v6-build.patch
262 deleted file mode 100644
263 index 9e32183..00000000
264 --- a/net-misc/bird/files/1.3.0-v4-v6-build.patch
265 +++ /dev/null
266 @@ -1,109 +0,0 @@
267 -diff -uNr bird-1.3.0.ORIG//tools/Makefile-top.in bird-1.3.0/tools/Makefile-top.in
268 ---- bird-1.3.0.ORIG//tools/Makefile-top.in 2011-03-31 10:42:08.264002882 +0100
269 -+++ bird-1.3.0/tools/Makefile-top.in 2011-03-31 10:42:32.083002944 +0100
270 -@@ -3,16 +3,19 @@
271 -
272 - objdir=@objdir@
273 -
274 --all depend tags install install-docs:
275 -+all depend tags install install-docs install-bin install-bin6:
276 - $(MAKE) -C $(objdir) $@
277 -
278 - docs userdocs progdocs:
279 - $(MAKE) -C doc $@
280 -
281 --clean:
282 -- $(MAKE) -C $(objdir) clean
283 -+almost-clean:
284 -+ $(MAKE) -C $(objdir) almost-clean
285 - find . -name "*~" -or -name "*.[oa]" -or -name "\#*\#" -or -name TAGS -or -name core -or -name depend -or -name ".#*" | xargs rm -f
286 -
287 -+clean: almost-clean
288 -+ $(MAKE) -C $(objdir) clean
289 -+
290 - distclean: clean
291 - $(MAKE) -C doc distclean
292 - rm -rf $(objdir) autom4te.cache
293 -diff -uNr bird-1.3.0.ORIG//tools/Makefile.in bird-1.3.0/tools/Makefile.in
294 ---- bird-1.3.0.ORIG//tools/Makefile.in 2011-03-31 10:42:08.265002882 +0100
295 -+++ bird-1.3.0/tools/Makefile.in 2011-03-31 10:42:32.083002944 +0100
296 -@@ -3,13 +3,13 @@
297 -
298 - include Rules
299 -
300 --.PHONY: all daemon client subdir depend clean distclean tags docs userdocs progdocs
301 -+.PHONY: all daemon client subdir depend clean distclean tags docs userdocs progdocs almost-clean
302 -
303 - all: sysdep/paths.h .dep-stamp subdir daemon @CLIENT@
304 -
305 --daemon: $(exedir)/bird
306 -+daemon: $(exedir)/bird@SUFFIX6@
307 -
308 --client: $(exedir)/birdc
309 -+client: $(exedir)/birdc@SUFFIX6@
310 -
311 - bird-dep := $(addsuffix /all.o, $(static-dirs)) conf/all.o lib/birdlib.a
312 -
313 -@@ -27,10 +27,10 @@
314 - set -e ; for a in $(dynamic-dirs) ; do $(MAKE) -C $$a $@ ; done
315 - set -e ; for a in $(static-dirs) $(client-dirs) ; do $(MAKE) -C $$a -f $(srcdir_abs)/$$a/Makefile $@ ; done
316 -
317 --$(exedir)/bird: $(bird-dep)
318 -+$(exedir)/bird@SUFFIX6@: $(bird-dep)
319 - $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
320 -
321 --$(exedir)/birdc: $(birdc-dep)
322 -+$(exedir)/birdc@SUFFIX6@: $(birdc-dep)
323 - $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(CLIENT_LIBS)
324 -
325 - .dir-stamp: sysdep/paths.h
326 -@@ -54,25 +54,42 @@
327 - tags:
328 - cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) $(client-dirs) -name *.[chY]`
329 -
330 --install: all
331 -+install-gen:
332 - $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(localstatedir)/run
333 -- $(INSTALL_PROGRAM) -s $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX6@
334 -+
335 -+install-bin: install-gen
336 -+ $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/
337 -+ if test -n "@CLIENT@" ; then \
338 -+ $(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/ ; \
339 -+ fi
340 -+ if ! test -f $(DESTDIR)/$(sysconfdir)/bird.conf ; then \
341 -+ $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird.conf ; \
342 -+ else \
343 -+ echo "Not overwriting old bird.conf" ; \
344 -+ fi
345 -+
346 -+install-bin6: install-gen
347 -+ $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/
348 - if test -n "@CLIENT@" ; then \
349 -- $(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX6@ ; \
350 -+ $(INSTALL_PROGRAM) $(exedir)/birdc6 $(DESTDIR)/$(sbindir)/birdc ; \
351 - fi
352 -- if ! test -f $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; then \
353 -- $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; \
354 -+ if ! test -f $(DESTDIR)/$(sysconfdir)/bird6.conf ; then \
355 -+ $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird6.conf ; \
356 - else \
357 -- echo "Not overwriting old bird@SUFFIX@.conf" ; \
358 -+ echo "Not overwriting old bird6.conf" ; \
359 - fi
360 -
361 -+install: all install-bin@SUFFIX6@
362 -+
363 - install-docs:
364 - $(INSTALL) -d $(DESTDIR)/$(docdir)
365 - $(INSTALL_DATA) $(srcdir)/doc/{bird,prog}{,-*}.html $(DESTDIR)/$(docdir)/
366 -
367 --clean:
368 -+almost-clean:
369 - find . -name "*.[oa]" -o -name core -o -name depend -o -name "*.html" | xargs rm -f
370 - rm -f conf/cf-lex.c conf/cf-parse.* conf/commands.h conf/keywords.h
371 -+
372 -+clean: almost-clean
373 - rm -f $(exedir)/bird $(exedir)/birdc $(exedir)/bird.ctl $(exedir)/bird6.ctl .dep-stamp
374 -
375 - distclean: clean
376
377 diff --git a/net-misc/bird/files/1.3.1-v4-v6-build.patch b/net-misc/bird/files/1.3.1-v4-v6-build.patch
378 deleted file mode 100644
379 index 3d6d0e2..00000000
380 --- a/net-misc/bird/files/1.3.1-v4-v6-build.patch
381 +++ /dev/null
382 @@ -1,109 +0,0 @@
383 -diff -uNr bird-1.3.1.ORIG//tools/Makefile-top.in bird-1.3.1/tools/Makefile-top.in
384 ---- bird-1.3.1.ORIG//tools/Makefile-top.in 2011-05-02 12:57:26.799971384 +0100
385 -+++ bird-1.3.1/tools/Makefile-top.in 2011-05-02 12:57:42.587971260 +0100
386 -@@ -3,16 +3,19 @@
387 -
388 - objdir=@objdir@
389 -
390 --all depend tags install install-docs:
391 -+all depend tags install install-docs install-bin install-bin6:
392 - $(MAKE) -C $(objdir) $@
393 -
394 - docs userdocs progdocs:
395 - $(MAKE) -C doc $@
396 -
397 --clean:
398 -- $(MAKE) -C $(objdir) clean
399 -+almost-clean:
400 -+ $(MAKE) -C $(objdir) almost-clean
401 - find . -name "*~" -or -name "*.[oa]" -or -name "\#*\#" -or -name TAGS -or -name core -or -name depend -or -name ".#*" | xargs rm -f
402 -
403 -+clean: almost-clean
404 -+ $(MAKE) -C $(objdir) clean
405 -+
406 - distclean: clean
407 - $(MAKE) -C doc distclean
408 - rm -rf $(objdir) autom4te.cache
409 -diff -uNr bird-1.3.1.ORIG//tools/Makefile.in bird-1.3.1/tools/Makefile.in
410 ---- bird-1.3.1.ORIG//tools/Makefile.in 2011-05-02 12:57:26.799971384 +0100
411 -+++ bird-1.3.1/tools/Makefile.in 2011-05-02 12:57:42.588971277 +0100
412 -@@ -3,13 +3,13 @@
413 -
414 - include Rules
415 -
416 --.PHONY: all daemon client subdir depend clean distclean tags docs userdocs progdocs
417 -+.PHONY: all daemon client subdir depend clean distclean tags docs userdocs progdocs almost-clean
418 -
419 - all: sysdep/paths.h .dep-stamp subdir daemon @CLIENT@
420 -
421 --daemon: $(exedir)/bird
422 -+daemon: $(exedir)/bird@SUFFIX6@
423 -
424 --client: $(exedir)/birdc
425 -+client: $(exedir)/birdc@SUFFIX6@
426 -
427 - bird-dep := $(addsuffix /all.o, $(static-dirs)) conf/all.o lib/birdlib.a
428 -
429 -@@ -27,10 +27,10 @@
430 - set -e ; for a in $(dynamic-dirs) ; do $(MAKE) -C $$a $@ ; done
431 - set -e ; for a in $(static-dirs) $(client-dirs) ; do $(MAKE) -C $$a -f $(srcdir_abs)/$$a/Makefile $@ ; done
432 -
433 --$(exedir)/bird: $(bird-dep)
434 -+$(exedir)/bird@SUFFIX6@: $(bird-dep)
435 - $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
436 -
437 --$(exedir)/birdc: $(birdc-dep)
438 -+$(exedir)/birdc@SUFFIX6@: $(birdc-dep)
439 - $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(CLIENT_LIBS)
440 -
441 - .dir-stamp: sysdep/paths.h
442 -@@ -55,25 +55,42 @@
443 - tags:
444 - cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) $(client-dirs) -name *.[chY]`
445 -
446 --install: all
447 -+install-gen:
448 - $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(localstatedir)/run
449 -- $(INSTALL_PROGRAM) -s $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX6@
450 -+
451 -+install-bin: install-gen
452 -+ $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/
453 -+ if test -n "@CLIENT@" ; then \
454 -+ $(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/ ; \
455 -+ fi
456 -+ if ! test -f $(DESTDIR)/$(sysconfdir)/bird.conf ; then \
457 -+ $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird.conf ; \
458 -+ else \
459 -+ echo "Not overwriting old bird.conf" ; \
460 -+ fi
461 -+
462 -+install-bin6: install-gen
463 -+ $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/
464 - if test -n "@CLIENT@" ; then \
465 -- $(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX6@ ; \
466 -+ $(INSTALL_PROGRAM) $(exedir)/birdc6 $(DESTDIR)/$(sbindir)/birdc ; \
467 - fi
468 -- if ! test -f $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; then \
469 -- $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; \
470 -+ if ! test -f $(DESTDIR)/$(sysconfdir)/bird6.conf ; then \
471 -+ $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird6.conf ; \
472 - else \
473 -- echo "Not overwriting old bird@SUFFIX@.conf" ; \
474 -+ echo "Not overwriting old bird6.conf" ; \
475 - fi
476 -
477 -+install: all install-bin@SUFFIX6@
478 -+
479 - install-docs:
480 - $(INSTALL) -d $(DESTDIR)/$(docdir)
481 - $(INSTALL_DATA) $(srcdir)/doc/{bird,prog}{,-*}.html $(DESTDIR)/$(docdir)/
482 -
483 --clean:
484 -+almost-clean:
485 - find . -name "*.[oa]" -o -name core -o -name depend -o -name "*.html" | xargs rm -f
486 - rm -f conf/cf-lex.c conf/cf-parse.* conf/commands.h conf/keywords.h
487 -+
488 -+clean: almost-clean
489 - rm -f $(exedir)/bird $(exedir)/birdc $(exedir)/bird.ctl $(exedir)/bird6.ctl .dep-stamp
490 -
491 - distclean: clean
492
493 diff --git a/net-misc/bird/files/1.3.2-v4-v6-build.patch b/net-misc/bird/files/1.3.2-v4-v6-build.patch
494 deleted file mode 100644
495 index 134c31f..00000000
496 --- a/net-misc/bird/files/1.3.2-v4-v6-build.patch
497 +++ /dev/null
498 @@ -1,109 +0,0 @@
499 -diff -uNr bird-1.3.2.ORIG/tools/Makefile.in bird-1.3.2/tools/Makefile.in
500 ---- bird-1.3.2.ORIG/tools/Makefile.in 2011-11-07 10:53:52.881139861 +0000
501 -+++ bird-1.3.2/tools/Makefile.in 2011-11-07 10:54:08.606140225 +0000
502 -@@ -3,13 +3,13 @@
503 -
504 - include Rules
505 -
506 --.PHONY: all daemon client subdir depend clean distclean tags docs userdocs progdocs
507 -+.PHONY: all daemon client subdir depend clean distclean tags docs userdocs progdocs almost-clean
508 -
509 - all: sysdep/paths.h .dep-stamp subdir daemon @CLIENT@
510 -
511 --daemon: $(exedir)/bird
512 -+daemon: $(exedir)/bird@SUFFIX6@
513 -
514 --client: $(exedir)/birdc
515 -+client: $(exedir)/birdc@SUFFIX6@
516 -
517 - bird-dep := $(addsuffix /all.o, $(static-dirs)) conf/all.o lib/birdlib.a
518 -
519 -@@ -27,10 +27,10 @@
520 - set -e ; for a in $(dynamic-dirs) ; do $(MAKE) -C $$a $@ ; done
521 - set -e ; for a in $(static-dirs) $(client-dirs) ; do $(MAKE) -C $$a -f $(srcdir_abs)/$$a/Makefile $@ ; done
522 -
523 --$(exedir)/bird: $(bird-dep)
524 -+$(exedir)/bird@SUFFIX6@: $(bird-dep)
525 - $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
526 -
527 --$(exedir)/birdc: $(birdc-dep)
528 -+$(exedir)/birdc@SUFFIX6@: $(birdc-dep)
529 - $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(CLIENT_LIBS)
530 -
531 - .dir-stamp: sysdep/paths.h
532 -@@ -55,25 +55,42 @@
533 - tags:
534 - cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) $(client-dirs) -name *.[chY]`
535 -
536 --install: all
537 -+install-gen:
538 - $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(localstatedir)/run
539 -- $(INSTALL_PROGRAM) -s $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX6@
540 -+
541 -+install-bin: install-gen
542 -+ $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/
543 -+ if test -n "@CLIENT@" ; then \
544 -+ $(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/ ; \
545 -+ fi
546 -+ if ! test -f $(DESTDIR)/$(sysconfdir)/bird.conf ; then \
547 -+ $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird.conf ; \
548 -+ else \
549 -+ echo "Not overwriting old bird.conf" ; \
550 -+ fi
551 -+
552 -+install-bin6: install-gen
553 -+ $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/
554 - if test -n "@CLIENT@" ; then \
555 -- $(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX6@ ; \
556 -+ $(INSTALL_PROGRAM) $(exedir)/birdc6 $(DESTDIR)/$(sbindir)/birdc ; \
557 - fi
558 -- if ! test -f $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; then \
559 -- $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; \
560 -+ if ! test -f $(DESTDIR)/$(sysconfdir)/bird6.conf ; then \
561 -+ $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird6.conf ; \
562 - else \
563 -- echo "Not overwriting old bird@SUFFIX@.conf" ; \
564 -+ echo "Not overwriting old bird6.conf" ; \
565 - fi
566 -
567 -+install: all install-bin@SUFFIX6@
568 -+
569 - install-docs:
570 - $(INSTALL) -d $(DESTDIR)/$(docdir)
571 - $(INSTALL_DATA) $(srcdir)/doc/{bird,prog}{,-*}.html $(DESTDIR)/$(docdir)/
572 -
573 --clean:
574 -+almost-clean:
575 - find . -name "*.[oa]" -o -name core -o -name depend -o -name "*.html" | xargs rm -f
576 - rm -f conf/cf-lex.c conf/cf-parse.* conf/commands.h conf/keywords.h
577 -+
578 -+clean: almost-clean
579 - rm -f $(exedir)/bird $(exedir)/birdc $(exedir)/bird.ctl $(exedir)/bird6.ctl .dep-stamp
580 -
581 - distclean: clean
582 -diff -uNr bird-1.3.2.ORIG/tools/Makefile-top.in bird-1.3.2/tools/Makefile-top.in
583 ---- bird-1.3.2.ORIG/tools/Makefile-top.in 2011-11-07 10:53:52.881139861 +0000
584 -+++ bird-1.3.2/tools/Makefile-top.in 2011-11-07 10:54:08.603140225 +0000
585 -@@ -3,16 +3,19 @@
586 -
587 - objdir=@objdir@
588 -
589 --all depend tags install install-docs:
590 -+all depend tags install install-docs install-bin install-bin6:
591 - $(MAKE) -C $(objdir) $@
592 -
593 - docs userdocs progdocs:
594 - $(MAKE) -C doc $@
595 -
596 --clean:
597 -- $(MAKE) -C $(objdir) clean
598 -+almost-clean:
599 -+ $(MAKE) -C $(objdir) almost-clean
600 - find . -name "*~" -or -name "*.[oa]" -or -name "\#*\#" -or -name TAGS -or -name core -or -name depend -or -name ".#*" | xargs rm -f
601 -
602 -+clean: almost-clean
603 -+ $(MAKE) -C $(objdir) clean
604 -+
605 - distclean: clean
606 - $(MAKE) -C doc distclean
607 - rm -rf $(objdir) autom4te.cache
608
609 diff --git a/net-misc/bird/files/initd-v4-bird-1.2.3 b/net-misc/bird/files/initd-v4-bird-1.2.3
610 deleted file mode 100644
611 index 485eda2..00000000
612 --- a/net-misc/bird/files/initd-v4-bird-1.2.3
613 +++ /dev/null
614 @@ -1,39 +0,0 @@
615 -#!/sbin/openrc-run
616 -# Copyright 1999-2009 Gentoo Foundation
617 -# Distributed under the terms of the GNU General Public License v2
618 -# $Id$
619 -
620 -EXE=bird
621 -CLI=birdc
622 -SOCK="/var/run/${EXE}.ctl"
623 -
624 -depend() {
625 - need net
626 - use logger
627 -}
628 -
629 -checkconfig() {
630 - if [ ! -f "/etc/${EXE}.conf" ]; then
631 - eerror "Please create /etc/${EXE}.conf"
632 - return 1
633 - fi
634 - return 0
635 -}
636 -
637 -start() {
638 - checkconfig || return $?
639 -
640 - ebegin "Starting BIRD"
641 - "/usr/sbin/${EXE}" -c "/etc/${EXE}.conf" -s "${SOCK}"
642 - eend $? "Failed to start BIRD"
643 -}
644 -
645 -stop() {
646 - ebegin "Stopping BIRD"
647 - if [ -f "${SOCK}" ]; then
648 - echo "down" | "/usr/sbin/${CLI}" -s "${SOCK}" &>/dev/null
649 - eend $? "Failed to stop BIRD"
650 - else
651 - eend 0
652 - fi
653 -}
654
655 diff --git a/net-misc/bird/files/initd-v4-bird-1.2.4 b/net-misc/bird/files/initd-v4-bird-1.2.4
656 deleted file mode 100644
657 index 7f5b6ca..00000000
658 --- a/net-misc/bird/files/initd-v4-bird-1.2.4
659 +++ /dev/null
660 @@ -1,39 +0,0 @@
661 -#!/sbin/openrc-run
662 -# Copyright 1999-2010 Gentoo Foundation
663 -# Distributed under the terms of the GNU General Public License v2
664 -# $Id$
665 -
666 -EXE=bird
667 -CLI=birdc
668 -SOCK="/var/run/${EXE}.ctl"
669 -
670 -depend() {
671 - need net
672 - use logger
673 -}
674 -
675 -checkconfig() {
676 - if [ ! -f "/etc/${EXE}.conf" ]; then
677 - eerror "Please create /etc/${EXE}.conf"
678 - return 1
679 - fi
680 - return 0
681 -}
682 -
683 -start() {
684 - checkconfig || return $?
685 -
686 - ebegin "Starting BIRD"
687 - "/usr/sbin/${EXE}" -c "/etc/${EXE}.conf" -s "${SOCK}"
688 - eend $? "Failed to start BIRD"
689 -}
690 -
691 -stop() {
692 - ebegin "Stopping BIRD"
693 - if [ -f "${SOCK}" ]; then
694 - echo "down" | "/usr/sbin/${CLI}" -s "${SOCK}" &>/dev/null
695 - eend $? "Failed to stop BIRD"
696 - else
697 - eend 0
698 - fi
699 -}
700
701 diff --git a/net-misc/bird/files/initd-v4-bird-1.3.0 b/net-misc/bird/files/initd-v4-bird-1.3.0
702 deleted file mode 100644
703 index 0a6dfd0..00000000
704 --- a/net-misc/bird/files/initd-v4-bird-1.3.0
705 +++ /dev/null
706 @@ -1,42 +0,0 @@
707 -#!/sbin/openrc-run
708 -# Copyright 1999-2011 Gentoo Foundation
709 -# Distributed under the terms of the GNU General Public License v2
710 -# $Id$
711 -
712 -opts="reload"
713 -
714 -EXE=bird
715 -SOCK="/var/run/${EXE}.ctl"
716 -
717 -depend() {
718 - need net
719 - use logger
720 -}
721 -
722 -checkconfig() {
723 - if [ ! -f "/etc/${EXE}.conf" ]; then
724 - eerror "Please create /etc/${EXE}.conf"
725 - return 1
726 - fi
727 - return 0
728 -}
729 -
730 -start() {
731 - checkconfig || return $?
732 - ebegin "Starting BIRD"
733 - start-stop-daemon --start --exec /usr/sbin/${EXE} -- -c "/etc/${EXE}.conf" -s "${SOCK}"
734 - eend $? "Failed to start BIRD"
735 -}
736 -
737 -stop() {
738 - ebegin "Stopping BIRD"
739 - start-stop-daemon --stop --exec /usr/sbin/${EXE}
740 - eend $? "Failed to stop BIRD"
741 -}
742 -
743 -reload() {
744 - service_started "${SVCNAME}" || return
745 - ebegin "Reloading BIRD"
746 - start-stop-daemon --stop --signal HUP --oknodo --exec /usr/sbin/${EXE}
747 - eend $? "Failed to reload BIRD"
748 -}
749
750 diff --git a/net-misc/bird/files/initd-v4-bird-1.3.1 b/net-misc/bird/files/initd-v4-bird-1.3.1
751 deleted file mode 100644
752 index 0a6dfd0..00000000
753 --- a/net-misc/bird/files/initd-v4-bird-1.3.1
754 +++ /dev/null
755 @@ -1,42 +0,0 @@
756 -#!/sbin/openrc-run
757 -# Copyright 1999-2011 Gentoo Foundation
758 -# Distributed under the terms of the GNU General Public License v2
759 -# $Id$
760 -
761 -opts="reload"
762 -
763 -EXE=bird
764 -SOCK="/var/run/${EXE}.ctl"
765 -
766 -depend() {
767 - need net
768 - use logger
769 -}
770 -
771 -checkconfig() {
772 - if [ ! -f "/etc/${EXE}.conf" ]; then
773 - eerror "Please create /etc/${EXE}.conf"
774 - return 1
775 - fi
776 - return 0
777 -}
778 -
779 -start() {
780 - checkconfig || return $?
781 - ebegin "Starting BIRD"
782 - start-stop-daemon --start --exec /usr/sbin/${EXE} -- -c "/etc/${EXE}.conf" -s "${SOCK}"
783 - eend $? "Failed to start BIRD"
784 -}
785 -
786 -stop() {
787 - ebegin "Stopping BIRD"
788 - start-stop-daemon --stop --exec /usr/sbin/${EXE}
789 - eend $? "Failed to stop BIRD"
790 -}
791 -
792 -reload() {
793 - service_started "${SVCNAME}" || return
794 - ebegin "Reloading BIRD"
795 - start-stop-daemon --stop --signal HUP --oknodo --exec /usr/sbin/${EXE}
796 - eend $? "Failed to reload BIRD"
797 -}
798
799 diff --git a/net-misc/bird/files/initd-v4-bird-1.3.2 b/net-misc/bird/files/initd-v4-bird-1.3.2
800 deleted file mode 100644
801 index 0a6dfd0..00000000
802 --- a/net-misc/bird/files/initd-v4-bird-1.3.2
803 +++ /dev/null
804 @@ -1,42 +0,0 @@
805 -#!/sbin/openrc-run
806 -# Copyright 1999-2011 Gentoo Foundation
807 -# Distributed under the terms of the GNU General Public License v2
808 -# $Id$
809 -
810 -opts="reload"
811 -
812 -EXE=bird
813 -SOCK="/var/run/${EXE}.ctl"
814 -
815 -depend() {
816 - need net
817 - use logger
818 -}
819 -
820 -checkconfig() {
821 - if [ ! -f "/etc/${EXE}.conf" ]; then
822 - eerror "Please create /etc/${EXE}.conf"
823 - return 1
824 - fi
825 - return 0
826 -}
827 -
828 -start() {
829 - checkconfig || return $?
830 - ebegin "Starting BIRD"
831 - start-stop-daemon --start --exec /usr/sbin/${EXE} -- -c "/etc/${EXE}.conf" -s "${SOCK}"
832 - eend $? "Failed to start BIRD"
833 -}
834 -
835 -stop() {
836 - ebegin "Stopping BIRD"
837 - start-stop-daemon --stop --exec /usr/sbin/${EXE}
838 - eend $? "Failed to stop BIRD"
839 -}
840 -
841 -reload() {
842 - service_started "${SVCNAME}" || return
843 - ebegin "Reloading BIRD"
844 - start-stop-daemon --stop --signal HUP --oknodo --exec /usr/sbin/${EXE}
845 - eend $? "Failed to reload BIRD"
846 -}
847
848 diff --git a/net-misc/bird/files/initd-v6-bird-1.2.3 b/net-misc/bird/files/initd-v6-bird-1.2.3
849 deleted file mode 100644
850 index 26d4709..00000000
851 --- a/net-misc/bird/files/initd-v6-bird-1.2.3
852 +++ /dev/null
853 @@ -1,39 +0,0 @@
854 -#!/sbin/openrc-run
855 -# Copyright 1999-2010 Gentoo Foundation
856 -# Distributed under the terms of the GNU General Public License v2
857 -# $Id$
858 -
859 -EXE=bird6
860 -CLI=birdc6
861 -SOCK="/var/run/${EXE}.ctl"
862 -
863 -depend() {
864 - need net
865 - use logger
866 -}
867 -
868 -checkconfig() {
869 - if [ ! -f "/etc/${EXE}.conf" ]; then
870 - eerror "Please create /etc/${EXE}.conf"
871 - return 1
872 - fi
873 - return 0
874 -}
875 -
876 -start() {
877 - checkconfig || return $?
878 -
879 - ebegin "Starting BIRD"
880 - "/usr/sbin/${EXE}" -c "/etc/${EXE}.conf" -s "${SOCK}"
881 - eend $? "Failed to start BIRD"
882 -}
883 -
884 -stop() {
885 - ebegin "Stopping BIRD"
886 - if [ -f "${SOCK}" ]; then
887 - echo "down" | "/usr/sbin/${CLI}" -s "${SOCK}" &>/dev/null
888 - eend $? "Failed to stop BIRD"
889 - else
890 - eend 0
891 - fi
892 -}
893
894 diff --git a/net-misc/bird/files/initd-v6-bird-1.2.4 b/net-misc/bird/files/initd-v6-bird-1.2.4
895 deleted file mode 100644
896 index 26d4709..00000000
897 --- a/net-misc/bird/files/initd-v6-bird-1.2.4
898 +++ /dev/null
899 @@ -1,39 +0,0 @@
900 -#!/sbin/openrc-run
901 -# Copyright 1999-2010 Gentoo Foundation
902 -# Distributed under the terms of the GNU General Public License v2
903 -# $Id$
904 -
905 -EXE=bird6
906 -CLI=birdc6
907 -SOCK="/var/run/${EXE}.ctl"
908 -
909 -depend() {
910 - need net
911 - use logger
912 -}
913 -
914 -checkconfig() {
915 - if [ ! -f "/etc/${EXE}.conf" ]; then
916 - eerror "Please create /etc/${EXE}.conf"
917 - return 1
918 - fi
919 - return 0
920 -}
921 -
922 -start() {
923 - checkconfig || return $?
924 -
925 - ebegin "Starting BIRD"
926 - "/usr/sbin/${EXE}" -c "/etc/${EXE}.conf" -s "${SOCK}"
927 - eend $? "Failed to start BIRD"
928 -}
929 -
930 -stop() {
931 - ebegin "Stopping BIRD"
932 - if [ -f "${SOCK}" ]; then
933 - echo "down" | "/usr/sbin/${CLI}" -s "${SOCK}" &>/dev/null
934 - eend $? "Failed to stop BIRD"
935 - else
936 - eend 0
937 - fi
938 -}
939
940 diff --git a/net-misc/bird/files/initd-v6-bird-1.3.0 b/net-misc/bird/files/initd-v6-bird-1.3.0
941 deleted file mode 100644
942 index 7b55d21..00000000
943 --- a/net-misc/bird/files/initd-v6-bird-1.3.0
944 +++ /dev/null
945 @@ -1,42 +0,0 @@
946 -#!/sbin/openrc-run
947 -# Copyright 1999-2011 Gentoo Foundation
948 -# Distributed under the terms of the GNU General Public License v2
949 -# $Id$
950 -
951 -opts="reload"
952 -
953 -EXE=bird6
954 -SOCK="/var/run/${EXE}.ctl"
955 -
956 -depend() {
957 - need net
958 - use logger
959 -}
960 -
961 -checkconfig() {
962 - if [ ! -f "/etc/${EXE}.conf" ]; then
963 - eerror "Please create /etc/${EXE}.conf"
964 - return 1
965 - fi
966 - return 0
967 -}
968 -
969 -start() {
970 - checkconfig || return $?
971 - ebegin "Starting BIRD"
972 - start-stop-daemon --start --exec /usr/sbin/${EXE} -- -c "/etc/${EXE}.conf" -s "${SOCK}"
973 - eend $? "Failed to start BIRD"
974 -}
975 -
976 -stop() {
977 - ebegin "Stopping BIRD"
978 - start-stop-daemon --stop --exec /usr/sbin/${EXE}
979 - eend $? "Failed to stop BIRD"
980 -}
981 -
982 -reload() {
983 - service_started "${SVCNAME}" || return
984 - ebegin "Reloading BIRD"
985 - start-stop-daemon --stop --signal HUP --oknodo --exec /usr/sbin/${EXE}
986 - eend $? "Failed to reload BIRD"
987 -}
988
989 diff --git a/net-misc/bird/files/initd-v6-bird-1.3.1 b/net-misc/bird/files/initd-v6-bird-1.3.1
990 deleted file mode 100644
991 index 7b55d21..00000000
992 --- a/net-misc/bird/files/initd-v6-bird-1.3.1
993 +++ /dev/null
994 @@ -1,42 +0,0 @@
995 -#!/sbin/openrc-run
996 -# Copyright 1999-2011 Gentoo Foundation
997 -# Distributed under the terms of the GNU General Public License v2
998 -# $Id$
999 -
1000 -opts="reload"
1001 -
1002 -EXE=bird6
1003 -SOCK="/var/run/${EXE}.ctl"
1004 -
1005 -depend() {
1006 - need net
1007 - use logger
1008 -}
1009 -
1010 -checkconfig() {
1011 - if [ ! -f "/etc/${EXE}.conf" ]; then
1012 - eerror "Please create /etc/${EXE}.conf"
1013 - return 1
1014 - fi
1015 - return 0
1016 -}
1017 -
1018 -start() {
1019 - checkconfig || return $?
1020 - ebegin "Starting BIRD"
1021 - start-stop-daemon --start --exec /usr/sbin/${EXE} -- -c "/etc/${EXE}.conf" -s "${SOCK}"
1022 - eend $? "Failed to start BIRD"
1023 -}
1024 -
1025 -stop() {
1026 - ebegin "Stopping BIRD"
1027 - start-stop-daemon --stop --exec /usr/sbin/${EXE}
1028 - eend $? "Failed to stop BIRD"
1029 -}
1030 -
1031 -reload() {
1032 - service_started "${SVCNAME}" || return
1033 - ebegin "Reloading BIRD"
1034 - start-stop-daemon --stop --signal HUP --oknodo --exec /usr/sbin/${EXE}
1035 - eend $? "Failed to reload BIRD"
1036 -}
1037
1038 diff --git a/net-misc/bird/files/initd-v6-bird-1.3.2 b/net-misc/bird/files/initd-v6-bird-1.3.2
1039 deleted file mode 100644
1040 index 7b55d21..00000000
1041 --- a/net-misc/bird/files/initd-v6-bird-1.3.2
1042 +++ /dev/null
1043 @@ -1,42 +0,0 @@
1044 -#!/sbin/openrc-run
1045 -# Copyright 1999-2011 Gentoo Foundation
1046 -# Distributed under the terms of the GNU General Public License v2
1047 -# $Id$
1048 -
1049 -opts="reload"
1050 -
1051 -EXE=bird6
1052 -SOCK="/var/run/${EXE}.ctl"
1053 -
1054 -depend() {
1055 - need net
1056 - use logger
1057 -}
1058 -
1059 -checkconfig() {
1060 - if [ ! -f "/etc/${EXE}.conf" ]; then
1061 - eerror "Please create /etc/${EXE}.conf"
1062 - return 1
1063 - fi
1064 - return 0
1065 -}
1066 -
1067 -start() {
1068 - checkconfig || return $?
1069 - ebegin "Starting BIRD"
1070 - start-stop-daemon --start --exec /usr/sbin/${EXE} -- -c "/etc/${EXE}.conf" -s "${SOCK}"
1071 - eend $? "Failed to start BIRD"
1072 -}
1073 -
1074 -stop() {
1075 - ebegin "Stopping BIRD"
1076 - start-stop-daemon --stop --exec /usr/sbin/${EXE}
1077 - eend $? "Failed to stop BIRD"
1078 -}
1079 -
1080 -reload() {
1081 - service_started "${SVCNAME}" || return
1082 - ebegin "Reloading BIRD"
1083 - start-stop-daemon --stop --signal HUP --oknodo --exec /usr/sbin/${EXE}
1084 - eend $? "Failed to reload BIRD"
1085 -}