Re: pkg/38983: sendmail doesn't compile on i386-current

[Mark Davies <mark%mcs.vuw.ac.nz@localhost>]

The following reply was made to PR toolchain/38983; it has been noted by GNATS.

From: Mark Davies <mark%mcs.vuw.ac.nz@localhost>
To: Makoto Fujiwara <makoto%ki.nu@localhost>
Cc: gnats-bugs%netbsd.org@localhost
Subject: Re: pkg/38983: sendmail doesn't compile on i386-current
Date: Thu, 13 Nov 2008 08:36:13 +1300

 --Boundary-00=_tAzGJvkvoS8spqA
 Content-Type: text/plain;
   charset="iso-8859-1"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 Well having not read this PR (until now) I'll include my fix to the problem 
 which is quite similar to the proposed patch already suggested by Eric 
 Schnoebelen except mine makes the define conditional on value of 
 __NetBSD_Version__ (and adds a define for SM_CONF_STRL but thats not 
 directly relevant).
 
 cheers
 mark
 
 --Boundary-00=_tAzGJvkvoS8spqA
 Content-Type: text/x-diff;
   charset="iso 8859-15";
   name="sendmail.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
        filename="sendmail.patch"
 
 Index: Makefile
 ===================================================================
 RCS file: /src/cvs/netbsd/pkgsrc/mail/sendmail/Makefile,v
 retrieving revision 1.104
 diff -u -r1.104 Makefile
 --- Makefile   13 Aug 2008 15:41:29 -0000      1.104
 +++ Makefile   16 Oct 2008 05:00:32 -0000
 @@ -1,7 +1,7 @@
  # $NetBSD: Makefile,v 1.104 2008/08/13 15:41:29 manu Exp $
  
  PKGNAME=      sendmail-${DIST_VERS}
 -PKGREVISION=  1
 +PKGREVISION=  2
  COMMENT=      The well known Mail Transport Agent
  
  CONFLICTS+=   courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]*
 Index: distinfo
 ===================================================================
 RCS file: /src/cvs/netbsd/pkgsrc/mail/sendmail/distinfo,v
 retrieving revision 1.37
 diff -u -r1.37 distinfo
 --- distinfo   14 Jun 2008 08:58:06 -0000      1.37
 +++ distinfo   16 Oct 2008 05:00:11 -0000
 @@ -3,7 +3,7 @@
  SHA1 (sendmail.8.14.3.tar.gz) = 814c54c3917aa6b0981b5ea99fb34e0c02f31489
  RMD160 (sendmail.8.14.3.tar.gz) = 5423360ce908c985827cf6524a6de87e3451c27a
  Size (sendmail.8.14.3.tar.gz) = 2069209 bytes
 -SHA1 (patch-aa) = b7ceece7760e3d637016da039f8429c1fb89f2cf
 +SHA1 (patch-aa) = 7b78da1c202fd47a20ce7ab30a90537d93880ba6
  SHA1 (patch-ab) = a2abf6e78772e257e2a1973e7730159ff24a91aa
  SHA1 (patch-ac) = 96c19300b4188dbcbd202768eea912f675dadc27
  SHA1 (patch-ad) = 7232cc7ceb46a2dbf631d61185e4c6ca4af18a13
 @@ -15,3 +15,4 @@
  SHA1 (patch-aj) = e65e6fe44380de2f9c397c1a97677eb4ad285433
  SHA1 (patch-al) = f5d8cef8c4abba5d5ae813b754c16037190a7ef1
  SHA1 (patch-am) = d84eedbff0f037c1db341255dc9e1877866f12c7
 +SHA1 (patch-an) = 92509850777047b180616dc2508ee5c5c01f42c0
 Index: patches/patch-aa
 ===================================================================
 RCS file: /src/cvs/netbsd/pkgsrc/mail/sendmail/patches/patch-aa,v
 retrieving revision 1.18
 diff -u -r1.18 patch-aa
 --- patches/patch-aa   30 Aug 2004 20:16:28 -0000      1.18
 +++ patches/patch-aa   16 Oct 2008 04:59:44 -0000
 @@ -1,8 +1,8 @@
  $NetBSD: patch-aa,v 1.18 2004/08/30 20:16:28 adrianp Exp $
  
 ---- devtools/OS/NetBSD.orig   Sun Jun 27 00:19:35 2004
 -+++ devtools/OS/NetBSD        Sun Jun 27 00:24:11 2004
 -@@ -7,13 +7,14 @@
 +--- devtools/OS/NetBSD.orig   2004-06-17 05:50:00.000000000 +1200
 ++++ devtools/OS/NetBSD
 +@@ -7,13 +7,15 @@ define(`confMAPDEF', `-DNEWDB -DNIS -DMA
   define(`confLIBS', `-lutil')
   define(`confENVDEF', ` -DNETISO')
   define(`confDEPEND_TYPE', `CC-M')
 @@ -11,6 +11,7 @@
  -define(`confUBINGRP', `wheel')
  -define(`confMANOWN', `root')
  -define(`confMANGRP', `wheel')
 ++define(`confSM_OS_HEADER', `sm_os_netbsd')
  +define(`confSBINGRP', `${BSD_BINGRP}')
  +define(`confUBINOWN', `${BSD_BINOWN}')
  +define(`confUBINGRP', `${BSD_BINGRP}')
 --- /dev/null  2008-11-13 08:13:04.000000000 +1300
 +++ patches/patch-an   2008-10-16 17:59:44.000000000 +1300
 @@ -0,0 +1,28 @@
 +$NetBSD$
 +
 +--- include/sm/os/sm_os_netbsd.h.orig 2008-10-16 17:49:30.000000000 +1300
 ++++ include/sm/os/sm_os_netbsd.h
 +@@ -0,0 +1,23 @@
 ++/*
 ++ */
 ++
 ++/*
 ++**  sm_os_netbsd.h -- platform definitions for NetBSD
 ++*/
 ++
 ++#define SM_OS_NAME   "netbsd"
 ++
 ++#define SM_CONF_SYS_CDEFS_H  1
 ++
 ++#if defined(__NetBSD__)
 ++#  include <sys/param.h> /* defines __NetBSD_Version__ */
 ++#  if __NetBSD_Version__ >= 104030000
 ++     /* 1.4.3 and later have strlcpy()/strlcat() */
 ++#    ifndef SM_CONF_STRL
 ++#       define SM_CONF_STRL             1
 ++#    endif
 ++#  endif
 ++#  if __NetBSD_Version__ >= 499006500
 ++#    define SM_CONF_STDBOOL_H           1
 ++#  endif
 ++#endif
 
 --Boundary-00=_tAzGJvkvoS8spqA--