- Fix build after devel/dmalloc

- Fix build with gcc 4.2

Submitted by:	pointyhat via pav
		Petar Petrov <pesho.petrov@gmail.com>
Approved by:	maintainer

14 files changed, 406 insertions, 0 deletions

diff --git a/devel/sfslite-dbg/files/patch-async_arena.h b/devel/sfslite-dbg/files/patch-async_arena.h
new file mode 100644
index 000000000000..5d09ca4c1046
--- /dev/null
+++ b/devel/sfslite-dbg/files/patch-async_arena.h
@@ -0,0 +1,11 @@
+--- async/arena.h	2005-11-01 18:20:29.000000000 +0200
++++ async/arena.h_new	2007-07-07 00:36:09.000000000 +0300
+@@ -61,7 +61,7 @@
+ #ifdef DMALLOC
+   char *_strdup_leap (const char *, int, const char *str)
+     { return strcpy ((char *) alloc (1 + strlen (str), 1), str); }
+-  char *dmalloc_strdup (const char *, int, const char *str, int)
++  char *dmalloc_strndup (const char *, int, const char *str, int, int)
+     { return strcpy ((char *) alloc (1 + strlen (str), 1), str); }
+ #endif /* DMALLOC */
+ 
diff --git a/devel/sfslite-dbg/files/patch-async_sysconf.h b/devel/sfslite-dbg/files/patch-async_sysconf.h
new file mode 100644
index 000000000000..a714e599a7fa
--- /dev/null
+++ b/devel/sfslite-dbg/files/patch-async_sysconf.h
@@ -0,0 +1,26 @@
+--- async/sysconf.h	2005-11-01 18:20:33.000000000 +0200
++++ async/sysconf.h_new	2007-07-07 00:36:00.000000000 +0300
+@@ -494,11 +494,12 @@
+ #endif /* HAVE_MEMORY_H */
+ #include <dmalloc.h>
+ #undef memcpy
++#undef memmove
+ #undef xfree
+ #define memcpy(to, from, len) \
+-  _dmalloc_memcpy((char *) (to), (const char *) (from), len)
++  _dmalloc_memcpy(__FILE__, __LINE__, (char *) (to), (const char *) (from), len)
+ #define memmove(to, from, len) \
+-  _dmalloc_bcopy((const char *) (from), (char *) (to), len)
++  _dmalloc_bcopy(__FILE__, __LINE__, (const char *) (from), (char *) (to), len)
+ /* Work around Dmalloc's misunderstanding of free's definition */
+ 
+ #if DMALLOC_VERSION_MAJOR >= 5
+@@ -508,7 +509,7 @@
+   dmalloc_malloc (f, l, s, DMALLOC_FUNC_MALLOC, 0, 0)
+ #define _xfree_leap(f, l, p) dmalloc_free (f, l, p, DMALLOC_FUNC_FREE)
+ #undef xstrdup 
+-#define xstrdup(__s) ((char *) dmalloc_strdup(__FILE__, __LINE__, __s, 1))
++#define xstrdup(__s) ((char *) dmalloc_strndup(__FILE__, __LINE__, __s, -1, 1))
+ #endif /* DMALLOC_VERSION_MAJOR >= 5 */
+ 
+ static inline void
diff --git a/devel/sfslite/files/patch-arpc-authopaque.C b/devel/sfslite/files/patch-arpc-authopaque.C
new file mode 100644
index 000000000000..4ce45f062eae
--- /dev/null
+++ b/devel/sfslite/files/patch-arpc-authopaque.C
@@ -0,0 +1,29 @@
+--- arpc/authopaque.C.orig	2005-11-01 16:20:27.000000000 +0000
++++ arpc/authopaque.C	2007-07-12 22:38:36.000000000 +0000
+@@ -41,7 +41,7 @@
+ {
+   AUTH *auth = New AUTH;
+   bzero (auth, sizeof (*auth));
+-  auth->ah_ops = (AUTH::auth_ops *) &auth_opaque_ops;
++  auth->ah_ops = (AUTH::auth_ops *) ((void *)&auth_opaque_ops);
+   auth->ah_cred.oa_base = static_cast<caddr_t> (xmalloc (MAX_AUTH_BYTES));
+   auth->ah_verf.oa_base = static_cast<caddr_t> (xmalloc (MAX_AUTH_BYTES));
+   authopaque_set (auth, NULL, NULL);
+@@ -66,7 +66,7 @@
+ void
+ authopaque_set (AUTH *auth, const opaque_auth *cred, const opaque_auth *verf)
+ {
+-  assert (auth->ah_ops == (AUTH::auth_ops *) &auth_opaque_ops);
++  assert (auth->ah_ops == (AUTH::auth_ops *) ((void *)&auth_opaque_ops));
+   authcopy (&auth->ah_cred, cred);
+   authcopy (&auth->ah_verf, verf);
+ }
+@@ -74,7 +74,7 @@
+ void
+ authopaque_set (AUTH *auth, const authunix_parms *aup)
+ {
+-  assert (auth->ah_ops == (AUTH::auth_ops *) &auth_opaque_ops);
++  assert (auth->ah_ops == (AUTH::auth_ops *) ((void *)&auth_opaque_ops));
+ 
+   auth->ah_cred.oa_flavor = AUTH_UNIX;
+   xdrmem xdr (auth->ah_cred.oa_base, MAX_AUTH_BYTES);
diff --git a/devel/sfslite/files/patch-arpc-authuint.C b/devel/sfslite/files/patch-arpc-authuint.C
new file mode 100644
index 000000000000..bba84862ea86
--- /dev/null
+++ b/devel/sfslite/files/patch-arpc-authuint.C
@@ -0,0 +1,20 @@
+--- arpc/authuint.C.orig	2005-11-01 16:20:27.000000000 +0000
++++ arpc/authuint.C	2007-07-12 22:38:40.000000000 +0000
+@@ -33,7 +33,7 @@
+ u_int32_t
+ authuint_getval (AUTH *auth)
+ {
+-  assert (auth->ah_ops == (AUTH::auth_ops *) &auth_uint_ops);
++  assert (auth->ah_ops == (AUTH::auth_ops *) ((void *)&auth_uint_ops));
+   return auth->ah_key.key.low;
+ }
+ 
+@@ -43,7 +43,7 @@
+   AUTH *auth = New AUTH;
+   bzero (auth, sizeof (*auth));
+   auth->ah_key.key.low = val;
+-  auth->ah_ops = (AUTH::auth_ops *) &auth_uint_ops;
++  auth->ah_ops = (AUTH::auth_ops *) ((void *)&auth_uint_ops);
+   return auth;
+ }
+ 
diff --git a/devel/sfslite/files/patch-arpc-rpctypes.h b/devel/sfslite/files/patch-arpc-rpctypes.h
new file mode 100644
index 000000000000..40ed777bc168
--- /dev/null
+++ b/devel/sfslite/files/patch-arpc-rpctypes.h
@@ -0,0 +1,14 @@
+--- arpc/rpctypes.h.orig	2005-11-22 17:42:29.000000000 +0000
++++ arpc/rpctypes.h	2007-07-12 22:38:43.000000000 +0000
+@@ -271,9 +271,9 @@
+   using rpc_vec<char, n>::base;
+   using rpc_vec<char, n>::size;
+ 
+-  void setstrmem (const str &s) { set (s.cstr (), s.len ()); }
++  void setstrmem (const str &s) { rpc_vec<char, n>::set (s.cstr, s.len ()); }
+   rpc_bytes &operator= (const str &s)
+-    { setsize (s.len ()); memcpy (base (), s.cstr (), size ()); return *this; }
++    { rpc_vec<char, n>::setsize (s.len ()); memcpy (base (), s.cstr (), size ()); return *this; }
+   template<size_t m> rpc_bytes &operator= (const rpc_vec<char, m> &v)
+     { rpc_vec<char, n>::operator= (v); return *this; }
+   template<size_t m> rpc_bytes &operator= (const array<char, m> &v)
diff --git a/devel/sfslite/files/patch-arpc-xdr_suio.C b/devel/sfslite/files/patch-arpc-xdr_suio.C
new file mode 100644
index 000000000000..e888326b596d
--- /dev/null
+++ b/devel/sfslite/files/patch-arpc-xdr_suio.C
@@ -0,0 +1,20 @@
+--- arpc/xdr_suio.C.orig	2005-11-01 16:20:27.000000000 +0000
++++ arpc/xdr_suio.C	2007-07-12 22:38:45.000000000 +0000
+@@ -66,7 +66,7 @@
+ };
+ static const XDR xsproto = {
+   XDR_ENCODE,
+-  (xdr_ops_t *) &xsops,
++  (xdr_ops_t *) ((void *)&xsops),
+   NULL, NULL, NULL, 0
+ };
+ 
+@@ -82,7 +82,7 @@
+ };
+ static const XDR xsproto_scrub = {
+   XDR_ENCODE,
+-  (xdr_ops_t *) &xsops_scrub,
++  (xdr_ops_t *) ((void *)&xsops_scrub),
+   NULL, NULL, NULL, 0
+ };
+ 
diff --git a/devel/sfslite/files/patch-arpc-xdr_suio.h b/devel/sfslite/files/patch-arpc-xdr_suio.h
new file mode 100644
index 000000000000..60c77197634b
--- /dev/null
+++ b/devel/sfslite/files/patch-arpc-xdr_suio.h
@@ -0,0 +1,12 @@
+--- arpc/xdr_suio.h.orig	2005-11-01 16:20:27.000000000 +0000
++++ arpc/xdr_suio.h	2007-07-12 22:38:48.000000000 +0000
+@@ -26,7 +26,8 @@
+ static inline suio *&
+ xsuio (XDR *x)
+ {
+-  return (suio *&) x->x_private;
++  void *& ptr = (void *&) x->x_private;
++  return (suio *&)ptr;
+ }
+ 
+ extern "C" {
diff --git a/devel/sfslite/files/patch-async-arena.h b/devel/sfslite/files/patch-async-arena.h
new file mode 100644
index 000000000000..2e3c2e99a4b9
--- /dev/null
+++ b/devel/sfslite/files/patch-async-arena.h
@@ -0,0 +1,11 @@
+--- async/arena.h.orig	2005-11-01 16:20:29.000000000 +0000
++++ async/arena.h	2007-07-12 22:38:10.000000000 +0000
+@@ -61,7 +61,7 @@
+ #ifdef DMALLOC
+   char *_strdup_leap (const char *, int, const char *str)
+     { return strcpy ((char *) alloc (1 + strlen (str), 1), str); }
+-  char *dmalloc_strdup (const char *, int, const char *str, int)
++  char *dmalloc_strndup (const char *, int, const char *str, int, int)
+     { return strcpy ((char *) alloc (1 + strlen (str), 1), str); }
+ #endif /* DMALLOC */
+ 
diff --git a/devel/sfslite/files/patch-async-daemonize.C b/devel/sfslite/files/patch-async-daemonize.C
new file mode 100644
index 000000000000..d4779f0a0e18
--- /dev/null
+++ b/devel/sfslite/files/patch-async-daemonize.C
@@ -0,0 +1,45 @@
+--- async/daemonize.C.orig	2005-11-01 16:20:30.000000000 +0000
++++ async/daemonize.C	2007-07-12 22:38:51.000000000 +0000
+@@ -49,18 +49,18 @@
+ 	      const str &logfile, int flags, mode_t mode)
+ {
+ #ifdef PATH_LOGGER
+-  char *av[] = { PATH_LOGGER, "-p", NULL, "-t", NULL, NULL, NULL };
++  char *av[] = { (char *)PATH_LOGGER, (char *)"-p", NULL, (char *)"-t", NULL, NULL, NULL };
+   av[2] = const_cast<char *> (priority.cstr ());
+   
+   if (line)
+     av[5] = const_cast<char *> (line.cstr ());
+   else
+-    av[5] = "log started";
++    av[5] = (char *)"log started";
+ 
+   if (tag)
+     av[4] = const_cast<char *> (tag.cstr ());
+   else 
+-    av[4] = "";
++    av[4] = (char *)"";
+ 
+   pid_t pid;
+   int status;
+@@ -93,9 +93,9 @@
+ start_logger ()
+ {
+ #ifdef PATH_LOGGER
+-  char *av[] = { PATH_LOGGER, "-p",
++  char *av[] = { (char *)PATH_LOGGER, (char *)"-p",
+ 		 const_cast<char *> (syslog_priority.cstr ()),
+-		 "-t", "", NULL};
++		 (char *)"-t", (char *)"", NULL};
+   int fds[2];
+ 
+   close (0);
+@@ -177,7 +177,7 @@
+       piddir = builddir;
+     str path = strbuf () << piddir << "/" << progname << ".pid";
+     struct stat sb;
+-    if (str2file (path, strbuf ("%d\n", int (getpid ())), 0444, &sb))
++    if (str2file (path, strbuf ("%d\n", int (getpid ())), 0444, false, &sb))
+       pidfiles.push_back (pidfile (path, sb));
+   }
+ }
diff --git a/devel/sfslite/files/patch-async-parseopt.C b/devel/sfslite/files/patch-async-parseopt.C
new file mode 100644
index 000000000000..5f0df5ab9b63
--- /dev/null
+++ b/devel/sfslite/files/patch-async-parseopt.C
@@ -0,0 +1,11 @@
+--- async/parseopt.C.orig	2005-11-01 16:20:32.000000000 +0000
++++ async/parseopt.C	2007-07-12 22:38:53.000000000 +0000
+@@ -24,7 +24,7 @@
+ #include "amisc.h"
+ #include "parseopt.h"
+ 
+-char *parseargs::errorbuf = "";
++char *parseargs::errorbuf = (char *)"";
+ 
+ static inline int
+ isspc (char c)
diff --git a/devel/sfslite/files/patch-async-suio_vuprintf.C b/devel/sfslite/files/patch-async-suio_vuprintf.C
new file mode 100644
index 000000000000..28aaf5aa19b2
--- /dev/null
+++ b/devel/sfslite/files/patch-async-suio_vuprintf.C
@@ -0,0 +1,42 @@
+--- async/suio_vuprintf.C.orig	2005-11-01 16:20:33.000000000 +0000
++++ async/suio_vuprintf.C	2007-07-12 22:38:56.000000000 +0000
+@@ -139,7 +139,7 @@
+   int dprec;			/* a copy of prec if [diouxX], 0 otherwise */
+   int realsz;			/* field size expanded by dprec */
+   int size;			/* size of converted field or string */
+-  char *xdigs = "";		/* digits for [xX] conversion */
++  char *xdigs = (char *)"";	/* digits for [xX] conversion */
+ 
+   char buf[BUF];                /* space for %c, %[diouxX], %[eEfgG] */
+   char ox[2];                   /* space for 0x hex-prefix */
+@@ -392,7 +392,7 @@
+       /* NOSTRICT */
+       _uquad = (u_long) va_arg (ap, void *);
+       base = HEX;
+-      xdigs = "0123456789abcdef";
++      xdigs = (char *)"0123456789abcdef";
+       flags |= HEXPREFIX;
+       ch = 'x';
+       goto nosign;
+@@ -435,10 +435,10 @@
+       base = DEC;
+       goto nosign;
+     case 'X':
+-      xdigs = "0123456789ABCDEF";
++      xdigs = (char *)"0123456789ABCDEF";
+       goto hex;
+     case 'x':
+-      xdigs = "0123456789abcdef";
++      xdigs = (char *)"0123456789abcdef";
+     hex:
+       _uquad = UARG ();
+       base = HEX;
+@@ -498,7 +498,7 @@
+ 	  break;
+ 
+ 	default:
+-	  cp = "bug in vfprintf: bad base";
++	  cp = (char *)"bug in vfprintf: bad base";
+ 	  size = strlen (cp);
+ 	  goto skipsize;
+ 	}
diff --git a/devel/sfslite/files/patch-async-sysconf.h b/devel/sfslite/files/patch-async-sysconf.h
new file mode 100644
index 000000000000..f060c826fc77
--- /dev/null
+++ b/devel/sfslite/files/patch-async-sysconf.h
@@ -0,0 +1,26 @@
+--- async/sysconf.h.orig	2005-11-01 16:20:33.000000000 +0000
++++ async/sysconf.h	2007-07-12 22:38:10.000000000 +0000
+@@ -494,11 +494,12 @@
+ #endif /* HAVE_MEMORY_H */
+ #include <dmalloc.h>
+ #undef memcpy
++#undef memmove
+ #undef xfree
+ #define memcpy(to, from, len) \
+-  _dmalloc_memcpy((char *) (to), (const char *) (from), len)
++  _dmalloc_memcpy(__FILE__, __LINE__, (char *) (to), (const char *) (from), len)
+ #define memmove(to, from, len) \
+-  _dmalloc_bcopy((const char *) (from), (char *) (to), len)
++  _dmalloc_bcopy(__FILE__, __LINE__, (const char *) (from), (char *) (to), len)
+ /* Work around Dmalloc's misunderstanding of free's definition */
+ 
+ #if DMALLOC_VERSION_MAJOR >= 5
+@@ -508,7 +509,7 @@
+   dmalloc_malloc (f, l, s, DMALLOC_FUNC_MALLOC, 0, 0)
+ #define _xfree_leap(f, l, p) dmalloc_free (f, l, p, DMALLOC_FUNC_FREE)
+ #undef xstrdup 
+-#define xstrdup(__s) ((char *) dmalloc_strdup(__FILE__, __LINE__, __s, 1))
++#define xstrdup(__s) ((char *) dmalloc_strndup(__FILE__, __LINE__, __s, -1, 1))
+ #endif /* DMALLOC_VERSION_MAJOR >= 5 */
+ 
+ static inline void
diff --git a/devel/sfslite/files/patch-crypt-getsysnoise.C b/devel/sfslite/files/patch-crypt-getsysnoise.C
new file mode 100644
index 000000000000..83223d62e3cb
--- /dev/null
+++ b/devel/sfslite/files/patch-crypt-getsysnoise.C
@@ -0,0 +1,81 @@
+--- crypt/getsysnoise.C.orig	2005-11-01 16:20:36.000000000 +0000
++++ crypt/getsysnoise.C	2007-07-12 22:38:59.000000000 +0000
+@@ -27,57 +27,57 @@
+ #include <sys/resource.h>
+ 
+ char *const noiseprogs[][5] = {
+-  { PATH_PS, "laxwww" },
+-  { PATH_PS, "-al" },
+-  { PATH_LS, "-nfail", "/tmp/." },
++  { (char *)PATH_PS, (char *)"laxwww" },
++  { (char *)PATH_PS, (char *)"-al" },
++  { (char *)PATH_LS, (char *)"-nfail", (char *)"/tmp/." },
+ #ifdef PATH_NETSTAT
+-  { PATH_NETSTAT, "-s" },
+-  { PATH_NETSTAT, "-an" },
+-  { PATH_NETSTAT, "-in" },
++  { (char *)PATH_NETSTAT, (char *)"-s" },
++  { (char *)PATH_NETSTAT, (char *)"-an" },
++  { (char *)PATH_NETSTAT, (char *)"-in" },
+ #endif /* PATH_NETSTAT */
+ #ifdef PATH_NTPQ
+-  { PATH_NTPQ, "-np" },
++  { (char *)PATH_NTPQ, (char *)"-np" },
+ #endif /* PATH_NTPQ */
+ #ifdef PATH_W
+-  { PATH_W },
++  { (char *)PATH_W },
+ #endif /* PATH_W */
+ #ifdef PATH_NFSSTAT
+-  { PATH_NFSSTAT },
++  { (char *)PATH_NFSSTAT },
+ #endif /* PATH_NFSSTAT */
+ #ifdef PATH_VNSTAT
+-  { PATH_VMSTAT },
+-  { PATH_VMSTAT, "-i" },
+-  { PATH_VMSTAT, "-s" },
++  { (char *)PATH_VMSTAT },
++  { (char *)PATH_VMSTAT, (char *)"-i" },
++  { (char *)PATH_VMSTAT, (char *)"-s" },
+ #endif /* PATH_VNSTAT */
+ #ifdef PATH_IOSTAT
+ #if defined (__linux__) || defined (__osf__)
+-  { PATH_IOSTAT },
++  { (char *)PATH_IOSTAT },
+ #else /* not linux or osf */
+-  { PATH_IOSTAT, "-I" },
++  { (char *)PATH_IOSTAT, (char *)"-I" },
+ #endif /* not linux or osf */
+ #endif /* PATH_IOSTAT */
+ #ifdef PATH_LSOF
+-  { PATH_LSOF, "-bwn",
++  { (char *)PATH_LSOF, (char *)"-bwn",
+ # ifdef LSOF_DEVCACHE
+-    "-Di"
++    (char *)"-Di"
+ # endif /* LSOF_DEVCACHE */
+   },
+ #else /* no lsof */
+ # ifdef PATH_FSTAT
+-  { PATH_FSTAT },
++  { (char *)PATH_FSTAT },
+ # endif /* PATH_FSTAT */
+ # ifdef PATH_PSTAT
+-  { PATH_PSTAT, "-f" },
++  { (char *)PATH_PSTAT, (char *)"-f" },
+ # endif /* PATH_PSTAT */
+ #endif /* no lsof */
+ #ifdef PATH_PSTAT
+-  { PATH_PSTAT, "-t" },
++  { (char *)PATH_PSTAT, (char *)"-t" },
+ # if defined (__OpenBSD__) || defined (__NetBSD__) || defined (__FreeBSD__)
+-  { PATH_PSTAT, "-v" },
++  { (char *)PATH_PSTAT, (char *)"-v" },
+ # endif /* open/net/freebsd */
+ #endif /* PATH_PSTAT */
+ #ifdef PATH_NFSSTAT
+-  { PATH_NFSSTAT },
++  { (char *)PATH_NFSSTAT },
+ #endif /* PATH_NFSSTAT */
+ #if 0
+   { PATH_RUP },
diff --git a/devel/sfslite/files/patch-rpcc-rpcc.C b/devel/sfslite/files/patch-rpcc-rpcc.C
new file mode 100644
index 000000000000..41383c390340
--- /dev/null
+++ b/devel/sfslite/files/patch-rpcc-rpcc.C
@@ -0,0 +1,58 @@
+--- rpcc/rpcc.C.orig	2005-07-15 23:21:51.000000000 +0000
++++ rpcc/rpcc.C	2007-07-12 22:39:01.000000000 +0000
+@@ -152,8 +152,8 @@
+   void (*fn) (str) = NULL;
+   int len;
+ 
+-  av.push_back (PATH_CPP);
+-  av.push_back ("-DRPCC");
++  av.push_back ((char *)PATH_CPP);
++  av.push_back ((char *)"-DRPCC");
+   av.push_back (NULL);
+ 
+   for (an = 1; an < argc; an++) {
+@@ -213,38 +213,38 @@
+ 
+   switch (mode) {
+   case HEADER:
+-    av[2] = "-DRPCC_H";
++    av[2] = (char *)"-DRPCC_H";
+     fn = genheader;
+     if (!outfile)
+       outfile = strbuf ("%.*sh", len - 1, basename);
+     break;
+   case CFILE:
+-    av[2] = "-DRPCC_C";
++    av[2] = (char *)"-DRPCC_C";
+     fn = gencfile;
+     if (!outfile)
+       outfile = strbuf ("%.*sC", len - 1, basename);
+     break;
+   case PYTHON:
+-    av[2] = "-DRPCC_P";
++    av[2] = (char *)"-DRPCC_P";
+     fn = genpython;
+     if (!outfile)
+       outfile = strbuf ("%.*spy", len - 1, basename);
+      break;
+   case PYL:
+-    av[2] = "-DRPCC_PYL";
++    av[2] = (char *)"-DRPCC_PYL";
+     fn = genpyc_lib;
+     // foo.x -> foo_lib.C
+     if (!outfile)
+       outfile = strbuf ("%.*s_lib.C", len - 2, basename);
+     break;
+   case PYH:
+-    av[2] = "-DRPCC_PYH";
++    av[2] = (char *)"-DRPCC_PYH";
+     fn = genpyh;
+     if (!outfile)
+       outfile = strbuf ("%.*sh", len -1, basename);
+     break;
+   case PYS:
+-    av[2] = "-DRPCC_PYS";
++    av[2] = (char *)"-DRPCC_PYS";
+     fn = genpyc_so;
+     // foo.x -> foo_so.C
+     if (!outfile)