From cbd040847df406a618fd58b1a92f33dc424d2ffd Mon Sep 17 00:00:00 2001 From: gdt Date: Tue, 31 Aug 2004 18:16:36 +0000 Subject: 2004-08-31 Greg Troxel * Rename scripts to *.sh.in, and use autoconf-style substitution for prefix and localstatedir. --- ChangeLog | 9 +++++++++ Makefile.am | 2 +- configure.ac | 15 ++++++++++++++- pkgsrc/ChangeLog | 15 +++++++++++++++ pkgsrc/Makefile.am | 4 +++- pkgsrc/bgpd.sh | 44 ------------------------------------------ pkgsrc/bgpd.sh.in | 44 ++++++++++++++++++++++++++++++++++++++++++ pkgsrc/ospf6d.sh | 44 ------------------------------------------ pkgsrc/ospf6d.sh.in | 44 ++++++++++++++++++++++++++++++++++++++++++ pkgsrc/ospfd.sh | 44 ------------------------------------------ pkgsrc/ospfd.sh.in | 44 ++++++++++++++++++++++++++++++++++++++++++ pkgsrc/ripd.sh | 44 ------------------------------------------ pkgsrc/ripd.sh.in | 44 ++++++++++++++++++++++++++++++++++++++++++ pkgsrc/ripngd.sh | 44 ------------------------------------------ pkgsrc/ripngd.sh.in | 44 ++++++++++++++++++++++++++++++++++++++++++ pkgsrc/zebra.sh | 55 ----------------------------------------------------- pkgsrc/zebra.sh.in | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 17 files changed, 317 insertions(+), 278 deletions(-) create mode 100644 pkgsrc/ChangeLog delete mode 100644 pkgsrc/bgpd.sh create mode 100644 pkgsrc/bgpd.sh.in delete mode 100644 pkgsrc/ospf6d.sh create mode 100644 pkgsrc/ospf6d.sh.in delete mode 100644 pkgsrc/ospfd.sh create mode 100644 pkgsrc/ospfd.sh.in delete mode 100644 pkgsrc/ripd.sh create mode 100644 pkgsrc/ripd.sh.in delete mode 100644 pkgsrc/ripngd.sh create mode 100644 pkgsrc/ripngd.sh.in delete mode 100644 pkgsrc/zebra.sh create mode 100644 pkgsrc/zebra.sh.in diff --git a/ChangeLog b/ChangeLog index f3330586..4db0bddc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-08-31 Greg Troxel + + * 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. + 2004-08-19 Paul Jakma * Makefile.am: add m4 directory to EXTRA_DIST, and define diff --git a/Makefile.am b/Makefile.am index f141f573..d620c996 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in. SUBDIRS = lib @ZEBRA@ @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ \ - @ISISD@ @VTYSH@ @OSPFCLIENT@ pkgsrc redhat doc + @ISISD@ @VTYSH@ @OSPFCLIENT@ @pkgsrcdir@ redhat doc DIST_SUBDIRS = lib zebra bgpd ripd ripngd ospfd ospf6d \ isisd vtysh ospfclient doc pkgsrc redhat tests diff --git a/configure.ac b/configure.ac index df819ede..b44befa7 100755 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ ## Copyright (c) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro ## Portions Copyright (c) 2003 Paul Jakma ## -## $Id: configure.ac,v 1.61 2004/08/27 15:57:35 gdt Exp $ +## $Id: configure.ac,v 1.62 2004/08/31 18:16:36 gdt Exp $ AC_PREREQ(2.53) AC_INIT(quagga, 0.96.5, [http://bugzilla.quagga.net]) @@ -22,6 +22,17 @@ AC_ARG_ENABLE([exampledir], dnl XXX add --exampledir to autoconf standard directory list somehow AC_SUBST(exampledir) +dnl default is to match previous behavior +pkgsrcrcdir="" +pkgsrcdir="" +AC_ARG_ENABLE([pkgsrcrcdir], + AC_HELP_STRING([--enable-pkgsrcrcdir], + [specify directory for rc.d scripts]), + pkgsrcrcdir="$enableval"; pkgsrcdir="pkgsrc",) +dnl XXX add --pkgsrcrcdir to autoconf standard directory list somehow +AC_SUBST(pkgsrcdir) +AC_SUBST(pkgsrcrcdir) + dnl ----------------------------------- dnl Get hostname and other information. dnl ----------------------------------- @@ -1127,6 +1138,8 @@ AC_OUTPUT(Makefile lib/Makefile zebra/Makefile ripd/Makefile redhat/Makefile redhat/quagga.spec lib/version.h tests/Makefile + pkgsrc/bgpd.sh pkgsrc/ospf6d.sh pkgsrc/ospfd.sh + pkgsrc/ripd.sh pkgsrc/ripngd.sh pkgsrc/zebra.sh , [chmod +x vtysh/extract.pl]) 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 + + * Rename scripts to *.sh.in, and use autoconf-style substitution + for prefix and localstatedir. + +2004-08-31 Greg Troxel + + * 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 deleted file mode 100644 index b150e9f0..00000000 --- a/pkgsrc/bgpd.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# -# bgpd is part of the quagga routing beast -# -# PROVIDE: bgpd -# REQUIRE: zebra -## - -PATH=/sbin:/bin:/usr/sbin:/usr/bin:@PREFIX@/sbin:@PREFIX@/bin -export PATH - -if [ -f /etc/rc.subr ] -then - . /etc/rc.subr -fi - -name="bgpd" -rcvar=$name -required_files="@PKG_SYSCONFDIR@/${name}.conf" -command="@PREFIX@/sbin/${name}" -command_args="-d" - -start_precmd="zebra_precmd" -socket_dir=/var/run/zebra -pidfile="${socket_dir}/${name}.pid" - -zebra_precmd() -{ - rc_flags="$( - set -- $rc_flags - while [ $# -ne 0 ]; do - if [ X"$1" = X-P -o X"$1" = X-A ]; then - break - fi - shift - done - if [ $# -eq 0 ]; then - echo "-P 0" - fi - ) $rc_flags" -} - -load_rc_config $name -run_rc_command "$1" diff --git a/pkgsrc/bgpd.sh.in b/pkgsrc/bgpd.sh.in new file mode 100644 index 00000000..d234b543 --- /dev/null +++ b/pkgsrc/bgpd.sh.in @@ -0,0 +1,44 @@ +#!/bin/sh +# +# bgpd is part of the quagga routing beast +# +# PROVIDE: bgpd +# REQUIRE: zebra +## + +PATH=/sbin:/bin:/usr/sbin:/usr/bin:@prefix@/sbin:@prefix@/bin +export PATH + +if [ -f /etc/rc.subr ] +then + . /etc/rc.subr +fi + +name="bgpd" +rcvar=$name +required_files="@sysconfdir@/${name}.conf" +command="@prefix@/sbin/${name}" +command_args="-d" + +start_precmd="zebra_precmd" +socket_dir=@localstatedir@ +pidfile="${socket_dir}/${name}.pid" + +zebra_precmd() +{ + rc_flags="$( + set -- $rc_flags + while [ $# -ne 0 ]; do + if [ X"$1" = X-P -o X"$1" = X-A ]; then + break + fi + shift + done + if [ $# -eq 0 ]; then + echo "-P 0" + fi + ) $rc_flags" +} + +load_rc_config $name +run_rc_command "$1" diff --git a/pkgsrc/ospf6d.sh b/pkgsrc/ospf6d.sh deleted file mode 100644 index b0088233..00000000 --- a/pkgsrc/ospf6d.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# -# ospf6d is part of the quagga routing beast -# -# PROVIDE: ospf6d -# REQUIRE: zebra -## - -PATH=/sbin:/bin:/usr/sbin:/usr/bin:@PREFIX@/sbin:@PREFIX@/bin -export PATH - -if [ -f /etc/rc.subr ] -then - . /etc/rc.subr -fi - -name="ospf6d" -rcvar=$name -required_files="@PKG_SYSCONFDIR@/${name}.conf" -command="@PREFIX@/sbin/${name}" -command_args="-d" - -start_precmd="zebra_precmd" -socket_dir=/var/run/zebra -pidfile="${socket_dir}/${name}.pid" - -zebra_precmd() -{ - rc_flags="$( - set -- $rc_flags - while [ $# -ne 0 ]; do - if [ X"$1" = X-P -o X"$1" = X-A ]; then - break - fi - shift - done - if [ $# -eq 0 ]; then - echo "-P 0" - fi - ) $rc_flags" -} - -load_rc_config $name -run_rc_command "$1" diff --git a/pkgsrc/ospf6d.sh.in b/pkgsrc/ospf6d.sh.in new file mode 100644 index 00000000..3fbdb81b --- /dev/null +++ b/pkgsrc/ospf6d.sh.in @@ -0,0 +1,44 @@ +#!/bin/sh +# +# ospf6d is part of the quagga routing beast +# +# PROVIDE: ospf6d +# REQUIRE: zebra +## + +PATH=/sbin:/bin:/usr/sbin:/usr/bin:@prefix@/sbin:@prefix@/bin +export PATH + +if [ -f /etc/rc.subr ] +then + . /etc/rc.subr +fi + +name="ospf6d" +rcvar=$name +required_files="@sysconfdir@/${name}.conf" +command="@prefix@/sbin/${name}" +command_args="-d" + +start_precmd="zebra_precmd" +socket_dir=@localstatedir@ +pidfile="${socket_dir}/${name}.pid" + +zebra_precmd() +{ + rc_flags="$( + set -- $rc_flags + while [ $# -ne 0 ]; do + if [ X"$1" = X-P -o X"$1" = X-A ]; then + break + fi + shift + done + if [ $# -eq 0 ]; then + echo "-P 0" + fi + ) $rc_flags" +} + +load_rc_config $name +run_rc_command "$1" diff --git a/pkgsrc/ospfd.sh b/pkgsrc/ospfd.sh deleted file mode 100644 index c8522119..00000000 --- a/pkgsrc/ospfd.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# -# ospfd is part of the quagga routing beast -# -# PROVIDE: ospfd -# REQUIRE: zebra -## - -PATH=/sbin:/bin:/usr/sbin:/usr/bin:@PREFIX@/sbin:@PREFIX@/bin -export PATH - -if [ -f /etc/rc.subr ] -then - . /etc/rc.subr -fi - -name="ospfd" -rcvar=$name -required_files="@PKG_SYSCONFDIR@/${name}.conf" -command="@PREFIX@/sbin/${name}" -command_args="-d" - -start_precmd="zebra_precmd" -socket_dir=/var/run/zebra -pidfile="${socket_dir}/${name}.pid" - -zebra_precmd() -{ - rc_flags="$( - set -- $rc_flags - while [ $# -ne 0 ]; do - if [ X"$1" = X-P -o X"$1" = X-A ]; then - break - fi - shift - done - if [ $# -eq 0 ]; then - echo "-P 0" - fi - ) $rc_flags" -} - -load_rc_config $name -run_rc_command "$1" diff --git a/pkgsrc/ospfd.sh.in b/pkgsrc/ospfd.sh.in new file mode 100644 index 00000000..daa22520 --- /dev/null +++ b/pkgsrc/ospfd.sh.in @@ -0,0 +1,44 @@ +#!/bin/sh +# +# ospfd is part of the quagga routing beast +# +# PROVIDE: ospfd +# REQUIRE: zebra +## + +PATH=/sbin:/bin:/usr/sbin:/usr/bin:@prefix@/sbin:@prefix@/bin +export PATH + +if [ -f /etc/rc.subr ] +then + . /etc/rc.subr +fi + +name="ospfd" +rcvar=$name +required_files="@sysconfdir@/${name}.conf" +command="@prefix@/sbin/${name}" +command_args="-d" + +start_precmd="zebra_precmd" +socket_dir=@localstatedir@ +pidfile="${socket_dir}/${name}.pid" + +zebra_precmd() +{ + rc_flags="$( + set -- $rc_flags + while [ $# -ne 0 ]; do + if [ X"$1" = X-P -o X"$1" = X-A ]; then + break + fi + shift + done + if [ $# -eq 0 ]; then + echo "-P 0" + fi + ) $rc_flags" +} + +load_rc_config $name +run_rc_command "$1" diff --git a/pkgsrc/ripd.sh b/pkgsrc/ripd.sh deleted file mode 100644 index 6ba86c4b..00000000 --- a/pkgsrc/ripd.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# -# ripd is part of the quagga routing beast -# -# PROVIDE: ripd -# REQUIRE: zebra -## - -PATH=/sbin:/bin:/usr/sbin:/usr/bin:@PREFIX@/sbin:@PREFIX@/bin -export PATH - -if [ -f /etc/rc.subr ] -then - . /etc/rc.subr -fi - -name="ripd" -rcvar=$name -required_files="@PKG_SYSCONFDIR@/${name}.conf" -command="@PREFIX@/sbin/${name}" -command_args="-d" - -start_precmd="zebra_precmd" -socket_dir=/var/run/zebra -pidfile="${socket_dir}/${name}.pid" - -zebra_precmd() -{ - rc_flags="$( - set -- $rc_flags - while [ $# -ne 0 ]; do - if [ X"$1" = X-P -o X"$1" = X-A ]; then - break - fi - shift - done - if [ $# -eq 0 ]; then - echo "-P 0" - fi - ) $rc_flags" -} - -load_rc_config $name -run_rc_command "$1" diff --git a/pkgsrc/ripd.sh.in b/pkgsrc/ripd.sh.in new file mode 100644 index 00000000..31575419 --- /dev/null +++ b/pkgsrc/ripd.sh.in @@ -0,0 +1,44 @@ +#!/bin/sh +# +# ripd is part of the quagga routing beast +# +# PROVIDE: ripd +# REQUIRE: zebra +## + +PATH=/sbin:/bin:/usr/sbin:/usr/bin:@prefix@/sbin:@prefix@/bin +export PATH + +if [ -f /etc/rc.subr ] +then + . /etc/rc.subr +fi + +name="ripd" +rcvar=$name +required_files="@sysconfdir@/${name}.conf" +command="@prefix@/sbin/${name}" +command_args="-d" + +start_precmd="zebra_precmd" +socket_dir=@localstatedir@ +pidfile="${socket_dir}/${name}.pid" + +zebra_precmd() +{ + rc_flags="$( + set -- $rc_flags + while [ $# -ne 0 ]; do + if [ X"$1" = X-P -o X"$1" = X-A ]; then + break + fi + shift + done + if [ $# -eq 0 ]; then + echo "-P 0" + fi + ) $rc_flags" +} + +load_rc_config $name +run_rc_command "$1" diff --git a/pkgsrc/ripngd.sh b/pkgsrc/ripngd.sh deleted file mode 100644 index ff45b4ed..00000000 --- a/pkgsrc/ripngd.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# -# ripngd is part of the quagga routing beast -# -# PROVIDE: ripngd -# REQUIRE: zebra -## - -PATH=/sbin:/bin:/usr/sbin:/usr/bin:@PREFIX@/sbin:@PREFIX@/bin -export PATH - -if [ -f /etc/rc.subr ] -then - . /etc/rc.subr -fi - -name="ripngd" -rcvar=$name -required_files="@PKG_SYSCONFDIR@/${name}.conf" -command="@PREFIX@/sbin/${name}" -command_args="-d" - -start_precmd="zebra_precmd" -socket_dir=/var/run/zebra -pidfile="${socket_dir}/${name}.pid" - -zebra_precmd() -{ - rc_flags="$( - set -- $rc_flags - while [ $# -ne 0 ]; do - if [ X"$1" = X-P -o X"$1" = X-A ]; then - break - fi - shift - done - if [ $# -eq 0 ]; then - echo "-P 0" - fi - ) $rc_flags" -} - -load_rc_config $name -run_rc_command "$1" diff --git a/pkgsrc/ripngd.sh.in b/pkgsrc/ripngd.sh.in new file mode 100644 index 00000000..d06ac90b --- /dev/null +++ b/pkgsrc/ripngd.sh.in @@ -0,0 +1,44 @@ +#!/bin/sh +# +# ripngd is part of the quagga routing beast +# +# PROVIDE: ripngd +# REQUIRE: zebra +## + +PATH=/sbin:/bin:/usr/sbin:/usr/bin:@prefix@/sbin:@prefix@/bin +export PATH + +if [ -f /etc/rc.subr ] +then + . /etc/rc.subr +fi + +name="ripngd" +rcvar=$name +required_files="@sysconfdir@/${name}.conf" +command="@prefix@/sbin/${name}" +command_args="-d" + +start_precmd="zebra_precmd" +socket_dir=@localstatedir@ +pidfile="${socket_dir}/${name}.pid" + +zebra_precmd() +{ + rc_flags="$( + set -- $rc_flags + while [ $# -ne 0 ]; do + if [ X"$1" = X-P -o X"$1" = X-A ]; then + break + fi + shift + done + if [ $# -eq 0 ]; then + echo "-P 0" + fi + ) $rc_flags" +} + +load_rc_config $name +run_rc_command "$1" diff --git a/pkgsrc/zebra.sh b/pkgsrc/zebra.sh deleted file mode 100644 index e4750f74..00000000 --- a/pkgsrc/zebra.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -# -# zebra is the head of the quagga routing beast -# -# PROVIDE: zebra -# REQUIRE: NETWORKING -## - -PATH=/sbin:/bin:/usr/sbin:/usr/bin:@PREFIX@/sbin:@PREFIX@/bin -export PATH - -if [ -f /etc/rc.subr ] -then - . /etc/rc.subr -fi - -name="zebra" -rcvar=$name -required_files="@PKG_SYSCONFDIR@/${name}.conf" -command="@PREFIX@/sbin/${name}" -command_args="-d" - -start_precmd="zebra_precmd" -stop_postcmd="zebra_postcmd" -socket_dir=/var/run/zebra -pidfile="${socket_dir}/${name}.pid" - -zebra_precmd() -{ - mkdir -p "${socket_dir}" - chown quagga.quagga "${socket_dir}" - chmod 750 "${socket_dir}" - rc_flags="$( - set -- $rc_flags - while [ $# -ne 0 ]; do - if [ X"$1" = X-P -o X"$1" = X-A ]; then - break - fi - shift - done - if [ $# -eq 0 ]; then - echo "-P 0" - fi - ) $rc_flags" -} - -zebra_postcmd() -{ - if [ -d "${socketdir}" ]; then - rmdir ${socketdir} - fi -} - -load_rc_config $name -run_rc_command "$1" diff --git a/pkgsrc/zebra.sh.in b/pkgsrc/zebra.sh.in new file mode 100644 index 00000000..c2f12a78 --- /dev/null +++ b/pkgsrc/zebra.sh.in @@ -0,0 +1,55 @@ +#!/bin/sh +# +# zebra is the head of the quagga routing beast +# +# PROVIDE: zebra +# REQUIRE: NETWORKING +## + +PATH=/sbin:/bin:/usr/sbin:/usr/bin:@prefix@/sbin:@prefix@/bin +export PATH + +if [ -f /etc/rc.subr ] +then + . /etc/rc.subr +fi + +name="zebra" +rcvar=$name +required_files="@sysconfdir@/${name}.conf" +command="@prefix@/sbin/${name}" +command_args="-d" + +start_precmd="zebra_precmd" +stop_postcmd="zebra_postcmd" +socket_dir=@localstatedir@ +pidfile="${socket_dir}/${name}.pid" + +zebra_precmd() +{ + mkdir -p "${socket_dir}" + chown quagga.quagga "${socket_dir}" + chmod 750 "${socket_dir}" + rc_flags="$( + set -- $rc_flags + while [ $# -ne 0 ]; do + if [ X"$1" = X-P -o X"$1" = X-A ]; then + break + fi + shift + done + if [ $# -eq 0 ]; then + echo "-P 0" + fi + ) $rc_flags" +} + +zebra_postcmd() +{ + if [ -d "${socketdir}" ]; then + rmdir ${socketdir} + fi +} + +load_rc_config $name +run_rc_command "$1" -- cgit v1.2.1