Pullup ticket #3823 - requested by dholland
net/nasd: build fix

Revisions pulled up:
- net/nasd/distinfo                                             1.2
- net/nasd/patches/patch-al                                     1.2
- net/nasd/patches/patch-ay                                     1.2
- net/nasd/patches/patch-common_i386_Imakefile                  1.1
- net/nasd/patches/patch-include_nasd_nasd__timer_h             1.1
- net/nasd/patches/patch-kernel__generate_dux_other_Makefile    1.1
- net/nasd/patches/patch-kernel__generate_dux_other_nasd_Makefile 1.1

---
   Module Name:	pkgsrc
   Committed By:	dholland
   Date:		Sat Jun  2 23:34:56 UTC 2012

   Modified Files:
   	pkgsrc/net/nasd: distinfo
   	pkgsrc/net/nasd/patches: patch-al patch-ay
   Added Files:
   	pkgsrc/net/nasd/patches: patch-common_i386_Imakefile
   	    patch-include_nasd_nasd__timer_h
   	    patch-kernel__generate_dux_other_Makefile
   	    patch-kernel__generate_dux_other_nasd_Makefile

   Log Message:
   Fix broken build.

   (1) With gcc 4.5, cpp does not fold lines separated by a escaped
   newline in the output. Therefore when nasd_rpcgen runs its rpc
   definitions through cpp, what comes out contains syntax errors. The
   parser then reports these with SIGSEGV. First fix the cpp plumbing to
   use the cpp tool wrapper during build, and then have it use -traditional.

   (2) On amd64, roughly half the build thinks it's actually i386. Patch
   the other half to agree. This may not turn out to work, but it does
   build instead of dumping out bizarre compile errors.


(tron)

$NetBSD: patch-common_i386_Imakefile,v 1.1.2.2 2012/06/06 18:11:41 tron Exp $

Treat x86_64 like i386, as half the build system already does, and
hope it works.

--- common/i386/Imakefile~	2005-03-21 08:52:02.000000000 +0000
+++ common/i386/Imakefile
@@ -25,7 +25,7 @@
 
 #include "NASD.tmpl"
 
-#if defined(i386Architecture)
+#if defined(i386Architecture) || defined(__amd64__) || defined(__x86_64__)
 
 SRCS = \
 	nasd_rpcc.c

$NetBSD: patch-include_nasd_nasd__timer_h,v 1.1.2.2 2012/06/06 18:11:41 tron Exp $

Handle x86_64 like i386.

--- include/nasd/nasd_timer.h~	2005-03-21 08:52:03.000000000 +0000
+++ include/nasd/nasd_timer.h
@@ -33,7 +33,7 @@
 
 #define NASD_TM_INTERVALS 60
 
-#if defined(SOLARIS) && !defined(i386)
+#if defined(SOLARIS) && !defined(i386) && !defined(__x86_64__)
 #include <nasd/generic/nasd_generic_timer.h>
 #define NASD_TIMERS_DEFINED
 #endif /* SOLARIS && !i386 */
@@ -127,7 +127,7 @@ struct nasd_delaycounter_s {
 
 #endif /* DEC_OSF */
 
-#ifdef i386
+#if defined(i386) || defined(__x86_64__)
 
 #include <asm/delay.h>
 
@@ -237,7 +237,7 @@ struct nasd_delaycounter_s {
 /*
  * Performance counters
  */
-#if defined(DEC_OSF) || defined(i386)
+#if defined(DEC_OSF) || defined(i386) || defined(__x86_64__)
 typedef struct nasd_timer_s           nasd_timer_t;
 typedef struct nasd_multitimer_s      nasd_multitimer_t;
 typedef struct nasd_timer_interval_s  nasd_timer_interval_t;
@@ -261,7 +261,7 @@ extern nasd_uint32 NASD_rpcc();
 #define NASD_RPCC() NASD_rpcc()
 #define NASD_TICKS nasd_ctimer_ticks
 
-#ifdef i386
+#if defined(i386) || defined(__x86_64__)
 extern void NASD_rpcc_int64(nasd_uint32 *high, nasd_uint32 *low);
 #endif /* i386 */
 

$NetBSD: patch-kernel__generate_dux_other_Makefile,v 1.1.2.2 2012/06/06 18:11:41 tron Exp $

Set cpp and use -traditional when invoking nasd_rpcgen.

--- kernel_generate/dux/other/Makefile~	2005-03-21 08:52:03.000000000 +0000
+++ kernel_generate/dux/other/Makefile
@@ -55,8 +55,9 @@ IMODE   = 444
 IOWNER  = bin
 IGROUP  = bin
 
-NASD_RPCGEN = ../../../../bin/nasd_rpcgen
-NASD_RPCGEN_BIN = ${NASD_RPCGEN}
+NASD_RPCGEN = ${NASD_RPCGEN_BIN} ${NASD_RPCGEN_ARGS}
+NASD_RPCGEN_BIN = ../../../../bin/nasd_rpcgen
+NASD_RPCGEN_ARGS = -C 'cpp -traditional'
 NASD_RPCGEN_INCLUDES = -I${MAKETOP}kernel/nasd/kernel_generate/dux -I${MAKETOP}kernel/nasd/kernel_generate/dux/other
 
 include ${MAKEFILEPATH}/standard.mk

$NetBSD: patch-kernel__generate_dux_other_nasd_Makefile,v 1.1.2.2 2012/06/06 18:11:41 tron Exp $

Set cpp and use -traditional when invoking nasd_rpcgen.

--- kernel_generate/dux/other/nasd/Makefile~	2005-03-21 08:52:03.000000000 +0000
+++ kernel_generate/dux/other/nasd/Makefile
@@ -61,7 +61,7 @@ IGROUP  = bin
 IOWNER  = bin
 
 NASD_RPCGEN_BIN = ../../../../../bin/nasd_rpcgen
-NASD_RPCGEN = ${NASD_RPCGEN_BIN} -S_t
+NASD_RPCGEN = ${NASD_RPCGEN_BIN} -S_t -C 'cpp -traditional'
 NASD_RPCGEN_INCLUDES = -I${MAKETOP}kernel/nasd/kernel_generate/dux -I${MAKETOP}kernel/nasd/kernel_generate/dux/other
 
 NASD_OPTIONS_H=${MAKETOP}kernel/nasd/include/nasd/nasd_options.h