diff options
Diffstat (limited to 'pkgsrc')
| -rw-r--r-- | pkgsrc/ChangeLog | 15 | ||||
| -rw-r--r-- | pkgsrc/Makefile.am | 4 | ||||
| -rw-r--r-- | pkgsrc/bgpd.sh.in (renamed from pkgsrc/bgpd.sh) | 8 | ||||
| -rw-r--r-- | pkgsrc/ospf6d.sh.in (renamed from pkgsrc/ospf6d.sh) | 8 | ||||
| -rw-r--r-- | pkgsrc/ospfd.sh.in (renamed from pkgsrc/ospfd.sh) | 8 | ||||
| -rw-r--r-- | pkgsrc/ripd.sh.in (renamed from pkgsrc/ripd.sh) | 8 | ||||
| -rw-r--r-- | pkgsrc/ripngd.sh.in (renamed from pkgsrc/ripngd.sh) | 8 | ||||
| -rw-r--r-- | pkgsrc/zebra.sh.in (renamed from pkgsrc/zebra.sh) | 8 |
8 files changed, 42 insertions, 25 deletions
diff --git a/pkgsrc/ChangeLog b/pkgsrc/ChangeLog new file mode 100644 index 00000000..79ade41b --- /dev/null +++ b/pkgsrc/ChangeLog @@ -0,0 +1,15 @@ +2004-08-31 Greg Troxel <gdt@poblano.ir.bbn.com> + + * Rename scripts to *.sh.in, and use autoconf-style substitution + for prefix and localstatedir. + +2004-08-31 Greg Troxel <gdt@poblano.ir.bbn.com> + + * Makefile.am: Only put pkgsrc dir in SUBDIRS if we should install + rc.d files. (Note that pkgsrc is always in DIST_SUBDIRS.) + + * configure.ac (pkgsrcdir): add new --enable-pkgsrcrcdir to give a + directory into which www.pkgsrc.org-style rc.d files are + installed. + + diff --git a/pkgsrc/Makefile.am b/pkgsrc/Makefile.am index 4db92ab4..622fbf07 100644 --- a/pkgsrc/Makefile.am +++ b/pkgsrc/Makefile.am @@ -1 +1,3 @@ -EXTRA_DIST = bgpd.sh ospf6d.sh ospfd.sh ripd.sh ripngd.sh zebra.sh +rcdir=@pkgsrcrcdir@ + +rc_SCRIPTS = bgpd.sh ospf6d.sh ospfd.sh ripd.sh ripngd.sh zebra.sh diff --git a/pkgsrc/bgpd.sh b/pkgsrc/bgpd.sh.in index b150e9f0..d234b543 100644 --- a/pkgsrc/bgpd.sh +++ b/pkgsrc/bgpd.sh.in @@ -6,7 +6,7 @@ # REQUIRE: zebra ## -PATH=/sbin:/bin:/usr/sbin:/usr/bin:@PREFIX@/sbin:@PREFIX@/bin +PATH=/sbin:/bin:/usr/sbin:/usr/bin:@prefix@/sbin:@prefix@/bin export PATH if [ -f /etc/rc.subr ] @@ -16,12 +16,12 @@ fi name="bgpd" rcvar=$name -required_files="@PKG_SYSCONFDIR@/${name}.conf" -command="@PREFIX@/sbin/${name}" +required_files="@sysconfdir@/${name}.conf" +command="@prefix@/sbin/${name}" command_args="-d" start_precmd="zebra_precmd" -socket_dir=/var/run/zebra +socket_dir=@localstatedir@ pidfile="${socket_dir}/${name}.pid" zebra_precmd() diff --git a/pkgsrc/ospf6d.sh b/pkgsrc/ospf6d.sh.in index b0088233..3fbdb81b 100644 --- a/pkgsrc/ospf6d.sh +++ b/pkgsrc/ospf6d.sh.in @@ -6,7 +6,7 @@ # REQUIRE: zebra ## -PATH=/sbin:/bin:/usr/sbin:/usr/bin:@PREFIX@/sbin:@PREFIX@/bin +PATH=/sbin:/bin:/usr/sbin:/usr/bin:@prefix@/sbin:@prefix@/bin export PATH if [ -f /etc/rc.subr ] @@ -16,12 +16,12 @@ fi name="ospf6d" rcvar=$name -required_files="@PKG_SYSCONFDIR@/${name}.conf" -command="@PREFIX@/sbin/${name}" +required_files="@sysconfdir@/${name}.conf" +command="@prefix@/sbin/${name}" command_args="-d" start_precmd="zebra_precmd" -socket_dir=/var/run/zebra +socket_dir=@localstatedir@ pidfile="${socket_dir}/${name}.pid" zebra_precmd() diff --git a/pkgsrc/ospfd.sh b/pkgsrc/ospfd.sh.in index c8522119..daa22520 100644 --- a/pkgsrc/ospfd.sh +++ b/pkgsrc/ospfd.sh.in @@ -6,7 +6,7 @@ # REQUIRE: zebra ## -PATH=/sbin:/bin:/usr/sbin:/usr/bin:@PREFIX@/sbin:@PREFIX@/bin +PATH=/sbin:/bin:/usr/sbin:/usr/bin:@prefix@/sbin:@prefix@/bin export PATH if [ -f /etc/rc.subr ] @@ -16,12 +16,12 @@ fi name="ospfd" rcvar=$name -required_files="@PKG_SYSCONFDIR@/${name}.conf" -command="@PREFIX@/sbin/${name}" +required_files="@sysconfdir@/${name}.conf" +command="@prefix@/sbin/${name}" command_args="-d" start_precmd="zebra_precmd" -socket_dir=/var/run/zebra +socket_dir=@localstatedir@ pidfile="${socket_dir}/${name}.pid" zebra_precmd() diff --git a/pkgsrc/ripd.sh b/pkgsrc/ripd.sh.in index 6ba86c4b..31575419 100644 --- a/pkgsrc/ripd.sh +++ b/pkgsrc/ripd.sh.in @@ -6,7 +6,7 @@ # REQUIRE: zebra ## -PATH=/sbin:/bin:/usr/sbin:/usr/bin:@PREFIX@/sbin:@PREFIX@/bin +PATH=/sbin:/bin:/usr/sbin:/usr/bin:@prefix@/sbin:@prefix@/bin export PATH if [ -f /etc/rc.subr ] @@ -16,12 +16,12 @@ fi name="ripd" rcvar=$name -required_files="@PKG_SYSCONFDIR@/${name}.conf" -command="@PREFIX@/sbin/${name}" +required_files="@sysconfdir@/${name}.conf" +command="@prefix@/sbin/${name}" command_args="-d" start_precmd="zebra_precmd" -socket_dir=/var/run/zebra +socket_dir=@localstatedir@ pidfile="${socket_dir}/${name}.pid" zebra_precmd() diff --git a/pkgsrc/ripngd.sh b/pkgsrc/ripngd.sh.in index ff45b4ed..d06ac90b 100644 --- a/pkgsrc/ripngd.sh +++ b/pkgsrc/ripngd.sh.in @@ -6,7 +6,7 @@ # REQUIRE: zebra ## -PATH=/sbin:/bin:/usr/sbin:/usr/bin:@PREFIX@/sbin:@PREFIX@/bin +PATH=/sbin:/bin:/usr/sbin:/usr/bin:@prefix@/sbin:@prefix@/bin export PATH if [ -f /etc/rc.subr ] @@ -16,12 +16,12 @@ fi name="ripngd" rcvar=$name -required_files="@PKG_SYSCONFDIR@/${name}.conf" -command="@PREFIX@/sbin/${name}" +required_files="@sysconfdir@/${name}.conf" +command="@prefix@/sbin/${name}" command_args="-d" start_precmd="zebra_precmd" -socket_dir=/var/run/zebra +socket_dir=@localstatedir@ pidfile="${socket_dir}/${name}.pid" zebra_precmd() diff --git a/pkgsrc/zebra.sh b/pkgsrc/zebra.sh.in index e4750f74..c2f12a78 100644 --- a/pkgsrc/zebra.sh +++ b/pkgsrc/zebra.sh.in @@ -6,7 +6,7 @@ # REQUIRE: NETWORKING ## -PATH=/sbin:/bin:/usr/sbin:/usr/bin:@PREFIX@/sbin:@PREFIX@/bin +PATH=/sbin:/bin:/usr/sbin:/usr/bin:@prefix@/sbin:@prefix@/bin export PATH if [ -f /etc/rc.subr ] @@ -16,13 +16,13 @@ fi name="zebra" rcvar=$name -required_files="@PKG_SYSCONFDIR@/${name}.conf" -command="@PREFIX@/sbin/${name}" +required_files="@sysconfdir@/${name}.conf" +command="@prefix@/sbin/${name}" command_args="-d" start_precmd="zebra_precmd" stop_postcmd="zebra_postcmd" -socket_dir=/var/run/zebra +socket_dir=@localstatedir@ pidfile="${socket_dir}/${name}.pid" zebra_precmd() |