* Antoine Jacoutot wrote:
> Hi.
>
> I propose the following patch for comms/hylafax that:
> - set the voice handling program to ${LOCALBASE}/sbin/vgetty (and not
> the hardcoded /bin/vgetty)
an even better place is ${LOCALBASE}/libexec: System daemons and
utilities (executed by other programs) (hier(7)).
> - disable the check for sysvinit scripts support which can cause the
> "make fake" stage to fail if a sysvinit startup directory exists
> (ie. /etc/init.d/)
as we don't have them generally, yes.
>
> Let me know what you think.
>
> --
> Antoine Jacoutot
> Observatoire de Paris
> SIO - Centre de calcul (Bat 15)
> 5, Place Jules Janssen
> 92195 Meudon Cedex
> Tel : +33 (0)1.45.07.71.95
> Index: hylafax//patches/patch-configure
> ===================================================================
> RCS file: /cvs/ports/comms/hylafax/patches/patch-configure,v
> retrieving revision 1.5
> diff -u -r1.5 patch-configure
> --- hylafax//patches/patch-configure 18 Mar 2006 17:19:21 -0000 1.5
> +++ hylafax//patches/patch-configure 16 Oct 2006 08:41:57 -0000
> @@ -1,6 +1,6 @@
> $OpenBSD: patch-configure,v 1.5 2006/03/18 17:19:21 naddy Exp $
> --- configure.orig Tue Oct 1 16:05:55 2002
> -+++ configure Sat Mar 18 18:13:47 2006
> ++++ configure Mon Oct 16 10:33:49 2006
> @@ -37,10 +37,10 @@
> #
> # Setup general configuration parameters.
> @@ -16,6 +16,15 @@
> DIR_LIBEXEC=$DIR_SBIN
> DIR_SPOOL=/var/spool/hylafax
> DIR_HTML=/var/httpd/htdocs/hylafax
> +@@ -59,7 +59,7 @@ DSO=auto
> + GETTY=auto
> + HTML=no
> + PS=auto
> +-SYSVINIT=auto
> ++SYSVINIT=no
> + FAXQ_SERVER=yes # init script starts faxq
> + HFAXD_SERVER=yes # init script starts hfaxd
> + HFAXD_OLD_PROTOCOL=no # don't start old protocol
> @@ -72,8 +72,8 @@ DPS=no
> GS=no
> IMP=no
> @@ -68,3 +77,31 @@
> EOF
> boom
> return 1
> +@@ -3669,17 +3669,17 @@ else
> + fi
> +
> + # vgetty support
> +-if [ -z "$PATH_VGETTY" ]; then
> +- PATH_VGETTY=`findApp vgetty /usr/libexec:/sbin:$PATH`
> +- if [ -z "$PATH_VGETTY" ]; then
> +- PATH_VGETTY=/bin/vgetty
> +- Note "WARNING, no vgetty program found to handle a voice call, using
> $PATH_VGETTY."
> +- else
> +- Note "Looks like $PATH_VGETTY is the program to exec for a voice call."
> +- fi
> +-else
> ++#if [ -z "$PATH_VGETTY" ]; then
> ++# PATH_VGETTY=`findApp vgetty /usr/libexec:/sbin:$PATH`
> ++# if [ -z "$PATH_VGETTY" ]; then
> ++ PATH_VGETTY=${LOCALBASE}/sbin/vgetty
> ++# Note "WARNING, no vgetty program found to handle a voice call, using
> $PATH_VGETTY."
> ++# else
> ++# Note "Looks like $PATH_VGETTY is the program to exec for a voice call."
> ++# fi
> ++#else
> + Note "Using $PATH_VGETTY as the program to exec for a voice call."
> +-fi
> ++#fi
> +
> + # egetty support
> + if [ -z "$PATH_EGETTY" ]; then