head	1.2;
access;
symbols
	pkgsrc-2026Q1:1.2.0.112
	pkgsrc-2026Q1-base:1.2
	pkgsrc-2025Q4:1.2.0.110
	pkgsrc-2025Q4-base:1.2
	pkgsrc-2025Q3:1.2.0.108
	pkgsrc-2025Q3-base:1.2
	pkgsrc-2025Q2:1.2.0.106
	pkgsrc-2025Q2-base:1.2
	pkgsrc-2025Q1:1.2.0.104
	pkgsrc-2025Q1-base:1.2
	pkgsrc-2024Q4:1.2.0.102
	pkgsrc-2024Q4-base:1.2
	pkgsrc-2024Q3:1.2.0.100
	pkgsrc-2024Q3-base:1.2
	pkgsrc-2024Q2:1.2.0.98
	pkgsrc-2024Q2-base:1.2
	pkgsrc-2024Q1:1.2.0.96
	pkgsrc-2024Q1-base:1.2
	pkgsrc-2023Q4:1.2.0.94
	pkgsrc-2023Q4-base:1.2
	pkgsrc-2023Q3:1.2.0.92
	pkgsrc-2023Q3-base:1.2
	pkgsrc-2023Q2:1.2.0.90
	pkgsrc-2023Q2-base:1.2
	pkgsrc-2023Q1:1.2.0.88
	pkgsrc-2023Q1-base:1.2
	pkgsrc-2022Q4:1.2.0.86
	pkgsrc-2022Q4-base:1.2
	pkgsrc-2022Q3:1.2.0.84
	pkgsrc-2022Q3-base:1.2
	pkgsrc-2022Q2:1.2.0.82
	pkgsrc-2022Q2-base:1.2
	pkgsrc-2022Q1:1.2.0.80
	pkgsrc-2022Q1-base:1.2
	pkgsrc-2021Q4:1.2.0.78
	pkgsrc-2021Q4-base:1.2
	pkgsrc-2021Q3:1.2.0.76
	pkgsrc-2021Q3-base:1.2
	pkgsrc-2021Q2:1.2.0.74
	pkgsrc-2021Q2-base:1.2
	pkgsrc-2021Q1:1.2.0.72
	pkgsrc-2021Q1-base:1.2
	pkgsrc-2020Q4:1.2.0.70
	pkgsrc-2020Q4-base:1.2
	pkgsrc-2020Q3:1.2.0.68
	pkgsrc-2020Q3-base:1.2
	pkgsrc-2020Q2:1.2.0.64
	pkgsrc-2020Q2-base:1.2
	pkgsrc-2020Q1:1.2.0.44
	pkgsrc-2020Q1-base:1.2
	pkgsrc-2019Q4:1.2.0.66
	pkgsrc-2019Q4-base:1.2
	pkgsrc-2019Q3:1.2.0.62
	pkgsrc-2019Q3-base:1.2
	pkgsrc-2019Q2:1.2.0.60
	pkgsrc-2019Q2-base:1.2
	pkgsrc-2019Q1:1.2.0.58
	pkgsrc-2019Q1-base:1.2
	pkgsrc-2018Q4:1.2.0.56
	pkgsrc-2018Q4-base:1.2
	pkgsrc-2018Q3:1.2.0.54
	pkgsrc-2018Q3-base:1.2
	pkgsrc-2018Q2:1.2.0.52
	pkgsrc-2018Q2-base:1.2
	pkgsrc-2018Q1:1.2.0.50
	pkgsrc-2018Q1-base:1.2
	pkgsrc-2017Q4:1.2.0.48
	pkgsrc-2017Q4-base:1.2
	pkgsrc-2017Q3:1.2.0.46
	pkgsrc-2017Q3-base:1.2
	pkgsrc-2017Q2:1.2.0.42
	pkgsrc-2017Q2-base:1.2
	pkgsrc-2017Q1:1.2.0.40
	pkgsrc-2017Q1-base:1.2
	pkgsrc-2016Q4:1.2.0.38
	pkgsrc-2016Q4-base:1.2
	pkgsrc-2016Q3:1.2.0.36
	pkgsrc-2016Q3-base:1.2
	pkgsrc-2016Q2:1.2.0.34
	pkgsrc-2016Q2-base:1.2
	pkgsrc-2016Q1:1.2.0.32
	pkgsrc-2016Q1-base:1.2
	pkgsrc-2015Q4:1.2.0.30
	pkgsrc-2015Q4-base:1.2
	pkgsrc-2015Q3:1.2.0.28
	pkgsrc-2015Q3-base:1.2
	pkgsrc-2015Q2:1.2.0.26
	pkgsrc-2015Q2-base:1.2
	pkgsrc-2015Q1:1.2.0.24
	pkgsrc-2015Q1-base:1.2
	pkgsrc-2014Q4:1.2.0.22
	pkgsrc-2014Q4-base:1.2
	pkgsrc-2014Q3:1.2.0.20
	pkgsrc-2014Q3-base:1.2
	pkgsrc-2014Q2:1.2.0.18
	pkgsrc-2014Q2-base:1.2
	pkgsrc-2014Q1:1.2.0.16
	pkgsrc-2014Q1-base:1.2
	pkgsrc-2013Q4:1.2.0.14
	pkgsrc-2013Q4-base:1.2
	pkgsrc-2013Q3:1.2.0.12
	pkgsrc-2013Q3-base:1.2
	pkgsrc-2013Q2:1.2.0.10
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2013Q1:1.2.0.8
	pkgsrc-2013Q1-base:1.2
	pkgsrc-2012Q4:1.2.0.6
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2012Q3:1.2.0.4
	pkgsrc-2012Q3-base:1.2
	pkgsrc-2012Q2:1.2.0.2
	pkgsrc-2012Q2-base:1.2
	pkgsrc-2012Q1:1.1.1.1.0.60
	pkgsrc-2012Q1-base:1.1.1.1
	pkgsrc-2011Q4:1.1.1.1.0.58
	pkgsrc-2011Q4-base:1.1.1.1
	pkgsrc-2011Q3:1.1.1.1.0.56
	pkgsrc-2011Q3-base:1.1.1.1
	pkgsrc-2011Q2:1.1.1.1.0.54
	pkgsrc-2011Q2-base:1.1.1.1
	pkgsrc-2011Q1:1.1.1.1.0.52
	pkgsrc-2011Q1-base:1.1.1.1
	pkgsrc-2010Q4:1.1.1.1.0.50
	pkgsrc-2010Q4-base:1.1.1.1
	pkgsrc-2010Q3:1.1.1.1.0.48
	pkgsrc-2010Q3-base:1.1.1.1
	pkgsrc-2010Q2:1.1.1.1.0.46
	pkgsrc-2010Q2-base:1.1.1.1
	pkgsrc-2010Q1:1.1.1.1.0.44
	pkgsrc-2010Q1-base:1.1.1.1
	pkgsrc-2009Q4:1.1.1.1.0.42
	pkgsrc-2009Q4-base:1.1.1.1
	pkgsrc-2009Q3:1.1.1.1.0.40
	pkgsrc-2009Q3-base:1.1.1.1
	pkgsrc-2009Q2:1.1.1.1.0.38
	pkgsrc-2009Q2-base:1.1.1.1
	pkgsrc-2009Q1:1.1.1.1.0.36
	pkgsrc-2009Q1-base:1.1.1.1
	pkgsrc-2008Q4:1.1.1.1.0.34
	pkgsrc-2008Q4-base:1.1.1.1
	pkgsrc-2008Q3:1.1.1.1.0.32
	pkgsrc-2008Q3-base:1.1.1.1
	cube-native-xorg:1.1.1.1.0.30
	cube-native-xorg-base:1.1.1.1
	pkgsrc-2008Q2:1.1.1.1.0.28
	pkgsrc-2008Q2-base:1.1.1.1
	cwrapper:1.1.1.1.0.26
	pkgsrc-2008Q1:1.1.1.1.0.24
	pkgsrc-2008Q1-base:1.1.1.1
	pkgsrc-2007Q4:1.1.1.1.0.22
	pkgsrc-2007Q4-base:1.1.1.1
	pkgsrc-2007Q3:1.1.1.1.0.20
	pkgsrc-2007Q3-base:1.1.1.1
	pkgsrc-2007Q2:1.1.1.1.0.18
	pkgsrc-2007Q2-base:1.1.1.1
	pkgsrc-2007Q1:1.1.1.1.0.16
	pkgsrc-2007Q1-base:1.1.1.1
	pkgsrc-2006Q4:1.1.1.1.0.14
	pkgsrc-2006Q4-base:1.1.1.1
	pkgsrc-2006Q3:1.1.1.1.0.12
	pkgsrc-2006Q3-base:1.1.1.1
	pkgsrc-2006Q2:1.1.1.1.0.10
	pkgsrc-2006Q2-base:1.1.1.1
	pkgsrc-2006Q1:1.1.1.1.0.8
	pkgsrc-2006Q1-base:1.1.1.1
	pkgsrc-2005Q4:1.1.1.1.0.6
	pkgsrc-2005Q4-base:1.1.1.1
	pkgsrc-2005Q3:1.1.1.1.0.4
	pkgsrc-2005Q3-base:1.1.1.1
	pkgsrc-2005Q2:1.1.1.1.0.2
	pkgsrc-2005Q2-base:1.1.1.1
	pkgsrc-base:1.1.1.1
	TNF:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2012.06.02.23.34.56;	author dholland;	state Exp;
branches;
next	1.1;

1.1
date	2005.05.04.08.56.50;	author agc;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2005.05.04.08.56.50;	author agc;	state Exp;
branches
	1.1.1.1.60.1;
next	;

1.1.1.1.60.1
date	2012.06.06.18.11.41;	author tron;	state Exp;
branches;
next	;


desc
@@


1.2
log
@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.
@
text
@$NetBSD: patch-al,v 1.1.1.1 2005/05/04 08:56:50 agc Exp $

- have rpcgen use cpp on the path (thus picking up the tool wrapper)
- use -traditional with cpp, or gcc 4.4(?) and up fail
- add explicit netbsd support
- add pthread options

--- config/NASD.tmpl.orig	2005-03-21 08:52:02.000000000 +0000
+++ config/NASD.tmpl
@@@@ -94,6 +94,7 @@@@ CRYPT_COMMONLIB=$(THE_TOP)/common/crypto
  * nasd_rpcgen binary
  */
 NASD_RPCGEN_BIN=$(THE_TOP)/rpcgen/nasd_rpcgen
+NASD_RPCGEN_ARGS=-C 'cpp -traditional'
 NASD_RPCGEN_INCLUDES=-I$(THE_TOP)/include
 
 /* may be overridden by local Imakefiles */
@@@@ -167,7 +168,7 @@@@ DEFINES = -D__LANGUAGE_C__ $(NASD_CFGDEF
  */
 #define NASD_MakeSubdirs(_dirs_) NamedTargetSubdirs(all,_dirs_,"Making",PassCDebugFlags,all)
 #else /* AIXArchitecture && (NASD_OSMajorVersion == 4) */
-#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(NetBSDArchitecture)
 /*
  * The XFree86 NamedTargetSubdirs macro was written by
  * some weeder who just didn't grasp the beauty of
@@@@ -188,7 +189,7 @@@@ name:: @@@@\
 			exit $$status; \ @@@@\
 		fi \ @@@@\
 	done
-#endif /* LinuxArchitecture || FreeBSDArchitecture */
+#endif /* LinuxArchitecture || FreeBSDArchitecture || NetBSDArchitecture */
 /*
  * Everything else
  */
@@@@ -407,7 +408,7 @@@@ Makefiles makefiles::
 PULLINSYMS = -include ${NASD_KMOD_INCDIR}/nasd/nasd_linux_common_syms.ver.h
 
 .c.o:
-	$(CC) -c $(CFLAGS) $(NASD_DEFAULTCFLAGS) $(PULLINSYMS) $(NASD_LCFLAGS) $<
+	$(CC) -c $(CFLAGS) -pthread $(NASD_DEFAULTCFLAGS) $(PULLINSYMS) $(NASD_LCFLAGS) $<
 
 #ifndef NASD_OverrideCOTarget
 #define NASD_OverrideCOTarget
@@@@ -432,7 +433,7 @@@@ filenamebase.o: filenamebase.c @@@@\
 program: objects deplibs @@@@\
 	RemoveTargetProgram($@@) @@@@\
 	RemoveTargetProgram(a.out) @@@@\
-	$(CC) -o a.out objects $(LDOPTIONS) locallibs $(LDLIBS) syslibs $(ARCHLIBS) $(EXTRA_LOAD_FLAGS) @@@@\
+	$(CC) -o a.out objects $(LDOPTIONS) locallibs $(LDLIBS) syslibs $(ARCHLIBS) -lpthread $(EXTRA_LOAD_FLAGS) @@@@\
 	$(MV) a.out $@@ @@@@\
 @@@@\
 clean:: @@@@\
@@@@ -592,7 +593,7 @@@@ depend:: idlfn headerfn @@@@\
 @@@@\
 idlfn:: rpcfn $(THE_TOP)/include/nasd/nasd_options.h @@@@\
 	$(RM) idlfn tmp.idlfn @@@@\
-	$(NASD_RPCGEN_BIN) -S_t -I$(THE_TOP)/include -i tmp.idlfn rpcfn @@@@\
+	$(NASD_RPCGEN_BIN) $(NASD_RPCGEN_ARGS) -S_t -I$(THE_TOP)/include -i tmp.idlfn rpcfn @@@@\
 	$(MV) tmp.idlfn idlfn @@@@\
 @@@@\
 headerfn:: idlfn @@@@\
@@@@ -682,7 +683,7 @@@@ depend:: headerfn @@@@\
 @@@@\
 headerfn:: rpcfn $(THE_TOP)/include/nasd/nasd_options.h @@@@\
 	$(RM) headerfn tmp.headerfn @@@@\
-	$(NASD_RPCGEN_BIN) -S_t -I$(THE_TOP)/include -h tmp.headerfn rpcfn @@@@\
+	$(NASD_RPCGEN_BIN) $(NASD_RPCGEN_ARGS) -S_t -I$(THE_TOP)/include -h tmp.headerfn rpcfn @@@@\
 	$(MV) tmp.headerfn headerfn @@@@\
 @@@@\
 clean:: @@@@\
@@@@ -699,7 +700,7 @@@@ depend:: serverfn.c @@@@\
 serverfn.c:: rpcfn $(NASD_RPCGEN_BIN) $(THE_TOP)/include/nasd/nasd_options.h @@@@\
 	@@echo Generating serverfn.c @@@@\
 	@@$(RM) serverfn.c tmp.serverfn.c @@@@\
-	$(NASD_RPCGEN_BIN) -S_t -I$(THE_TOP)/include -B nasd/nasd_error.h -B nasd/nasd_types.h -B headerfn1 -B headerfn2 -y tmp.serverfn.c rpcfn @@@@\
+	$(NASD_RPCGEN_BIN) $(NASD_RPCGEN_ARGS) -S_t -I$(THE_TOP)/include -B nasd/nasd_error.h -B nasd/nasd_types.h -B headerfn1 -B headerfn2 -y tmp.serverfn.c rpcfn @@@@\
 	$(MV) tmp.serverfn.c serverfn.c @@@@\
 	@@echo Generated serverfn.c @@@@\
 @@@@\
@@@@ -716,7 +717,7 @@@@ depend:: serverfn.h @@@@\
 serverfn.h:: rpcfn $(NASD_RPCGEN_BIN) $(THE_TOP)/include/nasd/nasd_options.h @@@@\
 	@@echo Generating serverfn.h @@@@\
 	@@$(RM) serverfn.h tmp.serverfn.h @@@@\
-	$(NASD_RPCGEN_BIN) -S_t -I$(THE_TOP)/include -Y tmp.serverfn.h -B nasd/nasd_error.h -B nasd/nasd_types.h rpcfn @@@@\
+	$(NASD_RPCGEN_BIN) $(NASD_RPCGEN_ARGS) -S_t -I$(THE_TOP)/include -Y tmp.serverfn.h -B nasd/nasd_error.h -B nasd/nasd_types.h rpcfn @@@@\
 	$(MV) tmp.serverfn.h serverfn.h @@@@\
 	@@echo Generated serverfn.h @@@@\
 @@@@\
@@@@ -731,7 +732,7 @@@@ depend:: clientfn.c @@@@\
 clientfn.c:: rpcfn $(NASD_RPCGEN_BIN) $(THE_TOP)/include/nasd/nasd_options.h @@@@\
 	@@echo Generating clientfn.c @@@@\
 	@@$(RM) clientfn.c tmp.clientfn.c @@@@\
-	$(NASD_RPCGEN_BIN) -S_t -I$(THE_TOP)/include -B nasd/nasd_error.h -B nasd/nasd_types.h -B nasd/nasd_marshall.h -B headerfn1 -B headerfn2 -x tmp.clientfn.c rpcfn @@@@\
+	$(NASD_RPCGEN_BIN) $(NASD_RPCGEN_ARGS) -S_t -I$(THE_TOP)/include -B nasd/nasd_error.h -B nasd/nasd_types.h -B nasd/nasd_marshall.h -B headerfn1 -B headerfn2 -x tmp.clientfn.c rpcfn @@@@\
 	$(MV) tmp.clientfn.c clientfn.c @@@@\
 	@@echo Generated clientfn.c @@@@\
 @@@@\
@@@@ -748,7 +749,7 @@@@ depend:: clientfn.h @@@@\
 clientfn.h:: rpcfn $(NASD_RPCGEN_BIN) $(THE_TOP)/include/nasd/nasd_options.h @@@@\
 	@@echo Generating clientfn.h @@@@\
 	@@$(RM) clientfn.h tmp.clientfn.h @@@@\
-	$(NASD_RPCGEN_BIN) -S_t -I$(THE_TOP)/include -X tmp.clientfn.h -B nasd/nasd_error.h -B nasd/nasd_types.h rpcfn @@@@\
+	$(NASD_RPCGEN_BIN) $(NASD_RPCGEN_ARGS) -S_t -I$(THE_TOP)/include -X tmp.clientfn.h -B nasd/nasd_error.h -B nasd/nasd_types.h rpcfn @@@@\
 	$(MV) tmp.clientfn.h clientfn.h @@@@\
 	@@echo Generated clientfn.h @@@@\
 @@@@\
@@@@ -765,7 +766,7 @@@@ depend:: marshallfn @@@@\
 marshallfn:: rpcfn $(NASD_RPCGEN_BIN) $(THE_TOP)/include/nasd/nasd_options.h @@@@\
 	@@echo Generating marshallfn @@@@\
 	@@$(RM) marshallfn tmp.marshallfn @@@@\
-	$(NASD_RPCGEN_BIN) -S_t -I$(THE_TOP)/include -M tmp.marshallfn -P nasd_ -B headerfn rpcfn @@@@\
+	$(NASD_RPCGEN_BIN) $(NASD_RPCGEN_ARGS) -S_t -I$(THE_TOP)/include -M tmp.marshallfn -P nasd_ -B headerfn rpcfn @@@@\
 	$(MV) tmp.marshallfn marshallfn @@@@\
 	@@echo Generated marshallfn @@@@\
 @@@@\
@@@@ -783,7 +784,7 @@@@ depend:: marshallfn @@@@\
 marshallfn:: rpcfn $(NASD_RPCGEN_BIN) $(THE_TOP)/include/nasd/nasd_options.h @@@@\
 	@@echo Generating marshallfn @@@@\
 	@@$(RM) marshallfn tmp.marshallfn @@@@\
-	$(NASD_RPCGEN_BIN) -S_t -I$(THE_TOP)/include -e tmp.marshallfn -P nasd_ -B headerfn rpcfn @@@@\
+	$(NASD_RPCGEN_BIN) $(NASD_RPCGEN_ARGS) -S_t -I$(THE_TOP)/include -e tmp.marshallfn -P nasd_ -B headerfn rpcfn @@@@\
 	$(MV) tmp.marshallfn marshallfn @@@@\
 	@@echo Generated marshallfn @@@@\
 @@@@\
@@@@ -821,7 +822,8 @@@@ sayconfig::
 	NASD_SayVar(NASD_RPC_PACKAGE_DEFINES)
 	NASD_SayVar(NASD_CMU_PDLDEFINES)
 
-#ifdef FreeBSDArchitecture
+
+#if defined(FreeBSDArchitecture) || defined(NetBSDArchitecture)
 /* FreeBSD's make automatically looks for .depend, but gmake doesn't. */
 #undef IncludeMakefile
 #define IncludeMakefile(file) @@@@-include file
@


1.1
log
@Initial revision
@
text
@d1 1
a1 1
$NetBSD$
d3 16
a18 9
Index: config/NASD.tmpl
===================================================================
RCS file: /usr/cvsroot/nasd/nasd-1.3/config/NASD.tmpl,v
retrieving revision 1.1.1.1
retrieving revision 1.3
diff -u -r1.1.1.1 -r1.3
--- config/NASD.tmpl	21 Mar 2005 08:52:02 -0000	1.1.1.1
+++ config/NASD.tmpl	21 Mar 2005 22:36:25 -0000	1.3
@@@@ -167,7 +167,7 @@@@
d27 1
a27 1
@@@@ -188,7 +188,7 @@@@
d36 1
a36 1
@@@@ -407,7 +407,7 @@@@
d45 1
a45 1
@@@@ -432,7 +432,7 @@@@
d54 73
a126 1
@@@@ -821,7 +821,8 @@@@
@


1.1.1.1
log
@Initial import of nasd-1.3, a prototype storage implementation, from CMU.

The original tar file has trailing base64 checksums, so I have
repackaged the tar file for just now.

	This is release 1.3 of the Parallel Data Laboratory NASD
	software prototype.  The release includes the NASD drive
	prototype, the NASD-NFS filemanager, simple client APIs, a
	regression-testing suite, sample programs, a snapshot of
	Cheops (which is one implementation of aggregation over
	multiple NASDs), and some basic documentation.

@
text
@@


1.1.1.1.60.1
log
@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.
@
text
@d3 9
a11 16
- have rpcgen use cpp on the path (thus picking up the tool wrapper)
- use -traditional with cpp, or gcc 4.4(?) and up fail
- add explicit netbsd support
- add pthread options

--- config/NASD.tmpl.orig	2005-03-21 08:52:02.000000000 +0000
+++ config/NASD.tmpl
@@@@ -94,6 +94,7 @@@@ CRYPT_COMMONLIB=$(THE_TOP)/common/crypto
  * nasd_rpcgen binary
  */
 NASD_RPCGEN_BIN=$(THE_TOP)/rpcgen/nasd_rpcgen
+NASD_RPCGEN_ARGS=-C 'cpp -traditional'
 NASD_RPCGEN_INCLUDES=-I$(THE_TOP)/include
 
 /* may be overridden by local Imakefiles */
@@@@ -167,7 +168,7 @@@@ DEFINES = -D__LANGUAGE_C__ $(NASD_CFGDEF
d20 1
a20 1
@@@@ -188,7 +189,7 @@@@ name:: @@@@\
d29 1
a29 1
@@@@ -407,7 +408,7 @@@@ Makefiles makefiles::
d38 1
a38 1
@@@@ -432,7 +433,7 @@@@ filenamebase.o: filenamebase.c @@@@\
d47 1
a47 73
@@@@ -592,7 +593,7 @@@@ depend:: idlfn headerfn @@@@\
 @@@@\
 idlfn:: rpcfn $(THE_TOP)/include/nasd/nasd_options.h @@@@\
 	$(RM) idlfn tmp.idlfn @@@@\
-	$(NASD_RPCGEN_BIN) -S_t -I$(THE_TOP)/include -i tmp.idlfn rpcfn @@@@\
+	$(NASD_RPCGEN_BIN) $(NASD_RPCGEN_ARGS) -S_t -I$(THE_TOP)/include -i tmp.idlfn rpcfn @@@@\
 	$(MV) tmp.idlfn idlfn @@@@\
 @@@@\
 headerfn:: idlfn @@@@\
@@@@ -682,7 +683,7 @@@@ depend:: headerfn @@@@\
 @@@@\
 headerfn:: rpcfn $(THE_TOP)/include/nasd/nasd_options.h @@@@\
 	$(RM) headerfn tmp.headerfn @@@@\
-	$(NASD_RPCGEN_BIN) -S_t -I$(THE_TOP)/include -h tmp.headerfn rpcfn @@@@\
+	$(NASD_RPCGEN_BIN) $(NASD_RPCGEN_ARGS) -S_t -I$(THE_TOP)/include -h tmp.headerfn rpcfn @@@@\
 	$(MV) tmp.headerfn headerfn @@@@\
 @@@@\
 clean:: @@@@\
@@@@ -699,7 +700,7 @@@@ depend:: serverfn.c @@@@\
 serverfn.c:: rpcfn $(NASD_RPCGEN_BIN) $(THE_TOP)/include/nasd/nasd_options.h @@@@\
 	@@echo Generating serverfn.c @@@@\
 	@@$(RM) serverfn.c tmp.serverfn.c @@@@\
-	$(NASD_RPCGEN_BIN) -S_t -I$(THE_TOP)/include -B nasd/nasd_error.h -B nasd/nasd_types.h -B headerfn1 -B headerfn2 -y tmp.serverfn.c rpcfn @@@@\
+	$(NASD_RPCGEN_BIN) $(NASD_RPCGEN_ARGS) -S_t -I$(THE_TOP)/include -B nasd/nasd_error.h -B nasd/nasd_types.h -B headerfn1 -B headerfn2 -y tmp.serverfn.c rpcfn @@@@\
 	$(MV) tmp.serverfn.c serverfn.c @@@@\
 	@@echo Generated serverfn.c @@@@\
 @@@@\
@@@@ -716,7 +717,7 @@@@ depend:: serverfn.h @@@@\
 serverfn.h:: rpcfn $(NASD_RPCGEN_BIN) $(THE_TOP)/include/nasd/nasd_options.h @@@@\
 	@@echo Generating serverfn.h @@@@\
 	@@$(RM) serverfn.h tmp.serverfn.h @@@@\
-	$(NASD_RPCGEN_BIN) -S_t -I$(THE_TOP)/include -Y tmp.serverfn.h -B nasd/nasd_error.h -B nasd/nasd_types.h rpcfn @@@@\
+	$(NASD_RPCGEN_BIN) $(NASD_RPCGEN_ARGS) -S_t -I$(THE_TOP)/include -Y tmp.serverfn.h -B nasd/nasd_error.h -B nasd/nasd_types.h rpcfn @@@@\
 	$(MV) tmp.serverfn.h serverfn.h @@@@\
 	@@echo Generated serverfn.h @@@@\
 @@@@\
@@@@ -731,7 +732,7 @@@@ depend:: clientfn.c @@@@\
 clientfn.c:: rpcfn $(NASD_RPCGEN_BIN) $(THE_TOP)/include/nasd/nasd_options.h @@@@\
 	@@echo Generating clientfn.c @@@@\
 	@@$(RM) clientfn.c tmp.clientfn.c @@@@\
-	$(NASD_RPCGEN_BIN) -S_t -I$(THE_TOP)/include -B nasd/nasd_error.h -B nasd/nasd_types.h -B nasd/nasd_marshall.h -B headerfn1 -B headerfn2 -x tmp.clientfn.c rpcfn @@@@\
+	$(NASD_RPCGEN_BIN) $(NASD_RPCGEN_ARGS) -S_t -I$(THE_TOP)/include -B nasd/nasd_error.h -B nasd/nasd_types.h -B nasd/nasd_marshall.h -B headerfn1 -B headerfn2 -x tmp.clientfn.c rpcfn @@@@\
 	$(MV) tmp.clientfn.c clientfn.c @@@@\
 	@@echo Generated clientfn.c @@@@\
 @@@@\
@@@@ -748,7 +749,7 @@@@ depend:: clientfn.h @@@@\
 clientfn.h:: rpcfn $(NASD_RPCGEN_BIN) $(THE_TOP)/include/nasd/nasd_options.h @@@@\
 	@@echo Generating clientfn.h @@@@\
 	@@$(RM) clientfn.h tmp.clientfn.h @@@@\
-	$(NASD_RPCGEN_BIN) -S_t -I$(THE_TOP)/include -X tmp.clientfn.h -B nasd/nasd_error.h -B nasd/nasd_types.h rpcfn @@@@\
+	$(NASD_RPCGEN_BIN) $(NASD_RPCGEN_ARGS) -S_t -I$(THE_TOP)/include -X tmp.clientfn.h -B nasd/nasd_error.h -B nasd/nasd_types.h rpcfn @@@@\
 	$(MV) tmp.clientfn.h clientfn.h @@@@\
 	@@echo Generated clientfn.h @@@@\
 @@@@\
@@@@ -765,7 +766,7 @@@@ depend:: marshallfn @@@@\
 marshallfn:: rpcfn $(NASD_RPCGEN_BIN) $(THE_TOP)/include/nasd/nasd_options.h @@@@\
 	@@echo Generating marshallfn @@@@\
 	@@$(RM) marshallfn tmp.marshallfn @@@@\
-	$(NASD_RPCGEN_BIN) -S_t -I$(THE_TOP)/include -M tmp.marshallfn -P nasd_ -B headerfn rpcfn @@@@\
+	$(NASD_RPCGEN_BIN) $(NASD_RPCGEN_ARGS) -S_t -I$(THE_TOP)/include -M tmp.marshallfn -P nasd_ -B headerfn rpcfn @@@@\
 	$(MV) tmp.marshallfn marshallfn @@@@\
 	@@echo Generated marshallfn @@@@\
 @@@@\
@@@@ -783,7 +784,7 @@@@ depend:: marshallfn @@@@\
 marshallfn:: rpcfn $(NASD_RPCGEN_BIN) $(THE_TOP)/include/nasd/nasd_options.h @@@@\
 	@@echo Generating marshallfn @@@@\
 	@@$(RM) marshallfn tmp.marshallfn @@@@\
-	$(NASD_RPCGEN_BIN) -S_t -I$(THE_TOP)/include -e tmp.marshallfn -P nasd_ -B headerfn rpcfn @@@@\
+	$(NASD_RPCGEN_BIN) $(NASD_RPCGEN_ARGS) -S_t -I$(THE_TOP)/include -e tmp.marshallfn -P nasd_ -B headerfn rpcfn @@@@\
 	$(MV) tmp.marshallfn marshallfn @@@@\
 	@@echo Generated marshallfn @@@@\
 @@@@\
@@@@ -821,7 +822,8 @@@@ sayconfig::
@

