Update spamassassin to 2.55

Many small changes since 2.53, but difficult to pick out anything significant.

13 files changed, 184 insertions, 198 deletions

diff --git a/mail/spamassassin/MESSAGE b/mail/spamassassin/MESSAGE
index d65ee2d3ee7..fd2b3b719d9 100644
--- a/mail/spamassassin/MESSAGE
+++ b/mail/spamassassin/MESSAGE
@@ -1,9 +1,9 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2003/04/15 00:02:24 heinz Exp $
+$NetBSD: MESSAGE,v 1.5 2003/05/22 11:41:02 abs Exp $
 
 ***IMPORTANT***
 
-  Version 2.53 changes the default tagging behavior. SpamAssassin will now
+  Version 2.53 changed the default tagging behavior. SpamAssassin will now
   create a new report message and attach the original spam message as a
   MIME part (use the "report_safe" option to change this).
 
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 727d13ee01f..a0a1607ab15 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2003/04/15 00:35:25 heinz Exp $
+# $NetBSD: Makefile,v 1.21 2003/05/22 11:41:02 abs Exp $
 
-DISTNAME=	Mail-SpamAssassin-2.53
-PKGNAME=	spamassassin-2.53
+DISTNAME=	Mail-SpamAssassin-2.55
+PKGNAME=	spamassassin-2.55
 PKGREVISION=	# empty
 SVR4_PKGNAME=	sa
 CATEGORIES=	mail
diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo
index 691a6628dcc..1b319922d1d 100644
--- a/mail/spamassassin/distinfo
+++ b/mail/spamassassin/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.13 2003/04/15 00:02:24 heinz Exp $
+$NetBSD: distinfo,v 1.14 2003/05/22 11:41:02 abs Exp $
 
-SHA1 (Mail-SpamAssassin-2.53.tar.gz) = 568d8c05cea13c1daa0be9ba2cfcd99f60e660b8
-Size (Mail-SpamAssassin-2.53.tar.gz) = 700518 bytes
-SHA1 (patch-ab) = 0283d2c289d933ee165648d15f70a6a05a7bfddf
-SHA1 (patch-ae) = 97f9691c71d35274a21dc5710e5cfb273ecb0f63
-SHA1 (patch-aj) = a0e1f3d04d17ef7010214e9af4036c94c040a42e
-SHA1 (patch-ak) = 39dee2951b24b26f12150cd12efc3eee9c1ed569
-SHA1 (patch-al) = fe02e20d8c3fec4dad2e70daad1d6fa5bd25cab6
-SHA1 (patch-am) = 92c0263112b8d164d306b1563ad3d4e2a6d118c2
-SHA1 (patch-an) = 1da8574e8cb74d0bec2918d61967fa236436f3eb
-SHA1 (patch-ao) = ea46624d614412f5eb259282f5ef6ff5f1229d95
+SHA1 (Mail-SpamAssassin-2.55.tar.gz) = 35aa4f2264694b656154ed5732e4ffecde08c76a
+Size (Mail-SpamAssassin-2.55.tar.gz) = 700610 bytes
+SHA1 (patch-aa) = e952d36e1ff2963ff1d3240a1bc64df9cc7701d0
+SHA1 (patch-ab) = cec0052f7e3628fea466fe3b3d3bd5035d858598
+SHA1 (patch-ac) = 140bee9b6699e9685436b7e621f965937917587b
+SHA1 (patch-ad) = 055d499f89bd5ec7f5c86ce5884c8192df6085f8
+SHA1 (patch-ae) = d0f709a8c664481023be93a874afa4033ed4736c
+SHA1 (patch-af) = 1c7a1c1490515c8d9c34c8dfddc3b11d87f4c700
+SHA1 (patch-ag) = 89d0459d2234ed9333ef2e1a31a619a184250f29
diff --git a/mail/spamassassin/patches/patch-aa b/mail/spamassassin/patches/patch-aa
new file mode 100644
index 00000000000..42c7bf5e267
--- /dev/null
+++ b/mail/spamassassin/patches/patch-aa
@@ -0,0 +1,26 @@
+$NetBSD: patch-aa,v 1.6 2003/05/22 11:41:03 abs Exp $
+
+--- Makefile.PL.orig	2003-05-20 07:06:16.000000000 +0100
++++ Makefile.PL
+@@ -337,16 +337,17 @@ binaries.mk: configure
+ 	./configure
+ 
+ inst_cfs: $(PKG_LOCAL_RULES_DIR) $(PKG_LOCAL_RULES_DIR)/local.cf
+-	$(MKPATH) $(PKG_DEF_RULES_DIR)
++	$(BSD_INSTALL_DATA_DIR) $(PKG_DEF_RULES_DIR)
+ 	$(RM_RF) $(PKG_DEF_RULES_DIR)/*
+ 	$(PERL) build/preprocessor $(FIXVARS) -Irules -O$(PKG_DEF_RULES_DIR) $(RULES)
+-	$(CHMOD) $(PERM_RWX) $(PKG_DEF_RULES_DIR)
++	@ \# $(CHMOD) $(PERM_RWX) $(PKG_DEF_RULES_DIR)
+ 
+ $(PKG_LOCAL_RULES_DIR):
+-	$(MKPATH) $@
++	$(BSD_INSTALL_DATA_DIR) $@
+ 
+ $(PKG_LOCAL_RULES_DIR)/local.cf: rules/local.cf
+-	$(PERL) -e "use File::Copy; (-f '$@') or copy ('$?', '$@');"
++	@ \# manage local.cf through pkgsrc .mk files
++	@ \# $(PERL) -e "use File::Copy; (-f '$@') or copy ('$?', '$@');"
+ 
+ text_html_doc: made-doc-stamp
+ 	$(NOOP)
diff --git a/mail/spamassassin/patches/patch-ab b/mail/spamassassin/patches/patch-ab
index f665d904b42..14bd6649442 100644
--- a/mail/spamassassin/patches/patch-ab
+++ b/mail/spamassassin/patches/patch-ab
@@ -1,26 +1,26 @@
-$NetBSD: patch-ab,v 1.3 2003/04/15 00:02:25 heinz Exp $
+$NetBSD: patch-ab,v 1.4 2003/05/22 11:41:03 abs Exp $
 
---- Makefile.PL.orig	Sun Mar 30 03:55:30 2003
-+++ Makefile.PL
-@@ -334,16 +334,17 @@
- 	./configure
+--- binaries.mk.in.orig	2002-12-19 13:19:08.000000000 +0000
++++ binaries.mk.in
+@@ -4,6 +4,7 @@ CFLAGS = @CFLAGS@
+ CCDLFLAGS = @CCDLFLAGS@
  
- inst_cfs: $(PKG_LOCAL_RULES_DIR) $(PKG_LOCAL_RULES_DIR)/local.cf
--	$(MKPATH) $(PKG_DEF_RULES_DIR)
-+	$(BSD_INSTALL_DATA_DIR) $(PKG_DEF_RULES_DIR)
- 	$(RM_RF) $(PKG_DEF_RULES_DIR)/*
- 	$(PERL) build/preprocessor $(FIXVARS) -Irules -O$(PKG_DEF_RULES_DIR) $(RULES)
--	$(CHMOD) $(PERM_RWX) $(PKG_DEF_RULES_DIR)
-+	@ \# $(CHMOD) $(PERM_RWX) $(PKG_DEF_RULES_DIR)
+ LIBS = @LIBS@
++SSLLIBS = @SSLLIBS@
+ LDFLAGS = @LDFLAGS@
+ LDDLFLAGS = @LDDLFLAGS@
  
- $(PKG_LOCAL_RULES_DIR):
--	$(MKPATH) $@
-+	$(BSD_INSTALL_DATA_DIR) $@
+@@ -33,11 +34,11 @@ spamd/libspamc$(SHLIBEXT): $(LIBSPAMC_FI
  
- $(PKG_LOCAL_RULES_DIR)/local.cf: rules/local.cf
--	$(PERL) -e "use File::Copy; (-f '$@') or copy ('$?', '$@');"
-+	@ \# manage local.cf through pkgsrc .mk files
-+	@ \# $(PERL) -e "use File::Copy; (-f '$@') or copy ('$?', '$@');"
+ spamd/sslspamc$(EXE_EXT): $(SPAMC_FILES) $(LIBSPAMC_FILES)
+ 	$(CC) $(SSLCFLAGS) $(CFLAGS) $(SPAMC_FILES) $(LIBSPAMC_FILES) \
+-		-o $@ $(LDFLAGS) $(LIBS)
++		-o $@ $(LDFLAGS) $(SSLLIBS) $(LIBS)
  
- text_html_doc: made-doc-stamp
- 	$(NOOP)
+ spamd/libsslspamc$(SHLIBEXT): $(LIBSPAMC_FILES)
+ 	$(CC) $(SSLCFLAGS) $(CCDLFLAGS) $(LIBSPAMC_FILES) \
+-		-o $@ $(LDDLFLAGS) $(LIBS)
++		-o $@ $(LDDLFLAGS) $(SSLLIBS) $(LIBS)
+ 
+ qmail/qmail-spamc: $(QMAIL_SPAMC_FILES)
+ 	$(CC) $(CFLAGS) $(QMAIL_SPAMC_FILES) \
diff --git a/mail/spamassassin/patches/patch-an b/mail/spamassassin/patches/patch-ac
index 27ccd10bbf7..e5f0aa93879 100644
--- a/mail/spamassassin/patches/patch-an
+++ b/mail/spamassassin/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-an,v 1.1 2003/04/15 00:02:26 heinz Exp $
+$NetBSD: patch-ac,v 1.4 2003/05/22 11:41:03 abs Exp $
 
---- configure.in.orig	Fri Mar 28 22:25:56 2003
+--- configure.in.orig	2003-03-28 21:25:56.000000000 +0000
 +++ configure.in
 @@ -1,4 +1,9 @@
  AC_INIT
@@ -12,7 +12,7 @@ $NetBSD: patch-an,v 1.1 2003/04/15 00:02:26 heinz Exp $
  AC_CONFIG_SRCDIR([Makefile.PL])
  AC_CONFIG_HEADER(config.h)
  
-@@ -41,8 +46,12 @@
+@@ -41,8 +46,12 @@ fi
  dnl ----------------------------------------------------------------------
  
  AC_CHECK_LIB(socket, socket)
@@ -27,7 +27,7 @@ $NetBSD: patch-an,v 1.1 2003/04/15 00:02:26 heinz Exp $
  AC_CHECK_LIB(inet, connect)
  AC_CHECK_LIB(nsl, t_accept)
  AC_CHECK_LIB(dl, dlopen)
-@@ -125,6 +134,7 @@
+@@ -125,6 +134,7 @@ dnl ------------------------------------
  # we cheat, since we *know* we have Perl installed ;)
  CCDLFLAGS=`perl -e 'use Config; print $Config::Config{ccdlflags}'`
  LDDLFLAGS=`perl -e 'use Config; print $Config::Config{lddlflags}'`
diff --git a/mail/spamassassin/patches/patch-ao b/mail/spamassassin/patches/patch-ad
index 6c81aa956cf..3481174fc7a 100644
--- a/mail/spamassassin/patches/patch-ao
+++ b/mail/spamassassin/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
+$NetBSD: patch-ad,v 1.5 2003/05/22 11:41:03 abs Exp $
 
---- configure.orig	Fri Mar 28 22:25:56 2003
+--- configure.orig	2003-03-28 21:25:56.000000000 +0000
 +++ configure
 @@ -1,19 +1,11 @@
  #! /bin/sh
@@ -23,7 +23,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  ## --------------------- ##
  ## M4sh Initialization.  ##
  ## --------------------- ##
-@@ -22,11 +14,13 @@
+@@ -22,11 +14,13 @@ fi
  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
    emulate sh
    NULLCMD=:
@@ -38,7 +38,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  # Support unset when possible.
  if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
    as_unset=unset
-@@ -34,34 +28,39 @@
+@@ -34,34 +28,39 @@ else
    as_unset=false
  fi
  
@@ -103,7 +103,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
  	 X"$0" : 'X\(//\)$' \| \
  	 X"$0" : 'X\(/\)$' \| \
-@@ -72,6 +71,7 @@
+@@ -72,6 +71,7 @@ echo X/"$0" |
    	  /^X\/\(\/\).*/{ s//\1/; q; }
    	  s/.*/./; q'`
  
@@ -111,7 +111,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  # PATH needs CR, and LINENO needs CR and PATH.
  # Avoid depending upon Character Ranges.
  as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-@@ -85,7 +85,7 @@
+@@ -85,7 +85,7 @@ if test "${PATH_SEPARATOR+set}" != set; 
    echo "#! /bin/sh" >conftest.sh
    echo  "exit 0"   >>conftest.sh
    chmod +x conftest.sh
@@ -120,7 +120,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
      PATH_SEPARATOR=';'
    else
      PATH_SEPARATOR=:
-@@ -138,6 +138,8 @@
+@@ -138,6 +138,8 @@ do
    as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
    test "x$as_lineno_1" != "x$as_lineno_2" &&
    test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
@@ -129,7 +129,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  	     CONFIG_SHELL=$as_dir/$as_base
  	     export CONFIG_SHELL
  	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-@@ -210,6 +212,12 @@
+@@ -210,6 +212,12 @@ else
  fi
  rm -f conf$$ conf$$.exe conf$$.file
  
@@ -142,7 +142,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  as_executable_p="test -f"
  
  # Sed expression to map a string onto a valid CPP name.
-@@ -226,7 +234,7 @@
+@@ -226,7 +234,7 @@ as_nl='
  IFS=" 	$as_nl"
  
  # CDPATH.
@@ -151,7 +151,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  
  
  # Name of the host.
-@@ -240,6 +248,7 @@
+@@ -240,6 +248,7 @@ exec 6>&1
  # Initializations.
  #
  ac_default_prefix=/usr/local
@@ -159,7 +159,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  cross_compiling=no
  subdirs=
  MFLAGS=
-@@ -296,6 +305,8 @@
+@@ -296,6 +305,8 @@ ac_includes_default="\
  # include <unistd.h>
  #endif"
  
@@ -168,7 +168,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  
  # Initialize some variables set by options.
  ac_init_help=
-@@ -719,6 +730,9 @@
+@@ -719,6 +730,9 @@ if test ! -r $srcdir/$ac_unique_file; th
     { (exit 1); exit 1; }; }
    fi
  fi
@@ -178,7 +178,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
  ac_env_build_alias_set=${build_alias+set}
  ac_env_build_alias_value=$build_alias
-@@ -819,6 +833,11 @@
+@@ -819,6 +833,11 @@ if test -n "$ac_init_help"; then
  
    cat <<\_ACEOF
  
@@ -190,7 +190,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  Some influential environment variables:
    CC          C compiler command
    CFLAGS      C compiler flags
-@@ -867,7 +886,7 @@
+@@ -867,7 +886,7 @@ esac
  # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
  # absolute.
  ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
@@ -199,7 +199,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
  ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
  
-@@ -907,7 +926,7 @@
+@@ -907,7 +926,7 @@ This file contains any messages produced
  running configure, to aid debugging if configure makes a mistake.
  
  It was created by $as_me, which was
@@ -208,7 +208,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  
    $ $0 $@
  
-@@ -973,12 +992,9 @@
+@@ -973,12 +992,9 @@ do
    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
    esac
@@ -223,7 +223,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  done
  
  # When interrupted or exit'd, cleanup temporary files, and complete
-@@ -990,6 +1006,7 @@
+@@ -990,6 +1006,7 @@ trap 'exit_status=$?
    # Save into config.log some information that might help in debugging.
    {
      echo
@@ -231,7 +231,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
      cat <<\_ASBOX
  ## ---------------- ##
  ## Cache variables. ##
-@@ -1012,6 +1029,35 @@
+@@ -1012,6 +1029,35 @@ _ASBOX
      esac;
  }
      echo
@@ -267,7 +267,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
      if test -s confdefs.h; then
        cat <<\_ASBOX
  ## ----------- ##
-@@ -1019,7 +1065,7 @@
+@@ -1019,7 +1065,7 @@ _ASBOX
  ## ----------- ##
  _ASBOX
        echo
@@ -276,7 +276,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
        echo
      fi
      test "$ac_signal" != 0 &&
-@@ -1177,7 +1223,15 @@
+@@ -1177,7 +1223,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
  
@@ -293,7 +293,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  
  
  if test -f Makefile.PL -a ! -f Makefile ; then
-@@ -1388,9 +1442,7 @@
+@@ -1388,9 +1442,7 @@ if test $ac_prog_rejected = yes; then
      # However, it has the same basename, so the bogon will be chosen
      # first if we set CC to just the basename; use the full file name.
      shift
@@ -304,7 +304,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
    fi
  fi
  fi
-@@ -1523,12 +1575,6 @@
+@@ -1523,12 +1575,6 @@ cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  #include "confdefs.h"
  
@@ -317,7 +317,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  int
  main ()
  {
-@@ -1557,11 +1603,10 @@
+@@ -1557,11 +1603,10 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
  # Be careful to initialize this variable, since it used to be cached.
  # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
  ac_cv_exeext=
@@ -332,7 +332,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
      a.out ) # We found the default executable, but exeext='' is most
              # certainly right.
              break;;
-@@ -1575,8 +1620,10 @@
+@@ -1575,8 +1620,10 @@ done
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
@@ -345,7 +345,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
     { (exit 77); exit 77; }; }
  fi
  
-@@ -1633,9 +1680,10 @@
+@@ -1633,9 +1680,10 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
  # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
  # work properly (i.e., refer to `conftest.exe'), while it won't with
  # `rm'.
@@ -358,7 +358,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
      *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
            export ac_cv_exeext
            break;;
-@@ -1664,12 +1712,6 @@
+@@ -1664,12 +1712,6 @@ else
  #line $LINENO "configure"
  #include "confdefs.h"
  
@@ -371,7 +371,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  int
  main ()
  {
-@@ -1686,7 +1728,7 @@
+@@ -1686,7 +1728,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    (exit $ac_status); }; then
    for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
    case $ac_file in
@@ -380,7 +380,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
      *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
         break;;
    esac
-@@ -1714,12 +1756,6 @@
+@@ -1714,12 +1756,6 @@ else
  #line $LINENO "configure"
  #include "confdefs.h"
  
@@ -393,7 +393,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  int
  main ()
  {
-@@ -1768,12 +1804,6 @@
+@@ -1768,12 +1804,6 @@ else
  #line $LINENO "configure"
  #include "confdefs.h"
  
@@ -406,7 +406,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  int
  main ()
  {
-@@ -1819,6 +1849,97 @@
+@@ -1819,6 +1849,97 @@ else
      CFLAGS=
    fi
  fi
@@ -504,7 +504,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  # Some people use a C++ compiler to compile C.  Since we use `exit',
  # in C++ we need to declare it.  In case someone uses the same compiler
  # for both compiling C and C++ we need to have the C++ compiler decide
-@@ -1854,12 +1975,6 @@
+@@ -1854,12 +1975,6 @@ do
  #include "confdefs.h"
  #include <stdlib.h>
  $ac_declaration
@@ -517,7 +517,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  int
  main ()
  {
-@@ -1891,12 +2006,6 @@
+@@ -1891,12 +2006,6 @@ rm -f conftest.$ac_objext conftest.$ac_e
  #line $LINENO "configure"
  #include "confdefs.h"
  $ac_declaration
@@ -530,7 +530,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  int
  main ()
  {
-@@ -1981,7 +2090,7 @@
+@@ -1981,7 +2090,7 @@ _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -539,7 +539,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-@@ -2014,7 +2123,7 @@
+@@ -2014,7 +2123,7 @@ _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -548,7 +548,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-@@ -2072,7 +2181,7 @@
+@@ -2072,7 +2181,7 @@ _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -557,7 +557,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-@@ -2105,7 +2214,7 @@
+@@ -2105,7 +2214,7 @@ _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -566,7 +566,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-@@ -2148,6 +2257,21 @@
+@@ -2148,6 +2257,21 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
@@ -588,7 +588,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  echo "$as_me:$LINENO: checking for ANSI C header files" >&5
  echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
  if test "${ac_cv_header_stdc+set}" = set; then
-@@ -2165,7 +2289,7 @@
+@@ -2165,7 +2289,7 @@ _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -597,7 +597,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-@@ -2196,7 +2320,7 @@
+@@ -2196,7 +2320,7 @@ if test $ac_cv_header_stdc = yes; then
  
  _ACEOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
@@ -606,7 +606,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
    :
  else
    ac_cv_header_stdc=no
-@@ -2214,7 +2338,7 @@
+@@ -2214,7 +2338,7 @@ if test $ac_cv_header_stdc = yes; then
  
  _ACEOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
@@ -615,7 +615,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
    :
  else
    ac_cv_header_stdc=no
-@@ -2273,7 +2397,7 @@
+@@ -2273,7 +2397,7 @@ cat conftest.$ac_ext >&5
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
@@ -624,7 +624,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  fi
  fi
  fi
-@@ -2404,7 +2528,7 @@
+@@ -2404,7 +2528,7 @@ _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -633,7 +633,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-@@ -2522,7 +2646,7 @@
+@@ -2522,7 +2646,7 @@ _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -642,7 +642,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-@@ -2639,7 +2763,7 @@
+@@ -2639,7 +2763,7 @@ _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -651,7 +651,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-@@ -2699,103 +2823,6 @@
+@@ -2699,103 +2823,6 @@ fi
  done
  
  
@@ -755,7 +755,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
  echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
  if test "${ac_cv_c_const+set}" = set; then
-@@ -2805,12 +2832,6 @@
+@@ -2805,12 +2832,6 @@ else
  #line $LINENO "configure"
  #include "confdefs.h"
  
@@ -768,7 +768,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  int
  main ()
  {
-@@ -2904,12 +2925,6 @@
+@@ -2904,12 +2925,6 @@ else
  #line $LINENO "configure"
  #include "confdefs.h"
  $ac_includes_default
@@ -781,7 +781,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  int
  main ()
  {
-@@ -2962,12 +2977,6 @@
+@@ -2962,12 +2977,6 @@ else
  #line $LINENO "configure"
  #include "confdefs.h"
  $ac_includes_default
@@ -794,7 +794,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  int
  main ()
  {
-@@ -3023,7 +3032,7 @@
+@@ -3023,7 +3032,7 @@ else
  
  _ACEOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
@@ -803,7 +803,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
    ac_cv_type_uid_t=yes
  else
    ac_cv_type_uid_t=no
-@@ -3055,12 +3064,6 @@
+@@ -3055,12 +3064,6 @@ else
  #line $LINENO "configure"
  #include "confdefs.h"
  $ac_includes_default
@@ -816,7 +816,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  int
  main ()
  {
-@@ -3117,12 +3120,6 @@
+@@ -3117,12 +3120,6 @@ else
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/socket.h>
@@ -829,7 +829,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  int
  main ()
  {
-@@ -3181,12 +3178,6 @@
+@@ -3181,12 +3178,6 @@ extern "C"
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
  char socket ();
@@ -842,7 +842,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  int
  main ()
  {
-@@ -3227,8 +3218,8 @@
+@@ -3227,8 +3218,8 @@ _ACEOF
  
  fi
  
@@ -853,7 +853,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  echo $ECHO_N "checking for CRYPTO_lock in -lcrypto... $ECHO_C" >&6
  if test "${ac_cv_lib_crypto_CRYPTO_lock+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3246,12 +3237,6 @@
+@@ -3246,12 +3237,6 @@ extern "C"
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
  char CRYPTO_lock ();
@@ -866,7 +866,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  int
  main ()
  {
-@@ -3284,16 +3269,10 @@
+@@ -3284,16 +3269,10 @@ fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_lock" >&5
  echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_lock" >&6
  if test $ac_cv_lib_crypto_CRYPTO_lock = yes; then
@@ -885,7 +885,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  echo $ECHO_N "checking for SSL_CTX_free in -lssl... $ECHO_C" >&6
  if test "${ac_cv_lib_ssl_SSL_CTX_free+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3311,12 +3290,6 @@
+@@ -3311,12 +3290,6 @@ extern "C"
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
  char SSL_CTX_free ();
@@ -898,7 +898,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  int
  main ()
  {
-@@ -3349,14 +3322,12 @@
+@@ -3349,14 +3322,12 @@ fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_CTX_free" >&5
  echo "${ECHO_T}$ac_cv_lib_ssl_SSL_CTX_free" >&6
  if test $ac_cv_lib_ssl_SSL_CTX_free = yes; then
@@ -917,7 +917,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  
  echo "$as_me:$LINENO: checking for connect in -linet" >&5
  echo $ECHO_N "checking for connect in -linet... $ECHO_C" >&6
-@@ -3376,12 +3347,6 @@
+@@ -3376,12 +3347,6 @@ extern "C"
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
  char connect ();
@@ -930,7 +930,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  int
  main ()
  {
-@@ -3441,12 +3406,6 @@
+@@ -3441,12 +3406,6 @@ extern "C"
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
  char t_accept ();
@@ -943,7 +943,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  int
  main ()
  {
-@@ -3506,12 +3465,6 @@
+@@ -3506,12 +3465,6 @@ extern "C"
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
  char dlopen ();
@@ -956,7 +956,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  int
  main ()
  {
-@@ -3582,12 +3535,6 @@
+@@ -3582,12 +3535,6 @@ extern "C"
  char $ac_func ();
  char (*f) ();
  
@@ -969,7 +969,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  int
  main ()
  {
-@@ -3646,12 +3593,6 @@
+@@ -3646,12 +3593,6 @@ else
  #line $LINENO "configure"
  #include "confdefs.h"
  #include <netdb.h>
@@ -982,7 +982,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  int
  main ()
  {
-@@ -3701,12 +3642,6 @@
+@@ -3701,12 +3642,6 @@ else
  #line $LINENO "configure"
  #include "confdefs.h"
  #include <getopt.h>
@@ -995,7 +995,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  int
  main ()
  {
-@@ -3757,12 +3692,6 @@
+@@ -3757,12 +3692,6 @@ else
  #include "confdefs.h"
  #include <sys/types.h>
  #include <netinet/in.h>
@@ -1008,7 +1008,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  int
  main ()
  {
-@@ -3804,12 +3733,6 @@
+@@ -3804,12 +3733,6 @@ else
  #line $LINENO "configure"
  #include "confdefs.h"
  $ac_includes_default
@@ -1021,7 +1021,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  int
  main ()
  {
-@@ -3867,12 +3790,6 @@
+@@ -3867,12 +3790,6 @@ else
  #include "confdefs.h"
  #include <sys/types.h>
  #include <netinet/in.h>
@@ -1034,7 +1034,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  int
  main ()
  {
-@@ -3925,12 +3842,6 @@
+@@ -3925,12 +3842,6 @@ else
  #include <sysexits.h>
  #endif
  #include <errno.h>
@@ -1047,7 +1047,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  int
  main ()
  {
-@@ -3978,7 +3889,8 @@
+@@ -3978,7 +3889,8 @@ LDDLFLAGS=`perl -e 'use Config; print $C
  
  
  
@@ -1057,7 +1057,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
-@@ -3990,7 +3902,7 @@
+@@ -3990,7 +3902,7 @@ cat >confcache <<\_ACEOF
  # config.status only pays attention to the cache file if you give it
  # the --recheck option to rerun configure.
  #
@@ -1066,7 +1066,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  # loading this file, other *unset* `ac_cv_foo' will be assigned the
  # following values.
  
-@@ -4056,6 +3968,21 @@
+@@ -4056,6 +3968,21 @@ fi
  
  DEFS=-DHAVE_CONFIG_H
  
@@ -1088,7 +1088,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  
  : ${CONFIG_STATUS=./config.status}
  ac_clean_files_save=$ac_clean_files
-@@ -4074,7 +4001,6 @@
+@@ -4074,7 +4001,6 @@ SHELL=\${CONFIG_SHELL-$SHELL}
  _ACEOF
  
  cat >>$CONFIG_STATUS <<\_ACEOF
@@ -1096,7 +1096,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  ## --------------------- ##
  ## M4sh Initialization.  ##
  ## --------------------- ##
-@@ -4083,11 +4009,13 @@
+@@ -4083,11 +4009,13 @@ cat >>$CONFIG_STATUS <<\_ACEOF
  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
    emulate sh
    NULLCMD=:
@@ -1111,7 +1111,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  # Support unset when possible.
  if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
    as_unset=unset
-@@ -4095,34 +4023,39 @@
+@@ -4095,34 +4023,39 @@ else
    as_unset=false
  fi
  
@@ -1176,7 +1176,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
  	 X"$0" : 'X\(//\)$' \| \
  	 X"$0" : 'X\(/\)$' \| \
-@@ -4133,6 +4066,7 @@
+@@ -4133,6 +4066,7 @@ echo X/"$0" |
    	  /^X\/\(\/\).*/{ s//\1/; q; }
    	  s/.*/./; q'`
  
@@ -1184,7 +1184,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  # PATH needs CR, and LINENO needs CR and PATH.
  # Avoid depending upon Character Ranges.
  as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-@@ -4146,7 +4080,7 @@
+@@ -4146,7 +4080,7 @@ if test "${PATH_SEPARATOR+set}" != set; 
    echo "#! /bin/sh" >conftest.sh
    echo  "exit 0"   >>conftest.sh
    chmod +x conftest.sh
@@ -1193,7 +1193,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
      PATH_SEPARATOR=';'
    else
      PATH_SEPARATOR=:
-@@ -4200,6 +4134,8 @@
+@@ -4200,6 +4134,8 @@ do
    as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
    test "x$as_lineno_1" != "x$as_lineno_2" &&
    test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
@@ -1202,7 +1202,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  	     CONFIG_SHELL=$as_dir/$as_base
  	     export CONFIG_SHELL
  	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-@@ -4273,6 +4209,12 @@
+@@ -4273,6 +4209,12 @@ else
  fi
  rm -f conf$$ conf$$.exe conf$$.file
  
@@ -1215,7 +1215,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  as_executable_p="test -f"
  
  # Sed expression to map a string onto a valid CPP name.
-@@ -4289,7 +4231,7 @@
+@@ -4289,7 +4231,7 @@ as_nl='
  IFS=" 	$as_nl"
  
  # CDPATH.
@@ -1224,7 +1224,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  
  exec 6>&1
  
-@@ -4306,7 +4248,7 @@
+@@ -4306,7 +4248,7 @@ _ASBOX
  cat >&5 <<_CSEOF
  
  This file was extended by $as_me, which was
@@ -1233,7 +1233,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -4365,7 +4307,7 @@
+@@ -4365,7 +4307,7 @@ _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
  config.status
@@ -1242,7 +1242,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
    with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  
  Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-@@ -4385,17 +4327,20 @@
+@@ -4385,17 +4327,20 @@ do
    --*=*)
      ac_option=`expr "x$1" : 'x\([^=]*\)='`
      ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
@@ -1268,7 +1268,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
    # Handling of the options.
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
-@@ -4418,12 +4363,12 @@
+@@ -4418,12 +4363,12 @@ Try \`$0 --help' for more information." 
    --debug | --d* | -d )
      debug=: ;;
    --file | --fil | --fi | --f )
@@ -1285,7 +1285,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
      ac_need_defaults=false;;
  
    # This is an error.
-@@ -4541,9 +4486,13 @@
+@@ -4541,9 +4486,13 @@ s,@ac_ct_CC@,$ac_ct_CC,;t t
  s,@EXEEXT@,$EXEEXT,;t t
  s,@OBJEXT@,$OBJEXT,;t t
  s,@CPP@,$CPP,;t t
@@ -1299,7 +1299,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  CEOF
  
  _ACEOF
-@@ -4614,25 +4563,30 @@
+@@ -4614,25 +4563,30 @@ echo X"$ac_file" |
    	  /^X\(\/\/\)$/{ s//\1/; q; }
    	  /^X\(\/\).*/{ s//\1/; q; }
    	  s/.*/./; q'`
@@ -1349,7 +1349,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  
    ac_builddir=.
  
-@@ -4662,7 +4616,7 @@
+@@ -4662,7 +4616,7 @@ esac
  # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
  # absolute.
  ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
@@ -1358,7 +1358,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
  ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
  
-@@ -4847,7 +4801,7 @@
+@@ -4847,7 +4801,7 @@ _ACEOF
  # Break up conftest.defines because some shells have a limit on the size
  # of here documents, and old seds have small limits too (100 cmds).
  echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
@@ -1367,7 +1367,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
  echo '  :' >>$CONFIG_STATUS
  rm -f conftest.tail
-@@ -4871,7 +4825,7 @@
+@@ -4871,7 +4825,7 @@ do
    mv conftest.tail conftest.defines
  done
  rm -f conftest.defines
@@ -1376,7 +1376,7 @@ $NetBSD: patch-ao,v 1.1 2003/04/15 00:02:26 heinz Exp $
  echo >>$CONFIG_STATUS
  
  # Break up conftest.undefs because some shells have a limit on the size
-@@ -4927,25 +4881,30 @@
+@@ -4927,25 +4881,30 @@ echo X"$ac_file" |
    	  /^X\(\/\/\)$/{ s//\1/; q; }
    	  /^X\(\/\).*/{ s//\1/; q; }
    	  s/.*/./; q'`
diff --git a/mail/spamassassin/patches/patch-ae b/mail/spamassassin/patches/patch-ae
index de342b5aa8a..38f75ef572c 100644
--- a/mail/spamassassin/patches/patch-ae
+++ b/mail/spamassassin/patches/patch-ae
@@ -1,14 +1,14 @@
-$NetBSD: patch-ae,v 1.4 2003/04/15 00:02:25 heinz Exp $
+$NetBSD: patch-ae,v 1.5 2003/05/22 11:41:03 abs Exp $
 
---- spamd/spamd.raw.orig	Fri Mar 28 22:26:44 2003
-+++ spamd/spamd.raw
-@@ -979,7 +979,8 @@
- use POSIX 'setsid';
- sub daemonize
- {
--    $0 = join(' ', $0, @ARGV) unless($opt{'debug'});; # pretty command line in ps
-+    # no pretty 'ps' command line (easier for NetBSD rc script)
-+    # $0 = join(' ', $0, @ARGV) unless($opt{'debug'});; # pretty command line in ps
-     chdir '/' or die "Can't chdir to '/': $!";
-     $SIG{__WARN__} = sub { logmsg($_[0]); };
-     open STDIN,'/dev/null' or die "Can't read '/dev/null': $!";
+--- lib/Mail/SpamAssassin/DBBasedAddrList.pm.orig	2003-03-28 21:26:12.000000000 +0000
++++ lib/Mail/SpamAssassin/DBBasedAddrList.pm
+@@ -5,7 +5,8 @@ use bytes;
+ use Fcntl;
+ 
+ # tell AnyDBM_File to prefer DB_File, if possible.
+-# BEGIN { @AnyDBM_File::ISA = qw(DB_File GDBM_File NDBM_File SDBM_File); }
++# Pkgsrc: enable following line because BayesStore.pm already broke the rule
++BEGIN { @AnyDBM_File::ISA = qw(DB_File GDBM_File NDBM_File SDBM_File); }
+ # off until 3.0; there's lots of existing AWLs out there this breaks.
+ 
+ use AnyDBM_File;
diff --git a/mail/spamassassin/patches/patch-af b/mail/spamassassin/patches/patch-af
new file mode 100644
index 00000000000..33146a3a576
--- /dev/null
+++ b/mail/spamassassin/patches/patch-af
@@ -0,0 +1,14 @@
+$NetBSD: patch-af,v 1.3 2003/05/22 11:41:03 abs Exp $
+
+--- spamd/spamd.raw.orig	2003-05-20 07:06:18.000000000 +0100
++++ spamd/spamd.raw
+@@ -1009,7 +1009,8 @@ sub kill_handler
+ use POSIX 'setsid';
+ sub daemonize
+ {
+-    $0 = join(' ', $0, @ARGV) unless($opt{'debug'});; # pretty command line in ps
++    # no pretty 'ps' command line (easier for NetBSD rc script)
++    # $0 = join(' ', $0, @ARGV) unless($opt{'debug'});; # pretty command line in ps
+     chdir '/' or die "Can't chdir to '/': $!";
+     $SIG{__WARN__} = sub { logmsg($_[0]); };
+     open STDIN,'/dev/null' or die "Can't read '/dev/null': $!";
diff --git a/mail/spamassassin/patches/patch-al b/mail/spamassassin/patches/patch-ag
index 710a6998122..009b95e6a5d 100644
--- a/mail/spamassassin/patches/patch-al
+++ b/mail/spamassassin/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.1 2003/04/15 00:02:26 heinz Exp $
+$NetBSD: patch-ag,v 1.5 2003/05/22 11:41:03 abs Exp $
 
---- tools/check_whitelist.orig	Thu Dec 19 20:05:01 2002
+--- tools/check_whitelist.orig	2002-12-19 19:05:01.000000000 +0000
 +++ tools/check_whitelist
-@@ -5,7 +5,8 @@
+@@ -5,7 +5,8 @@ use Fcntl;
  
  # must match line at top of lib/Mail/SpamAssassin/DBBasedAddrList.pm.
  # now off until 3.0
diff --git a/mail/spamassassin/patches/patch-aj b/mail/spamassassin/patches/patch-aj
deleted file mode 100644
index 477ab87aaaa..00000000000
--- a/mail/spamassassin/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2003/04/15 00:02:26 heinz Exp $
-
---- t/spamd_utf8.t.orig	Wed Dec 18 22:41:11 2002
-+++ t/spamd_utf8.t
-@@ -4,7 +4,7 @@
- use SATest; sa_t_init("spamd_utf8");
- use Test; BEGIN { plan tests => 3 };
- 
--$ENV{'LANG'} = 'en_US.utf8';	# ensure we test in UTF-8 locale
-+$ENV{'LANG'} = 'en_US.UTF-8';	# ensure we test in UTF-8 locale
- 
- # ---------------------------------------------------------------------------
- 
diff --git a/mail/spamassassin/patches/patch-ak b/mail/spamassassin/patches/patch-ak
deleted file mode 100644
index 0268bf552dd..00000000000
--- a/mail/spamassassin/patches/patch-ak
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2003/04/15 00:02:26 heinz Exp $
-
---- lib/Mail/SpamAssassin/DBBasedAddrList.pm.orig	Fri Mar 28 22:26:12 2003
-+++ lib/Mail/SpamAssassin/DBBasedAddrList.pm
-@@ -5,7 +5,8 @@
- use Fcntl;
- 
- # tell AnyDBM_File to prefer DB_File, if possible.
--# BEGIN { @AnyDBM_File::ISA = qw(DB_File GDBM_File NDBM_File SDBM_File); }
-+# Pkgsrc: enable following line because BayesStore.pm already broke the rule
-+BEGIN { @AnyDBM_File::ISA = qw(DB_File GDBM_File NDBM_File SDBM_File); }
- # off until 3.0; there's lots of existing AWLs out there this breaks.
- 
- use AnyDBM_File;
diff --git a/mail/spamassassin/patches/patch-am b/mail/spamassassin/patches/patch-am
deleted file mode 100644
index 2a6594be2f8..00000000000
--- a/mail/spamassassin/patches/patch-am
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-am,v 1.1 2003/04/15 00:02:26 heinz Exp $
-
---- binaries.mk.in.orig	Thu Dec 19 14:19:08 2002
-+++ binaries.mk.in
-@@ -4,6 +4,7 @@
- CCDLFLAGS = @CCDLFLAGS@
- 
- LIBS = @LIBS@
-+SSLLIBS = @SSLLIBS@
- LDFLAGS = @LDFLAGS@
- LDDLFLAGS = @LDDLFLAGS@
- 
-@@ -33,11 +34,11 @@
- 
- spamd/sslspamc$(EXE_EXT): $(SPAMC_FILES) $(LIBSPAMC_FILES)
- 	$(CC) $(SSLCFLAGS) $(CFLAGS) $(SPAMC_FILES) $(LIBSPAMC_FILES) \
--		-o $@ $(LDFLAGS) $(LIBS)
-+		-o $@ $(LDFLAGS) $(SSLLIBS) $(LIBS)
- 
- spamd/libsslspamc$(SHLIBEXT): $(LIBSPAMC_FILES)
- 	$(CC) $(SSLCFLAGS) $(CCDLFLAGS) $(LIBSPAMC_FILES) \
--		-o $@ $(LDDLFLAGS) $(LIBS)
-+		-o $@ $(LDDLFLAGS) $(SSLLIBS) $(LIBS)
- 
- qmail/qmail-spamc: $(QMAIL_SPAMC_FILES)
- 	$(CC) $(CFLAGS) $(QMAIL_SPAMC_FILES) \