Fix mkdir lossage from rev 1.22 and change two Makefiles to match the one
in tree.
This commit is contained in:
parent
93be4ccdb5
commit
8e900f5ee8
|
@ -1,6 +1,6 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
#
|
#
|
||||||
# $NetBSD: ipfilter2netbsd,v 1.22 1998/04/09 00:32:40 tv Exp $
|
# $NetBSD: ipfilter2netbsd,v 1.23 1998/05/17 16:05:39 veego Exp $
|
||||||
#
|
#
|
||||||
# Copyright (c) 1996 Matthew R. Green
|
# Copyright (c) 1996 Matthew R. Green
|
||||||
# All rights reserved.
|
# All rights reserved.
|
||||||
|
@ -60,15 +60,14 @@ esac
|
||||||
echo preparing directory $d
|
echo preparing directory $d
|
||||||
rm -rf $d
|
rm -rf $d
|
||||||
mkdir -p $d; cd $d
|
mkdir -p $d; cd $d
|
||||||
mkdir -p src/usr.sbin/ipf/ipf src/sys/netinet src/usr.sbin/ipf/ipfstat src/usr.sbin/ipf/ipftest src/usr.sbin/ipf/ipmon src/usr.sbin/ipf/ipnat src/usr.sbin/ipf/ipresend src/usr.sbin/ipf/ipsend src/usr.sbin/ipf/iptest src/usr.sbin/ipf/rules src/sys/lkm/neti
|
mkdir -p src/usr.sbin/ipf/ipf src/sys/netinet src/usr.sbin/ipf/ipfstat src/usr.sbin/ipf/ipftest src/usr.sbin/ipf/ipmon src/usr.sbin/ipf/ipnat src/usr.sbin/ipf/ipresend src/usr.sbin/ipf/ipsend src/usr.sbin/ipf/iptest src/usr.sbin/ipf/rules src/sys/lkm/netinet/if_ipl
|
||||||
net/if_ipl
|
|
||||||
|
|
||||||
### start Makefile ###############################
|
### start Makefile ###############################
|
||||||
cd $d/src/usr.sbin/ipf
|
cd $d/src/usr.sbin/ipf
|
||||||
|
|
||||||
echo creating main Makefile
|
echo creating main Makefile
|
||||||
cat > Makefile<<'__eof_makefile'
|
cat > Makefile<<'__eof_makefile'
|
||||||
# $NetBSD: ipfilter2netbsd,v 1.22 1998/04/09 00:32:40 tv Exp $
|
# $NetBSD: ipfilter2netbsd,v 1.23 1998/05/17 16:05:39 veego Exp $
|
||||||
|
|
||||||
SUBDIR= ipf ipfstat ipftest ipmon ipnat ipresend ipsend iptest rules
|
SUBDIR= ipf ipfstat ipftest ipmon ipnat ipresend ipsend iptest rules
|
||||||
|
|
||||||
|
@ -81,11 +80,13 @@ cd $d/src/usr.sbin/ipf
|
||||||
|
|
||||||
echo creating main Makefile.inc
|
echo creating main Makefile.inc
|
||||||
cat > Makefile.inc<<'__eof_makefile'
|
cat > Makefile.inc<<'__eof_makefile'
|
||||||
# $NetBSD: ipfilter2netbsd,v 1.22 1998/04/09 00:32:40 tv Exp $
|
# $NetBSD: ipfilter2netbsd,v 1.23 1998/05/17 16:05:39 veego Exp $
|
||||||
|
|
||||||
WARNS?= 1
|
WARNS?= 1
|
||||||
|
|
||||||
|
.if exists(${.CURDIR}/../../Makefile.inc)
|
||||||
.include "${.CURDIR}/../../Makefile.inc"
|
.include "${.CURDIR}/../../Makefile.inc"
|
||||||
|
.endif
|
||||||
__eof_makefile
|
__eof_makefile
|
||||||
### end Makefile.inc ###############################
|
### end Makefile.inc ###############################
|
||||||
|
|
||||||
|
@ -102,7 +103,7 @@ cd $d/src/usr.sbin/ipf/ipf
|
||||||
|
|
||||||
echo creating Makefile
|
echo creating Makefile
|
||||||
cat > Makefile<<'__eof_makefile'
|
cat > Makefile<<'__eof_makefile'
|
||||||
# $NetBSD: ipfilter2netbsd,v 1.22 1998/04/09 00:32:40 tv Exp $
|
# $NetBSD: ipfilter2netbsd,v 1.23 1998/05/17 16:05:39 veego Exp $
|
||||||
|
|
||||||
.include <bsd.own.mk>
|
.include <bsd.own.mk>
|
||||||
|
|
||||||
|
@ -131,7 +132,7 @@ cd $d/src/usr.sbin/ipf/ipfstat
|
||||||
|
|
||||||
echo creating Makefile
|
echo creating Makefile
|
||||||
cat > Makefile<<'__eof_makefile'
|
cat > Makefile<<'__eof_makefile'
|
||||||
# $NetBSD: ipfilter2netbsd,v 1.22 1998/04/09 00:32:40 tv Exp $
|
# $NetBSD: ipfilter2netbsd,v 1.23 1998/05/17 16:05:39 veego Exp $
|
||||||
|
|
||||||
PROG= ipfstat
|
PROG= ipfstat
|
||||||
SRCS= kmem.c fils.c opt.c parse.c
|
SRCS= kmem.c fils.c opt.c parse.c
|
||||||
|
@ -157,7 +158,7 @@ cd $d/src/usr.sbin/ipf/ipftest
|
||||||
|
|
||||||
echo creating Makefile
|
echo creating Makefile
|
||||||
cat > Makefile<<'__eof_makefile'
|
cat > Makefile<<'__eof_makefile'
|
||||||
# $NetBSD: ipfilter2netbsd,v 1.22 1998/04/09 00:32:40 tv Exp $
|
# $NetBSD: ipfilter2netbsd,v 1.23 1998/05/17 16:05:39 veego Exp $
|
||||||
|
|
||||||
PROG= ipftest
|
PROG= ipftest
|
||||||
SRCS= ipt.c ipft_sn.c ipft_ef.c ipft_td.c ipft_pc.c opt.c ipft_tx.c misc.c ip_frag.c ip_state.c ip_nat.c ipft_hx.c ip_fil.c fil.c parse.c ip_proxy.c ip_auth.c
|
SRCS= ipt.c ipft_sn.c ipft_ef.c ipft_td.c ipft_pc.c opt.c ipft_tx.c misc.c ip_frag.c ip_state.c ip_nat.c ipft_hx.c ip_fil.c fil.c parse.c ip_proxy.c ip_auth.c
|
||||||
|
@ -182,7 +183,7 @@ cd $d/src/usr.sbin/ipf/ipmon
|
||||||
|
|
||||||
echo creating Makefile
|
echo creating Makefile
|
||||||
cat > Makefile<<'__eof_makefile'
|
cat > Makefile<<'__eof_makefile'
|
||||||
# $NetBSD: ipfilter2netbsd,v 1.22 1998/04/09 00:32:40 tv Exp $
|
# $NetBSD: ipfilter2netbsd,v 1.23 1998/05/17 16:05:39 veego Exp $
|
||||||
|
|
||||||
PROG= ipmon
|
PROG= ipmon
|
||||||
MAN= ipmon.8
|
MAN= ipmon.8
|
||||||
|
@ -207,7 +208,7 @@ mv ipnat.1 ipnat.8
|
||||||
|
|
||||||
echo creating Makefile
|
echo creating Makefile
|
||||||
cat > Makefile<<'__eof_makefile'
|
cat > Makefile<<'__eof_makefile'
|
||||||
# $NetBSD: ipfilter2netbsd,v 1.22 1998/04/09 00:32:40 tv Exp $
|
# $NetBSD: ipfilter2netbsd,v 1.23 1998/05/17 16:05:39 veego Exp $
|
||||||
|
|
||||||
PROG= ipnat
|
PROG= ipnat
|
||||||
SRCS= kmem.c ipnat.c
|
SRCS= kmem.c ipnat.c
|
||||||
|
@ -232,14 +233,18 @@ cd $d/src/usr.sbin/ipf/ipresend
|
||||||
|
|
||||||
echo creating Makefile
|
echo creating Makefile
|
||||||
cat > Makefile<<'__eof_makefile'
|
cat > Makefile<<'__eof_makefile'
|
||||||
# $NetBSD: ipfilter2netbsd,v 1.22 1998/04/09 00:32:40 tv Exp $
|
# $NetBSD: ipfilter2netbsd,v 1.23 1998/05/17 16:05:39 veego Exp $
|
||||||
|
|
||||||
PROG= ipresend
|
PROG= ipresend
|
||||||
SRCS= ipresend.c ip.c resend.c opt.c ipft_ef.c ipft_hx.c ipft_sn.c ipft_td.c ipft_tx.c sbpf.c 44arp.c ipft_pc.c
|
SRCS= ipresend.c ip.c resend.c opt.c ipft_ef.c ipft_hx.c ipft_sn.c ipft_td.c ipft_tx.c sbpf.c 44arp.c ipft_pc.c
|
||||||
MAN= ipresend.1
|
MAN= ipresend.1
|
||||||
CPPFLAGS+=-I${.CURDIR}/../ipfstat -I${.CURDIR}/../ipsend -I${.CURDIR}/../ipftest -I${.CURDIR}/../ipf
|
|
||||||
|
|
||||||
.PATH: ${.CURDIR}/../ipf ${.CURDIR}/../ipfstat ${.CURDIR}/../ipsend ${.CURDIR}/../ipftest
|
CPPFLAGS+=-I${.CURDIR}/../ipf -I${.CURDIR}/../ipfstat
|
||||||
|
CPPFLAGS+=-I${.CURDIR}/../ipsend -I${.CURDIR}/../ipftest
|
||||||
|
|
||||||
|
.PATH: ${.CURDIR}/../ipf ${.CURDIR}/../ipfstat
|
||||||
|
.PATH: ${.CURDIR}/../ipsend ${.CURDIR}/../ipftest
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
__eof_makefile
|
__eof_makefile
|
||||||
### end of ipresend ###############################
|
### end of ipresend ###############################
|
||||||
|
@ -259,7 +264,7 @@ cd $d/src/usr.sbin/ipf/ipsend
|
||||||
|
|
||||||
echo creating Makefile
|
echo creating Makefile
|
||||||
cat > Makefile<<'__eof_makefile'
|
cat > Makefile<<'__eof_makefile'
|
||||||
# $NetBSD: ipfilter2netbsd,v 1.22 1998/04/09 00:32:40 tv Exp $
|
# $NetBSD: ipfilter2netbsd,v 1.23 1998/05/17 16:05:39 veego Exp $
|
||||||
|
|
||||||
PROG= ipsend
|
PROG= ipsend
|
||||||
SRCS= ipsend.c ip.c ipsopt.c 44arp.c sbpf.c iplang_l.l iplang_y.y
|
SRCS= ipsend.c ip.c ipsopt.c 44arp.c sbpf.c iplang_l.l iplang_y.y
|
||||||
|
@ -287,7 +292,7 @@ cd $d/src/usr.sbin/ipf/iptest
|
||||||
|
|
||||||
echo creating Makefile
|
echo creating Makefile
|
||||||
cat > Makefile<<'__eof_makefile'
|
cat > Makefile<<'__eof_makefile'
|
||||||
# $NetBSD: ipfilter2netbsd,v 1.22 1998/04/09 00:32:40 tv Exp $
|
# $NetBSD: ipfilter2netbsd,v 1.23 1998/05/17 16:05:39 veego Exp $
|
||||||
|
|
||||||
PROG= iptest
|
PROG= iptest
|
||||||
SRCS= iptest.c iptests.c ip.c sbpf.c 44arp.c sock.c
|
SRCS= iptest.c iptests.c ip.c sbpf.c 44arp.c sock.c
|
||||||
|
@ -313,7 +318,7 @@ cd $d/src/usr.sbin/ipf/rules
|
||||||
|
|
||||||
echo creating Makefile
|
echo creating Makefile
|
||||||
cat > Makefile<<'__eof_makefile'
|
cat > Makefile<<'__eof_makefile'
|
||||||
# $NetBSD: ipfilter2netbsd,v 1.22 1998/04/09 00:32:40 tv Exp $
|
# $NetBSD: ipfilter2netbsd,v 1.23 1998/05/17 16:05:39 veego Exp $
|
||||||
|
|
||||||
FILESDIR= /usr/share/examples/ipf
|
FILESDIR= /usr/share/examples/ipf
|
||||||
MAN= mkfilters.1
|
MAN= mkfilters.1
|
||||||
|
@ -348,7 +353,7 @@ cd $d/src/sys/lkm/netinet/if_ipl
|
||||||
|
|
||||||
echo creating Makefile
|
echo creating Makefile
|
||||||
cat > Makefile<<'__eof_makefile'
|
cat > Makefile<<'__eof_makefile'
|
||||||
# $NetBSD: ipfilter2netbsd,v 1.22 1998/04/09 00:32:40 tv Exp $
|
# $NetBSD: ipfilter2netbsd,v 1.23 1998/05/17 16:05:39 veego Exp $
|
||||||
|
|
||||||
.include "../Makefile.inc"
|
.include "../Makefile.inc"
|
||||||
|
|
||||||
|
@ -376,7 +381,7 @@ find $d -name '*.[chly]' -print | while read c; do
|
||||||
< $c > /tmp/ipf2n$$ && mv /tmp/ipf2n$$ $c && echo transformed $c
|
< $c > /tmp/ipf2n$$ && mv /tmp/ipf2n$$ $c && echo transformed $c
|
||||||
sed 1q < $c | grep '\$NetBSD' || (
|
sed 1q < $c | grep '\$NetBSD' || (
|
||||||
cat <<'__eof_header'
|
cat <<'__eof_header'
|
||||||
/* $NetBSD: ipfilter2netbsd,v 1.22 1998/04/09 00:32:40 tv Exp $ */
|
/* $NetBSD: ipfilter2netbsd,v 1.23 1998/05/17 16:05:39 veego Exp $ */
|
||||||
|
|
||||||
__eof_header
|
__eof_header
|
||||||
cat $c
|
cat $c
|
||||||
|
|
Loading…
Reference in New Issue