- Rework the port a little

PR:		ports/67218
Submitted by:	Paul Everlund <tdv94ped@cs.umu.se> (maintainer)

6 files changed, 138 insertions, 46 deletions

diff --git a/comms/hylafax/files/hylafax-faxq.sh.sample b/comms/hylafax/files/hylafax-faxq.sh.sample
new file mode 100644
index 0000000..643e834
--- /dev/null
+++ b/comms/hylafax/files/hylafax-faxq.sh.sample
@@ -0,0 +1,23 @@
+#! /bin/sh
+# hylafax faxq startup example.
+# be sure to initialize the followings:
+#   server: /usr/local/sbin/faxsetup
+#   modems: /usr/local/sbin/faxaddmodem
+#   incoming calls: /etc/ttys
+
+case "$1" in
+start)
+        if [ -x /usr/local/sbin/faxq ]; then
+                /usr/local/sbin/faxq && echo -n ' hylafax-faxq'
+        fi
+        ;;
+stop)
+        killall faxq && echo -n ' hylafax-faxq'
+        ;;
+*)
+        echo "Usage: `basename $0` {start|stop}" >&2
+        exit 64
+        ;;
+esac
+
+exit 0
diff --git a/comms/hylafax/files/hylafax-hfaxd.sh.sample b/comms/hylafax/files/hylafax-hfaxd.sh.sample
new file mode 100644
index 0000000..b24845c
--- /dev/null
+++ b/comms/hylafax/files/hylafax-hfaxd.sh.sample
@@ -0,0 +1,27 @@
+#! /bin/sh
+# hylafax hfaxd startup example.
+# be sure to initialize the followings:
+#   server........: /usr/local/sbin/faxsetup
+#   modems........: /usr/local/sbin/faxaddmodem
+#   incoming calls: /etc/ttys
+#
+# add switch to use old protocol (not recommended): -o [port]
+# add switch to use paging protocol (SNPP)........: -s [port]
+# read more about these options in 'man hfaxd'.
+
+case "$1" in
+start)
+        if [ -x /usr/local/sbin/hfaxd ]; then
+                /usr/local/sbin/hfaxd && echo -n ' hylafax-hfaxd'
+        fi
+        ;;
+stop)
+        killall hfaxd && echo -n ' hylafax-hfaxd'
+        ;;
+*)
+        echo "Usage: `basename $0` {start|stop}" >&2
+        exit 64
+        ;;
+esac
+
+exit 0
diff --git a/comms/hylafax/files/hylafax.sh.sample b/comms/hylafax/files/hylafax.sh.sample
deleted file mode 100644
index f7a0f61..0000000
--- a/comms/hylafax/files/hylafax.sh.sample
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/sh 
-# hylafax startup example. 
-# be sure to initialize the followings: 
-#   server: /usr/local/sbin/faxsetup 
-#   modems: /usr/local/sbin/faxaddmodem 
-#   incoming calls: /etc/ttys 
-
-case "$1" in
-start)
-	if [ -x /usr/local/sbin/faxq ]; then 
-		/usr/local/sbin/faxq && echo -n ' hylafax' 
-	fi
-	;;
-stop)
-	killall faxq && echo -n ' hylafax'
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	exit 64
-	;;
-esac
-
-exit 0
diff --git a/comms/hylafax/files/patch-Makefile.in b/comms/hylafax/files/patch-Makefile.in
deleted file mode 100644
index f6af939..0000000
--- a/comms/hylafax/files/patch-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile.in.orig	Mon May 27 21:22:33 2002
-+++ Makefile.in	Mon Jan 13 20:20:15 2003
-@@ -219,10 +219,8 @@
- makeClientDirs::
- 	-${INSTALL} -u ${SYSUSER} -g ${SYSGROUP} -m ${DIRMODE} \
- 	    -idb hylafax.sw.client -dir \
--	    ${BIN} ${LIBDATA} ${LIBEXEC} ${SBIN}
-+	    ${LIBDATA}
- makeServerDirs::
--	-${INSTALL} -u ${SYSUSER} -g ${SYSGROUP} -m ${DIRMODE} \
--	    -idb hylafax.sw.server -dir ${SBIN};
- 	-${INSTALL} -u ${FAXUSER} -g ${FAXGROUP} -m ${DIRMODE} \
- 	    -idb hylafax.sw.server -dir ${SPOOL}
- 	-${INSTALL} -u ${FAXUSER} -g ${FAXGROUP} -m ${DIRMODE} \
diff --git a/comms/hylafax/files/patch-configure b/comms/hylafax/files/patch-configure
index ec410d8..59dc20e 100644
--- a/comms/hylafax/files/patch-configure
+++ b/comms/hylafax/files/patch-configure
@@ -1,13 +1,92 @@
-$FreeBSD$
-
---- configure.orig	Wed May 30 19:29:46 2001
-+++ configure	Mon Apr  8 22:28:59 2002
-@@ -2584,7 +2584,7 @@
+--- configure.orig	Mon May 24 15:24:35 2004
++++ configure	Mon May 24 17:44:28 2004
+@@ -43,8 +43,8 @@
+ DIR_LIB=/usr/local/lib
+ DIR_LIBEXEC=$DIR_SBIN
+ DIR_SPOOL=/var/spool/hylafax
+-DIR_HTML=/var/httpd/htdocs/hylafax
+-DIR_CGI=/var/httpd/cgi-bin
++DIR_HTML=/usr/local/share/doc/hylafax
++DIR_CGI=/usr/local/share/doc/hylafax/cgi-bin
+ PATH_DPSRIP=$DIR_LIBEXEC/ps2fax.exe
+ PATH_IMPRIP=/usr/lib/print/psrip
+ HTMLPATH=/hylafax
+@@ -52,9 +52,9 @@
+ DEFVRES=98
+ PAGESIZE="North American Letter"
+ FAXUID=uucp
+-FAXGID=
+-SYSUID=bin
+-SYSGID=
++FAXGID=dialer
++SYSUID=root
++SYSGID=wheel
+ DSO=auto
+ GETTY=auto
+ HTML=no
+@@ -2604,7 +2604,7 @@
      }
      CheckFuncDecl unlink 'extern int unlink(const char*);' unistd.h
      CheckFuncDecl read 'extern int read(int, const void*, unsigned int);' unistd.h
 -    CheckFuncDecl ioctl 'extern int ioctl(int, int, ...);' unistd.h sys/ioctl.h
-+#    CheckFuncDecl ioctl 'extern int ioctl(int, int, ...);' unistd.h sys/ioctl.h
++    CheckFuncDecl ioctl 'extern int ioctl(int, unsigned long, ...);' sys/ioccom.h
      CheckForFunc fchown && {
  	echo '#define HAS_FCHOWN 1'
  	Note "... configure use of fchown"
+@@ -4245,18 +4245,8 @@
+ 
+ HylaFAX configuration parameters (part 1 of 2) are:
+ 
+-[ 1] Directory for applications:        $DIR_BIN
+-[ 2] Directory for lib data files:      $DIR_LIBDATA
+-[ 3] Directory for lib executables:     $DIR_LIBEXEC
+-[ 4] Directory for system apps:  	$DIR_SBIN
+-[ 5] Directory for manual pages:        $DIR_MAN
+-[ 6] Directory for HTML documentation:  $DIR_HTML
+-[ 7] Directory for spooling:            $DIR_SPOOL
+-[ 8] Directory for uucp lock files:     $DIR_LOCKS
+-[ 9] Uucp lock file scheme:             $LOCKS
+ [10] PostScript imager package:         $PS
+ [11] PostScript imager program:         $PATH_PSRIP
+-[12] Manual page installation scheme:   $MANSCHEME
+ [13] Default page size:                 $PAGESIZE
+ [14] Default vertical res (lpi):        $DEFVRES
+ 
+@@ -4272,16 +4262,9 @@
+ [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
++[26] Use old protocol:			$HFAXD_OLD_PROTOCOL
++[27] Use paging protocol:		$HFAXD_SNPP_SERVER
++
+ EOF
+ }
+   
+@@ -4382,7 +4365,7 @@
+     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 ; do
++	    for i in 10 11 13 14 ; do
+ 		promptForParameter $i;
+ 	    done
+ 	fi
+@@ -4411,7 +4394,7 @@
+     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
++	    for i in 15 16 17 26 27 ; do
+ 		promptForParameter $i;
+ 	    done
+ 	fi
diff --git a/comms/hylafax/files/patch-util::faxrcvd.sh.in b/comms/hylafax/files/patch-util::faxrcvd.sh.in
index 224331f..6a3fdf4 100644
--- a/comms/hylafax/files/patch-util::faxrcvd.sh.in
+++ b/comms/hylafax/files/patch-util::faxrcvd.sh.in
@@ -1,10 +1,10 @@
---- util/faxrcvd.sh.in.orig	Sun Sep 28 15:54:52 2003
-+++ util/faxrcvd.sh.in	Sun Sep 28 15:56:06 2003
+--- util/faxrcvd.sh.in.orig	Sun May 23 15:47:38 2004
++++ util/faxrcvd.sh.in	Sun May 23 15:48:12 2004
 @@ -51,6 +51,7 @@
  }
  . etc/setup.cache
  
-+export PATH=$PATH:%%LOCALBASE%%/bin
++export PATH=$PATH:$BIN
  INFO=$SBIN/faxinfo
  FAX2PS=$TIFFBIN/fax2ps
  MIMENCODE=mimencode