CVS commit: [pkgsrc-2012Q1] pkgsrc/net/nasd

["Matthias Scheler" <tron%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tron
Date:           Wed Jun  6 18:11:41 UTC 2012

Modified Files:
        pkgsrc/net/nasd [pkgsrc-2012Q1]: distinfo
        pkgsrc/net/nasd/patches [pkgsrc-2012Q1]: patch-al patch-ay
Added Files:
        pkgsrc/net/nasd/patches [pkgsrc-2012Q1]: 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:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.60.1 pkgsrc/net/nasd/distinfo
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.60.1 pkgsrc/net/nasd/patches/patch-al \
    pkgsrc/net/nasd/patches/patch-ay
cvs rdiff -u -r0 -r1.1.2.2 \
    pkgsrc/net/nasd/patches/patch-common_i386_Imakefile \
    pkgsrc/net/nasd/patches/patch-include_nasd_nasd__timer_h \
    pkgsrc/net/nasd/patches/patch-kernel__generate_dux_other_Makefile \
    pkgsrc/net/nasd/patches/patch-kernel__generate_dux_other_nasd_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.