summaryrefslogtreecommitdiff
path: root/comms/hylafax/patches
diff options
context:
space:
mode:
Diffstat (limited to 'comms/hylafax/patches')
-rw-r--r--comms/hylafax/patches/patch-ae78
-rw-r--r--comms/hylafax/patches/patch-ao84
-rw-r--r--comms/hylafax/patches/patch-ap12
-rw-r--r--comms/hylafax/patches/patch-ar16
4 files changed, 32 insertions, 158 deletions
diff --git a/comms/hylafax/patches/patch-ae b/comms/hylafax/patches/patch-ae
index faf61dfb212..1090367e14b 100644
--- a/comms/hylafax/patches/patch-ae
+++ b/comms/hylafax/patches/patch-ae
@@ -1,18 +1,20 @@
-$NetBSD: patch-ae,v 1.5 2001/07/08 13:32:15 bad Exp $
+$NetBSD: patch-ae,v 1.6 2003/06/27 12:18:12 hubertf Exp $
---- configure.orig Thu May 31 04:29:46 2001
-+++ configure Sun Jul 8 02:41:07 2001
-@@ -37,22 +37,22 @@
+--- configure.orig Tue Oct 1 16:05:55 2002
++++ configure
+@@ -37,23 +37,23 @@
#
# Setup general configuration parameters.
#
-DIR_BIN=/usr/local/bin
-DIR_SBIN=/usr/local/sbin
-DIR_LIBDATA=/usr/local/lib/fax
+-DIR_LIB=/usr/local/lib
-DIR_LIBEXEC=$DIR_SBIN
+DIR_BIN=${PREFIX}/bin
+DIR_SBIN=${PREFIX}/sbin
+DIR_LIBDATA=${PREFIX}/libdata/hylafax
++DIR_LIB=${PREFIX}/lib
+DIR_LIBEXEC=${PREFIX}/libexec
DIR_SPOOL=/var/spool/hylafax
-DIR_HTML=/var/httpd/htdocs/hylafax
@@ -33,7 +35,7 @@ $NetBSD: patch-ae,v 1.5 2001/07/08 13:32:15 bad Exp $
SYSGID=
DSO=auto
GETTY=auto
-@@ -71,8 +71,8 @@
+@@ -72,8 +72,8 @@ DPS=no
GS=no
IMP=no
UTMP=auto
@@ -44,7 +46,7 @@ $NetBSD: patch-ae,v 1.5 2001/07/08 13:32:15 bad Exp $
TIFFBIN=
LIBZ=
ZLIBINC=
-@@ -80,8 +80,8 @@
+@@ -81,8 +81,8 @@ REGEX=yes
LIBREGEX='-L${DEPTH}/regex -lregex'
REGEXINC='${DEPTH}/${TOPSRCDIR}/regex'
DBLIB=no
@@ -52,18 +54,18 @@ $NetBSD: patch-ae,v 1.5 2001/07/08 13:32:15 bad Exp $
-DBLIBINC=/usr/local/include
+LIBDB="-L${PREFIX}/lib -ldb"
+DBLIBINC=${PREFIX}/include
- CONFIG_OSFCNH=auto
- MANNUM4_5=4F
- MANNUM1_8=1M
-@@ -208,6 +208,7 @@
+ FAXD=
+ LIBFAXSERVER='libfaxserver.${DSO}'
+ LIBUTIL='${UTIL}/libfaxutil.${DSO}'
+@@ -216,6 +216,7 @@ PKG_EMAIL
PKG_VENDOR
PORT
PORTFUNCS
+PREFIX
PROTOTYPES
PSPACKAGE PS
- PWD
-@@ -271,7 +272,7 @@
+ PWDCMD
+@@ -279,7 +280,7 @@ test -d /usr/bsd && PATH=$PATH:/usr/bsd
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
@@ -72,24 +74,7 @@ $NetBSD: patch-ae,v 1.5 2001/07/08 13:32:15 bad Exp $
PATH=$PATH:$OPATH
POSIXLY_CORRECT=1; export POSIXLY_CORRECT # disable GNU extensions
-@@ -652,6 +653,7 @@
- {
- echo `(for i do
- case "$i" in
-+ -Wl*) echo "$i" ;;
- /*|-l*|-l[$]{DEPTH}/*) echo "$i" ;;
- -L|-L/*|-L[$]{DEPTH}/*) echo "$i" ;;
- -I|-I/*|-I[$]{DEPTH}/*) echo "$i" ;;
-@@ -3004,7 +3006,7 @@
- # Location of TIFF binaries
- #
- if [ -z "$TIFFBIN" ]; then
-- DIRS="/usr/local/bin /usr/contrib/bin /usr/gnu/bin /usr/bin"
-+ DIRS="${PREFIX}/bin /usr/local/bin /usr/gnu/bin /usr/bin"
- for i in $DIRS; do
- test -x $i/tiff2ps && { TIFFBIN=$i; break; }
- done
-@@ -3036,13 +3038,7 @@
+@@ -3020,13 +3021,7 @@ main()
printf("old include files: version %u\n", ZLIB_VERSION);
exit(-1);
}
@@ -103,15 +88,16 @@ $NetBSD: patch-ae,v 1.5 2001/07/08 13:32:15 bad Exp $
}
EOF
capture cat t.c
-@@ -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 @@
+@@ -3088,7 +3083,7 @@ Note "Checking TIFF support."
+ # Location of TIFF binaries
+ #
+ if [ -z "$TIFFBIN" ]; then
+- DIRS="/usr/local/bin /usr/contrib/bin /usr/gnu/bin /usr/bin"
++ DIRS="${PREFIX}/bin /usr/local/bin /usr/gnu/bin /usr/bin"
+ for i in $DIRS; do
+ test -x $i/tiff2ps && { TIFFBIN=$i; break; }
+ done
+@@ -3672,7 +3667,7 @@ fi
if [ -z "$PATH_VGETTY" ]; then
PATH_VGETTY=`findApp vgetty /usr/libexec:/sbin:$PATH`
if [ -z "$PATH_VGETTY" ]; then
@@ -120,7 +106,7 @@ $NetBSD: patch-ae,v 1.5 2001/07/08 13:32:15 bad 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."
-@@ -3616,7 +3613,7 @@
+@@ -3685,7 +3680,7 @@ fi
if [ -z "$PATH_EGETTY" ]; then
PATH_EGETTY=`findApp egetty /usr/libexec:/sbin:$PATH`
if [ -z "$PATH_EGETTY" ]; then
@@ -129,7 +115,7 @@ $NetBSD: patch-ae,v 1.5 2001/07/08 13:32:15 bad 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."
-@@ -3687,6 +3684,7 @@
+@@ -3756,6 +3751,7 @@ PickRIP()
{
if [ -z "$PATH_GSRIP" ]; then
GSLOCS="
@@ -137,7 +123,7 @@ $NetBSD: patch-ae,v 1.5 2001/07/08 13:32:15 bad Exp $
/usr/local/bin/gs
/usr/contrib/bin/gs
/usr/gnu/bin/gs
-@@ -3734,7 +3732,7 @@
+@@ -3803,7 +3799,7 @@ fax software to operate correctly. See
on building Ghostscript with the necessary TIFF driver.
EOF
@@ -146,7 +132,7 @@ $NetBSD: patch-ae,v 1.5 2001/07/08 13:32:15 bad Exp $
PATH_GSRIP=$PATH_PSRIP
fi
}
-@@ -3801,9 +3799,9 @@
+@@ -3870,9 +3866,9 @@ if [ -z "$PATH_AFM" ]; then
else
DIR_AFMS="
/usr/lib/afm
@@ -159,7 +145,7 @@ $NetBSD: patch-ae,v 1.5 2001/07/08 13:32:15 bad Exp $
/usr/share/ghostscript/fonts
/usr/gnu/lib/ghostscript/fonts
/opt/gnu/lib/ghostscript/fonts
-@@ -3823,7 +3821,7 @@
+@@ -3892,7 +3888,7 @@ if [ -z "$PATH_AFM" ]; then
fi
if [ -z "$PATH_AFM" ]; then
# put it where ghostscript normally puts things
@@ -168,7 +154,7 @@ $NetBSD: patch-ae,v 1.5 2001/07/08 13:32:15 bad Exp $
Note "WARNING, could not locate a directory with font metric information,"
Note "guessing that font metric information goes in $PATH_AFM."
else
-@@ -3842,6 +3840,7 @@
+@@ -3911,6 +3907,7 @@ fi
#
if [ -z "$DIR_MAN" ]; then
MANPATH="
@@ -176,7 +162,7 @@ $NetBSD: patch-ae,v 1.5 2001/07/08 13:32:15 bad Exp $
$MANPATH
/usr/local/man
/usr/contrib/man
-@@ -3851,7 +3850,7 @@
+@@ -3920,7 +3917,7 @@ if [ -z "$DIR_MAN" ]; then
for i in $MANPATH; do
test -d $i && { DIR_MAN=$i; break; }
done
diff --git a/comms/hylafax/patches/patch-ao b/comms/hylafax/patches/patch-ao
deleted file mode 100644
index 530c7d44fa4..00000000000
--- a/comms/hylafax/patches/patch-ao
+++ /dev/null
@@ -1,84 +0,0 @@
-$NetBSD: patch-ao,v 1.4 2001/04/23 15:06:19 abs Exp $
-
---- util/TypeRules.c++.orig Sun Jun 13 08:41:26 1999
-+++ util/TypeRules.c++
-@@ -36,6 +36,14 @@
- #include <netinet/in.h>
- }
-
-+#ifndef TRUE
-+#define TRUE 1
-+#endif
-+
-+#ifndef FALSE
-+#define FALSE 0
-+#endif
-+
- TypeRule::TypeRule() {}
- TypeRule::~TypeRule() {}
- TypeRule::TypeRule(const TypeRule& other)
-@@ -51,7 +59,7 @@
- }
-
- static const char* typeNames[] =
-- { "ascii", "string", "address", "byte", "short", "long" };
-+ { "ascii", "asciiesc", "string", "address", "byte", "short", "long" };
- static const char* opNames[] =
- { "<any>", "=", "!=", "<", "<=", ">", ">=", "&", "^", "!" };
- static const char* resultNames[] = { "tiff", "postscript", "error" };
-@@ -68,7 +76,7 @@
- );
- if (type == STRING)
- printf(" \"%s\"", value.s);
-- else if (type != ASCII) {
-+ else if (type != ASCII && type != ASCIIESC) {
- if (op == ANY)
- printf(" <any value>");
- else
-@@ -86,6 +94,7 @@
- const u_char* cp = (const u_char*) data;
- switch (type) {
- case ASCII:
-+ {
- u_int i;
- for (i = 0; i < size; i++)
- if (!isprint(cp[i]) && !isspace(cp[i])) {
-@@ -95,6 +104,19 @@
- }
- ok = true;
- goto done;
-+ }
-+ case ASCIIESC:
-+ {
-+ u_int i;
-+ for (i = 0; i < size; i++)
-+ if (!isprint(cp[i]) && !isspace(cp[i]) && cp[i] != '\033') {
-+ if (verbose)
-+ printf("failed (unprintable char %#x)\n", cp[i]);
-+ return (FALSE);
-+ }
-+ ok = TRUE;
-+ goto done;
-+ }
- case STRING:
- ok = (strncmp((const char*)(cp+off), value.s,
- fxmin((u_int) strlen(value.s), (u_int)(size-off))) == 0);
-@@ -311,6 +333,8 @@
- rule.type = TypeRule::STRING;
- else if (strncasecmp(tp, "ascii", cp-tp) == 0)
- rule.type = TypeRule::ASCII;
-+ else if (strncasecmp(tp, "asciiesc", cp-tp) == 0)
-+ rule.type = TypeRule::ASCIIESC;
- else if (strncasecmp(tp, "addr", cp-tp) == 0)
- rule.type = TypeRule::ADDR;
- else {
-@@ -321,7 +345,8 @@
- cp++;
- rule.op = TypeRule::EQ; // default is '='
- const char* vp = cp;
-- if (rule.type != TypeRule::STRING && rule.type != TypeRule::ASCII) {
-+ if (rule.type != TypeRule::STRING && rule.type != TypeRule::ASCII
-+ && rule.type != TypeRule::ASCIIESC) {
- // numeric value
- switch (*vp) {
- case '=': rule.op = TypeRule::EQ; cp++; break;
diff --git a/comms/hylafax/patches/patch-ap b/comms/hylafax/patches/patch-ap
deleted file mode 100644
index 68eb9a8d664..00000000000
--- a/comms/hylafax/patches/patch-ap
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ap,v 1.5 2001/04/23 15:06:19 abs Exp $
-
---- util/TypeRules.h.orig Sun Jun 13 08:41:26 1999
-+++ util/TypeRules.h
-@@ -130,6 +130,7 @@
- bool cont; // continuation
- enum {
- ASCII, // ascii-only string
-+ ASCIIESC, // ascii-only string + escape char (iso-2022 variants)
- STRING, // byte string
- ADDR, // address of match
- BYTE, // 8 bits
diff --git a/comms/hylafax/patches/patch-ar b/comms/hylafax/patches/patch-ar
deleted file mode 100644
index f4b1af51b5a..00000000000
--- a/comms/hylafax/patches/patch-ar
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ar,v 1.5 2001/07/08 13:32:15 bad Exp $
-
---- 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
- #
-+# Japanization (should help other iso-2022 variants too)
-+#
-+#>15 string asciiesc ps a2ps-j -l '' -p -ns -nt <%i >%o
-+#0 asciiesc x ps a2ps-j -l '' -p -ns -nt <%i >%o
-+#
- # This causes anything else with ascii-only data to be treated as text.
- #
- 0 ascii x ps %F/textfmt -B -f Courier-Bold\
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-30 08:43:44 +0000