diff options
Diffstat (limited to 'comms/hylafax/patches')
-rw-r--r-- | comms/hylafax/patches/patch-ac | 8 | ||||
-rw-r--r-- | comms/hylafax/patches/patch-ae | 64 | ||||
-rw-r--r-- | comms/hylafax/patches/patch-af | 8 | ||||
-rw-r--r-- | comms/hylafax/patches/patch-ai | 23 | ||||
-rw-r--r-- | comms/hylafax/patches/patch-an | 20 | ||||
-rw-r--r-- | comms/hylafax/patches/patch-ar | 8 |
6 files changed, 77 insertions, 54 deletions
diff --git a/comms/hylafax/patches/patch-ac b/comms/hylafax/patches/patch-ac index 028e31bfe84..0e26e6844c8 100644 --- a/comms/hylafax/patches/patch-ac +++ b/comms/hylafax/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.4 2001/04/23 15:06:13 abs Exp $ +$NetBSD: patch-ac,v 1.5 2001/07/08 13:32:15 bad Exp $ ---- config/Makefile.in.orig Fri Jun 23 08:58:41 2000 -+++ config/Makefile.in -@@ -100,6 +100,7 @@ +--- config/Makefile.in.orig Mon Jun 4 07:40:04 2001 ++++ config/Makefile.in Sun Jul 8 00:48:02 2001 +@@ -102,6 +102,7 @@ PUTSERVER=${INSTALL} -idb ${PRODUCT}.sw.server install: default ${CONFIGFILES} diff --git a/comms/hylafax/patches/patch-ae b/comms/hylafax/patches/patch-ae index b1a341d2f21..faf61dfb212 100644 --- a/comms/hylafax/patches/patch-ae +++ b/comms/hylafax/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs Exp $ +$NetBSD: patch-ae,v 1.5 2001/07/08 13:32:15 bad Exp $ ---- configure.orig Tue Feb 6 04:54:05 2001 -+++ configure -@@ -37,21 +37,19 @@ +--- configure.orig Thu May 31 04:29:46 2001 ++++ configure Sun Jul 8 02:41:07 2001 +@@ -37,22 +37,22 @@ # # Setup general configuration parameters. # @@ -14,11 +14,11 @@ $NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs Exp $ +DIR_SBIN=${PREFIX}/sbin +DIR_LIBDATA=${PREFIX}/libdata/hylafax +DIR_LIBEXEC=${PREFIX}/libexec - DIR_SPOOL=/var/spool/fax + DIR_SPOOL=/var/spool/hylafax -DIR_HTML=/var/httpd/htdocs/hylafax -DIR_CGI=/var/httpd/cgi-bin -+DIR_HTML=${PREFIX}/http/htdocs/hylafax -+DIR_CGI=${PREFIX}/http/cgi-bin ++DIR_HTML=${RPEFIX}/http/htdocs/hylafax ++DIR_CGI=${RPEFIX}/http/cgi-bin PATH_DPSRIP=$DIR_LIBEXEC/ps2fax.exe -PATH_IMPRIP=/usr/lib/print/psrip +PATH_IMPRIP=${PREFIX}/lib/print/psrip @@ -26,12 +26,14 @@ $NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs Exp $ CGIPATH=/cgi-bin DEFVRES=98 PAGESIZE="North American Letter" --FAXUID=uucp --FAXGID= - SYSUID=bin + FAXUID=uucp + FAXGID= +-SYSUID=bin ++SYSUID=root SYSGID= DSO=auto -@@ -71,8 +69,8 @@ + GETTY=auto +@@ -71,8 +71,8 @@ GS=no IMP=no UTMP=auto @@ -42,7 +44,7 @@ $NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs Exp $ TIFFBIN= LIBZ= ZLIBINC= -@@ -80,8 +78,8 @@ +@@ -80,8 +80,8 @@ LIBREGEX='-L${DEPTH}/regex -lregex' REGEXINC='${DEPTH}/${TOPSRCDIR}/regex' DBLIB=no @@ -53,15 +55,15 @@ $NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs Exp $ CONFIG_OSFCNH=auto MANNUM4_5=4F MANNUM1_8=1M -@@ -208,6 +206,7 @@ +@@ -208,6 +208,7 @@ PKG_VENDOR PORT PORTFUNCS +PREFIX + PROTOTYPES PSPACKAGE PS - REGEX - RM RMCMD -@@ -264,7 +263,7 @@ + PWD +@@ -271,7 +272,7 @@ test -d /usr/ucb && PATH=$PATH:/usr/ucb # Sun and others test -d /usr/contrib/bin && PATH=$PATH:/usr/contrib/bin # BSDi test -d /usr/5bin && PATH=/usr/5bin:$PATH:/usr/etc # Sun and others @@ -70,7 +72,7 @@ $NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs Exp $ PATH=$PATH:$OPATH POSIXLY_CORRECT=1; export POSIXLY_CORRECT # disable GNU extensions -@@ -644,6 +643,7 @@ +@@ -652,6 +653,7 @@ { echo `(for i do case "$i" in @@ -78,7 +80,7 @@ $NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs Exp $ /*|-l*|-l[$]{DEPTH}/*) echo "$i" ;; -L|-L/*|-L[$]{DEPTH}/*) echo "$i" ;; -I|-I/*|-I[$]{DEPTH}/*) echo "$i" ;; -@@ -2992,7 +2992,7 @@ +@@ -3004,7 +3006,7 @@ # Location of TIFF binaries # if [ -z "$TIFFBIN" ]; then @@ -87,7 +89,7 @@ $NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs Exp $ for i in $DIRS; do test -x $i/tiff2ps && { TIFFBIN=$i; break; } done -@@ -3024,13 +3024,7 @@ +@@ -3036,13 +3038,7 @@ printf("old include files: version %u\n", ZLIB_VERSION); exit(-1); } @@ -101,7 +103,15 @@ $NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs Exp $ } EOF capture cat t.c -@@ -3591,7 +3585,7 @@ +@@ -3517,6 +3513,7 @@ + if [ -z "$SYSGID" ]; then + case $TARGET in + *-aix*) SYSGID=sys;; ++ *netbsd*) SYSGID=wheel;; + *bsd*) SYSGID=bin;; + *-hpux*) SYSGID=bin;; + *-irix*) SYSGID=sys;; +@@ -3603,7 +3600,7 @@ if [ -z "$PATH_VGETTY" ]; then PATH_VGETTY=`findApp vgetty /usr/libexec:/sbin:$PATH` if [ -z "$PATH_VGETTY" ]; then @@ -110,7 +120,7 @@ $NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs Exp $ 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." -@@ -3604,7 +3598,7 @@ +@@ -3616,7 +3613,7 @@ if [ -z "$PATH_EGETTY" ]; then PATH_EGETTY=`findApp egetty /usr/libexec:/sbin:$PATH` if [ -z "$PATH_EGETTY" ]; then @@ -119,7 +129,7 @@ $NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs Exp $ Note "WARNING, no egetty program found, using $PATH_EGETTY." else Note "Looks like $PATH_EGETTY is the program to exec for an extern call." -@@ -3675,6 +3669,7 @@ +@@ -3687,6 +3684,7 @@ { if [ -z "$PATH_GSRIP" ]; then GSLOCS=" @@ -127,7 +137,7 @@ $NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs Exp $ /usr/local/bin/gs /usr/contrib/bin/gs /usr/gnu/bin/gs -@@ -3722,7 +3717,7 @@ +@@ -3734,7 +3732,7 @@ on building Ghostscript with the necessary TIFF driver. EOF @@ -136,7 +146,7 @@ $NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs Exp $ PATH_GSRIP=$PATH_PSRIP fi } -@@ -3789,9 +3784,9 @@ +@@ -3801,9 +3799,9 @@ else DIR_AFMS=" /usr/lib/afm @@ -149,7 +159,7 @@ $NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs Exp $ /usr/share/ghostscript/fonts /usr/gnu/lib/ghostscript/fonts /opt/gnu/lib/ghostscript/fonts -@@ -3811,7 +3806,7 @@ +@@ -3823,7 +3821,7 @@ fi if [ -z "$PATH_AFM" ]; then # put it where ghostscript normally puts things @@ -158,7 +168,7 @@ $NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs Exp $ Note "WARNING, could not locate a directory with font metric information," Note "guessing that font metric information goes in $PATH_AFM." else -@@ -3830,6 +3825,7 @@ +@@ -3842,6 +3840,7 @@ # if [ -z "$DIR_MAN" ]; then MANPATH=" @@ -166,7 +176,7 @@ $NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs Exp $ $MANPATH /usr/local/man /usr/contrib/man -@@ -3839,7 +3835,7 @@ +@@ -3851,7 +3850,7 @@ for i in $MANPATH; do test -d $i && { DIR_MAN=$i; break; } done diff --git a/comms/hylafax/patches/patch-af b/comms/hylafax/patches/patch-af index 5b7f2b03363..c6605a1e5f0 100644 --- a/comms/hylafax/patches/patch-af +++ b/comms/hylafax/patches/patch-af @@ -1,7 +1,7 @@ -$NetBSD: patch-af,v 1.4 2001/04/23 15:06:14 abs Exp $ +$NetBSD: patch-af,v 1.5 2001/07/08 13:32:15 bad Exp $ ---- defs.in.orig Sun Feb 11 03:29:06 2001 -+++ defs.in +--- defs.in.orig Thu Mar 8 07:44:17 2001 ++++ defs.in Sun Jul 8 00:48:02 2001 @@ -44,6 +44,7 @@ # to insufficient; you are better off rerunning the # configure script so that all uses are set correctly. @@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.4 2001/04/23 15:06:14 abs Exp $ SPOOL = @SPOOL@ SBIN = @SBIN@ BIN = @BIN@ -@@ -256,7 +257,7 @@ +@@ -257,7 +258,7 @@ LDOPTS = ${VLDOPTS} ${LLDOPTS} ${GLDOPTS} LDLIBS = ${VLDLIBS} ${LLDLIBS} ${GLDLIBS} diff --git a/comms/hylafax/patches/patch-ai b/comms/hylafax/patches/patch-ai index 1def3a02c8e..92b9772a6db 100644 --- a/comms/hylafax/patches/patch-ai +++ b/comms/hylafax/patches/patch-ai @@ -1,7 +1,7 @@ -$NetBSD: patch-ai,v 1.5 2001/04/23 15:06:15 abs Exp $ +$NetBSD: patch-ai,v 1.6 2001/07/08 13:32:15 bad Exp $ ---- etc/faxsetup.sh.in.orig Tue Feb 6 04:54:07 2001 -+++ etc/faxsetup.sh.in +--- etc/faxsetup.sh.in.orig Thu Jun 14 07:36:16 2001 ++++ etc/faxsetup.sh.in Sun Jul 8 01:25:48 2001 @@ -41,7 +41,9 @@ # This script interactively prepares and verifies # a HylaFAX client and/or server machine for use. @@ -37,19 +37,32 @@ $NetBSD: patch-ai,v 1.5 2001/04/23 15:06:15 abs Exp $ MKFIFO MV PATH -@@ -747,6 +751,48 @@ +@@ -747,6 +751,61 @@ bitch "Sorry, but you must run this script as the super-user!" boom fi + +createspool() +{ ++ old_spool="`dirname ${DIR_SPOOL}`/fax" ++ if [ -d "${old_spool}" ]; then ++ cat <<EOF ++================================================================= ++ ++ Found an existing ${old_spool}, probably from an older version ++ of the HylaFax package. ++ You might want to copy you customizations to @SPOOL@ after ++ faxsetup is done. ++ ++================================================================= ++EOF ++ fi + if [ -d "${DIR_SPOOL}" ]; then + cat <<EOF +================================================================= + + @SPOOL@ already exists, probably from a previous run of -+ faxsetup.sh -- I'm not touching it! ++ faxsetup -- I'm not touching it! + + If you encounter problems, deinstall the HylaFax package, + remove @SPOOL@ and reinstall the package. diff --git a/comms/hylafax/patches/patch-an b/comms/hylafax/patches/patch-an index 129ec5d8211..4629efea04f 100644 --- a/comms/hylafax/patches/patch-an +++ b/comms/hylafax/patches/patch-an @@ -1,7 +1,7 @@ -$NetBSD: patch-an,v 1.4 2001/04/23 15:06:18 abs Exp $ +$NetBSD: patch-an,v 1.5 2001/07/08 13:32:15 bad Exp $ ---- util/Makefile.in.orig Sun Sep 3 04:39:34 2000 -+++ util/Makefile.in +--- util/Makefile.in.orig Wed May 30 04:04:39 2001 ++++ util/Makefile.in Sun Jul 8 01:12:54 2001 @@ -154,7 +154,7 @@ PUTCLIENT = ${INSTALL} -idb ${PRODUCT}.sw.client PUTSERVER = ${INSTALL} -idb ${PRODUCT}.sw.server @@ -16,13 +16,13 @@ $NetBSD: patch-an,v 1.4 2001/04/23 15:06:18 abs Exp $ ${PUTSBIN} -m 755 -src recvstats.sh -O recvstats ${PUTSBIN} -m 755 -idb "config(update)" -src faxcron.sh -O faxcron + -${MKDIR} -m 755 ${LIBEXEC}/hylafax - ${PUTSUPD} -m 755 -src ${SRCDIR}/ps2fax.gs.sh -O ps2fax.gs - ${PUTSUPD} -m 755 -src ${SRCDIR}/ps2fax.dps.sh -O ps2fax.dps - ${PUTSUPD} -m 755 -src ${SRCDIR}/ps2fax.imp.sh -O ps2fax.imp -@@ -182,9 +183,11 @@ - ${PUTSUPD} -m 755 -src ${SRCDIR}/pollrcvd.sh -O pollrcvd - ${PUTSUPD} -m 755 -src ${SRCDIR}/mkcover.sh -O mkcover - ${PUTSUPD} -m 755 -src ${SRCDIR}/wedged.sh -O wedged + ${PUTSUPD} -m 755 -src ps2fax.gs.sh -O ps2fax.gs + ${PUTSUPD} -m 755 -src ps2fax.dps.sh -O ps2fax.dps + ${PUTSUPD} -m 755 -src ps2fax.imp.sh -O ps2fax.imp +@@ -183,9 +184,11 @@ + ${PUTSUPD} -m 755 -src pollrcvd.sh -O pollrcvd + ${PUTSUPD} -m 755 -src mkcover.sh -O mkcover + ${PUTSUPD} -m 755 -src wedged.sh -O wedged - ${PUTSERVER} -F ${SPOOL}/etc -m 444 -idb "config(update)" \ + -${MKDIR} -m 755 ${PREFIX}/share/hylafax + -${MKDIR} -m 755 ${PREFIX}/share/hylafax/etc_template diff --git a/comms/hylafax/patches/patch-ar b/comms/hylafax/patches/patch-ar index 4ebd4fe310b..f4b1af51b5a 100644 --- a/comms/hylafax/patches/patch-ar +++ b/comms/hylafax/patches/patch-ar @@ -1,8 +1,8 @@ -$NetBSD: patch-ar,v 1.4 2001/04/23 15:06:20 abs Exp $ +$NetBSD: patch-ar,v 1.5 2001/07/08 13:32:15 bad Exp $ ---- util/typerules.orig Mon Sep 4 06:57:44 2000 -+++ util/typerules -@@ -129,6 +129,11 @@ +--- util/typerules.orig Sun Apr 15 06:58:06 2001 ++++ util/typerules Sun Jul 8 00:48:02 2001 +@@ -134,6 +134,11 @@ >15 string ascii ps %F/textfmt -B -f Courier-Bold\ -Ml=0.4in -p 11 -s %s >%o <%i # |