]> git.ipfire.org Git - thirdparty/HylaFAX.git/commitdiff
--- hylafax/config.site
authorTim Rice <tim@multitalents.net>
Sun, 15 Oct 2000 22:21:54 +0000 (22:21 +0000)
committerTim Rice <tim@multitalents.net>
Sun, 15 Oct 2000 22:21:54 +0000 (22:21 +0000)
Added
#DIR_SYSVINIT="/etc/init.d" # location of SysV-style init script
#DIR_SYSVINITSTART="../rc2.d" # location of SysV-style start script
#DIR_SYSVINITSTOP="../rc0.d" # location of SysV-style stop script
#NAME_SYSVINITSTART="S80fax" # name of SysV-style start script
#NAME_SYSVINITSTOP="K80fax" # name of SysV-style stop script
#FAXQ_SERVER=yes # init script starts faxq
#HFAXD_SERVER=yes # init script starts hfaxd
#HFAXD_OLD_PROTOCOL=no # don't start old protocol
#HFAXD_SNPP_SERVER=no # don't start paging protocol

--- hylafax/configure

Added CONFIG_BADGETOPTPROTO=yes for sco3.2v4

Changed
sysv-*) MANSEDLOCAL=;;
to
sysv-*) MANSEDLOCAL='-e " "'
so etc/Makefile would work.

--- hylafax/etc/faxsetup.sh.in

Changes for addition of HFAXD_OLD_PROTOCOL & HFAXD_SNPP_SERVER variables.

--- hylafax/etc/hylafax.in

Corrected "# chkconfig:" line to not start HylaFAX in single user mode.
Changes for addition of HFAXD_OLD_PROTOCOL & HFAXD_SNPP_SERVER variables.

--- hylafax/html/building.html

Added descriptions for DIR_SYSVINIT, DIR_SYSVINITSTART, DIR_SYSVINITSTOP,
NAME_SYSVINITSTART, NAME_SYSVINITSTOP, FAXQ_SERVER, HFAXD_SERVER,
FAXD_OLD_PROTOCOL, & HFAXD_SNPP_SERVER configure variables.

Updated build notes for SCO, UnixWare, & Solaris.

--- hylafax/pkg/sproto.stub.in

Changes for DIR_SYSVINIT, DIR_SYSVINITSTART, DIR_SYSVINITSTOP,
NAME_SYSVINITSTART, NAME_SYSVINITSTOP, FAXQ_SERVER, HFAXD_SERVER,
FAXD_OLD_PROTOCOL, & HFAXD_SNPP_SERVER configure variables.

Fixed faxaddmodem & faxsetup lines to reflect previous changes to
etc/Makefile.in

Changed etc/hosts to etc/hosts.hfaxd to be consistent with previous changes
to the source code.

Changed Modems/K56flex.html to Modems/rockwell-56k.html to be consistent
with previous changes to the source code.

--- hylafax/pkg/cproto.stub.in

Changed man1/hylafax.1 to man1/hylafax-client.1 to be consistent
with previous changes to the source code.

--- hylafax/distrules
Added
faxd/NSF.c++
faxd/NSF.h
html/Modems/zyxel-elite.html
html/Modems/zyxel-omni.html
html/icons/contents.gif
man/faxadduser.1m
man/faxdeluser.1m
port/snprintf.c
port/vsnprintf.c
util/faxadduser.c
util/faxdeluser.c

config.site
configure
distrules
etc/Makefile.in
etc/faxsetup.sh.in
etc/hylafax.in
html/building.html
pkg/cproto.stub.in
pkg/sproto.stub.in

index 72fb7bb94ae9c1ded8d3fcb58bb58c3c6ea536a4..3a42191f3c85a843684f93650ff655a145df1435 100644 (file)
 #PATH_DPSRIP="/var/spool/fax/bin/ps2fax.exe"   # pathname of DPS-based RIP
 #PATH_IMPRIP="/usr/lib/print/psrip"    # pathname of Impressario 2.1 RIP
 #MANSCHEME="sysv-source-cat-strip"     # manual page installation scheme
-#SYSVINIT=                             # location SysV init script 
+#SYSVINIT="auto"               # install SysV-style init support (auto|yes|no)
+#DIR_SYSVINIT="/etc/init.d"    # location of SysV-style init script
+#DIR_SYSVINITSTART="../rc2.d"  # location of SysV-style start script
+#DIR_SYSVINITSTOP="../rc0.d"   # location of SysV-style stop script
+#NAME_SYSVINITSTART="S80fax"   # name of SysV-style start script
+#NAME_SYSVINITSTOP="K80fax"    # name of SysV-style stop script
+#FAXQ_SERVER=yes               # init script starts faxq
+#HFAXD_SERVER=yes              # init script starts hfaxd
+#HFAXD_OLD_PROTOCOL=no         # don't start old protocol
+#HFAXD_SNPP_SERVER=no          # don't start paging protocol
 
 # SVR4 packaging stuff
 #PKG_ARCH=                             # ARCH variable in pkginfo file
index d68087a82510db0ce4fc5f99ab0b2d1f29e3f73c..7cd2bbabe79fd1535604a53056424bc78dd6f4d5 100755 (executable)
--- a/configure
+++ b/configure
@@ -58,7 +58,11 @@ DSO=auto
 GETTY=auto
 HTML=no
 PS=auto
-SYSVINIT=
+SYSVINIT=auto
+FAXQ_SERVER=yes                        # init script starts faxq
+HFAXD_SERVER=yes               # init script starts hfaxd
+HFAXD_OLD_PROTOCOL=no          # don't start old protocol
+HFAXD_SNPP_SERVER=no           # don't start paging protocol
 SGI2FAX=auto
 PORT=auto
 LIBMALLOC=auto
@@ -79,6 +83,7 @@ DBLIB=no
 LIBDB="-L/usr/local/lib -ldb"
 DBLIBINC=/usr/local/include
 CONFIG_OSFCNH=auto
+MANSEDLOCAL='-e " "'
 
 # SVR4 packaging stuff
 PKG_ARCH=                              # ARCH variable in pkginfo file
@@ -146,6 +151,7 @@ DIST_TYPE
 ECHO
 FAXGID
 FAXUID
+FAXQ_SERVER
 FILLORDER
 FONTMAP
 FONTPATH       PATH_AFM
@@ -153,6 +159,9 @@ FUSER
 GETTY
 GREP
 GSRIP          PATH_GSRIP
+HFAXD_SERVER
+HFAXD_OLD_PROTOCOL
+HFAXD_SNPP_SERVER
 HTML
 HTMLDIR        DIR_HTML
 HTMLPATH
@@ -210,6 +219,11 @@ STRIP
 SYSGID
 SYSUID
 SYSVINIT
+SYSVINITDIR    DIR_SYSVINIT
+SYSVINITSTARTDIR       DIR_SYSVINITSTART
+SYSVINITSTARTNAME      NAME_SYSVINITSTART
+SYSVINITSTOPDIR        DIR_SYSVINITSTOP
+SYSVINITSTOPNAME       NAME_SYSVINITSTOP
 TIFFBIN
 UTMP
 UUCP_LOCKDIR   DIR_LOCKS
@@ -585,7 +599,15 @@ findFile()
 #
 findApp()
 {
-    findThing "test -x" $1 $2
+    t="$1"; app=$1; path=$2;
+    case $app in
+    /*) eval test -x $app  -a  ! -d $app  && { echo $app; return; };;
+    esac
+    IFS=:
+    for i in $path; do
+       eval  test -x $i/$app  -a  ! -d $i/$app && { echo $i/$app; return 0; }
+    done
+    return 1
 }
 
 #
@@ -1876,6 +1898,7 @@ EmitConfigurationDefinitions()
     test "$CONFIG_BADGETOPTPROTO" || {         # char* const* vs. char**
        case $TARGET in
        *-aix*)         CONFIG_BADGETOPTPROTO=yes;;
+       *-sco3.2v4.*)   CONFIG_BADGETOPTPROTO=yes;;
        *)              CONFIG_BADGETOPTPROTO=no;;
        esac
     }
@@ -3351,18 +3374,75 @@ if [ -z "$INSTALL" ]; then
     esac
 fi
 
-if [ -z "$SYSVINIT" ]; then
-    # XXX The DIRS list needs to be more comprehensive
-    DIRS="/etc/init.d /etc/rc.d/init.d /sbin/init.d"
-    for i in $DIRS; do
-       if test -d $i; then
-           SYSVINIT=$i/hylafax
-           Note "Looks like a SysV-style init is used, enabling installation of startup code."
-           break;
-       fi
+# Location SysV style init scripts
+if [ -z "$DIR_SYSVINIT" ]; then
+    DIR_SYSVINITS="
+       /etc/rc.d/init.d
+       /etc/init.d
+    "
+    case $TARGET in
+       *-sunos*)       DIR_SYSVINITS="$DIR_SYSVINITS $DIR_SBIN";;
+       *-hpux*)        DIR_SYSVINITS="/sbin/init.d $DIR_SYSVINITS";;
+       *)              ;;
+    esac
+    DIR_SYSVINIT=
+    for i in $DIR_SYSVINITS; do
+       test -d $i && { DIR_SYSVINIT=$i; break; }
     done
 fi
 
+if [ "$SYSVINIT" = auto ]; then
+    if test -d $DIR_SYSVINIT; then
+       SYSVINIT=yes
+       Note "Looks like a SysV-style init is used, enabling installation of startup code."
+    else
+       SYSVINIT=no
+    fi
+fi
+
+if [ "$SYSVINIT" = yes ]; then
+       Note "Looks like SysV init scripts go in $DIR_SYSVINIT."
+fi
+
+if [ "$SYSVINIT" = yes ]; then
+    if [ -z "$DIR_SYSVINITSTART" ]; then
+       case $TARGET in
+           *-linux*)   DIR_SYSVINITSTART="../rc2.d ../rc3.d ../rc4.d ../rc5.d";;
+           *)          DIR_SYSVINITSTART="../rc2.d";;
+       esac
+    fi
+    if [ -z "$DIR_SYSVINITSTOP" ]; then
+       case $TARGET in
+           *-linux*)   DIR_SYSVINITSTOP="../rc0.d ../rc1.d ../rc6.d";;
+           *)          DIR_SYSVINITSTOP="../rc0.d";;
+       esac
+    fi
+    if [ -z "$NAME_SYSVINITSTART" ]; then
+       case $TARGET in
+           *-hpux*)            NAME_SYSVINITSTART="S905hylafax" ;;
+           *-linux*)           NAME_SYSVINITSTART="S97hylafax" ;;
+           *-sco3.2v4*)        NAME_SYSVINITSTART="S80hylafax" ;;
+           *-sco3.2v5*)        NAME_SYSVINITSTART="S90hylafax" ;;
+           *-univel*)          NAME_SYSVINITSTART="S80hylafax" ;;
+           *sysv4.2uw2*)       NAME_SYSVINITSTART="S80hylafax" ;;
+           *-UnixWare-*)       NAME_SYSVINITSTART="S80hylafax" ;;
+           *)                  NAME_SYSVINITSTART="S80fax" ;;
+       esac
+    fi
+    if [ -z "$NAME_SYSVINITSTOP" ]; then
+       case $TARGET in
+           *-hpux*)            NAME_SYSVINITSTOP="K095hylafax" ;;
+           *-linux*)           NAME_SYSVINITSTOP="K05hylafax" ;;
+           *-sco3.2v4*)        NAME_SYSVINITSTOP="K05hylafax" ;;
+           *-sco3.2v5*)        NAME_SYSVINITSTOP="K05hylafax" ;;
+           *-univel*)          NAME_SYSVINITSTOP="K05hylafax" ;;
+           *sysv4.2uw2*)       NAME_SYSVINITSTOP="K05hylafax" ;;
+           *-UnixWare-*)       NAME_SYSVINITSTOP="K05hylafax" ;;
+           *)                  NAME_SYSVINITSTOP="K80fax" ;;
+       esac
+    fi
+fi
+
 Note "Done selecting programs."
 
 #
@@ -4045,11 +4125,11 @@ getPageSizeInfo()
     param=`grep "$pat" $1 | sed -e 's/ .*//;q'`
 }
 
-printConfig()
+printConfig1()
 {
     cat<<EOF
 
-HylaFAX configuration parameters are:
+HylaFAX configuration parameters (part 1 of 2) are:
 
 [ 1] Directory for applications:        $DIR_BIN
 [ 2] Directory for lib data files:      $DIR_LIBDATA
@@ -4065,12 +4145,33 @@ HylaFAX configuration parameters are:
 [12] Manual page installation scheme:   $MANSCHEME
 [13] Default page size:                 $PAGESIZE
 [14] Default vertical res (lpi):        $DEFVRES
-[15] Location of getty program:         $PATH_GETTY
-[16] Location of sendmail program:      $PATH_SENDMAIL
 
 EOF
 }
 
+printConfig2()
+{
+    cat<<EOF
+
+HylaFAX configuration parameters (part 2 of 2) are:
+
+[15] Location of getty program:         $PATH_GETTY
+[16] Location of voice getty program:   $PATH_VGETTY
+[17] Location of sendmail program:      $PATH_SENDMAIL
+[18] Location of TIFF tools:            $TIFFBIN
+[19] Location of SysV init scripts:    $DIR_SYSVINIT
+[20] Location of SysV start scripts:   $DIR_SYSVINITSTART
+[21] Location of SysV stop scripts:    $DIR_SYSVINITSTOP
+[22] Name of SysV start script:                $NAME_SYSVINITSTART
+[23] Name of SysV stop script:         $NAME_SYSVINITSTOP
+[24] Init script starts faxq:          $FAXQ_SERVER
+[25] Init script starts hfaxd          $HFAXD_SERVER
+[26] Start old protocol:               $HFAXD_OLD_PROTOCOL
+[27] Start paging protocol:            $HFAXD_SNPP_SERVER
+EOF
+}
+  
+
 promptForParameter()
 {
     case $1 in
@@ -4114,8 +4215,42 @@ promptForParameter()
     15)        promptForNonNullStringParameter "$PATH_GETTY" \
            "Location of getty program";                PATH_GETTY="$param"
        ;;
-    16)        promptForNonNullStringParameter "$PATH_SENDMAIL" \
+    16) promptForNonNullStringParameter "$PATH_VGETTY" \
+           "Location of vgetty program";               PATH_VGETTY="$param"
+       ;;
+    17)        promptForNonNullStringParameter "$PATH_SENDMAIL" \
            "Location of sendmail program";             PATH_SENDMAIL="$param"
+       ;;
+    18) promptForNonNullStringParameter "$TIFFBIN" \
+           "Location of TIFF tools";                   TIFFBIN="$param"
+       ;;
+    19) promptForNonNullStringParameter "$DIR_SYSVINIT" \
+           "Location of SysV init scripts";            DIR_SYSVINIT="$param"
+       ;;
+    20) promptForNonNullStringParameter "$DIR_SYSVINITSTART" \
+           "Location of SysV start scripts";           DIR_SYSVINITSTART="$param"
+       ;;
+    21) promptForNonNullStringParameter "$DIR_SYSVINITSTOP" \
+           "Location of SysV stop scripts";            DIR_SYSVINITSTOP="$param"
+       ;;
+    22) promptForNonNullStringParameter "$NAME_SYSVINITSTART" \
+           "Name of SysV start script";                NAME_SYSVINITSTART="$param"
+       ;;
+    23) promptForNonNullStringParameter "$NAME_SYSVINITSTOP" \
+           "Name of SysV stop script";                 NAME_SYSVINITSTOP="$param"
+       ;;
+    24) promptForNonNullStringParameter "$FAXQ_SERVER" \
+           "Init script starts faxq";                  FAXQ_SERVER="$param"
+       ;;
+    25) promptForNonNullStringParameter "$HFAXD_SERVER" \
+           "Init script starts hfaxd";                 HFAXD_SERVER="$param"
+       ;;
+    26) promptForNonNullStringParameter "$HFAXD_OLD_PROTOCOL" \
+           "Start old protocol";                       HFAXD_OLD_PROTOCOL="$param"
+       ;;
+    27) promptForNonNullStringParameter "$HFAXD_SNPP_SERVER" \
+           "Start paging protocol";                    HFAXD_SNPP_SERVER="$param"
+       ;;
     esac
 }
 
@@ -4128,17 +4263,42 @@ if [ $QUIET = no ]; then
     ok=skip
     while [ "$ok" != y ] && [ "$ok" != yes ]; do
        if [ "$ok" != skip ]; then
-           for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16; do
+           for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 ; do
+               promptForParameter $i;
+           done
+       fi
+       printConfig1
+       prompt "Are these ok [yes]?"; read ok
+       test -z "$ok" && ok=yes
+       case "$ok" in
+       [1-9]|1[0-5])   promptForParameter $ok;;
+       [yY]*|[nN]*)    continue;;
+       ?*)
+           echo ""
+           echo "\"y\", \"yes\", or <RETURN> accepts the displayed parameters."
+           echo "A number lets you change the numbered parameter."
+           echo ""
+           ;;
+       esac
+       ok=skip
+    done
+fi
+
+if [ $QUIET = no ]; then
+    ok=skip
+    while [ "$ok" != y ] && [ "$ok" != yes ]; do
+       if [ "$ok" != skip ]; then
+           for i in 15 16 17 18 19 20 21 22 23 24 25 26 27 ; do
                promptForParameter $i;
            done
        fi
-       printConfig
+       printConfig2
        checkForExecutable $PATH_SENDMAIL
        checkForExecutable $PATH_GETTY
        prompt "Are these ok [yes]?"; read ok
        test -z "$ok" && ok=yes
        case "$ok" in
-       [1-9]|1[0-6])   promptForParameter $ok;;
+       1[6-9]|2[0-8])  promptForParameter $ok;;
        [yY]*|[nN]*)    continue;;
        ?*)
            echo ""
@@ -4162,7 +4322,7 @@ case $MANSCHEME in
 bsd-*-strip)   MANSEDLOCAL="-e s/4F/5/g -e s/1M/8/g";;
 bsd-*)         MANSEDLOCAL="-e s/4F/5F/g -e s/1M/8C/g";;
 sysv-*-strip)  MANSEDLOCAL="-e s/4F/4/g";;
-sysv-*)                MANSEDLOCAL=;;
+sysv-*)                MANSEDLOCAL='-e " "';;
 esac
 case $MANSCHEME in
 *-source-*)    MANCVT='${MANSED} $? >$@';;
index c1625dc2786840208100d848a078e1125ea0c6c9..4d27eb913f251b042443ba1bd394a6ee14286201 100644 (file)
--- a/distrules
+++ b/distrules
@@ -43,12 +43,14 @@ PORTFILES=\
     port/setegid.c                             \
     port/seteuid.c                             \
     port/setvbuf.c                             \
+    port/snprintf.c                            \
     port/srandom.c                             \
     port/strcasecmp.c                          \
     port/strtod.c                              \
     port/strtoul.c                             \
     port/syslog.c                              \
     port/vsyslog.c                             \
+    port/vsnprintf.c                           \
     port/writev.c                              \
     port/irix/so_locations                     \
     ${NULL}
@@ -96,7 +98,9 @@ HTMLFILES=\
     html/Modems/usr-courier.html               \
     html/Modems/usr-sportster.html             \
     html/Modems/zyxel-1496.html                        \
-    html/Modems/K56flex.html                   \
+    html/Modems/zyxel-elite.html               \
+    html/Modems/zyxel-omni.html                        \
+    html/Modems/rockwell-56k.html              \
     html/Modems/multitech-2834.html            \
     html/Modems/hayes-accura288.html           \
     html/Modems/Telebit/faxcmds.html           \
@@ -188,6 +192,7 @@ HYLAFAXSRC=\
        config/class2.0                         \
        config/dsi-scout+                       \
        config/e-tech                           \
+       config/elsa-microlink-56k-basic-2.0     \
        config/everex-2496d                     \
        config/exar                             \
        config/gvc-288                          \
@@ -196,6 +201,7 @@ HYLAFAXSRC=\
        config/mt-1432                          \
        config/moto-288                         \
        config/nuvo-voyager                     \
+       config/performance-rts                  \
        config/ppi-pm14400fxmt                  \
        config/ppi-pm14400fxsa                  \
        config/rc144ac                          \
@@ -204,13 +210,16 @@ HYLAFAXSRC=\
        config/rc288dpi-1                       \
        config/rc32acl                          \
        config/rc32acl-1                        \
-       config/rockwell                         \
+       config/rockwell-k56                     \
+       config/rockwell-rc                      \
+       config/sierra                           \
        config/skel                             \
        config/telebit-qblazer                  \
        config/telebit-t3000                    \
        config/telebit-wb                       \
        config/tricom2842                       \
        config/uds-fastalk                      \
+       config/umc92144                         \
        config/usr-2.0                          \
        config/usr-rts                          \
        config/usr-xon                          \
@@ -218,7 +227,6 @@ HYLAFAXSRC=\
        config/zyxel-1496e-1                    \
        config/zyxel-1496e-2.0                  \
        config/zyxel-2864                       \
-       config/sierra                           \
     etc/Makefile.in                            \
        etc/copy.h                              \
        etc/copy.m                              \
@@ -320,7 +328,9 @@ HYLAFAXSRC=\
        util/TypeRules.h                        \
        util/UnixTransport.h                    \
        util/cvtfacility.c                      \
+       util/faxadduser.c                       \
        util/faxconfig.c                        \
+       util/faxdeluser.c                       \
        util/faxmodem.c                         \
        util/faxmsg.c                           \
        util/faxstate.c                         \
@@ -368,29 +378,6 @@ HYLAFAXSRC=\
        regex/regexec.c                         \
        regex/regfree.c                         \
        regex/utils.h                           \
-    zlib/Makefile.in                           \
-       zlib/Makefile.IRIXdso                   \
-       zlib/ChangeLog                          \
-       zlib/README                             \
-       zlib/adler32.c                          \
-       zlib/deflate.c                          \
-       zlib/deflate.h                          \
-       zlib/infblock.c                         \
-       zlib/infblock.h                         \
-       zlib/infcodes.c                         \
-       zlib/infcodes.h                         \
-       zlib/inffast.c                          \
-       zlib/inffast.h                          \
-       zlib/inflate.c                          \
-       zlib/inftrees.c                         \
-       zlib/inftrees.h                         \
-       zlib/infutil.c                          \
-       zlib/infutil.h                          \
-       zlib/trees.c                            \
-       zlib/zconf.h                            \
-       zlib/zlib.h                             \
-       zlib/zutil.c                            \
-       zlib/zutil.h                            \
     faxalter/Makefile.in                       \
        faxalter/faxalter.c++                   \
     faxcover/Makefile.in                       \
@@ -426,6 +413,8 @@ HYLAFAXSRC=\
        faxd/Modem.h                            \
        faxd/ModemConfig.h                      \
        faxd/ModemServer.h                      \
+       faxd/NSF.c++                            \
+       faxd/NSF.h                              \
        faxd/PCFFont.h                          \
        faxd/QLink.h                            \
        faxd/ServerConfig.h                     \
@@ -589,6 +578,7 @@ MANPAGES=\
        man/dialtest.1m                         \
        man/faxabort.1m                         \
        man/faxaddmodem.1m                      \
+       man/faxadduser.1m                       \
        man/faxsetup.1m                         \
        man/faxalter.1                          \
        man/faxanswer.1m                        \
@@ -596,6 +586,7 @@ MANPAGES=\
        man/faxcover.1                          \
        man/faxqclean.1m                        \
        man/faxcron.1m                          \
+       man/faxdeluser.1m                       \
        man/faxinfo.1m                          \
        man/faxq.1m                             \
        man/faxgetty.1m                         \
@@ -636,7 +627,7 @@ MANPAGES=\
        man/tsi.4f                              \
        man/tsitest.1m                          \
        man/typerules.4f                        \
-       man/xferfaxlog.4f                               \
+       man/xferfaxlog.4f                       \
        man/wedged.1m                           \
        man/xferfaxstats.1m                     \
     ${NULL}
@@ -648,6 +639,7 @@ HTMLDIST=\
     html/sam.gif                               \
     html/matthias.gif                          \
     html/hylafax.gif                           \
+    html/icons/contents.gif                    \
     html/icons/frog.gif                                \
     html/icons/next.gif                                \
     html/icons/button.excl.gif                 \
index 0e64ce0aef61a626defb2be880fa90ec7f88eae7..ad31fdd992e8e212d49aea0fa271125c9de312ac 100644 (file)
@@ -41,6 +41,12 @@ DEPTH=..
 
 SRCDIR = ${DEPTH}/${TOPSRCDIR}/etc
 VPATH  = ../@SRCDIR@/etc
+DIR_SYSVINIT   = @SYSVINITDIR@
+DIR_SYSVINITSTART      = @SYSVINITSTARTDIR@
+DIR_SYSVINITSTOP       = @SYSVINITSTOPDIR@
+MANSEDLOCAL            = @MANSEDLOCAL@
+NAME_SYSVINITSTART     = @SYSVINITSTARTNAME@
+NAME_SYSVINITSTOP      = @SYSVINITSTOPNAME@
 
 DIALRULES=dialrules \
        dialrules.sf-ba \
@@ -76,8 +82,8 @@ PUTSAMPLE     = ${PUTSERVER} -u ${FAXUSER} -g ${FAXGROUP} \
                  -idb "config(noupdate)"
 
 install: default
-       ${PUTSERVER} -F ${SBIN} -m 755 -src ${SRCDIR}/faxaddmodem -O faxaddmodem
-       ${PUTSERVER} -F ${SBIN} -m 755 -src ${SRCDIR}/faxsetup -O faxsetup
+       ${PUTSERVER} -F ${SBIN} -m 755 -src faxaddmodem -O faxaddmodem
+       ${PUTSERVER} -F ${SBIN} -m 755 -src faxsetup -O faxsetup
        for i in bsdi irix linux; do \
            ${PUTSERVER} -F ${SBIN} -m 755 \
                -src ${SRCDIR}/faxsetup.$$i -O faxsetup.$$i; \
@@ -97,9 +103,23 @@ install: default
 # System V-specific init support.
 #
 installSysVInit: hylafax
-       if [ "@SYSVINIT@" ]; then \
-           cp hylafax @SYSVINIT@; \
-           chmod 755 @SYSVINIT@; \
+       if [ "@SYSVINIT@" = yes ]; then \
+           ${PUTSERVER} -F ${DIR_SYSVINIT} -m 755 -O hylafax; \
+           echo "checking ${DIR_SYSVINITSTART} directories"; \
+           if test -n "${DIR_SYSVINITSTART}"; then \
+               for i in "${DIR_SYSVINITSTART}"; do \
+                   if test -d ${DIR_SYSVINIT}/$$i; then \
+                       ${PUTSERVER} -F ${DIR_SYSVINIT}/$$i -lns ../`basename ${DIR_SYSVINIT}`/hylafax ${NAME_SYSVINITSTART}; \
+                   fi; \
+               done; \
+           fi; \
+           if test -n "${DIR_SYSVINITSTOP}"; then \
+               for i in "${DIR_SYSVINITSTOP}"; do \
+                   if test -d ${DIR_SYSVINIT}/$$i; then \
+                       ${PUTSERVER} -F ${DIR_SYSVINIT}/$$i -lns ../`basename ${DIR_SYSVINIT}`/hylafax ${NAME_SYSVINITSTOP}; \
+                   fi; \
+               done; \
+           fi \
        else \
            ${PUTSERVER} -F ${SBIN} -m 755 hylafax; \
        fi
@@ -118,4 +138,6 @@ installClient: default
 # These targets are created during the configuration procedure.
 #
 clobberconfig:
-       -${RM} -f hylafax probemodem.sh faxaddmodem.sh faxsetup.sh
+       -${RM} -f hylafax probemodem.sh faxaddmodem.sh faxsetup.sh \
+                       faxaddmodem faxsetup
+
index e5293ec1da4a3ee34aa3140863a6e8c1698e4af0..a7f870b4f955f04efd39164ca6bdf2211183207e 100644 (file)
@@ -104,13 +104,14 @@ PATH_IMPRIP=@IMPRIP@              # pathname of IRIX Impressario RIP
 
 POSIXLY_CORRECT=1; export POSIXLY_CORRECT              # disable GNU extensions
 
-
 #
 # Location of sysv init script
 #
-SYSVINIT=@SYSVINIT@
-FAXQ_SERVER=1
-HFAXD_SERVER=1
+DIR_SYSVINIT=@SYSVINITDIR@
+FAXQ_SERVER=@FAXQ_SERVER@
+HFAXD_SERVER=@HFAXD_SERVER@
+HFAXD_OLD_PROTOCOL=@HFAXD_OLD_PROTOCOL@
+HFAXD_SNPP_SERVER=@HFAXD_SNPP_SERVER@
 
 #
 # These are the configuration parameters written to the
@@ -135,6 +136,8 @@ FUSER
 GREP
 GSRIP          PATH_GSRIP
 HFAXD_SERVER
+HFAXD_OLD_PROTOCOL
+HFAXD_SNPP_SERVER
 IMPRIP         PATH_IMPRIP
 LIBDATA                DIR_LIBDATA
 LIBEXEC                DIR_LIBEXEC
@@ -1663,9 +1666,9 @@ fi
 #
 if onServer; then
     signalINETD=no
-    if [ -f "$SYSVINIT" ]; then
+    if [ -f ${DIR_SYSVINIT}/hylafax ]; then
        # started by init at boot time
-        if [ $FAXQ_SERVER -eq 0 ]; then
+        if [ $FAXQ_SERVER = no ]; then
             cat <<EOF
 
 Warning faxq will NOT be automatically started on reboot!
@@ -1673,11 +1676,8 @@ Warning faxq will NOT be automatically started on reboot!
 EOF
             true
         fi
-    else
-        FAXQ_SERVER=0
-        HFAXD_SERVER=0
     fi
-    if [ -f $INETDCONF -a $HFAXD_SERVER -eq 0 ]; then
+    if [ -f $INETDCONF -a $HFAXD_SERVER = no ]; then
        E="hylafax      stream  tcp     nowait  $FAX    $DIR_LIBEXEC/hfaxd      hfaxd -I"
        editInetdConf()
        {
@@ -1756,7 +1756,7 @@ EOF
                isOK "$x" && editInetdConf
            fi
        fi
-    elif [ ! -f $INETDCONF -a $HFAXD_SERVER -eq 0 ]; then
+    elif [ ! -f $INETDCONF -a $HFAXD_SERVER = no ]; then
        cat<<EOF
 
 
@@ -2168,9 +2168,9 @@ EOF
     prompt "Should I restart the HylaFAX server processes [yes]?"; read x
     if isOK "$x"; then
        echo ""
-       if [ -x "$SYSVINIT" ]; then
-           echo $SYSVINIT start
-           $SYSVINIT start
+       if [ -x ${DIR_SYSVINIT}/hylafax ]; then
+           echo ${DIR_SYSVINIT}/hylafax start
+           ${DIR_SYSVINIT}/hylafax start
        else
            echo $DIR_SBIN/faxq; $DIR_SBIN/faxq
        fi
index f1dc7843c2dc737c33bba8c02bb9d42332e28b94..eeb32aea1d54e8f32fa6d2974372d047b04feb13 100755 (executable)
@@ -1,7 +1,8 @@
 #! /bin/sh
 #      $Id$
 #
-# chkconfig: 12345 97 05
+# chkconfig: 2345 97 05
+#
 # description: HylaFAX(tm) is a sophisticated enterprise-strength fax
 #              package for class 1 and 2 fax modems on unix systems.
 #              This init script is the preferred way to start HylaFAX,
@@ -63,11 +64,18 @@ EOF
 }
 . $SPOOL/etc/setup.cache
 
+# Just in case these are not in setup.cache yet
 if [ -z "$HFAXD_SERVER" ]; then
-    HFAXD_SERVER=1
+    HFAXD_SERVER=@HFAXD_SERVER@
 fi
 if [ -z "$FAXQ_SERVER" ]; then
-    FAXQ_SERVER=1
+    FAXQ_SERVER=@FAXQ_SERVER@
+fi
+if [ -z "$HFAXD_OLD_PROTOCOL" ]; then
+    HFAXD_OLD_PROTOCOL=@HFAXD_OLD_PROTOCOL@
+fi
+if [ -z "$HFAXD_SNPP_SERVER" ]; then
+    HFAXD_SNPP_SERVER=@HFAXD_SNPP_SERVER@
 fi
 
 IS_ON=/etc/chkconfig           # NB: chkconfig is IRIX- and Linux-specific
@@ -146,21 +154,34 @@ fi
 case $1 in
 'start')
        if $IS_ON fax && test -x $FAXQ; then
-           if test $FAXQ_SERVER -eq 1 ; then
+           if test $FAXQ_SERVER = yes ; then
                killall -15 faxq
            fi
-           if test $HFAXD_SERVER -eq 1 ; then
+           if test $HFAXD_SERVER = yes ; then
                killall -15 hfaxd
            fi
            printf "HylaFAX:"
-            if test $FAXQ_SERVER -eq 1 ; then
+            if test $FAXQ_SERVER = yes ; then
                $FAXQ; printf " faxq"
             fi
-            if test $HFAXD_SERVER -eq 1 ; then
-               $HFAXD -i $FAXPORT;
-               printf " hfaxd (without old protocol or SNPP support)"
-           fi
-           if test ! $FAXQ_SERVER -eq 1 -a ! $HFAXD_SERVER -eq 1 ; then
+            if test $HFAXD_SERVER = yes ; then
+               HFAXD="$HFAXD -i $FAXPORT"
+               HFAXMSG=" hfaxd"
+               if [ $HFAXD_OLD_PROTOCOL = yes ]; then
+                   HFAXD="$HFAXD -o 4557"
+                   HFAXMSG="$HFAXMSG (with old protocol"
+               else
+                   HFAXMSG="$HFAXMSG (without old protocol"
+               fi
+               if [ $HFAXD_SNPP_SERVER = yes ]; then
+                   HFAXD="$HFAXD -s $SNPPPORT"
+                   HFAXMSG="$HFAXMSG & with SNPP support)"
+               else
+                   HFAXMSG="$HFAXMSG & without SNPP support)"
+               fi
+               $HFAXD ; printf "$HFAXMSG"
+            fi
+           if test $FAXQ_SERVER != yes -a $HFAXD_SERVER != yes ; then
                printf " not started (script disabled by configure)"
            fi
            $ECHO "."
index 0f25875137730afe05abdd44e18910e7b5ea2719..f0571fb517960442ee8cef72e00184b880f45f28 100644 (file)
@@ -1188,7 +1188,7 @@ programs that implement voice-oriented capabilities.</EM>
 
 <TR>
 <TD VALIGN=top><LISTING>
-HylaFAX configuration parameters are:
+HylaFAX configuration parameters (part 1 of 2) are:
 
 [ 1] Directory for applications:        /usr/local/bin
 [ 2] Directory for lib data files:      /usr/local/lib/fax
@@ -1197,18 +1197,30 @@ HylaFAX configuration parameters are:
 [ 5] Directory for manual pages:        /usr/local/man
 [ 6] Directory for HTML documentation:  /usr/local/doc/fax
 [ 7] Directory for spooling:            /var/spool/fax
-[ 8] Directory for font metrics:        /usr/contrib/lib/flexfax/afm
-[ 9] Directory for uucp lock files:     /var/spool/uucp
-[10] Uucp lock file scheme:             binary
-[11] PostScript imager package:         gs
-[12] PostScript imager program:         /usr/contrib/bin/gs
-[13] Manual page installation scheme:   bsd-nroff-gzip-0.gz
-[14] Default page size:                 North American Letter
-[15] Default vertical res (lpi):        98
-[16] Location of getty program:         /usr/libexec/getty
-[17] Location of voice getty program:   /bin/vgetty
-[18] Location of sendmail program:      /usr/sbin/sendmail
-[19] Location of TIFF tools:            /usr/local/bin
+[ 8] Directory for uucp lock files:     /var/spool/uucp
+[ 9] Uucp lock file scheme:             binary
+[10] PostScript imager package:         gs
+[11] PostScript imager program:         /usr/contrib/bin/gs
+[12] Manual page installation scheme:   bsd-nroff-gzip-0.gz
+[13] Default page size:                 North American Letter
+[14] Default vertical res (lpi):        98
+Are these ok [yes]? 
+
+HylaFAX configuration parameters (part 2 of 2) are:
+
+[15] Location of getty program:         /usr/libexec/getty
+[16] Location of voice getty program:   /bin/vgetty
+[17] Location of sendmail program:      /usr/sbin/sendmail
+[18] Location of TIFF tools:            /usr/local/bin
+[19] Location of SysV init scripts:
+[20] Location of SysV start scripts:
+[21] Location of SysV stop scripts:
+[22] Name of SysV start script:
+[23] Name of SysV stop script:
+[24] Init script starts faxq:           yes
+[25] Init script starts hfaxd           yes
+[26] Start old protocol:                no
+[27] Start paging protocol:             no
 
 Are these ok [yes]? 
 </LISTING></TD>
@@ -1545,6 +1557,32 @@ The directory in which the HylaFAX server spooling area should be setup;
 by default this is <B>/var/spool/fax</B>.
 </TR>
 
+<TR>
+<TD VALIGN=top><TT>DIR_SYSVINIT</TT></TD>
+<TD>
+Location of SysV-style init script.
+The default is for configure to search for
+<B>/etc/rc.d/init.d then /etc/init.d</B>.
+On sunos machines configure also searches for <B>$DIR_SBIN</B>.
+On hpux machines configure first searches for <B>/sbin/init.d</B>.
+</TR>
+
+<TR>
+<TD VALIGN=top><TT>DIR_SYSVINITSTART</TT></TD>
+<TD>
+Location of SysV-style start script
+The default is <B>../rc2.d</B>.
+<br>On Linux, the default is <B>../rc2.d ../rc3.d ../rc4.d ../rc5.d</B>.
+</TR>
+
+<TR>
+<TD VALIGN=top><TT>DIR_SYSVINITSTOP</TT></TD>
+<TD>
+Location of SysV-style stop script
+The default is <B>../rc0.d</B>.
+<br>On Linux, the default is <B>../rc0.d ../rc1.d ../rc6.d</B>.
+</TR>
+
 <TR>
 <TD VALIGN=top><TT>DSODELAY</TT></TD>
 <TD>
@@ -1582,6 +1620,13 @@ The group ID to use for the fax user; by default this is
 selected according to the target system.
 </TR>
 
+<TR>
+<TD VALIGN=top><TT>FAXQ_SERVER</TT></TD>
+<TD>
+Determines if the init script should start faxq
+<br>The default is <B>yes</B>.
+</TR>
+
 <TR>
 <TD VALIGN=top><TT>FAXUID</TT></TD>
 <TD>
@@ -1610,6 +1655,27 @@ Special options to pass the C++ compiler.  If this parameter
 is set, then configure may append other options to this list.
 </TR>
 
+<TR>
+<TD VALIGN=top><TT>HFAXD_OLD_PROTOCOL</TT></TD>
+<TD>
+Determines if the init script should start the old protocol.
+<br>The default is <B>no</B>.
+</TR>
+
+<TR>
+<TD VALIGN=top><TT>HFAXD_SERVER</TT></TD>
+<TD>
+Determines if the init script should start hfaxd.
+<br>The default is <B>yes</B>.
+</TR>
+
+<TR>
+<TD VALIGN=top><TT>HFAXD_SNPP_SERVER</TT></TD>
+<TD>
+Determines if the init script should start the paging protocol.
+<br>The default is <B>no</B>.
+</TR>
+
 <TR>
 <TD VALIGN=top><TT>INSTALL</TT></TD>
 <TD>
@@ -1770,6 +1836,27 @@ or <TT>strip</TT> to force the normal ".4f" suffix to be converted to ".4"
 is specified then filenames are not converted when they are installed.
 </TR>
 
+<TR>
+<TD VALIGN=top><TT>NAME_SYSVINITSTART</TT></TD>
+<TD>
+The name of SysV-style start script.
+<br>The default is <B>S80fax</B>.
+<br>On Linux, the default is <B>S97fax</B>.
+<br>On HPUX, the default is <B>S905hylafax</B>.
+<br>SCO 3.2v4.x, and UnixWare default to <B>S80hylafax</B>.
+<br>SCO 3.2v5.x.x defaults to <B>S90hylafax</B>.
+</TR>
+
+<TR>
+<TD VALIGN=top><TT>NAME_SYSVINITSTOP</TT></TD>
+<TD>
+The name of SysV-style stop script.
+<br>The default is <B>K80fax</B>.
+<br>On Linux, the default is <B>K05fax</B>.
+<br>On HPUX, the default is <B>K095hylafax</B>.
+<br>SCO 3.2v4.x, SCO 3.2v5.x.x, and UnixWare default to <B>K05hylafax</B>.
+</TR>
+
 <TR>
 <TD VALIGN=top><TT>PAGESIZE</TT></TD>
 <TD>
@@ -1841,6 +1928,32 @@ configuration file.
 for developers to integrate voice capabilities.</EM>
 </TR>
 
+<TR>
+<TD VALIGN=top><TT>PKG_ARCH</TT></TD>
+<TD>
+SVR4 packaging stuff (make package).
+This gets assigned to the ARCH variable in pkginfo file.
+The default is for configure to assign the value of $CPU
+</TR>
+
+<TR>
+<TD VALIGN=top><TT>PKG_EMAIL</TT></TD>
+<TD>
+SVR4 packaging stuff (make package).
+The e-mail address of the maker of the package.
+Ie. PKG_EMAIL=someone@somehost.somedomain
+This gets assigned to the EMAIL variable in pkginfo file.
+</TR>
+
+<TR>
+<TD VALIGN=top><TT>PKG_VENDOR</TT></TD>
+<TD>
+SVR4 packaging stuff (make package).
+The name of the maker of the package.
+Ie. PKG_VENDOR="Your Name Here"
+This gets assigned to the VENDOR variable in pkginfo file.
+</TR>
+
 <TR>
 <TD VALIGN=top><TT>PORTFUNCS</TT></TD>
 <TD>
@@ -2114,6 +2227,45 @@ though it is not necessary.
 
 <A NAME="SCO"><H3>SCO Guidance</H3></A>
 
+These notes pertain to SCO 3.2 v5.0.4
+<P>
+One of SCO's system include files for the CC compiler
+cause compilation to fail;
+The solution is to copy <B>/usr/include/utmp.h</B> to
+the top level of the HylaFAX build tree.
+
+<P>
+These notes pertain to SCO 3.2 v5.0.2
+<P>
+One of SCO's system include files has incorrect function prototypes
+that cause compilation to fail;
+The following diff may be applied to the problematic system include file
+or one may create a patched copy of the file in a private
+<B>sys</B> directory under the top level of the HylaFAX build tree.
+
+<LISTING>
+*** /usr/include/sys/syslog.h Thu Dec 26 04:42:27 1996
+--- sys/syslog.h Fri Dec 27 17:05:11 1996
+***************
+*** 198,204 ****
+  void closelog __P((void));
+  void openlog __P((const char *, int, int));
+  int setlogmask __P((int));
+! int vsyslog __P((int, char *, va_list ));
+  __END_DECLS
+  
+  #endif /* !INKERNEL */
+--- 198,204 ----
+  void closelog __P((void));
+  void openlog __P((const char *, int, int));
+  int setlogmask __P((int));
+! int vsyslog __P((int, const char *, va_list ));
+  __END_DECLS
+  
+  #endif /* !INKERNEL */
+</LISTING>
+
+<P>
 These notes pertain to SCO 3.2 v4.2; they may also be relevant to other
 versions.
 
@@ -2216,37 +2368,7 @@ or one may create patched copies of these files in a private
   #ifdef _NO_PROTOTYPE
 </LISTING>
 
-These notes pertain to SCO 3.2 v5.0
-<P>
-One of SCO's system include files has incorrect function prototypes
-that cause compilation to fail;
-The following diff may be applied to the problematic system include file
-or one may create a patched copy of the file in a private
-<B>sys</B> directory under the top level of the HylaFAX build tree.
-
-<LISTING>
-*** /usr/include/sys/syslog.h Thu Dec 26 04:42:27 1996
---- sys/syslog.h Fri Dec 27 17:05:11 1996
-***************
-*** 198,204 ****
-  void closelog __P((void));
-  void openlog __P((const char *, int, int));
-  int setlogmask __P((int));
-! int vsyslog __P((int, char *, va_list ));
-  __END_DECLS
-  
-  #endif /* !INKERNEL */
---- 198,204 ----
-  void closelog __P((void));
-  void openlog __P((const char *, int, int));
-  int setlogmask __P((int));
-! int vsyslog __P((int, const char *, va_list ));
-  __END_DECLS
-  
-  #endif /* !INKERNEL */
-</LISTING>
-
-<A NAME="Solaris"><H3>Solaris Guidance</H3></A>
+<H3><A NAME="Solaris">Solaris Guidance</A></H3>
 
 Under (at least) Solaris 2.3
 the standard make does VPATH processing incorrectly for files
@@ -2263,6 +2385,12 @@ set to reference the location of the newer TIFF library DSO
 or the path is explicitly set with a <TT>-R</TT> flag in the
 <TT>LIBTIFF</TT> configuration parameter.
 
+<P>
+On Solaris with GCC 2.95.x you will probably have to fix your LD_LIBRARY_PATH
+to see the libstdc++ libraries.
+<br> $ export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
+<br> $ ./configure
+
 <A NAME="Ultrix"><H3>Ultrix Guidance</H3></A>
 
 [<CITE>Ed: this information comes from Tom Lislegaard.</CITE>]
@@ -2410,10 +2538,26 @@ putting new syslog functions in my libc.a. This means that I
 have not tried to build with the <B>port/syslog.c</B> support
 included with HylaFAX; though it should be equivalent).
 
-<A NAME="UnixWare"><H3>UnixWare Guidance</H3></A>
+<H3><A NAME="UnixWare">UnixWare Guidance</A></H3>
+
+<P>
+If you use the SCO Skunkware glibs package for the tiff libraries
+you will need to add the following to your config.local
+<br>LIBTIFF="-L/usr/local/lib -ltiff -ljpeg -lz -lm"
 
+<P>
+On some versions the configuration parameter
+<TT>CONFIG_SOCKARGLENTYPE</TT> needs to be set to <TT>size_t</TT>
+to force the argument type for call-by-reference parameters
+to the socket-related system calls; this should automatically be
+done by <B>configure</B>.
+
+<P>
+These notes pertain to UnixWare 2.03
+<P>
 One system include file needs to be patched to correct
-function prototypes:
+function prototypes: If you dont' want to patch the system include file,
+copy it to the hylafax top level directory and patch it there.
 
 <LISTING>
 *** /usr/include/netdb.h       Mon Dec 11 05:25:35 1995
@@ -2455,13 +2599,6 @@ function prototypes:
   extern int           endhostent(void);
 </LISTING>
 
-<P>
-On some versions the configuration parameter
-<TT>CONFIG_SOCKARGLENTYPE</TT> needs to be set to <TT>size_t</TT>
-to force the argument type for call-by-reference parameters
-to the socket-related system calls; this should automatically be
-done by <B>configure</B>.
-
 <!--FOOTER-->
 
 <P>
index 12b3f8dac8e21ae772c4b4f44cd80381ade46f4f..50aebb08284095d4d7c0f6fa6d93d89de5ebc8d7 100644 (file)
@@ -25,7 +25,7 @@ f man @MANDIR@/man1/faxcover.1=../man/cman.apps/faxcover.1 0444 @SYSUID@ @SYSGID
 f man @MANDIR@/man1/faxmail.1=../man/cman.apps/faxmail.1 0444 @SYSUID@ @SYSGID@
 f man @MANDIR@/man1/faxrm.1=../man/cman.apps/faxrm.1 0444 @SYSUID@ @SYSGID@
 f man @MANDIR@/man1/faxstat.1=../man/cman.apps/faxstat.1 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/hylafax.1=../man/cman.apps/hylafax.1 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/hylafax-client.1=../man/cman.apps/hylafax-client.1 0444 @SYSUID@ @SYSGID@
 f man @MANDIR@/man1/sendfax.1=../man/cman.apps/sendfax.1 0444 @SYSUID@ @SYSGID@
 f man @MANDIR@/man1/sendpage.1=../man/cman.apps/sendpage.1 0444 @SYSUID@ @SYSGID@
 f man @MANDIR@/man1/sgi2fax.1=../man/cman.apps/sgi2fax.1 0444 @SYSUID@ @SYSGID@
index 443f220ec0ad88a48be4e7e83a6fd44a3a8b3c7e..a9eda2c0a1bbf1670194597b91769745284decaa 100644 (file)
@@ -1,10 +1,10 @@
 d none /etc ? ? ?
-d none /etc/init.d ? ? ?
-f none /etc/init.d/hylafax=../etc/hylafax 0755 @SYSUID@ @SYSGID@
-d none /etc/rc0.d ? ? ?
-s none /etc/rc0.d/K80fax=/etc/init.d/hylafax
-d none /etc/rc2.d ? ? ?
-s none /etc/rc2.d/S80fax=/etc/init.d/hylafax
+d none @SYSVINITDIR@ ? ? ?
+f none @SYSVINITDIR@/hylafax=../etc/hylafax 0755 @SYSUID@ @SYSGID@
+d none @SYSVINITDIR@/@SYSVINITSTOPDIR@ ? ? ?
+s none @SYSVINITDIR@/@SYSVINITSTOPDIR@/@SYSVINITSTOPNAME@=@SYSVINITDIR@/hylafax
+d none @SYSVINITDIR@/@SYSVINITSTARTDIR@ ? ? ?
+s none @SYSVINITDIR@/@SYSVINITSTARTDIR@/@SYSVINITSTARTNAME@=@SYSVINITDIR@/hylafax
 d none /etc/config ? ? ?
 f none /etc/config/fax=../etc/config.fax 0644 @SYSUID@ @SYSGID@
 d none @BIN@ ? ? ?
@@ -113,8 +113,8 @@ f none @SBIN@/tsitest=../faxd/tsitest 0755 @SYSUID@ @SYSGID@
 f none @SBIN@/tagtest=../faxd/tagtest 0755 @SYSUID@ @SYSGID@
 f none @SBIN@/cqtest=../faxd/cqtest 0755 @SYSUID@ @SYSGID@
 f none @SBIN@/choptest=../faxd/choptest 0755 @SYSUID@ @SYSGID@
-f none @SBIN@/faxaddmodem=../etc/faxaddmodem.sh 0755 @SYSUID@ @SYSGID@
-f none @SBIN@/faxsetup=../etc/faxsetup.sh 0755 @SYSUID@ @SYSGID@
+f none @SBIN@/faxaddmodem=../etc/faxaddmodem 0755 @SYSUID@ @SYSGID@
+f none @SBIN@/faxsetup=../etc/faxsetup 0755 @SYSUID@ @SYSGID@
 f none @SBIN@/faxsetup.bsdi=../@SRCDIR@/etc/faxsetup.bsdi 0755 @SYSUID@ @SYSGID@
 f none @SBIN@/faxsetup.irix=../@SRCDIR@/etc/faxsetup.irix 0755 @SYSUID@ @SYSGID@
 f none @SBIN@/faxsetup.linux=../@SRCDIR@/etc/faxsetup.linux 0755 @SYSUID@ @SYSGID@
@@ -183,7 +183,7 @@ d none @SPOOL@/etc 0755 @FAXUID@ @FAXGID@
 f none @SPOOL@/etc/dpsprinter.ps=../@SRCDIR@/util/dpsprinter.ps 0444 @SYSUID@ @SYSGID@
 f none @SPOOL@/etc/cover.templ=../@SRCDIR@/util/cover.templ 0444 @SYSUID@ @SYSGID@
 f none @SPOOL@/etc/xferfaxlog=../etc/xferfaxlog 0644 @FAXUID@ @FAXGID@
-f none @SPOOL@/etc/hosts.hfaxd=../etc/hosts 0600 @FAXUID@ @FAXGID@
+f none @SPOOL@/etc/hosts.hfaxd=../etc/hosts.hfaxd 0600 @FAXUID@ @FAXGID@
 f none @SPOOL@/etc/dialrules=../@SRCDIR@/etc/dialrules 0444 @SYSUID@ @SYSGID@
 f none @SPOOL@/etc/dialrules.sf-ba=../@SRCDIR@/etc/dialrules.sf-ba 0444 @SYSUID@ @SYSGID@
 f none @SPOOL@/etc/dialrules.europe=../@SRCDIR@/etc/dialrules.europe 0444 @SYSUID@ @SYSGID@
@@ -241,6 +241,7 @@ f html @HTMLDIR@/Modems/multitech-1432.html=../@SRCDIR@/html/Modems/multitech-14
 f html @HTMLDIR@/Modems/multitech-1932.html=../@SRCDIR@/html/Modems/multitech-1932.html 0444 @SYSUID@ @SYSGID@
 f html @HTMLDIR@/Modems/nuvo-96424pfx.html=../@SRCDIR@/html/Modems/nuvo-96424pfx.html 0444 @SYSUID@ @SYSGID@
 f html @HTMLDIR@/Modems/ppi-pm14400fxmt.html=../@SRCDIR@/html/Modems/ppi-pm14400fxmt.html 0444 @SYSUID@ @SYSGID@
+f html @HTMLDIR@/Modems/rockwell-56k.html=../@SRCDIR@/html/Modems/rockwell-56k.html 0444 @SYSUID@ @SYSGID@
 f html @HTMLDIR@/Modems/supra-v32bis.html=../@SRCDIR@/html/Modems/supra-v32bis.html 0444 @SYSUID@ @SYSGID@
 f html @HTMLDIR@/Modems/telebit-t3000.html=../@SRCDIR@/html/Modems/telebit-t3000.html 0444 @SYSUID@ @SYSGID@
 f html @HTMLDIR@/Modems/twincom-144df.html=../@SRCDIR@/html/Modems/twincom-144df.html 0444 @SYSUID@ @SYSGID@
@@ -248,7 +249,6 @@ f html @HTMLDIR@/Modems/ucom-traveller96.html=../@SRCDIR@/html/Modems/ucom-trave
 f html @HTMLDIR@/Modems/usr-courier.html=../@SRCDIR@/html/Modems/usr-courier.html 0444 @SYSUID@ @SYSGID@
 f html @HTMLDIR@/Modems/usr-sportster.html=../@SRCDIR@/html/Modems/usr-sportster.html 0444 @SYSUID@ @SYSGID@
 f html @HTMLDIR@/Modems/zyxel-1496.html=../@SRCDIR@/html/Modems/zyxel-1496.html 0444 @SYSUID@ @SYSGID@
-f html @HTMLDIR@/Modems/K56flex.html=../@SRCDIR@/html/Modems/K56flex.html 0444 @SYSUID@ @SYSGID@
 f html @HTMLDIR@/Modems/multitech-2834.html=../@SRCDIR@/html/Modems/multitech-2834.html 0444 @SYSUID@ @SYSGID@
 f html @HTMLDIR@/Modems/hayes-accura288.html=../@SRCDIR@/html/Modems/hayes-accura288.html 0444 @SYSUID@ @SYSGID@
 d html @HTMLDIR@/Majordomo 0755 @SYSUID@ @SYSGID@